nwafuthesis (26may22)

git-svn-id: svn://tug.org/texlive/trunk@63407 c570f23f-e606-0410-a88d-b1316a301751

1 files changed, 15 insertions, 6 deletions

diff --git a/Master/texmf-dist/tex/latex/nwafuthesis/nwafuthesis.cls b/Master/texmf-dist/tex/latex/nwafuthesis/nwafuthesis.cls
index 398e90540c7..5ddf4094cf2 100644
--- a/Master/texmf-dist/tex/latex/nwafuthesis/nwafuthesis.cls
+++ b/Master/texmf-dist/tex/latex/nwafuthesis/nwafuthesis.cls
@@ -30,7 +30,7 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}
 \RequirePackage{expl3}
-\GetIdInfo $Id: nwafuthesis.dtx 1.12 2022-05-24 Nan Geng <nangeng@nwafu.edu.cn> $
+\GetIdInfo $Id: nwafuthesis.dtx 1.13 2022-05-26 Nan Geng <nangeng@nwafu.edu.cn> $
   {Thesis template for Northwest A\&F University}
 \ProvidesExplClass{\ExplFileName}
   {\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription}
@@ -397,7 +397,7 @@
 \clist_const:Nn \c__nwafu_auth_decl_sign_clist
   { 作者签名, 导师签名, 日期 }
 \clist_const:Nn \c__nwafu_thesis_type_clist
-  { 博士学位论文, 硕士学位论文, 本科毕业 }
+  { 博士学位论文, 硕士学位论文, 本科生毕业 }
 \clist_const:Nn \c__nwafu_degree_type_clist
   { 学术学位, 专业学位 }
 \clist_const:Nn \c__nwafu_bachelor_type_clist
@@ -1146,7 +1146,9 @@
               }
           }{
             \RenewDocumentCommand \headrulewidth { } { 0.4 pt }
-            \nwafuhead[EC]{\small \nouppercase{ \l__nwafu_info_title_tl } }
+            \tl_set_eq:NN \l_tmpa_tl \l__nwafu_info_title_tl
+            \tl_replace_all:Nnn \l_tmpa_tl { \\ } { ~ }
+            \nwafuhead[EC]{\small \nouppercase{ \l_tmpa_tl } }
           }
       }{
         \RenewDocumentCommand \headrulewidth { } { 0.4 pt }
@@ -1163,7 +1165,9 @@
                         \clist_item:Nn \c__nwafu_thesis_type_clist
                           { \g__nwafu_thesis_type_int } }
                   }{
-                    \small \nouppercase{ \l__nwafu_info_title_tl }
+                    \tl_set_eq:NN \l_tmpa_tl \l__nwafu_info_title_tl
+                    \tl_replace_all:Nnn \l_tmpa_tl { \\ } { ~ }
+                    \small \nouppercase{ \l_tmpa_tl }
                   }
               }
           }
@@ -2468,7 +2472,7 @@
 \__nwafu_declare_element:nn { cover / i / id }
   {
     content     = \__nwafu_cover_id:,
-    format      = \bfseries\zihao { -5 },
+    format      = \bfseries\zihao { 4 },
     bottom-skip = 0 pt plus 0.3 fill,
     align       = right,
   }
@@ -3189,12 +3193,15 @@
   { \__nwafu_abstract_en_begin: } { \__nwafu_abstract_en_end:   }
 \cs_new_protected:Npn \__nwafu_abstract_begin:
   {
+    % \tl_set_eq:NN \l_tmpa_tl \l__nwafu_info_title_tl
+    % \tl_replace_all:Nnn \l_tmpa_tl { \\ } { ~ }
     \int_compare:nNnTF { \g__nwafu_thesis_type_int } < { 3 }
       {
         \__nwafu_chapter:V \c__nwafu_name_abstract_tl
       }{
         \par \mode_leave_vertical: \par
         \begin{center}\nwafu@hei\zihao{3}\l__nwafu_info_title_tl\end{center}
+        % \begin{center}\nwafu@hei\zihao{3}\l_tmpa_tl\end{center}
       }
   }
 \cs_set_eq:NN \my_uppercase:n \uppercase
@@ -3449,12 +3456,14 @@
 \ctex_at_end_preamble:n
   {
     \RequirePackage { hyperref }
+    \tl_set_eq:NN \l_tmpa_tl \l__nwafu_info_title_tl
+    \tl_replace_all:Nnn \l_tmpa_tl { \\ } { ~ }
     \hypersetup
       {
         bookmarksnumbered = true,
         psdextra          = true,
         unicode           = true,
-        pdftitle    = \l__nwafu_info_title_tl,
+        pdftitle    = \l_tmpa_tl,
         pdfauthor   = \l__nwafu_info_author_tl,
         pdfkeywords = \l__nwafu_abstract_keywords_clist,
         pdfcreator  = \c__nwafu_name_pdf_creator_tl