xduts (12apr22)

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

4 files changed, 57 insertions, 30 deletions

diff --git a/Master/texmf-dist/tex/xelatex/xduts/xdufont.sty b/Master/texmf-dist/tex/xelatex/xduts/xdufont.sty
index b705cb85ec0..a1916f28425 100644
--- a/Master/texmf-dist/tex/xelatex/xduts/xdufont.sty
+++ b/Master/texmf-dist/tex/xelatex/xduts/xdufont.sty
@@ -26,7 +26,7 @@
 \NeedsTeXFormat{LaTeX2e}
 \RequirePackage{expl3}
 \ProvidesExplPackage{xdufont}
-  {2022/04/10}{0.6.0.0}
+  {2022/04/11}{0.7.0.0}
   {Xidian University Font package}
 \RequirePackage { xparse, l3keys2e }
 \PassOptionsToPackage { quiet } { xeCJK }
diff --git a/Master/texmf-dist/tex/xelatex/xduts/xduugthesis.cls b/Master/texmf-dist/tex/xelatex/xduts/xduugthesis.cls
index b268e393224..edb14f92ad7 100644
--- a/Master/texmf-dist/tex/xelatex/xduts/xduugthesis.cls
+++ b/Master/texmf-dist/tex/xelatex/xduts/xduugthesis.cls
@@ -26,8 +26,8 @@
 \NeedsTeXFormat{LaTeX2e}
 \RequirePackage{expl3}
 \ProvidesExplClass{xduugthesis}
-  {2022/04/10}{0.6.0.0}
-  {Xidian University Undergraduate Thesis class}
+  {2022/04/11}{0.7.0.0}
+  {Xidian University Undergraduate Thesis document class}
 \RequirePackage { xparse, l3keys2e }
 \PassOptionsToPackage { quiet } { xeCJK }
 \PassOptionsToClass
@@ -438,6 +438,12 @@
 \tl_new:N \l__xdu_fig_label_sep_tl
 \clist_new:N \l__xdu_before_skip_clist
 \clist_new:N \l__xdu_after_skip_clist
+\tl_new:N \l__xdu_chap_tl
+\tl_new:N \l__xdu_sec_tl
+\tl_new:N \l__xdu_subsec_tl
+\tl_new:N \l__xdu_subsubsec_tl
+\tl_new:N \l__xdu_para_tl
+\tl_new:N \l__xdu_subpara_tl
 \keys_define:nn { xdu / style }
   {
     en-cjk-font .bool_set:N = \l__xdu_en_cjk_font_bool,
@@ -448,17 +454,23 @@
     bib-resource .clist_set:N = \l__xdu_bib_file_clist,
     fig-label-sep .tl_set:N = \l__xdu_fig_label_sep_tl,
     before-skip .clist_set:N = \l__xdu_before_skip_clist,
-    after-skip .clist_set:N = \l__xdu_after_skip_clist
+    after-skip .clist_set:N = \l__xdu_after_skip_clist,
+    chap-zihao .tl_set:N = \l__xdu_chap_tl,
+    sec-zihao .tl_set:N = \l__xdu_sec_tl,
+    subsec-zihao .tl_set:N = \l__xdu_subsec_tl,
+    subsubsec-zihao .tl_set:N = \l__xdu_subsubsec_tl,
+    para-zihao .tl_set:N = \l__xdu_para_tl,
+    subpara-zihao .tl_set:N = \l__xdu_subpara_tl
   }
 \keys_set:nn { xdu }
   {
-    style / en-cjk-font           = false,
-    style / language              = zh,
-    style / bib-backend           = biblatex,
-    style / bib-resource          = { },
-    style / fig-label-sep         = { 0.75em },
-    style / before-skip           = { 24pt, 18pt, 12pt, 12pt, 12pt, 12pt },
-    style / after-skip            = { 18pt, 12pt, 6pt, 6pt, 6pt, 6pt }
+    style / en-cjk-font   = false,
+    style / language      = zh,
+    style / bib-backend   = biblatex,
+    style / bib-resource  = { },
+    style / fig-label-sep = { 0.75em },
+    style / before-skip   = { 24pt, 18pt, 12pt, 12pt, 12pt, 12pt },
+    style / after-skip    = { 18pt, 12pt, 6pt, 6pt, 6pt, 6pt }
   }
 \NewDocumentCommand \xdusetup { m }
   { \keys_set:nn { xdu } { #1 } }
@@ -488,6 +500,8 @@
   }
 \cs_new:Npn \__xdu_uline:n #1
   { \CJKunderline [ thickness = 0.5pt ] { #1 } }
+\cs_new:Npn \__xdu_tl_set_if_empty:Nn #1#2
+  { \tl_if_empty:NT #1 { \tl_set:Nn #1 { #2 } } }
 \cs_new:Npn \__xdu_get_text_width:Nn #1#2
   {
     \box_clear_new:N \l__xdu_tmp_box
@@ -606,39 +620,51 @@
     paragraph     / number = { \theparagraph     },
     subparagraph  / number = { \thesubparagraph  }
   }
-\cs_new:Npn \__xdu_zh_title:nnn #1#2#3
+\cs_new:Npn \__xdu_zh_t:nnn #1#2#3
   {
     \use:c { __xdu_ #1 _family : }
-    \zihao { #2 }
+    \zihao { \use:c { l__xdu_ #2 _tl } }
     \str_if_eq:ccTF { #3 } { c }
       { \centering   }
       { \raggedright }
   }
-\cs_new:Npn \__xdu_en_title:nn #1#2
-  { \zihao { #1 } \raggedright \skip_horizontal:n { #2 ex } }
+\cs_new:Npn \__xdu_en_t:nn #1#2
+  { \zihao { \use:c { l__xdu_ #1 _tl } } \raggedright \skip_horizontal:n { #2 ex } }
 \ctex_at_end_preamble:n
   {
     \__xdu_lang_switch:nn
       {
+         \__xdu_tl_set_if_empty:Nn \l__xdu_chap_tl      { 3 }
+         \__xdu_tl_set_if_empty:Nn \l__xdu_sec_tl       { 4 }
+         \__xdu_tl_set_if_empty:Nn \l__xdu_subsec_tl    { 4 }
+         \__xdu_tl_set_if_empty:Nn \l__xdu_subsubsec_tl { 4 }
+         \__xdu_tl_set_if_empty:Nn \l__xdu_para_tl      { 4 }
+         \__xdu_tl_set_if_empty:Nn \l__xdu_subpara_tl   { 4 }
         \ctexset
           {
-            chapter       / format = { \__xdu_zh_title:nnn { sf } { 3 } { c } },
-            section       / format = { \__xdu_zh_title:nnn { rm } { 4 } { c } },
-            subsection    / format = { \__xdu_zh_title:nnn { rm } { 4 } { l } },
-            subsubsection / format = { \__xdu_zh_title:nnn { rm } { 4 } { l } },
-            paragraph     / format = { \__xdu_zh_title:nnn { rm } { 4 } { l } },
-            subparagraph  / format = { \__xdu_zh_title:nnn { rm } { 4 } { l } }
+            chapter       / format = { \__xdu_zh_t:nnn { sf } { chap      } { c } },
+            section       / format = { \__xdu_zh_t:nnn { rm } { sec       } { c } },
+            subsection    / format = { \__xdu_zh_t:nnn { rm } { subsec    } { l } },
+            subsubsection / format = { \__xdu_zh_t:nnn { rm } { subsubsec } { l } },
+            paragraph     / format = { \__xdu_zh_t:nnn { rm } { para      } { l } },
+            subparagraph  / format = { \__xdu_zh_t:nnn { rm } { subpara   } { l } }
           }
       }
       {
+        \__xdu_tl_set_if_empty:Nn \l__xdu_chap_tl      { 4  }
+        \__xdu_tl_set_if_empty:Nn \l__xdu_sec_tl       { -4 }
+        \__xdu_tl_set_if_empty:Nn \l__xdu_subsec_tl    { -4 }
+        \__xdu_tl_set_if_empty:Nn \l__xdu_subsubsec_tl { -4 }
+        \__xdu_tl_set_if_empty:Nn \l__xdu_para_tl      { -4 }
+        \__xdu_tl_set_if_empty:Nn \l__xdu_subpara_tl   { -4 }
         \ctexset
           {
-            chapter       / format = { \__xdu_en_title:nn { 4  } { 0  } },
-            section       / format = { \__xdu_en_title:nn { -4 } { 4  } },
-            subsection    / format = { \__xdu_en_title:nn { -4 } { 8  } },
-            subsubsection / format = { \__xdu_en_title:nn { -4 } { 12 } },
-            paragraph     / format = { \__xdu_en_title:nn { -4 } { 16 } },
-            subparagraph  / format = { \__xdu_en_title:nn { -4 } { 20 } }
+            chapter       / format = { \__xdu_en_t:nn { chap      } { 0  } },
+            section       / format = { \__xdu_en_t:nn { sec       } { 4  } },
+            subsection    / format = { \__xdu_en_t:nn { subsec    } { 8  } },
+            subsubsection / format = { \__xdu_en_t:nn { subsubsec } { 12 } },
+            paragraph     / format = { \__xdu_en_t:nn { para      } { 16 } },
+            subparagraph  / format = { \__xdu_en_t:nn { subpara   } { 20 } }
           }
       }
   }
@@ -766,7 +792,8 @@
       {
         \mode_leave_vertical:
         \hfil
-        \includegraphics [ height = #2, keepaspectratio ] { #3 }
+        \file_if_exist:nT { #3 }
+          { \includegraphics [ height = #2, keepaspectratio ] { #3 } }
         \hfil
       }
   }
@@ -825,10 +852,10 @@
     \__xdu_cover_i:nn   { 班级 } { \l__xdu_class_id_str   }
     \__xdu_cover_i:nn   { 学号 } { \l__xdu_student_id_str }
     \skip_vertical:n { 30pt }
-    \__xdu_cover_ii:nnn { 65pt } { 35pt } { xidian-text }
+    \__xdu_cover_ii:nnn { 65pt } { 35pt } { xidian-text.pdf }
     \vbox_to_ht:nn { 75pt }
       { \__xdu_sf_family: \zihao { 0 } \centering { 本科毕业设计论文 } }
-    \__xdu_cover_ii:nnn { 130pt } { 120pt } { xidian-logo }
+    \__xdu_cover_ii:nnn { 130pt } { 120pt } { xidian-logo.pdf }
     \clist_new:N \l__xdu_title_clist
     \__xdu_split_title:NV \l__xdu_title_clist \l__xdu_title_str
     \str_set:Nx \l__xdu_title_i_str  { \clist_item:Nn  \l__xdu_title_clist { 1 } }
diff --git a/Master/texmf-dist/tex/xelatex/xduts/xidian-logo.pdf b/Master/texmf-dist/tex/xelatex/xduts/xidian-logo.pdf
new file mode 100644
index 00000000000..1f676b4fafc
--- /dev/null
+++ b/Master/texmf-dist/tex/xelatex/xduts/xidian-logo.pdf
diff --git a/Master/texmf-dist/tex/xelatex/xduts/xidian-text.pdf b/Master/texmf-dist/tex/xelatex/xduts/xidian-text.pdf
new file mode 100644
index 00000000000..aca2d6291ad
--- /dev/null
+++ b/Master/texmf-dist/tex/xelatex/xduts/xidian-text.pdf