From 15fb78595d13adc4a43217f649cb105c5211d322 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Fri, 3 Feb 2023 22:07:08 +0000 Subject: xduts (3feb23) git-svn-id: svn://tug.org/texlive/trunk@65726 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/xelatex/xduts/xdufont.sty | 2 +- .../texmf-dist/tex/xelatex/xduts/xdupgthesis.cls | 62 +++++++++++++++------- .../texmf-dist/tex/xelatex/xduts/xduugthesis.cls | 54 +++++++++++-------- Master/texmf-dist/tex/xelatex/xduts/xduugtp.cls | 22 ++++++-- 4 files changed, 95 insertions(+), 45 deletions(-) (limited to 'Master/texmf-dist/tex') diff --git a/Master/texmf-dist/tex/xelatex/xduts/xdufont.sty b/Master/texmf-dist/tex/xelatex/xduts/xdufont.sty index bb032df1dab..eb4776b87a1 100644 --- a/Master/texmf-dist/tex/xelatex/xduts/xdufont.sty +++ b/Master/texmf-dist/tex/xelatex/xduts/xdufont.sty @@ -29,7 +29,7 @@ \NeedsTeXFormat{LaTeX2e} \RequirePackage{expl3} \ProvidesExplPackage{xdufont} - {2023/01/30}{4.3.0.2} + {2023/02/03}{4.4.0.0} {Xidian University Font package} \RequirePackage { xparse, l3keys2e } \PassOptionsToPackage { quiet } { xeCJK } diff --git a/Master/texmf-dist/tex/xelatex/xduts/xdupgthesis.cls b/Master/texmf-dist/tex/xelatex/xduts/xdupgthesis.cls index 7c3973f84fc..74ca50278fc 100644 --- a/Master/texmf-dist/tex/xelatex/xduts/xdupgthesis.cls +++ b/Master/texmf-dist/tex/xelatex/xduts/xdupgthesis.cls @@ -29,7 +29,7 @@ \NeedsTeXFormat{LaTeX2e} \RequirePackage{expl3} \ProvidesExplClass{xdupgthesis} - {2023/01/30}{4.3.0.2} + {2023/02/03}{4.4.0.0} {Xidian University Postgraduate Thesis document class} \RequirePackage { xparse, l3keys2e } \PassOptionsToPackage { quiet } { xeCJK } @@ -470,9 +470,9 @@ \use:c { __xdu_load_math_font_ \l__xdu_math_font_tl : } } \ctex_at_end_preamble:n { \__xdu_load_font: } -\str_new:N \l__xdu_title_str -\str_new:N \l__xdu_title_i_str -\str_new:N \l__xdu_title_ii_str +\tl_new:N \l__xdu_title_tl +\tl_new:N \l__xdu_title_i_tl +\tl_new:N \l__xdu_title_ii_tl \str_new:N \l__xdu_dept_str \str_new:N \l__xdu_major_str \str_new:N \l__xdu_author_str @@ -488,7 +488,7 @@ \tl_new:N \l__xdu_ack_tl \keys_define:nn { xdu / info } { - title .tl_set:N = \l__xdu_title_str, + title .tl_set:N = \l__xdu_title_tl, department .tl_set:N = \l__xdu_dept_str, major .tl_set:N = \l__xdu_major_str, author .tl_set:N = \l__xdu_author_str, @@ -714,6 +714,7 @@ \cs_new_eq:NN \figname \figurename \cs_set:Npn \tablename { \__xdu_lang_switch:nn { 表 } { Table } } \cs_new_eq:NN \tabname \tablename +\bool_new:N \l__xdu_title_bold_math_bool \bool_new:N \l__xdu_en_cjk_font_bool \tl_new:N \l__xdu_lang_tl \tl_new:N \l__xdu_bib_tool_tl @@ -744,6 +745,7 @@ \tl_new:N \l__xdu_page_v_align_tl \keys_define:nn { xdu / style } { + title-bold-math .bool_set:N = \l__xdu_title_bold_math_bool, en-cjk-font .bool_set:N = \l__xdu_en_cjk_font_bool, language .choices:nn = { zh, en } { \tl_set_eq:NN \l__xdu_lang_tl \l_keys_choice_tl }, @@ -781,6 +783,7 @@ } \keys_set:nn { xdu } { + style / title-bold-math = false, style / en-cjk-font = false, style / language = zh, style / bib-backend = biblatex, @@ -804,6 +807,15 @@ style / symmetric-margin = false, style / page-vertical-align = { 顶部对齐 } } +\cs_new:Npn \__xdu_bold_math: { } +\ctex_at_end_preamble:n + { + \bool_if:NT \l__xdu_title_bold_math_bool + { + \tl_if_eq:NnT \l__xdu_math_font_tl { cm } + { \cs_set_eq:NN \__xdu_bold_math: \boldmath } + } + } \bool_new:N \l__xdu_customize_los_bool \bool_new:N \l__xdu_customize_loa_bool \tl_new:N \l__xdu_colspec_los_tl @@ -883,9 +895,9 @@ { \bool_if:NTF \l__xdu_en_cjk_font_bool { \CJKfamily+ { tt } } { \ttfamily } } \ctex_at_end_preamble:n { - \str_new:N \l__xdu_pure_title_str - \str_set_eq:NN \l__xdu_pure_title_str \l__xdu_title_str - \str_remove_all:Nn \l__xdu_pure_title_str { \\ } + \tl_new:N \l__xdu_pure_title_tl + \tl_set_eq:NN \l__xdu_pure_title_tl \l__xdu_title_tl + \tl_remove_all:Nn \l__xdu_pure_title_tl { \\ } } \cs_new_protected:Npn \__xdu_split_title:Nn #1#2 { @@ -1130,9 +1142,20 @@ subparagraph / number = { \roman { subparagraph } } } \cs_new:Npn \__xdu_sec_format_i:n #1 - { \__xdu_rm_family: \bfseries \zihao { #1 } \dim_set:Nn \baselineskip { 20pt } } + { + \__xdu_rm_family: + \bfseries \__xdu_bold_math: + \zihao { #1 } + \dim_set:Nn \baselineskip { 20pt } + } \cs_new:Npn \__xdu_sec_format_ii: - { \__xdu_sf_family: \centering \zihao { 3 } \dim_set:Nn \baselineskip { 20pt } } + { + \__xdu_sf_family: + \centering + \__xdu_bold_math: + \zihao { 3 } + \dim_set:Nn \baselineskip { 20pt } + } \cs_new:Npn \__xdu_sec_format_iii: { \__xdu_rm_family: \centering \zihao { 3 } \dim_set:Nn \baselineskip { 20pt } } \ctex_at_end_preamble:n @@ -1190,7 +1213,7 @@ \ctex_at_end_preamble:n { \__xdu_lang_switch:nn - { \cs_set:Npn \cftchapfont { \__xdu_sf_family: \zihao { -4 } } } + { \cs_set:Npn \cftchapfont { \__xdu_sf_family: \__xdu_bold_math: \zihao { -4 } } } { \cs_set:Npn \cftchapfont { \__xdu_rm_family: \zihao { -4 } } } } \clist_map_inline:nn @@ -1546,7 +1569,7 @@ { \hypersetup { - pdftitle = \l__xdu_pure_title_str, + pdftitle = \l__xdu_pure_title_tl, pdfsubject = \l__xdu_header_str, pdfcreator = { XeLaTeX~with~xdupgthesis~class~in~XDUTS }, pdfauthor = \l__xdu_author_str @@ -1944,9 +1967,9 @@ \skip_vertical:n { 87.5pt } \vbox_to_ht:nn { 150pt } { - \rmfamily \zihao { 2 } \bfseries \centering + \rmfamily \zihao { 2 } \bfseries \__xdu_bold_math: \centering \dim_set:Nn \baselineskip { 30pt } - \l__xdu_title_str + \l__xdu_title_tl } \group_begin: \__xdu_zh_title_page_info: @@ -2014,7 +2037,7 @@ \dim_set:Nn \baselineskip { 30pt } \vbox_to_ht:nn { 170pt } { - \rmfamily \zihao { 2 } \bfseries \centering + \rmfamily \zihao { 2 } \bfseries \__xdu_bold_math: \centering \dim_set:Nn \baselineskip { 30pt } \l__xdu_title_en_str } @@ -2437,7 +2460,10 @@ \cs_new:Npn \__xdu_add_zh_toc:nn #1#2 { \str_if_eq:NNTF { #1 } { chapter } - { \phantomsection \addcontentsline { zh.toc } { #1 } { \__xdu_sf_family: #2 } } + { + \phantomsection \addcontentsline { zh.toc } + { #1 } { \__xdu_sf_family: \__xdu_bold_math: #2 } + } { \phantomsection \addcontentsline { zh.toc } { #1 } { #2 } } } \RenewDocumentCommand { \frontmatter } { } { } @@ -2454,9 +2480,9 @@ \skip_vertical:n { 435pt } \vbox_to_ht:nn { 120pt } { - \rmfamily \zihao { 2 } \bfseries \centering + \rmfamily \zihao { 2 } \bfseries \__xdu_bold_math: \centering \dim_set:Nn \baselineskip { 30pt } - \l__xdu_title_str + \l__xdu_title_tl } \__xdu_cover_author_info: \cleardoublepage diff --git a/Master/texmf-dist/tex/xelatex/xduts/xduugthesis.cls b/Master/texmf-dist/tex/xelatex/xduts/xduugthesis.cls index d94850cebf5..47fadda456e 100644 --- a/Master/texmf-dist/tex/xelatex/xduts/xduugthesis.cls +++ b/Master/texmf-dist/tex/xelatex/xduts/xduugthesis.cls @@ -29,7 +29,7 @@ \NeedsTeXFormat{LaTeX2e} \RequirePackage{expl3} \ProvidesExplClass{xduugthesis} - {2023/01/30}{4.3.0.2} + {2023/02/03}{4.4.0.0} {Xidian University Undergraduate Thesis document class} \RequirePackage { xparse, l3keys2e } \PassOptionsToPackage { quiet } { xeCJK } @@ -471,9 +471,9 @@ \use:c { __xdu_load_math_font_ \l__xdu_math_font_tl : } } \ctex_at_end_preamble:n { \__xdu_load_font: } -\str_new:N \l__xdu_title_str -\str_new:N \l__xdu_title_i_str -\str_new:N \l__xdu_title_ii_str +\tl_new:N \l__xdu_title_tl +\tl_new:N \l__xdu_title_i_tl +\tl_new:N \l__xdu_title_ii_tl \str_new:N \l__xdu_dept_str \str_new:N \l__xdu_major_str \str_new:N \l__xdu_author_str @@ -489,7 +489,7 @@ \tl_new:N \l__xdu_ack_tl \keys_define:nn { xdu / info } { - title .tl_set:N = \l__xdu_title_str, + title .tl_set:N = \l__xdu_title_tl, department .tl_set:N = \l__xdu_dept_str, major .tl_set:N = \l__xdu_major_str, author .tl_set:N = \l__xdu_author_str, @@ -547,6 +547,7 @@ \cs_new_eq:NN \figname \figurename \cs_set:Npn \tablename { \__xdu_lang_switch:nn { 表 } { Table } } \cs_new_eq:NN \tabname \tablename +\bool_new:N \l__xdu_title_bold_math_bool \bool_new:N \l__xdu_en_cjk_font_bool \tl_new:N \l__xdu_lang_tl \tl_new:N \l__xdu_bib_tool_tl @@ -577,6 +578,7 @@ \tl_new:N \l__xdu_page_v_align_tl \keys_define:nn { xdu / style } { + title-bold-math .bool_set:N = \l__xdu_title_bold_math_bool, en-cjk-font .bool_set:N = \l__xdu_en_cjk_font_bool, language .choices:nn = { zh, en } { \tl_set_eq:NN \l__xdu_lang_tl \l_keys_choice_tl }, @@ -614,6 +616,7 @@ } \keys_set:nn { xdu } { + style / title-bold-math = false, style / en-cjk-font = false, style / language = zh, style / bib-backend = biblatex, @@ -637,6 +640,15 @@ style / symmetric-margin = false, style / page-vertical-align = { 顶部对齐 } } +\cs_new:Npn \__xdu_bold_math: { } +\ctex_at_end_preamble:n + { + \bool_if:NT \l__xdu_title_bold_math_bool + { + \tl_if_eq:NnT \l__xdu_math_font_tl { cm } + { \cs_set_eq:NN \__xdu_bold_math: \boldmath } + } + } \NewDocumentCommand \xdusetup { m } { \keys_set:nn { xdu } { #1 } } \keys_define:nn { xdu } @@ -659,9 +671,9 @@ { \bool_if:NTF \l__xdu_en_cjk_font_bool { \CJKfamily+ { tt } } { \ttfamily } } \ctex_at_end_preamble:n { - \str_new:N \l__xdu_pure_title_str - \str_set_eq:NN \l__xdu_pure_title_str \l__xdu_title_str - \str_remove_all:Nn \l__xdu_pure_title_str { \\ } + \tl_new:N \l__xdu_pure_title_tl + \tl_set_eq:NN \l__xdu_pure_title_tl \l__xdu_title_tl + \tl_remove_all:Nn \l__xdu_pure_title_tl { \\ } } \cs_new_protected:Npn \__xdu_split_title:Nn #1#2 { @@ -836,7 +848,7 @@ { \pagestyle { fancy } \fancyhf { } - \fancyhead [ CE ] { \__xdu_rm_family: \zihao { 5 } \l__xdu_pure_title_str } + \fancyhead [ CE ] { \__xdu_rm_family: \zihao { 5 } \l__xdu_pure_title_tl } \fancyhead [ CO ] { \__xdu_rm_family: \zihao { 5 } \leftmark } \fancyhead [ LE ] { \__xdu_rm_family: \zihao { -5 } \thepage } \fancyhead [ RO ] { \__xdu_rm_family: \zihao { -5 } \thepage } @@ -900,7 +912,7 @@ { \rmfamily \zihao { \use:c { l__xdu_ #1 _tl } } - \bfseries + \bfseries \__xdu_bold_math: \str_if_eq:ccTF { #2 } { c } { \centering } { \raggedright } @@ -917,7 +929,7 @@ \__xdu_tl_set_if_empty:Nn \l__xdu_subpara_tl { 4 } \ctexset { - chapter / format = { \__xdu_zh_t:nnn { sf } { chap } { c } }, + chapter / format = { \__xdu_zh_t:nnn { sf } { chap } { c } \__xdu_bold_math: }, 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 } }, @@ -973,7 +985,7 @@ \cftchapfont, \cftchappagefont } - { \renewcommand { #1 } { \__xdu_rm_family: \zihao { -4 } \bfseries } } + { \renewcommand { #1 } { \__xdu_rm_family: \zihao { -4 } \bfseries \__xdu_bold_math: } } \clist_map_inline:nn { \cftsecfont, @@ -1332,7 +1344,7 @@ { \hypersetup { - pdftitle = \l__xdu_pure_title_str, + pdftitle = \l__xdu_pure_title_tl, pdfsubject = { 西安电子科技大学本科毕业设计论文 }, pdfcreator = { XeLaTeX~with~xduugthesis~class~in~XDUTS }, pdfauthor = \l__xdu_author_str @@ -1510,12 +1522,12 @@ } \__xdu_cover_ii:nnn { 140pt } { 120pt } { icon } \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 } } - \str_set:Nx \l__xdu_title_ii_str { \clist_item:Nn \l__xdu_title_clist { 2 } } - \__xdu_cover_iii:nnnn { 题目 } { sf } { 3 } { \l__xdu_title_i_str } - \tl_if_blank:VF \l__xdu_title_ii_str - { \__xdu_cover_iii:nnnn { } { sf } { 3 } { \l__xdu_title_ii_str } } + \__xdu_split_title:NV \l__xdu_title_clist \l__xdu_title_tl + \tl_set:Nx \l__xdu_title_i_tl { \clist_item:Nn \l__xdu_title_clist { 1 } } + \tl_set:Nx \l__xdu_title_ii_tl { \clist_item:Nn \l__xdu_title_clist { 2 } } + \__xdu_cover_iii:nnnn { 题目 } { sf } { 3 } { \__xdu_bold_math: \l__xdu_title_i_tl } + \tl_if_blank:VF \l__xdu_title_ii_tl + { \__xdu_cover_iii:nnnn { } { sf } { 3 } { \__xdu_bold_math: \l__xdu_title_ii_tl } } \__xdu_cover_iii:nnnn { 学院 } { rm } { -3 } { \l__xdu_dept_str } \__xdu_cover_iii:nnnn { 专业 } { rm } { -3 } { \l__xdu_major_str } \__xdu_cover_iii:nnnn { 学生姓名 } { rm } { -3 } { \l__xdu_author_str } @@ -1558,7 +1570,7 @@ \group_end: \cs_new:Npn \__xdu_keywords_space: { \hspace { 2em plus 1em minus 1em } } \group_begin: - \sffamily \zihao { -4 } \par + \sffamily \__xdu_bold_math: \zihao { -4 } \par \__xdu_typeout_keywords:nNn { 关键词: } { \l__xdu_keywords_zh_clist } { \__xdu_keywords_space: } \group_end: @@ -1571,7 +1583,7 @@ \file_if_exist_input:n { \l__xdu_abstract_en_tl } \group_end: \group_begin: - \rmfamily \zihao { -4 } \bfseries \par + \rmfamily \zihao { -4 } \bfseries \__xdu_bold_math: \par \__xdu_typeout_keywords:nNn { Keywords: } { \l__xdu_keywords_en_clist } { \__xdu_keywords_space: } \group_end: diff --git a/Master/texmf-dist/tex/xelatex/xduts/xduugtp.cls b/Master/texmf-dist/tex/xelatex/xduts/xduugtp.cls index 8ba3bcb12b2..db12268573c 100644 --- a/Master/texmf-dist/tex/xelatex/xduts/xduugtp.cls +++ b/Master/texmf-dist/tex/xelatex/xduts/xduugtp.cls @@ -29,7 +29,7 @@ \NeedsTeXFormat{LaTeX2e} \RequirePackage{expl3} \ProvidesExplClass{xduugtp} - {2023/01/30}{4.3.0.2} + {2023/02/03}{4.4.0.0} {Xidian University Undergraduate Thesis Proposal class} \RequirePackage { xparse, l3keys2e } \PassOptionsToPackage { quiet } { xeCJK } @@ -467,9 +467,9 @@ \use:c { __xdu_load_math_font_ \l__xdu_math_font_tl : } } \ctex_at_end_preamble:n { \__xdu_load_font: } -\str_new:N \l__xdu_title_str -\str_new:N \l__xdu_title_i_str -\str_new:N \l__xdu_title_ii_str +\tl_new:N \l__xdu_title_tl +\tl_new:N \l__xdu_title_i_tl +\tl_new:N \l__xdu_title_ii_tl \str_new:N \l__xdu_dept_str \str_new:N \l__xdu_major_str \str_new:N \l__xdu_author_str @@ -485,7 +485,7 @@ \tl_new:N \l__xdu_ack_tl \keys_define:nn { xdu / info } { - title .tl_set:N = \l__xdu_title_str, + title .tl_set:N = \l__xdu_title_tl, department .tl_set:N = \l__xdu_dept_str, major .tl_set:N = \l__xdu_major_str, author .tl_set:N = \l__xdu_author_str, @@ -546,6 +546,7 @@ \cs_new_eq:NN \figname \figurename \cs_set:Npn \tablename { \__xdu_lang_switch:nn { 表 } { Table } } \cs_new_eq:NN \tabname \tablename +\bool_new:N \l__xdu_title_bold_math_bool \bool_new:N \l__xdu_en_cjk_font_bool \tl_new:N \l__xdu_lang_tl \tl_new:N \l__xdu_bib_tool_tl @@ -576,6 +577,7 @@ \tl_new:N \l__xdu_page_v_align_tl \keys_define:nn { xdu / style } { + title-bold-math .bool_set:N = \l__xdu_title_bold_math_bool, en-cjk-font .bool_set:N = \l__xdu_en_cjk_font_bool, language .choices:nn = { zh, en } { \tl_set_eq:NN \l__xdu_lang_tl \l_keys_choice_tl }, @@ -613,6 +615,7 @@ } \keys_set:nn { xdu } { + style / title-bold-math = false, style / en-cjk-font = false, style / language = zh, style / bib-backend = biblatex, @@ -636,6 +639,15 @@ style / symmetric-margin = false, style / page-vertical-align = { 顶部对齐 } } +\cs_new:Npn \__xdu_bold_math: { } +\ctex_at_end_preamble:n + { + \bool_if:NT \l__xdu_title_bold_math_bool + { + \tl_if_eq:NnT \l__xdu_math_font_tl { cm } + { \cs_set_eq:NN \__xdu_bold_math: \boldmath } + } + } \NewDocumentCommand \xdusetup { m } { \keys_set:nn { xdu } { #1 } } \keys_define:nn { xdu } -- cgit v1.2.3