From 7a92e89960daddace54ddc3e8a0abcc4832a6fe9 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Thu, 28 Jul 2022 20:12:00 +0000 Subject: xduts (28jul22) git-svn-id: svn://tug.org/texlive/trunk@63996 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/xelatex/xduts/xdufont.sty | 7 +-- .../texmf-dist/tex/xelatex/xduts/xdupgthesis.cls | 69 +++++++++++++++++----- .../texmf-dist/tex/xelatex/xduts/xduugthesis.cls | 57 +++++++++++++++--- 3 files changed, 106 insertions(+), 27 deletions(-) (limited to 'Master/texmf-dist/tex/xelatex') diff --git a/Master/texmf-dist/tex/xelatex/xduts/xdufont.sty b/Master/texmf-dist/tex/xelatex/xduts/xdufont.sty index 3dbc2a3e0fb..b2db0741783 100644 --- a/Master/texmf-dist/tex/xelatex/xduts/xdufont.sty +++ b/Master/texmf-dist/tex/xelatex/xduts/xdufont.sty @@ -28,7 +28,7 @@ \NeedsTeXFormat{LaTeX2e} \RequirePackage{expl3} \ProvidesExplPackage{xdufont} - {2022/06/28}{2.10.3.0} + {2022/07/28}{2.12.1.1} {Xidian University Font package} \RequirePackage { xparse, l3keys2e } \PassOptionsToPackage { quiet } { xeCJK } @@ -422,11 +422,8 @@ { \__xdu_load_unicode_math_pkg: \__xdu_if_platform_macos:FT + { \setmathfont { XITS~Math } } { - \setmathfont { XITS~Math } - } - { - \__xdu_load_unicode_math_pkg: \setmathfont { XITSMath-Regular.otf } \setmathfont { XITSMath-Bold.otf } [ range= { bfup -> up, bfit -> it } ] diff --git a/Master/texmf-dist/tex/xelatex/xduts/xdupgthesis.cls b/Master/texmf-dist/tex/xelatex/xduts/xdupgthesis.cls index bb0a63f820a..819e09a742a 100644 --- a/Master/texmf-dist/tex/xelatex/xduts/xdupgthesis.cls +++ b/Master/texmf-dist/tex/xelatex/xduts/xdupgthesis.cls @@ -28,7 +28,7 @@ \NeedsTeXFormat{LaTeX2e} \RequirePackage{expl3} \ProvidesExplClass{xdupgthesis} - {2022/06/28}{2.10.3.0} + {2022/07/28}{2.12.1.1} {Xidian University Postgraduate Thesis document class} \RequirePackage { xparse, l3keys2e } \PassOptionsToPackage { quiet } { xeCJK } @@ -435,11 +435,8 @@ { \__xdu_load_unicode_math_pkg: \__xdu_if_platform_macos:FT + { \setmathfont { XITS~Math } } { - \setmathfont { XITS~Math } - } - { - \__xdu_load_unicode_math_pkg: \setmathfont { XITSMath-Regular.otf } \setmathfont { XITSMath-Bold.otf } [ range= { bfup -> up, bfit -> it } ] @@ -683,7 +680,11 @@ \tl_new:N \l__xdu_lang_tl \tl_new:N \l__xdu_bib_tool_tl \tl_new:N \l__xdu_biblatex_option_tl -\tl_new:N \l__xdu_ref_add_space +\clist_new:N \l__xdu_search_path_clist +\bool_new:N \l__xdu_fix_input_bool +\bool_new:N \l__xdu_fix_include_bool +\bool_new:N \l__xdu_fix_graphics_bool +\tl_new:N \l__xdu_ref_add_space_bool \tl_new:N \l__xdu_cap_label_sep_tl \bool_new:N \l__xdu_tab_small_bool \bool_new:N \l__xdu_alg_small_cap_bool @@ -706,7 +707,11 @@ bib-backend .choices:nn = { bibtex, biblatex } { \tl_set_eq:NN \l__xdu_bib_tool_tl \l_keys_choice_tl }, biblatex-option .tl_set:N = \l__xdu_biblatex_option_tl, - ref-add-space .bool_set:N = \l__xdu_ref_add_space, + file-search-path .clist_set:N = \l__xdu_search_path_clist, + fix-input .bool_set:N = \l__xdu_fix_input_bool, + fix-include .bool_set:N = \l__xdu_fix_include_bool, + fix-includegraphics .bool_set:N = \l__xdu_fix_graphics_bool, + ref-add-space .bool_set:N = \l__xdu_ref_add_space_bool, caption-label-sep .tl_set:N = \l__xdu_cap_label_sep_tl, table-small-font .bool_set:N = \l__xdu_tab_small_bool, algorithm-small-caption .bool_set:N = \l__xdu_alg_small_cap_bool, @@ -728,6 +733,10 @@ style / language = zh, style / bib-backend = biblatex, style / biblatex-option = { }, + style / file-search-path = { }, + style / fix-input = false, + style / fix-include = false, + style / fix-includegraphics = false, style / ref-add-space = false, style / caption-label-sep = { 0.75em }, style / table-small-font = true, @@ -762,12 +771,12 @@ style / title-row-los = { false }, style / title-row-loa = { false } } -\bool_new:N \l__xdu_customize_edubg_bool -\bool_new:N \l__xdu_customize_resresult_bool +\bool_new:N \l__xdu_cust_edubg_bool +\bool_new:N \l__xdu_cust_resresult_bool \keys_define:nn { xdu / style } { - customize-edubg .bool_set:N = \l__xdu_customize_edubg_bool, - customize-resresult .bool_set:N = \l__xdu_customize_resresult_bool + customize-edubg .bool_set:N = \l__xdu_cust_edubg_bool, + customize-resresult .bool_set:N = \l__xdu_cust_resresult_bool } \keys_set:nn { xdu } { @@ -1139,7 +1148,39 @@ \cftsubsecpagefont } { \renewcommand { #1 } { \__xdu_rm_family: \zihao { -4 } } } +\ctex_at_end_preamble:n + { + \seq_if_empty:NF \l__xdu_search_path_clist + { + \clist_map_inline:Nn \l__xdu_search_path_clist + { \seq_put_right:Nn \l_file_search_path_seq { #1 } } + } + \bool_if:NT \l__xdu_fix_input_bool + { + \cs_new_eq:NN \__xdu_org_input:n \input + \RenewDocumentCommand { \input } { m } + { \__xdu_org_input:n { ./ #1 } } + } + \bool_if:NT \l__xdu_fix_include_bool + { + \cs_new_eq:NN \__xdu_org_include:n \include + \RenewDocumentCommand { \include } { m } + { \__xdu_org_include:n { ./ #1 } } + } + \bool_if:NT \l__xdu_fix_graphics_bool + { + \cs_new_eq:NN \__xdu_org_includegraphics:n \includegraphics + \RenewDocumentCommand { \includegraphics } { o m } + { + \IfNoValueTF { #1 } + { \__xdu_org_includegraphics:n { ./ #2 } } + { \__xdu_org_includegraphics:n [ #1 ] { ./ #2 } } + } + } + } \renewcommand { \theequation } { \thechapter - \arabic { equation } } +\cs_set:Npn \topfraction { .8 } +\cs_set:Npn \floatpagefraction { .8 } \ctex_at_end_preamble:n { \clist_map_inline:nn @@ -1317,7 +1358,7 @@ } \ctex_at_end_preamble:n { - \bool_if:NT \l__xdu_ref_add_space + \bool_if:NT \l__xdu_ref_add_space_bool { \str_if_eq:NNT { \l__xdu_lang_tl } { zh } { @@ -2334,7 +2375,7 @@ \box_new:N \l__xdu_bio_indent_box \hbox_set:Nn \l__xdu_bio_indent_box { \rmfamily \zihao { -3 } \bfseries 1. \quad} \dim_set:Nn \l__xdu_bio_indent_dim { \box_wd:N \l__xdu_bio_indent_box } - \bool_if:NF \l__xdu_customize_edubg_bool + \bool_if:NF \l__xdu_cust_edubg_bool { \RequirePackage { tabularray } \newenvironment { edubg } @@ -2351,7 +2392,7 @@ \dim_set:Nn \parindent { 2 \ccwd } } } - \bool_if:NF \l__xdu_customize_resresult_bool + \bool_if:NF \l__xdu_cust_resresult_bool { \RequirePackage { enumitem } \SetEnumitemKey { resresult } diff --git a/Master/texmf-dist/tex/xelatex/xduts/xduugthesis.cls b/Master/texmf-dist/tex/xelatex/xduts/xduugthesis.cls index 37f26c0881e..073561e9f74 100644 --- a/Master/texmf-dist/tex/xelatex/xduts/xduugthesis.cls +++ b/Master/texmf-dist/tex/xelatex/xduts/xduugthesis.cls @@ -28,7 +28,7 @@ \NeedsTeXFormat{LaTeX2e} \RequirePackage{expl3} \ProvidesExplClass{xduugthesis} - {2022/06/28}{2.10.3.0} + {2022/07/28}{2.12.1.1} {Xidian University Undergraduate Thesis document class} \RequirePackage { xparse, l3keys2e } \PassOptionsToPackage { quiet } { xeCJK } @@ -436,11 +436,8 @@ { \__xdu_load_unicode_math_pkg: \__xdu_if_platform_macos:FT + { \setmathfont { XITS~Math } } { - \setmathfont { XITS~Math } - } - { - \__xdu_load_unicode_math_pkg: \setmathfont { XITSMath-Regular.otf } \setmathfont { XITSMath-Bold.otf } [ range= { bfup -> up, bfit -> it } ] @@ -532,7 +529,11 @@ \tl_new:N \l__xdu_lang_tl \tl_new:N \l__xdu_bib_tool_tl \tl_new:N \l__xdu_biblatex_option_tl -\tl_new:N \l__xdu_ref_add_space +\clist_new:N \l__xdu_search_path_clist +\bool_new:N \l__xdu_fix_input_bool +\bool_new:N \l__xdu_fix_include_bool +\bool_new:N \l__xdu_fix_graphics_bool +\tl_new:N \l__xdu_ref_add_space_bool \tl_new:N \l__xdu_cap_label_sep_tl \bool_new:N \l__xdu_tab_small_bool \bool_new:N \l__xdu_alg_small_cap_bool @@ -555,7 +556,11 @@ bib-backend .choices:nn = { bibtex, biblatex } { \tl_set_eq:NN \l__xdu_bib_tool_tl \l_keys_choice_tl }, biblatex-option .tl_set:N = \l__xdu_biblatex_option_tl, - ref-add-space .bool_set:N = \l__xdu_ref_add_space, + file-search-path .clist_set:N = \l__xdu_search_path_clist, + fix-input .bool_set:N = \l__xdu_fix_input_bool, + fix-include .bool_set:N = \l__xdu_fix_include_bool, + fix-includegraphics .bool_set:N = \l__xdu_fix_graphics_bool, + ref-add-space .bool_set:N = \l__xdu_ref_add_space_bool, caption-label-sep .tl_set:N = \l__xdu_cap_label_sep_tl, table-small-font .bool_set:N = \l__xdu_tab_small_bool, algorithm-small-caption .bool_set:N = \l__xdu_alg_small_cap_bool, @@ -577,6 +582,10 @@ style / language = zh, style / bib-backend = biblatex, style / biblatex-option = { }, + style / file-search-path = { }, + style / fix-input = false, + style / fix-include = false, + style / fix-includegraphics = false, style / ref-add-space = false, style / caption-label-sep = { 0.75em }, style / table-small-font = true, @@ -941,7 +950,39 @@ \cftsubparapagefont } { \renewcommand { #1 } { \__xdu_rm_family: \zihao { -4 } } } +\ctex_at_end_preamble:n + { + \seq_if_empty:NF \l__xdu_search_path_clist + { + \clist_map_inline:Nn \l__xdu_search_path_clist + { \seq_put_right:Nn \l_file_search_path_seq { #1 } } + } + \bool_if:NT \l__xdu_fix_input_bool + { + \cs_new_eq:NN \__xdu_org_input:n \input + \RenewDocumentCommand { \input } { m } + { \__xdu_org_input:n { ./ #1 } } + } + \bool_if:NT \l__xdu_fix_include_bool + { + \cs_new_eq:NN \__xdu_org_include:n \include + \RenewDocumentCommand { \include } { m } + { \__xdu_org_include:n { ./ #1 } } + } + \bool_if:NT \l__xdu_fix_graphics_bool + { + \cs_new_eq:NN \__xdu_org_includegraphics:n \includegraphics + \RenewDocumentCommand { \includegraphics } { o m } + { + \IfNoValueTF { #1 } + { \__xdu_org_includegraphics:n { ./ #2 } } + { \__xdu_org_includegraphics:n [ #1 ] { ./ #2 } } + } + } + } \renewcommand { \theequation } { \thechapter - \arabic { equation } } +\cs_set:Npn \topfraction { .8 } +\cs_set:Npn \floatpagefraction { .8 } \ctex_at_end_preamble:n { \clist_map_inline:nn @@ -1119,7 +1160,7 @@ } \ctex_at_end_preamble:n { - \bool_if:NT \l__xdu_ref_add_space + \bool_if:NT \l__xdu_ref_add_space_bool { \str_if_eq:NNT { \l__xdu_lang_tl } { zh } { -- cgit v1.2.3