njuthesis (15jan23)

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

4 files changed, 36 insertions, 28 deletions

diff --git a/Master/texmf-dist/tex/latex/njuthesis/njuthesis-graduate.def b/Master/texmf-dist/tex/latex/njuthesis/njuthesis-graduate.def
index 87a970d39c7..6b96701f2ea 100644
--- a/Master/texmf-dist/tex/latex/njuthesis/njuthesis-graduate.def
+++ b/Master/texmf-dist/tex/latex/njuthesis/njuthesis-graduate.def
@@ -6,7 +6,7 @@
 %%
 %% njuthesis.dtx  (with options: `def-g')
 %% 
-%% Copyright (C) 2021 - 2022
+%% Copyright (C) 2021 - 2023
 %% by Nanjing University Linux User Group
 %% <git+nju-lug-email-3104-issue-@yaoge123.cn>
 %% 
@@ -23,7 +23,7 @@
 %% To produce the documentation run the original source files ending with
 %% `.dtx' through XeTeX.
 %% 
-\GetIdInfo $Id: njuthesis.dtx 1.1.1 2022-12-04 00:00:00
+\GetIdInfo $Id: njuthesis.dtx 1.1.2 2023-01-15 14:35:00
   +0800 NJU LUG <git+nju-lug-email-3104-issue-@yaoge123.cn>$
   {Graduate definition file for njuthesis}
 \ProvidesExplFile{njuthesis-graduate.def}
@@ -139,7 +139,8 @@
       \skip_vertical:n { .5 cm }
       { Supervised~ by }
       \skip_vertical:N \c_zero_skip
-      \textsf { \g__nju_info_supvfull_en_tl },
+      \textsf { \g__nju_info_supv_en_tl
+        \tex_par:D \g__nju_info_supvii_en_tl },
     format      = \zihao { 4 },
     bottom-skip = 0 pt plus 1.2 fil
   }
@@ -337,7 +338,7 @@
       \c__nju_name_email_tl   & \g__nju_info_email_tl \\
       \c__nju_name_supvb_tl   &
         \clist_item:Nn \g__nju_info_supv_clist { 1 }
-        \bool_if:NT \g__nju_opt_second_supv_bool
+        \bool_if:NT \g__nju_opt_supvii_bool
           { \__nju_quad: \clist_item:Nn \g__nju_info_supvii_clist { 1 } } \\
     \end{tblr}
   }
@@ -480,8 +481,15 @@
   }
 \cs_new_protected:Npn \__nju_abs_info_en_g:N #1
   {
-    \clist_map_inline:nn { title, major, author, supvfull }
-      { \__nju_name:n { ##1 _en } #1 \__nju_info:n { ##1 _en } \\ }
+    \__nju_uline_list:NNx \g__nju_info_title_en_tl \g__nju_abs_title_left_skip
+      { \c__nju_name_title_en_tl #1 }
+    \clist_map_inline:nn { major, author, supvfull }
+      {
+        \tex_par:D
+        \__nju_get_width_print:Nx \l__nju_tmpa_dim
+          { \__nju_name:n { ##1 _en } #1 }
+        \__nju_box_ulined_info:Nn \l__nju_tmpa_dim { ##1 _en }
+      }
   }
 \cs_new_protected:Npn \__nju_make_abstract:
   {
diff --git a/Master/texmf-dist/tex/latex/njuthesis/njuthesis-postdoctoral.def b/Master/texmf-dist/tex/latex/njuthesis/njuthesis-postdoctoral.def
index becb066c635..9205ebe20b2 100644
--- a/Master/texmf-dist/tex/latex/njuthesis/njuthesis-postdoctoral.def
+++ b/Master/texmf-dist/tex/latex/njuthesis/njuthesis-postdoctoral.def
@@ -6,7 +6,7 @@
 %%
 %% njuthesis.dtx  (with options: `def-p')
 %% 
-%% Copyright (C) 2021 - 2022
+%% Copyright (C) 2021 - 2023
 %% by Nanjing University Linux User Group
 %% <git+nju-lug-email-3104-issue-@yaoge123.cn>
 %% 
@@ -23,7 +23,7 @@
 %% To produce the documentation run the original source files ending with
 %% `.dtx' through XeTeX.
 %% 
-\GetIdInfo $Id: njuthesis.dtx 1.1.1 2022-12-04 00:00:00
+\GetIdInfo $Id: njuthesis.dtx 1.1.2 2023-01-15 14:35:00
   +0800 NJU LUG <git+nju-lug-email-3104-issue-@yaoge123.cn>$
   {Postdoctoral definition file for njuthesis}
 \ProvidesExplFile{njuthesis-postdoctoral.def}
diff --git a/Master/texmf-dist/tex/latex/njuthesis/njuthesis-undergraduate.def b/Master/texmf-dist/tex/latex/njuthesis/njuthesis-undergraduate.def
index 9cd7b2ab952..3b2f644f131 100644
--- a/Master/texmf-dist/tex/latex/njuthesis/njuthesis-undergraduate.def
+++ b/Master/texmf-dist/tex/latex/njuthesis/njuthesis-undergraduate.def
@@ -6,7 +6,7 @@
 %%
 %% njuthesis.dtx  (with options: `def-u')
 %% 
-%% Copyright (C) 2021 - 2022
+%% Copyright (C) 2021 - 2023
 %% by Nanjing University Linux User Group
 %% <git+nju-lug-email-3104-issue-@yaoge123.cn>
 %% 
@@ -23,7 +23,7 @@
 %% To produce the documentation run the original source files ending with
 %% `.dtx' through XeTeX.
 %% 
-\GetIdInfo $Id: njuthesis.dtx 1.1.1 2022-12-04 00:00:00
+\GetIdInfo $Id: njuthesis.dtx 1.1.2 2023-01-15 14:35:00
   +0800 NJU LUG <git+nju-lug-email-3104-issue-@yaoge123.cn>$
   {Undergraduate definition file for njuthesis}
 \ProvidesExplFile{njuthesis-undergraduate.def}
@@ -36,8 +36,7 @@
 \__nju_declare_element:nn { u / cover / emblem-img }
   {
     content     = \__nju_emblem:N \c__nju_emblemwd_dim,
-    bottom-skip = 10 pt,
-    align       = l
+    bottom-skip = 10 pt
   }
 \__nju_declare_element:nn { u / cover / name-img }
   {
@@ -72,7 +71,7 @@
     \__nju_cover_entry:NNNnn #1 \l__nju_tmpb_dim #4 { grade } { id }
     \__nju_cover_entry:NNNn #1 #2 #4 { author }
     \__nju_cover_entry_supv:NNNn #1 \l__nju_tmpb_dim #4 { supv }
-    \bool_if:NT \g__nju_opt_second_supv_bool
+    \bool_if:NT \g__nju_opt_supvii_bool
       { \__nju_cover_entry_supv:NNNn #1 \l__nju_tmpb_dim #4 { supvii } }
     \__nju_cover_entry:NNNn #1 #2 #4 { submitdate }
   }
diff --git a/Master/texmf-dist/tex/latex/njuthesis/njuthesis.cls b/Master/texmf-dist/tex/latex/njuthesis/njuthesis.cls
index be4ec462560..1b977e7b347 100644
--- a/Master/texmf-dist/tex/latex/njuthesis/njuthesis.cls
+++ b/Master/texmf-dist/tex/latex/njuthesis/njuthesis.cls
@@ -6,7 +6,7 @@
 %%
 %% njuthesis.dtx  (with options: `class')
 %% 
-%% Copyright (C) 2021 - 2022
+%% Copyright (C) 2021 - 2023
 %% by Nanjing University Linux User Group
 %% <git+nju-lug-email-3104-issue-@yaoge123.cn>
 %% 
@@ -24,7 +24,7 @@
 %% `.dtx' through XeTeX.
 %% 
 \NeedsTeXFormat{LaTeX2e}
-\GetIdInfo $Id: njuthesis.dtx 1.1.1 2022-12-04 00:00:00
+\GetIdInfo $Id: njuthesis.dtx 1.1.2 2023-01-15 14:35:00
   +0800 NJU LUG <git+nju-lug-email-3104-issue-@yaoge123.cn>$
   {Thesis template for Nanjing University}
 \ProvidesExplClass{njuthesis}
@@ -70,7 +70,7 @@
 \bool_new:N \g__nju_opt_academic_bool
 \bool_new:N      \g__nju_opt_twoside_bool
 \bool_set_true:N \g__nju_opt_twoside_bool
-\bool_new:N \g__nju_opt_second_supv_bool
+\bool_new:N \g__nju_opt_supvii_bool
 \tl_new:N \g__nju_info_supvfull_tl
 \tl_new:N \g__nju_info_supvfull_en_tl
 \tl_new:N \g__nju_font_latin_tl
@@ -636,9 +636,9 @@
       { \skip_gset:cn { c__nju_ #2 _skip } { #3 } }
       { \dim_gset:cn  { c__nju_ #2 _dim  } { #3 } }
   }
-\NewDocumentCommand \njusetname { s m o m }
+\NewDocumentCommand \njusetname { s m O{} m }
   { \__nju_set_tokenlist:nnnnn {#1} {#2} {#3} {#4} { name } }
-\NewDocumentCommand \njusettext { s m o m }
+\NewDocumentCommand \njusettext { s m O{} m }
   { \__nju_set_tokenlist:nnnnn {#1} {#2} {#3} {#4} { text } }
 \cs_new_protected:Npn \__nju_set_tokenlist:nnnnn #1#2#3#4#5
   {
@@ -786,8 +786,9 @@
       { \clist_use:Nn \g__nju_info_supv_clist { \__nju_hskip: } }
     \clist_if_empty:NF \g__nju_info_supvii_clist
       {
+        \bool_gset_true:N \g__nju_opt_supvii_bool
         \tl_gput_right:Nx \g__nju_info_supvfull_tl
-          { \__nju_quad: \clist_use:Nn \g__nju_info_supv_clist { \__nju_hskip: } }
+          { \__nju_quad: \clist_use:Nn \g__nju_info_supvii_clist { \__nju_hskip: } }
       }
     \tl_set_eq:NN \g__nju_info_supvfull_en_tl \g__nju_info_supv_en_tl
     \tl_if_empty:NF \g__nju_info_supvii_en_tl
@@ -818,7 +819,7 @@
   {
     \__nju_loadfont_latin:n { Menlo }
     \fontspec_if_small_caps:F
-  {
+      {
         \msg_warning:nn { njuthesis } { no-small-caps }
         \__fontspec_main_setmainfont:nn
           { \c__nju_name_gyrefeature_clist } { texgyretermes }
@@ -839,13 +840,13 @@
       { texgyrecursor }
   }
 \clist_const:Nn \c__nju_name_gyrefeature_clist
-      {
-        Extension      = .otf,
-        UprightFont    = *-regular,
-        BoldFont       = *-bold,
-        ItalicFont     = *-italic,
-        BoldItalicFont = *-bolditalic
-      }
+  {
+    Extension      = .otf,
+    UprightFont    = *-regular,
+    BoldFont       = *-bold,
+    ItalicFont     = *-italic,
+    BoldItalicFont = *-bolditalic
+  }
 \cs_new_protected:Npn \__nju_hide_no_script_msg:
   { \msg_redirect_name:nnn { fontspec } { no-script } { info } }
 \cs_new_protected:Npn \__nju_loadfont_cjk_win:
@@ -936,7 +937,7 @@
     \setCJKfamilyfont { zhhei  } { Noto~Sans~CJK~SC  }
     \setCJKfamilyfont { zhfs   } { FZFangSong-Z02    }
     \setCJKfamilyfont { zhkai  } { FZKai-Z03         }
-      [AutoFakeBold=2.17]
+      [ \c__nju_name_fakebold_tl ]
   }
 \cs_new_protected:Npn \__nju_loadfont_cjk_source:
   {