From 99638029777533d71ab45a331944baf02775c7bd Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sun, 15 May 2022 20:41:52 +0000 Subject: xduts (15may22) git-svn-id: svn://tug.org/texlive/trunk@63307 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/xelatex/xduts/xdufont.sty | 9 ++--- .../texmf-dist/tex/xelatex/xduts/xdupgthesis.cls | 41 ++++++++++++++++---- .../texmf-dist/tex/xelatex/xduts/xduugthesis.cls | 44 ++++++++++++++++++---- 3 files changed, 74 insertions(+), 20 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 6c799297fdd..322f06f5211 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/05/08}{1.13.2.0} + {2022/05/15}{1.15.0.1} {Xidian University Font package} \RequirePackage { xparse, l3keys2e } \PassOptionsToPackage { quiet } { xeCJK } @@ -385,9 +385,8 @@ \cs_new:Npn \__xdu_load_latin_font_none: { } \cs_new:Npn \__xdu_load_unicode_math_pkg: { - \RequirePackage - [ \l__xdu_unicode_math_tl ] - { unicode-math } + \PassOptionsToPackage { \l__xdu_unicode_math_tl } { unicode-math } + \RequirePackage { unicode-math } } \cs_new:Npn \__xdu_load_math_font_cambria: { @@ -430,7 +429,7 @@ \__xdu_load_unicode_math_pkg: \setmathfont { XITSMath-Regular.otf } \setmathfont { XITSMath-Bold.otf } - [range= { bfup -> up, bfit -> it } ] + [ range= { bfup -> up, bfit -> it } ] } } \cs_new:Npn \__xdu_load_math_font_cm: { } diff --git a/Master/texmf-dist/tex/xelatex/xduts/xdupgthesis.cls b/Master/texmf-dist/tex/xelatex/xduts/xdupgthesis.cls index c62cf50c5c9..a0b094d3133 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/05/08}{1.13.2.0} + {2022/05/15}{1.15.0.1} {Xidian University Postgraduate Thesis document class} \RequirePackage { xparse, l3keys2e } \PassOptionsToPackage { quiet } { xeCJK } @@ -398,9 +398,8 @@ \cs_new:Npn \__xdu_load_latin_font_none: { } \cs_new:Npn \__xdu_load_unicode_math_pkg: { - \RequirePackage - [ \l__xdu_unicode_math_tl ] - { unicode-math } + \PassOptionsToPackage { \l__xdu_unicode_math_tl } { unicode-math } + \RequirePackage { unicode-math } } \cs_new:Npn \__xdu_load_math_font_cambria: { @@ -443,7 +442,7 @@ \__xdu_load_unicode_math_pkg: \setmathfont { XITSMath-Regular.otf } \setmathfont { XITSMath-Bold.otf } - [range= { bfup -> up, bfit -> it } ] + [ range= { bfup -> up, bfit -> it } ] } } \cs_new:Npn \__xdu_load_math_font_cm: { } @@ -738,6 +737,16 @@ \item \clist_use:Nnnn #2 { #3 } { #3 } { #3 } \end { list } } +\NewDocumentCommand \noauxwrite { m } + { + \if@filesw + \@fileswfalse + #1 + \@fileswtrue + \else + #1 + \fi + } \newgeometry { top = 3cm, @@ -922,6 +931,18 @@ } \PassOptionsToPackage { font = small } { subfig } \captionsetup [ sub ] { font = customfont } +\ctex_at_end_preamble:n + { + \@ifpackageloaded { subfig } + { \captionsetup [ subfloat ] { subrefformat = parens } } + { } + } +\ctex_at_end_preamble:n + { + \@ifpackageloaded { subcaption } + { \cs_set:Npn \thesubfigure { ( \alph { subfigure } ) } } + { } + } \ctex_at_end_preamble:n { \bool_if:NT \l__xdu_tab_small_bool @@ -994,22 +1015,28 @@ { \__xdu_trad_ref:n { #1 } } { \xspace \__xdu_trad_ref:n { #1 } \xspace } } + \cs_set_eq:NN \__xdu_trad_page_ref:n \pageref + \cs_set:Npn \pageref #1 + { \xspace \__xdu_trad_page_ref:n { #1 } \xspace } } } } } \cs_new_protected:Npn \__xdu_begin_document:n #1 { \ctex_gadd_ltxhook:nn { env/document/begin } { #1 } } +\PassOptionsToPackage { sort&compress } { gbt7714 } +\PassOptionsToPackage { style = gb7714-2015 } { biblatex } \__xdu_begin_document:n { \tl_if_eq:NnTF \l__xdu_bib_tool_tl { bibtex } { - \RequirePackage [ sort&compress,square,super,comma,numbers ] { natbib } \RequirePackage { gbt7714 } \bibliographystyle { gbt7714-numerical } + \NewDocumentCommand \parencite { m } + { \group_begin: \citestyle { numbers } \cite { #1 } \group_end: } } { - \RequirePackage [ style = gb7714-2015 ] { biblatex } + \RequirePackage { biblatex } \clist_map_inline:Nn \l__xdu_bib_file_clist { \addbibresource { #1 } } } } diff --git a/Master/texmf-dist/tex/xelatex/xduts/xduugthesis.cls b/Master/texmf-dist/tex/xelatex/xduts/xduugthesis.cls index 5d4b275af06..2725418a548 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/05/08}{1.13.2.0} + {2022/05/15}{1.15.0.1} {Xidian University Undergraduate Thesis document class} \RequirePackage { xparse, l3keys2e } \PassOptionsToPackage { quiet } { xeCJK } @@ -399,9 +399,8 @@ \cs_new:Npn \__xdu_load_latin_font_none: { } \cs_new:Npn \__xdu_load_unicode_math_pkg: { - \RequirePackage - [ \l__xdu_unicode_math_tl ] - { unicode-math } + \PassOptionsToPackage { \l__xdu_unicode_math_tl } { unicode-math } + \RequirePackage { unicode-math } } \cs_new:Npn \__xdu_load_math_font_cambria: { @@ -444,7 +443,7 @@ \__xdu_load_unicode_math_pkg: \setmathfont { XITSMath-Regular.otf } \setmathfont { XITSMath-Bold.otf } - [range= { bfup -> up, bfit -> it } ] + [ range= { bfup -> up, bfit -> it } ] } } \cs_new:Npn \__xdu_load_math_font_cm: { } @@ -670,6 +669,16 @@ \item \clist_use:Nnnn #2 { #3 } { #3 } { #3 } \end { list } } +\NewDocumentCommand \noauxwrite { m } + { + \if@filesw + \@fileswfalse + #1 + \@fileswtrue + \else + #1 + \fi + } \newgeometry { top = 3cm, @@ -862,7 +871,8 @@ paragraph / afterskip = { \clist_item:Nn \l__xdu_after_skip_clist { 5 } }, subparagraph / afterskip = { \clist_item:Nn \l__xdu_after_skip_clist { 6 } } } -\RequirePackage [ titles ] { tocloft } +\PassOptionsToPackage { titles } { tocloft } +\RequirePackage { tocloft } \cs_set:Npn \cftchapleader { \bfseries \cftdotfill { \cftdotsep } } \dim_set_eq:NN \cftbeforechapskip \cftbeforesecskip \clist_map_inline:nn @@ -980,6 +990,18 @@ } \PassOptionsToPackage { font = small } { subfig } \captionsetup [ sub ] { font = customfont } +\ctex_at_end_preamble:n + { + \@ifpackageloaded { subfig } + { \captionsetup [ subfloat ] { subrefformat = parens } } + { } + } +\ctex_at_end_preamble:n + { + \@ifpackageloaded { subcaption } + { \cs_set:Npn \thesubfigure { ( \alph { subfigure } ) } } + { } + } \ctex_at_end_preamble:n { \bool_if:NT \l__xdu_tab_small_bool @@ -1052,22 +1074,28 @@ { \__xdu_trad_ref:n { #1 } } { \xspace \__xdu_trad_ref:n { #1 } \xspace } } + \cs_set_eq:NN \__xdu_trad_page_ref:n \pageref + \cs_set:Npn \pageref #1 + { \xspace \__xdu_trad_page_ref:n { #1 } \xspace } } } } } \cs_new_protected:Npn \__xdu_begin_document:n #1 { \ctex_gadd_ltxhook:nn { env/document/begin } { #1 } } +\PassOptionsToPackage { sort&compress } { gbt7714 } +\PassOptionsToPackage { style = gb7714-2015 } { biblatex } \__xdu_begin_document:n { \tl_if_eq:NnTF \l__xdu_bib_tool_tl { bibtex } { - \RequirePackage [ sort&compress,square,super,comma,numbers ] { natbib } \RequirePackage { gbt7714 } \bibliographystyle { gbt7714-numerical } + \NewDocumentCommand \parencite { m } + { \group_begin: \citestyle { numbers } \cite { #1 } \group_end: } } { - \RequirePackage [ style = gb7714-2015 ] { biblatex } + \RequirePackage { biblatex } \clist_map_inline:Nn \l__xdu_bib_file_clist { \addbibresource { #1 } } } } -- cgit v1.2.3