From acf3807dc0f375729de890a56d32a063fc95bacf Mon Sep 17 00:00:00 2001 From: Norbert Preining Date: Wed, 8 Feb 2023 03:02:25 +0000 Subject: CTAN sync 202302080302 --- macros/xetex/latex/xduts/xduts.dtx | 46 +++++++++++++++++++++++-------------- macros/xetex/latex/xduts/xduts.pdf | Bin 333537 -> 333533 bytes 2 files changed, 29 insertions(+), 17 deletions(-) (limited to 'macros/xetex/latex') diff --git a/macros/xetex/latex/xduts/xduts.dtx b/macros/xetex/latex/xduts/xduts.dtx index 6816aa31a1..3bb022f91e 100644 --- a/macros/xetex/latex/xduts/xduts.dtx +++ b/macros/xetex/latex/xduts/xduts.dtx @@ -1,7 +1,7 @@ % \iffalse %<*driver> \ProvidesFile{xduts.dtx} -[2023/02/03 v4.4.0.0 Xidian University TeX Suite] +[2023/02/06 v4.4.2.0 Xidian University TeX Suite] % %\NeedsTeXFormat{LaTeX2e} %\RequirePackage{expl3} @@ -9,7 +9,7 @@ %\ProvidesExplClass{xduugtp} %\ProvidesExplClass{xdupgthesis} %\ProvidesExplClass{xduugthesis} -% {2023/02/03}{4.4.0.0} +% {2023/02/06}{4.4.2.0} % {Xidian University Font package} % {Xidian University Undergraduate Thesis Proposal class} % {Xidian University Postgraduate Thesis document class} @@ -5180,6 +5180,7 @@ literate = {\$}{{\textcolor{purple3}{\$}}}{1} % \end{macrocode} % \end{macro} % \begin{macro}{\DeclareCaptionFont,\captionsetup*} +% \changes{v4.4.2.0}{2023/02/06}{修正\pkgx{algorithm}算法caption对齐方式} % \changes{v3.1.1.0}{2022/12/04}{修正\pkgx{algorithm}算法caption格式设置} % \changes{v3.0.0.0}{2022/12/03}{设置\pkgx{algorithm}算法caption格式} % \changes{v2.18.0.0}{2022/11/28}{设置\pkgx{algorithm}算法caption对齐方式} @@ -5208,13 +5209,13 @@ literate = {\$}{{\textcolor{purple3}{\$}}}{1} { \captionsetup* [ algorithm ] { format = hang } } { \captionsetup* [ algorithm ] { format = plain } } \captionsetup* [ ruled ] { strut = off } - \tl_if_eq:NnTF \l_@@_ft_cap_align_tl { left } + \tl_if_eq:NnTF \l_@@_alg_cap_align_tl { left } { \captionsetup* [ algorithm ] { singlelinecheck = false, justification = justified } } { - \tl_if_eq:NnTF \l_@@_ft_cap_align_tl { centering } + \tl_if_eq:NnTF \l_@@_alg_cap_align_tl { centering } { \captionsetup* [ algorithm ] { singlelinecheck = false, justification = centerlast } @@ -5227,6 +5228,7 @@ literate = {\$}{{\textcolor{purple3}{\$}}}{1} } % \end{macrocode} % \end{macro} +% \changes{v4.4.1.0}{2023/02/06}{修正\pkgx{algorithm}算法三线间距配置} % \changes{v3.1.0.0}{2022/12/03}{设置\pkgx{algorithm}算法三线间距} % \begin{macro}{\ctex_at_end_preamble:n} % 设置\pkgx{algorithm}算法三线间距。 @@ -5235,14 +5237,18 @@ literate = {\$}{{\textcolor{purple3}{\$}}}{1} { \bool_if:NT \l_@@_add_alg_rule_vspace_bool { - \cs_set:Npn \fs@ruled + \@ifpackageloaded { algorithm } { - \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 + \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 + } } + { } } } % \end{macrocode} @@ -5257,7 +5263,7 @@ literate = {\$}{{\textcolor{purple3}{\$}}}{1} % \begin{macrocode} \ctex_at_end_preamble:n { - \cs_if_exist:NT \thealgocf + \@ifpackageloaded { algorithm2e } { \SetAlgoCaptionSeparator { \hbox_to_wd:nn { \l_@@_cap_label_sep_tl } { } } \bool_if:NTF \l_@@_alg_small_cap_bool @@ -5320,14 +5326,16 @@ literate = {\$}{{\textcolor{purple3}{\$}}}{1} } } } - \RenewDocumentCommand { \algocf@makecaption@ruled } { mm } - { \global \sbox \algocf@capbox { \algocf@makecaption { #1 } { #2 } } } - \RenewDocumentCommand { \algocf@makecaption@boxed } { mm } - { \global \sbox \algocf@capbox { \algocf@makecaption { #1 } { #2 } } } + \RenewDocumentCommand { \algocf@makecaption@ruled } { mm } + { \global \sbox \algocf@capbox { \algocf@makecaption { #1 } { #2 } } } + \RenewDocumentCommand { \algocf@makecaption@boxed } { mm } + { \global \sbox \algocf@capbox { \algocf@makecaption { #1 } { #2 } } } } + { } } % \end{macrocode} % \end{macro} +% \changes{v4.4.1.0}{2023/02/06}{修正\pkgx{algorithm2e}算法三线间距配置} % \changes{v3.1.0.0}{2022/12/03}{设置\pkgx{algorithm2e}算法三线间距} % \begin{macro}{\ctex_at_end_preamble:n} % 设置\pkgx{algorithm2e}算法三线间距。 @@ -5336,8 +5344,12 @@ literate = {\$}{{\textcolor{purple3}{\$}}}{1} { \bool_if:NT \l_@@_add_alg_rule_vspace_bool { - \dim_set:Nn \interspacetitleruled { 5pt } - \dim_set:Nn \interspacealgoruled { 5pt } + \@ifpackageloaded { algorithm2e } + { + \dim_set:Nn \interspacetitleruled { 5pt } + \dim_set:Nn \interspacealgoruled { 5pt } + } + { } } } % \end{macrocode} diff --git a/macros/xetex/latex/xduts/xduts.pdf b/macros/xetex/latex/xduts/xduts.pdf index 9f5ee31794..224504c986 100644 Binary files a/macros/xetex/latex/xduts/xduts.pdf and b/macros/xetex/latex/xduts/xduts.pdf differ -- cgit v1.2.3