diff --git a/njuthesis.dtx b/njuthesis.dtx
index ccc4a7ad1ffeb174537c70df95d22d428087b9a9..6029002632cbb42f7c06995a9435a8a23cbfa27e 100644
--- a/njuthesis.dtx
+++ b/njuthesis.dtx
@@ -1103,7 +1103,7 @@ through XeTeX.
\sys_if_engine_luatex:T{
% 鍔犱腑鏂囦笅鍒掔嚎
\RequirePackage{lua-ul}
- \newcommand{\njuline}[1]{\underLine{#1}}
+ \newcommand{\njuline}[1]{\underLine{#1}\null}
% emoji鏀寔
% \RequirePackage{emoji}
@@ -2369,124 +2369,123 @@ through XeTeX.
}
% \end{macrocode}
%
-%
+%
+% 鏈鎽樿鐜
%
% \begin{macrocode}
-% 鍒ゆ柇瀛︿綅
-\str_if_eq:NNTF {\l_@@_info_degree_tl} { ug }
-{
- % 鏈鎽樿鐜
- \NewDocumentEnvironment{abstract} {}
- {%
- % \pagestyle{plain}
- % \pagenumbering{Roman}
- % \phantomsection\addcontentsline{toc}{chapter}{涓枃鎽樿} % 灏嗘憳瑕佹彃鍏ョ洰褰曞拰pdf涔︾
- \pdfbookmark[0]{涓枃鎽樿}{abstract-zh} % 灏嗘憳瑕佹彃鍏df涔︾锛屼笌涓婁竴琛屼笉鍙叡瀛�
- \begin{center}
- \kaishu\zihao{-2}{\textbf{
- \uuline{鍗椾含澶у鏈鐢熸瘯涓氳鏂囷紙璁捐銆佷綔鍝侊級涓枃鎽樿}}}
- \end{center}
- {\bgroup
- \kaishu\zihao{-4}
- \tl_set:Nn \tabcolsep {0pt}
- \tl_set:Nn \arraystretch {0.8}
- \noindent
- 棰樼洰锛� \l_@@_info_title_tl \\
- 闄㈢郴锛� \l_@@_info_dept_tl \\
- 涓撲笟锛� \l_@@_major_tl \\
- 鏈鐢熷鍚嶏細 \l_@@_info_author_tl \\
- 鎸囧鏁欏笀锛堝鍚嶃€佽亴绉帮級锛歕l_@@_info_supv_full_tl \\
- 鎽樿锛�
- \egroup
- }
- \kaishu\zihao{-4}\par%
- }{%
- \newpage
+\cs_new_protected:Npn \@@_print_abstract_ug:
+{
+ % \pagestyle{plain}
+ % \pagenumbering{Roman}
+ % \phantomsection\addcontentsline{toc}{chapter}{涓枃鎽樿} % 灏嗘憳瑕佹彃鍏ョ洰褰曞拰pdf涔︾
+ \pdfbookmark[0]{涓枃鎽樿}{abstract-zh} % 灏嗘憳瑕佹彃鍏df涔︾锛屼笌涓婁竴琛屼笉鍙叡瀛�
+ \begin{center}
+ \kaishu\zihao{-2}{\textbf{
+ \uuline{鍗椾含澶у鏈鐢熸瘯涓氳鏂囷紙璁捐銆佷綔鍝侊級涓枃鎽樿}}}
+ \end{center}
+ {\bgroup
+ \kaishu\zihao{-4}
+ \tl_set:Nn \tabcolsep {0pt}
+ \tl_set:Nn \arraystretch {0.8}
+ \noindent
+ 棰樼洰锛� \l_@@_info_title_tl \\
+ 闄㈢郴锛� \l_@@_info_dept_tl \\
+ 涓撲笟锛� \l_@@_major_tl \\
+ 鏈鐢熷鍚嶏細 \l_@@_info_author_tl \\
+ 鎸囧鏁欏笀锛堝鍚嶃€佽亴绉帮級锛歕l_@@_info_supv_full_tl \\
+ 鎽樿锛�
+ \egroup
}
-
- % 鑻辨枃鎽樿
- \NewDocumentEnvironment{englishabstract} {}
- {%
- \pagestyle{plain}
- % \phantomsection\addcontentsline{toc}{chapter}{鑻辨枃鎽樿} % 灏嗘憳瑕佹彃鍏ョ洰褰曞拰pdf涔︾
- \pdfbookmark[0]{鑻辨枃鎽樿}{abstract-en} % 灏嗘憳瑕佹彃鍏df涔︾锛屼笌涓婁竴琛屼笉鍙叡瀛�
- \begin{center}
- \kaishu\zihao{-2}{\textbf{\uuline{
- 鍗椾含澶у鏈鐢熸瘯涓氳鏂囷紙璁捐銆佷綔鍝侊級鑻辨枃鎽樿}}}
- \end{center}
- {
- \bgroup
- THESIS: ~~\l_@@_info_title_en_tl \\
- DEPARTMENT: ~~\l_@@_info_dept_en_tl \\
- SPECIALIZATION: ~~\l_@@_major_en_tl \\
- UNDERGRADUATE:~~\l_@@_info_author_en_tl \\
- MENTOR:~~\l_@@_info_supv_full_en_tl \\
- ABSTRACT:
- \egroup
- }
- \zihao{-4}\par%
- }{%
- \cleardoublepage
- \newpage
+ \kaishu\zihao{-4}\par%
+}
+\cs_new_protected:Npn \@@_print_abstract_en_ug:
+{
+ \pagestyle{plain}
+ % \phantomsection\addcontentsline{toc}{chapter}{鑻辨枃鎽樿} % 灏嗘憳瑕佹彃鍏ョ洰褰曞拰pdf涔︾
+ \pdfbookmark[0]{鑻辨枃鎽樿}{abstract-en} % 灏嗘憳瑕佹彃鍏df涔︾锛屼笌涓婁竴琛屼笉鍙叡瀛�
+ \begin{center}
+ \kaishu\zihao{-2}{\textbf{\uuline{
+ 鍗椾含澶у鏈鐢熸瘯涓氳鏂囷紙璁捐銆佷綔鍝侊級鑻辨枃鎽樿}}}
+ \end{center}
+ {
+ \bgroup
+ THESIS: ~~\l_@@_info_title_en_tl \\
+ DEPARTMENT: ~~\l_@@_info_dept_en_tl \\
+ SPECIALIZATION: ~~\l_@@_major_en_tl \\
+ UNDERGRADUATE:~~\l_@@_info_author_en_tl \\
+ MENTOR:~~\l_@@_info_supv_full_en_tl \\
+ ABSTRACT:
+ \egroup
}
+ \zihao{-4}\par%
}
% \end{macrocode}
%
%
% 鐮旂┒鐢熸憳瑕佺幆澧�
% \begin{macrocode}
+\cs_new_protected:Npn \@@_print_abstract_g:
{
- \NewDocumentEnvironment{abstract} {}
- {%
- \pagestyle{plain}
- \pagenumbering{Roman}
- % \phantomsection\addcontentsline{toc}{chapter}{涓枃鎽樿} % 灏嗘憳瑕佹彃鍏ョ洰褰曞拰pdf涔︾
- \pdfbookmark[0]{涓枃鎽樿}{abstract-zh} % 灏嗘憳瑕佹彃鍏df涔︾锛屼笌涓婁竴琛屼笉鍙叡瀛�
- \begin{center}
+ \pagestyle{plain}
+ \pagenumbering{Roman}
+ % \phantomsection\addcontentsline{toc}{chapter}{涓枃鎽樿} % 灏嗘憳瑕佹彃鍏ョ洰褰曞拰pdf涔︾
+ \pdfbookmark[0]{涓枃鎽樿}{abstract-zh} % 灏嗘憳瑕佹彃鍏df涔︾锛屼笌涓婁竴琛屼笉鍙叡瀛�
+ \begin{center}
+ \kaishu\zihao{-2}{\textbf{\uuline{
+ 鍗椾含澶у鐮旂┒鐢熸瘯涓氳鏂囦腑鏂囨憳瑕侀椤电敤绾竲}}
+ \end{center}
+ \bgroup
+ \noindent
+ \kaishu\zihao{4}
+ \tl_set:Nn \tabcolsep {0pt}
+ \tl_set:Nn \arraystretch {0.8}
+ 姣曚笟璁烘枃棰樼洰锛歕hspace{0.5em}\njuline{\l_@@_info_title_tl\hfill}\\
+ \njuline{\makebox[11em]{\l_@@_major_tl}}涓撲笟
+ \njuline{\makebox[4em]{\l_@@_info_grade_tl}}绾�
+ \str_if_eq:NNTF {\l_@@_info_degree_tl} { phd } {鍗殅{纭晑
+ 澹敓濮撳悕锛歕njuline{\hfill\l_@@_info_author_tl\hfill}\\
+ 鎸囧鏁欏笀锛堝鍚嶃€佽亴绉帮級锛歕njuline{\hfill\l_@@_info_supv_full_tl\hfill}\par
+ \egroup
+ \kaishu\zihao{4}\par%
+}
+\cs_new_protected:Npn \@@_print_abstract_en_g:
+{
+ \pagestyle{plain}
+ % \phantomsection\addcontentsline{toc}{chapter}{鑻辨枃鎽樿} % 灏嗘憳瑕佹彃鍏ョ洰褰曞拰pdf涔︾
+ \pdfbookmark[0]{鑻辨枃鎽樿}{abstract-en} % 灏嗘憳瑕佹彃鍏df涔︾锛屼笌涓婁竴琛屼笉鍙叡瀛�
+ \begin{center}
\kaishu\zihao{-2}{\textbf{\uuline{
- 鍗椾含澶у鐮旂┒鐢熸瘯涓氳鏂囦腑鏂囨憳瑕侀椤电敤绾竲}}
- \end{center}
+ 鍗椾含澶у鐮旂┒鐢熸瘯涓氳鏂囪嫳鏂囨憳瑕侀椤电敤绾竲}}
+ \end{center}
+ {
\bgroup
- \noindent
- \kaishu\zihao{4}
- \tl_set:Nn \tabcolsep {0pt}
- \tl_set:Nn \arraystretch {0.8}
- 姣曚笟璁烘枃棰樼洰锛歕hspace{0.5em}\njuline{\l_@@_info_title_tl\hfill}\hspace{0em}\\
- \njuline{\makebox[9em]{\l_@@_major_tl}}涓撲笟
- \njuline{\makebox[4em]{\l_@@_info_grade_tl}}绾�
- \str_if_eq:NNTF {\l_@@_info_degree_tl} { phd } {鍗殅{纭晑
- 澹敓濮撳悕锛歕njuline{\hfill\l_@@_info_author_tl\hfill}\hspace{0em}\\
- 鎸囧鏁欏笀锛堝鍚嶃€佽亴绉帮級锛歕njuline{\hfill\l_@@_info_supv_full_tl\hfill}\hspace{0em}\par
+ \zihao{4}
+ THESIS: ~~\l_@@_info_title_en_tl \\
+ SPECIALIZATION: ~~\l_@@_major_en_tl \\
+ POSTGRADUATE:~~\l_@@_info_author_en_tl \\
+ MENTOR:~~\l_@@_info_supv_full_en_tl\par
\egroup
- \kaishu\zihao{4}\par%
- }{%
- \newpage
}
-
- % 鑻辨枃鎽樿
+ \zihao{4}\par%
+}
+% \end{macrocode}
+%
+%
+% 鍒ゆ柇瀛︿綅
+%
+% \begin{macrocode}
+\str_if_eq:NNTF {\l_@@_info_degree_tl} { ug }
+{
+ \NewDocumentEnvironment{abstract} {}
+ {\@@_print_abstract_ug:}{\newpage}
\NewDocumentEnvironment{englishabstract} {}
- {%
- \pagestyle{plain}
- % \phantomsection\addcontentsline{toc}{chapter}{鑻辨枃鎽樿} % 灏嗘憳瑕佹彃鍏ョ洰褰曞拰pdf涔︾
- \pdfbookmark[0]{鑻辨枃鎽樿}{abstract-en} % 灏嗘憳瑕佹彃鍏df涔︾锛屼笌涓婁竴琛屼笉鍙叡瀛�
- \begin{center}
- \kaishu\zihao{-2}{\textbf{\uuline{
- 鍗椾含澶у鐮旂┒鐢熸瘯涓氳鏂囪嫳鏂囨憳瑕侀椤电敤绾竲}}
- \end{center}
- {
- \bgroup
- \zihao{4}
- THESIS: ~~\l_@@_info_title_en_tl \\
- SPECIALIZATION: ~~\l_@@_major_en_tl \\
- POSTGRADUATE:~~\l_@@_info_author_en_tl \\
- MENTOR:~~\l_@@_info_supv_full_en_tl\par
- \egroup
- }
- \zihao{4}\par%
- }{%
- \cleardoublepage
- \newpage
- }
+ {\@@_print_abstract_en_ug:}{\cleardoublepage}
+}
+{
+ \NewDocumentEnvironment{abstract} {}
+ {\@@_print_abstract_g:}{\newpage}
+ \NewDocumentEnvironment{englishabstract} {}
+ {\@@_print_abstract_en_g:}{\cleardoublepage}
}
%</class>
% \end{macrocode}