From c1bb2b0ed0674cbfe9c5635aa28bd67ef7ac460f Mon Sep 17 00:00:00 2001
From: atxy <181850195@smail.nju.edu.cn>
Date: Tue, 21 Sep 2021 22:48:52 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E4=BA=86#22=E7=9A=84?=
 =?UTF-8?q?=E4=B8=8B=E5=88=92=E7=BA=BF=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 njuthesis.dtx | 40 +++++++++++++++++++++-------------------
 1 file changed, 21 insertions(+), 19 deletions(-)

diff --git a/njuthesis.dtx b/njuthesis.dtx
index c0420b7..cd380fa 100644
--- a/njuthesis.dtx
+++ b/njuthesis.dtx
@@ -647,6 +647,10 @@ through XeTeX.
 % 
 % 鍦ㄩ〉闈㈠竷灞€鏂归潰锛屾湰绉戠敓鏃犻〉鐪夛紝椤甸潰缂栧彿灞呬腑浣嶄簬椤佃剼锛涚爺绌剁敓鏃犻〉鑴氾紝椤电湁鍖呮嫭绔犺妭鍚嶅拰椤甸潰缂栧彿锛堝皻鏈‘瀹氾級銆�
 %
+% \subsubsection{鏂囧瓧}
+%
+% 涓轰簡閬垮厤鍘熺敓|\uline|鍛戒护鍦ㄤ腑鏂囩幆澧冧笅涓嶈兘姝e父鎹㈣鐨勯棶棰橈紝鏈ā鏉夸娇鐢▅\njuline|浣滀负鏇夸唬鏂规锛屽垎鍒\hologo{XeLaTeX} 鐨刓pkg{xeCJKfntef}鍖呭拰\hologo{LuaLaTeX}鐨刓pkg{lua-ul}鍖呬腑鐨勪笅鍒掔嚎鍛戒护杩涜浜嗗寘瑁呫€�
+%
 % \subsubsection{鍥剧墖}
 %
 % 鎵€鏈夊浘鐗囬粯璁ゅ瓨鏀惧湪涓荤洰褰曚笅鐨刓texttt{figure/}鏂囦欢澶瑰唴锛屽厑璁哥殑鏂囦欢鍚嶅寘鎷琝file{*.jpg}, \file{*.png}, \file{*.pdf}, \file{*.eps}, 
@@ -1093,13 +1097,13 @@ through XeTeX.
     \RequirePackage{microtype}
 
     % 鍔犱腑鏂囦笅鍒掔嚎锛屼笉鑳界敤浜巐ualatex
-    \RequirePackage{xeCJKfntef} 
-    \cs_new:Npn \@@_uline:n #1 {\CJKunderline{#1}}
+    \RequirePackage{xeCJKfntef}
+    \newcommand{\njuline}[1]{\CJKunderline{#1}}
 }
 \sys_if_engine_luatex:T{
     % 鍔犱腑鏂囦笅鍒掔嚎
     \RequirePackage{lua-ul}
-    \cs_new:Npn \@@_uline:n #1 {\underLine{#1}}
+    \newcommand{\njuline}[1]{\underLine{#1}}
 
     % emoji鏀寔
     % \RequirePackage{emoji}
@@ -2429,9 +2433,9 @@ through XeTeX.
 %    \end{macrocode}
 %
 % 
+% 鐮旂┒鐢熸憳瑕佺幆澧�
 %    \begin{macrocode}
-{ 
-  % 鐮旂┒鐢熸憳瑕佺幆澧�
+{
   \NewDocumentEnvironment{abstract} {}
   {%
     \pagestyle{plain}
@@ -2442,25 +2446,23 @@ through XeTeX.
       \kaishu\zihao{-2}{\textbf{\uuline{
         鍗椾含澶у鐮旂┒鐢熸瘯涓氳鏂囦腑鏂囨憳瑕侀椤电敤绾竲}}
     \end{center}
-    
     \bgroup
+    \noindent
     \kaishu\zihao{4}
     \tl_set:Nn \tabcolsep {0pt}
     \tl_set:Nn \arraystretch {0.8}
-    \noindent
-    姣曚笟璁烘枃棰樼洰锛歕hspace{0.5em}\@@_uline:n {\l_@@_info_title_tl\hfill}\\    
-    \uline{\makebox[9em]{\l_@@_major_tl}}涓撲笟
-    \uline{\makebox[4em]{\l_@@_info_grade_tl}}绾�
-    \str_if_eq:NNTF {\l_@@_info_degree_tl} { phd } {鍗殅{纭晑
-    澹敓濮撳悕锛歕uline{\hfill\l_@@_info_author_tl\hfill} \\
-    鎸囧鏁欏笀锛堝鍚嶃€佽亴绉帮級锛歕uline{\hfill\l_@@_info_supv_full_tl\hfill}\par
+    姣曚笟璁烘枃棰樼洰锛歕hspace{0.5em}\njuline{\l__nju_info_title_tl\hfill}\hspace{0em}\\
+    \njuline{\makebox[9em]{\l__nju_major_tl}}涓撲笟
+    \njuline{\makebox[4em]{\l__nju_info_grade_tl}}绾�
+    \str_if_eq:NNTF {\l__nju_info_degree_tl} { phd } {鍗殅{纭晑
+    澹敓濮撳悕锛歕njuline{\hfill\l__nju_info_author_tl\hfill}\hspace{0em}\\
+    鎸囧鏁欏笀锛堝鍚嶃€佽亴绉帮級锛歕njuline{\hfill\l__nju_info_supv_full_tl\hfill}\hspace{0em}\par
     \egroup
-  
     \kaishu\zihao{4}\par%
   }{%
   \newpage
   }
-  
+
   % 鑻辨枃鎽樿
   \NewDocumentEnvironment{englishabstract} {}
   {%
@@ -2474,10 +2476,10 @@ through XeTeX.
     {
       \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
+      THESIS: ~~\l__nju_info_title_en_tl \\
+      SPECIALIZATION: ~~\l__nju_major_en_tl \\
+      POSTGRADUATE:~~\l__nju_info_author_en_tl \\
+      MENTOR:~~\l__nju_info_supv_full_en_tl\par
       \egroup
     }
     \zihao{4}\par%
-- 
GitLab