From 9d3d4cf4171b39007b2c96eabf5640839b3520ed Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sat, 3 Dec 2022 21:02:25 +0000 Subject: xduts (3dec22) git-svn-id: svn://tug.org/texlive/trunk@65186 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/xelatex/xduts/xdufont.sty | 2 +- .../texmf-dist/tex/xelatex/xduts/xdupgthesis.cls | 149 ++++++++++++++++----- .../texmf-dist/tex/xelatex/xduts/xduugthesis.cls | 149 ++++++++++++++++----- 3 files changed, 227 insertions(+), 73 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 3d5fb585d62..0414b344920 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/12/01}{2.18.1.1} + {2022/12/03}{3.1.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 bc23e6e99c2..da26f8d49e7 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/12/01}{2.18.1.1} + {2022/12/03}{3.1.0.0} {Xidian University Postgraduate Thesis document class} \RequirePackage { xparse, l3keys2e } \PassOptionsToPackage { quiet } { xeCJK } @@ -697,11 +697,14 @@ \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 -\tl_new:N \l__xdu_cap_format_tl +\tl_new:N \l__xdu_ft_cap_format_tl +\tl_new:N \l__xdu_alg_cap_format_tl +\tl_new:N \l__xdu_ft_cap_align_tl +\tl_new:N \l__xdu_alg_cap_align_tl +\bool_new:N \l__xdu_add_alg_rule_vspace_bool \bool_new:N \l__xdu_tab_small_bool \bool_new:N \l__xdu_alg_small_cap_bool \bool_new:N \l__xdu_alg_small_bool -\tl_new:N \l__xdu_alg_capt_align_tl \clist_new:N \l__xdu_before_skip_clist \clist_new:N \l__xdu_after_skip_clist \tl_new:N \l__xdu_chap_tl @@ -726,13 +729,18 @@ 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, - caption-format .choices:nn = { plain, hang } - { \tl_set_eq:NN \l__xdu_cap_format_tl \l_keys_choice_tl }, + ft-caption-format .choices:nn = { plain, hang } + { \tl_set_eq:NN \l__xdu_ft_cap_format_tl \l_keys_choice_tl }, + alg-caption-format .choices:nn = { plain, hang } + { \tl_set_eq:NN \l__xdu_alg_cap_format_tl \l_keys_choice_tl }, + ft-caption-align .choices:nn = { left, centering, centering-left } + { \tl_set_eq:NN \l__xdu_ft_cap_align_tl \l_keys_choice_tl }, + alg-caption-align .choices:nn = { left, centering, centering-left } + { \tl_set_eq:NN \l__xdu_alg_cap_align_tl \l_keys_choice_tl }, + add-alg-rule-vspace .bool_set:N = \l__xdu_add_alg_rule_vspace_bool, table-small-font .bool_set:N = \l__xdu_tab_small_bool, algorithm-small-caption .bool_set:N = \l__xdu_alg_small_cap_bool, algorithm-small-font .bool_set:N = \l__xdu_alg_small_bool, - algorithm-caption-align .choices:nn = { left, centering } - { \tl_set_eq:NN \l__xdu_alg_capt_align_tl \l_keys_choice_tl }, before-skip .clist_set:N = \l__xdu_before_skip_clist, after-skip .clist_set:N = \l__xdu_after_skip_clist, chap-zihao .tl_set:N = \l__xdu_chap_tl, @@ -756,7 +764,11 @@ style / fix-includegraphics = false, style / ref-add-space = false, style / caption-label-sep = { 0.75em }, - style / caption-format = { hang }, + style / ft-caption-format = { hang }, + style / alg-caption-format = { hang }, + style / ft-caption-align = { centering-left }, + style / alg-caption-align = { left }, + style / add-alg-rule-vspace = { false }, style / table-small-font = true, style / algorithm-small-caption = true, style / algorithm-small-font = true, @@ -1257,16 +1269,10 @@ } { } } +\PassOptionsToPackage { ruled } { caption } \RequirePackage { caption } \DeclareCaptionLabelSeparator { customskip } { \hskip \l__xdu_cap_label_sep_tl } \DeclareCaptionFont { customfont } { \__xdu_rm_family: \zihao { 5 } } -\DeclareCaptionFont { algcustomfont } - { - \__xdu_rm_family: - \bool_if:NTF \l__xdu_alg_small_cap_bool - { \zihao { 5 } } - { \zihao { -4 } } - } \captionsetup { labelsep = customskip, @@ -1274,10 +1280,25 @@ } \ctex_at_end_preamble:n { - \tl_if_eq:NnTF \l__xdu_cap_format_tl { hang } - { \captionsetup { format = hang } } { } + \tl_if_eq:NnTF \l__xdu_ft_cap_format_tl { hang } + { \captionsetup { format = hang } } + { \captionsetup { format = plain } } + \tl_if_eq:NnTF \l__xdu_ft_cap_align_tl { left } + { \captionsetup { singlelinecheck = false, justification = justified } } + { + \tl_if_eq:NnTF \l__xdu_ft_cap_align_tl { centering } + { \captionsetup { singlelinecheck = false, justification = centerlast } } + { \captionsetup { singlelinecheck = true, justification = justified } } + } } -\captionsetup [ algorithm ] +\DeclareCaptionFont { algcustomfont } + { + \__xdu_rm_family: + \bool_if:NTF \l__xdu_alg_small_cap_bool + { \zihao { 5 } } + { \zihao { -4 } } + } +\captionsetup* [ algorithm ] { labelsep = customskip, labelfont = algcustomfont, @@ -1285,12 +1306,42 @@ } \ctex_at_end_preamble:n { - \tl_if_eq:NnTF \l__xdu_alg_capt_align_tl { left } + \tl_if_eq:NnTF \l__xdu_alg_cap_format_tl { hang } + { \captionsetup* [ algorithm ] { format = hang } } + { \captionsetup* [ algorithm ] { format = plain } } + \captionsetup* [ ruled ] { strut = 0 } + \tl_if_eq:NnTF \l__xdu_ft_cap_align_tl { left } { - \tl_if_eq:NnTF \l__xdu_cap_format_tl { hang } - { \captionsetup [ algorithm ] { format = hang } } { } + \captionsetup* [ algorithm ] + { singlelinecheck = false, justification = justified } + } + { + \tl_if_eq:NnTF \l__xdu_ft_cap_align_tl { centering } + { + \captionsetup* [ algorithm ] + { singlelinecheck = false, justification = centerlast } + } + { + \cs_set_eq:NN \floatc@ruled \floatc@plain + \captionsetup* [ ruled ] { slc = 1 } + \captionsetup* [ algorithm ] + { singlelinecheck = true, justification = justified } + } + } + } +\ctex_at_end_preamble:n + { + \bool_if:NT \l__xdu_add_alg_rule_vspace_bool + { + \cs_set:Npn \fs@ruled + { + \cs_set_eq:NN \@fs@capt \floatc@plain + \cs_set:Npn \@fs@pre { \hrule height .8pt depth 0pt \kern 5pt } + \cs_set:Npn \@fs@post { \kern 5pt \hrule \relax } + \cs_set:Npn \@fs@mid { \kern 5pt \hrule \kern 5pt } + \cs_set_eq:NN \@fs@iftopcapt \iftrue + } } - { \captionsetup [ algorithm ] { justification = centering } } } \ctex_at_end_preamble:n { @@ -1307,33 +1358,51 @@ \SetAlCapFnt { \__xdu_rm_family: \zihao { -4 } } } \SetAlCapSty { } - \tl_if_eq:NnTF \l__xdu_alg_capt_align_tl { left } + \RenewDocumentCommand { \algocf@makecaption } { mm } { - \box_new:N \l__xdu_algtwoe_capt_box - \RenewDocumentCommand { \algocf@makecaption } { mm } + \box_clear_new:N \l__xdu_algiie_capt_box + \hbox_set:Nn \l__xdu_algiie_capt_box + { \AlCapFnt #1 \algocf@capseparator \AlCapNameFnt #2 } + \dim_compare:nNnTF { \box_wd:N \l__xdu_algiie_capt_box } > { \hsize } { - \hbox_set:Nn \l__xdu_algtwoe_capt_box - { \AlCapFnt #1 \algocf@capseparator \AlCapNameFnt #2 } - \dim_compare:nNnTF { \box_wd:N \l__xdu_algtwoe_capt_box } > { \hsize } + \tl_if_eq:NnTF \l__xdu_alg_cap_format_tl { hang } { - \tl_if_eq:NnTF \l__xdu_cap_format_tl { hang } + \tl_if_eq:NnTF \l__xdu_alg_cap_align_tl { centering } + { + \makebox { \AlCapFnt #1 \algocf@capseparator } + \makebox + { + \parbox [ t ] { \hsize } + { \centering \AlCapNameFnt #2 } + } + } { \makebox { \AlCapFnt #1 \algocf@capseparator } \makebox { \parbox [ t ] { \hsize } { \AlCapNameFnt #2 } } } + } + { + \tl_if_eq:NnTF \l__xdu_alg_cap_align_tl { centering } + { + \parbox { \columnwidth } + { \centering \AlCapFnt #1 \algocf@capseparator \AlCapNameFnt #2} + } { \parbox { \columnwidth } { \AlCapFnt #1 \algocf@capseparator \AlCapNameFnt #2} } } - { \makebox [ \columnwidth ] { \box_use:N \l__xdu_algtwoe_capt_box } } } - } - { - \RenewDocumentCommand { \algocf@makecaption } { mm } { - \parbox { \columnwidth } - { \centering \AlCapFnt #1 \algocf@capseparator \AlCapNameFnt #2 } + \tl_if_eq:NnTF \l__xdu_alg_cap_align_tl { left } + { + \parbox { \columnwidth } + { \AlCapFnt #1 \algocf@capseparator \AlCapNameFnt #2 } + } + { + \parbox { \columnwidth } + { \centering \AlCapFnt #1 \algocf@capseparator \AlCapNameFnt #2 } + } } } \RenewDocumentCommand { \algocf@makecaption@ruled } { mm } @@ -1342,6 +1411,14 @@ { \global \sbox \algocf@capbox { \algocf@makecaption { #1 } { #2 } } } } } +\ctex_at_end_preamble:n + { + \bool_if:NT \l__xdu_add_alg_rule_vspace_bool + { + \dim_set:Nn \interspacetitleruled { 5pt } + \dim_set:Nn \interspacealgoruled { 5pt } + } + } \cs_new:Npn \__xdu_tblr_caption_box:n #1 { \makebox [ \tablewidth ] { \parbox { \columnwidth } { #1 } } } \ctex_at_end_preamble:n @@ -1382,7 +1459,7 @@ { } } \PassOptionsToPackage { font = small } { subfig } -\captionsetup [ sub ] { font = customfont } +\captionsetup* [ sub ] { font = customfont } \ctex_at_end_preamble:n { \@ifpackageloaded { subfig } diff --git a/Master/texmf-dist/tex/xelatex/xduts/xduugthesis.cls b/Master/texmf-dist/tex/xelatex/xduts/xduugthesis.cls index 26afb1b1b6d..61ede967dac 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/12/01}{2.18.1.1} + {2022/12/03}{3.1.0.0} {Xidian University Undergraduate Thesis document class} \RequirePackage { xparse, l3keys2e } \PassOptionsToPackage { quiet } { xeCJK } @@ -530,11 +530,14 @@ \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 -\tl_new:N \l__xdu_cap_format_tl +\tl_new:N \l__xdu_ft_cap_format_tl +\tl_new:N \l__xdu_alg_cap_format_tl +\tl_new:N \l__xdu_ft_cap_align_tl +\tl_new:N \l__xdu_alg_cap_align_tl +\bool_new:N \l__xdu_add_alg_rule_vspace_bool \bool_new:N \l__xdu_tab_small_bool \bool_new:N \l__xdu_alg_small_cap_bool \bool_new:N \l__xdu_alg_small_bool -\tl_new:N \l__xdu_alg_capt_align_tl \clist_new:N \l__xdu_before_skip_clist \clist_new:N \l__xdu_after_skip_clist \tl_new:N \l__xdu_chap_tl @@ -559,13 +562,18 @@ 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, - caption-format .choices:nn = { plain, hang } - { \tl_set_eq:NN \l__xdu_cap_format_tl \l_keys_choice_tl }, + ft-caption-format .choices:nn = { plain, hang } + { \tl_set_eq:NN \l__xdu_ft_cap_format_tl \l_keys_choice_tl }, + alg-caption-format .choices:nn = { plain, hang } + { \tl_set_eq:NN \l__xdu_alg_cap_format_tl \l_keys_choice_tl }, + ft-caption-align .choices:nn = { left, centering, centering-left } + { \tl_set_eq:NN \l__xdu_ft_cap_align_tl \l_keys_choice_tl }, + alg-caption-align .choices:nn = { left, centering, centering-left } + { \tl_set_eq:NN \l__xdu_alg_cap_align_tl \l_keys_choice_tl }, + add-alg-rule-vspace .bool_set:N = \l__xdu_add_alg_rule_vspace_bool, table-small-font .bool_set:N = \l__xdu_tab_small_bool, algorithm-small-caption .bool_set:N = \l__xdu_alg_small_cap_bool, algorithm-small-font .bool_set:N = \l__xdu_alg_small_bool, - algorithm-caption-align .choices:nn = { left, centering } - { \tl_set_eq:NN \l__xdu_alg_capt_align_tl \l_keys_choice_tl }, before-skip .clist_set:N = \l__xdu_before_skip_clist, after-skip .clist_set:N = \l__xdu_after_skip_clist, chap-zihao .tl_set:N = \l__xdu_chap_tl, @@ -589,7 +597,11 @@ style / fix-includegraphics = false, style / ref-add-space = false, style / caption-label-sep = { 0.75em }, - style / caption-format = { hang }, + style / ft-caption-format = { hang }, + style / alg-caption-format = { hang }, + style / ft-caption-align = { centering-left }, + style / alg-caption-align = { left }, + style / add-alg-rule-vspace = { false }, style / table-small-font = true, style / algorithm-small-caption = true, style / algorithm-small-font = true, @@ -1043,16 +1055,10 @@ } { } } +\PassOptionsToPackage { ruled } { caption } \RequirePackage { caption } \DeclareCaptionLabelSeparator { customskip } { \hskip \l__xdu_cap_label_sep_tl } \DeclareCaptionFont { customfont } { \__xdu_rm_family: \zihao { 5 } } -\DeclareCaptionFont { algcustomfont } - { - \__xdu_rm_family: - \bool_if:NTF \l__xdu_alg_small_cap_bool - { \zihao { 5 } } - { \zihao { -4 } } - } \captionsetup { labelsep = customskip, @@ -1060,10 +1066,25 @@ } \ctex_at_end_preamble:n { - \tl_if_eq:NnTF \l__xdu_cap_format_tl { hang } - { \captionsetup { format = hang } } { } + \tl_if_eq:NnTF \l__xdu_ft_cap_format_tl { hang } + { \captionsetup { format = hang } } + { \captionsetup { format = plain } } + \tl_if_eq:NnTF \l__xdu_ft_cap_align_tl { left } + { \captionsetup { singlelinecheck = false, justification = justified } } + { + \tl_if_eq:NnTF \l__xdu_ft_cap_align_tl { centering } + { \captionsetup { singlelinecheck = false, justification = centerlast } } + { \captionsetup { singlelinecheck = true, justification = justified } } + } } -\captionsetup [ algorithm ] +\DeclareCaptionFont { algcustomfont } + { + \__xdu_rm_family: + \bool_if:NTF \l__xdu_alg_small_cap_bool + { \zihao { 5 } } + { \zihao { -4 } } + } +\captionsetup* [ algorithm ] { labelsep = customskip, labelfont = algcustomfont, @@ -1071,12 +1092,42 @@ } \ctex_at_end_preamble:n { - \tl_if_eq:NnTF \l__xdu_alg_capt_align_tl { left } + \tl_if_eq:NnTF \l__xdu_alg_cap_format_tl { hang } + { \captionsetup* [ algorithm ] { format = hang } } + { \captionsetup* [ algorithm ] { format = plain } } + \captionsetup* [ ruled ] { strut = 0 } + \tl_if_eq:NnTF \l__xdu_ft_cap_align_tl { left } { - \tl_if_eq:NnTF \l__xdu_cap_format_tl { hang } - { \captionsetup [ algorithm ] { format = hang } } { } + \captionsetup* [ algorithm ] + { singlelinecheck = false, justification = justified } + } + { + \tl_if_eq:NnTF \l__xdu_ft_cap_align_tl { centering } + { + \captionsetup* [ algorithm ] + { singlelinecheck = false, justification = centerlast } + } + { + \cs_set_eq:NN \floatc@ruled \floatc@plain + \captionsetup* [ ruled ] { slc = 1 } + \captionsetup* [ algorithm ] + { singlelinecheck = true, justification = justified } + } + } + } +\ctex_at_end_preamble:n + { + \bool_if:NT \l__xdu_add_alg_rule_vspace_bool + { + \cs_set:Npn \fs@ruled + { + \cs_set_eq:NN \@fs@capt \floatc@plain + \cs_set:Npn \@fs@pre { \hrule height .8pt depth 0pt \kern 5pt } + \cs_set:Npn \@fs@post { \kern 5pt \hrule \relax } + \cs_set:Npn \@fs@mid { \kern 5pt \hrule \kern 5pt } + \cs_set_eq:NN \@fs@iftopcapt \iftrue + } } - { \captionsetup [ algorithm ] { justification = centering } } } \ctex_at_end_preamble:n { @@ -1093,33 +1144,51 @@ \SetAlCapFnt { \__xdu_rm_family: \zihao { -4 } } } \SetAlCapSty { } - \tl_if_eq:NnTF \l__xdu_alg_capt_align_tl { left } + \RenewDocumentCommand { \algocf@makecaption } { mm } { - \box_new:N \l__xdu_algtwoe_capt_box - \RenewDocumentCommand { \algocf@makecaption } { mm } + \box_clear_new:N \l__xdu_algiie_capt_box + \hbox_set:Nn \l__xdu_algiie_capt_box + { \AlCapFnt #1 \algocf@capseparator \AlCapNameFnt #2 } + \dim_compare:nNnTF { \box_wd:N \l__xdu_algiie_capt_box } > { \hsize } { - \hbox_set:Nn \l__xdu_algtwoe_capt_box - { \AlCapFnt #1 \algocf@capseparator \AlCapNameFnt #2 } - \dim_compare:nNnTF { \box_wd:N \l__xdu_algtwoe_capt_box } > { \hsize } + \tl_if_eq:NnTF \l__xdu_alg_cap_format_tl { hang } { - \tl_if_eq:NnTF \l__xdu_cap_format_tl { hang } + \tl_if_eq:NnTF \l__xdu_alg_cap_align_tl { centering } + { + \makebox { \AlCapFnt #1 \algocf@capseparator } + \makebox + { + \parbox [ t ] { \hsize } + { \centering \AlCapNameFnt #2 } + } + } { \makebox { \AlCapFnt #1 \algocf@capseparator } \makebox { \parbox [ t ] { \hsize } { \AlCapNameFnt #2 } } } + } + { + \tl_if_eq:NnTF \l__xdu_alg_cap_align_tl { centering } + { + \parbox { \columnwidth } + { \centering \AlCapFnt #1 \algocf@capseparator \AlCapNameFnt #2} + } { \parbox { \columnwidth } { \AlCapFnt #1 \algocf@capseparator \AlCapNameFnt #2} } } - { \makebox [ \columnwidth ] { \box_use:N \l__xdu_algtwoe_capt_box } } } - } - { - \RenewDocumentCommand { \algocf@makecaption } { mm } { - \parbox { \columnwidth } - { \centering \AlCapFnt #1 \algocf@capseparator \AlCapNameFnt #2 } + \tl_if_eq:NnTF \l__xdu_alg_cap_align_tl { left } + { + \parbox { \columnwidth } + { \AlCapFnt #1 \algocf@capseparator \AlCapNameFnt #2 } + } + { + \parbox { \columnwidth } + { \centering \AlCapFnt #1 \algocf@capseparator \AlCapNameFnt #2 } + } } } \RenewDocumentCommand { \algocf@makecaption@ruled } { mm } @@ -1128,6 +1197,14 @@ { \global \sbox \algocf@capbox { \algocf@makecaption { #1 } { #2 } } } } } +\ctex_at_end_preamble:n + { + \bool_if:NT \l__xdu_add_alg_rule_vspace_bool + { + \dim_set:Nn \interspacetitleruled { 5pt } + \dim_set:Nn \interspacealgoruled { 5pt } + } + } \cs_new:Npn \__xdu_tblr_caption_box:n #1 { \makebox [ \tablewidth ] { \parbox { \columnwidth } { #1 } } } \ctex_at_end_preamble:n @@ -1168,7 +1245,7 @@ { } } \PassOptionsToPackage { font = small } { subfig } -\captionsetup [ sub ] { font = customfont } +\captionsetup* [ sub ] { font = customfont } \ctex_at_end_preamble:n { \@ifpackageloaded { subfig } -- cgit v1.2.3