summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Master/texmf-dist/doc/xelatex/xduts/xduts.pdfbin333537 -> 333533 bytes
-rw-r--r--Master/texmf-dist/source/xelatex/xduts/xduts.dtx46
-rw-r--r--Master/texmf-dist/tex/xelatex/xduts/xdufont.sty2
-rw-r--r--Master/texmf-dist/tex/xelatex/xduts/xdupgthesis.cls41
-rw-r--r--Master/texmf-dist/tex/xelatex/xduts/xduugthesis.cls41
-rw-r--r--Master/texmf-dist/tex/xelatex/xduts/xduugtp.cls2
6 files changed, 81 insertions, 51 deletions
diff --git a/Master/texmf-dist/doc/xelatex/xduts/xduts.pdf b/Master/texmf-dist/doc/xelatex/xduts/xduts.pdf
index 9f5ee31794b..224504c9864 100644
--- a/Master/texmf-dist/doc/xelatex/xduts/xduts.pdf
+++ b/Master/texmf-dist/doc/xelatex/xduts/xduts.pdf
Binary files differ
diff --git a/Master/texmf-dist/source/xelatex/xduts/xduts.dtx b/Master/texmf-dist/source/xelatex/xduts/xduts.dtx
index 6816aa31a11..3bb022f91e9 100644
--- a/Master/texmf-dist/source/xelatex/xduts/xduts.dtx
+++ b/Master/texmf-dist/source/xelatex/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]
%</driver>
%<class|sty>\NeedsTeXFormat{LaTeX2e}
%<class|sty>\RequirePackage{expl3}
@@ -9,7 +9,7 @@
%<xduugtp>\ProvidesExplClass{xduugtp}
%<xdupgthesis>\ProvidesExplClass{xdupgthesis}
%<xduugthesis>\ProvidesExplClass{xduugthesis}
-%<class|sty> {2023/02/03}{4.4.0.0}
+%<class|sty> {2023/02/06}{4.4.2.0}
%<xdufont> {Xidian University Font package}
%<xduugtp> {Xidian University Undergraduate Thesis Proposal class}
%<xdupgthesis> {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/Master/texmf-dist/tex/xelatex/xduts/xdufont.sty b/Master/texmf-dist/tex/xelatex/xduts/xdufont.sty
index eb4776b87a1..26a00e08620 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/02/03}{4.4.0.0}
+ {2023/02/06}{4.4.2.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 74ca50278fc..78e755b1197 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/02/03}{4.4.0.0}
+ {2023/02/06}{4.4.2.0}
{Xidian University Postgraduate Thesis document class}
\RequirePackage { xparse, l3keys2e }
\PassOptionsToPackage { quiet } { xeCJK }
@@ -1357,13 +1357,13 @@
{ \captionsetup* [ algorithm ] { format = hang } }
{ \captionsetup* [ algorithm ] { format = plain } }
\captionsetup* [ ruled ] { strut = off }
- \tl_if_eq:NnTF \l__xdu_ft_cap_align_tl { left }
+ \tl_if_eq:NnTF \l__xdu_alg_cap_align_tl { left }
{
\captionsetup* [ algorithm ]
{ singlelinecheck = false, justification = justified }
}
{
- \tl_if_eq:NnTF \l__xdu_ft_cap_align_tl { centering }
+ \tl_if_eq:NnTF \l__xdu_alg_cap_align_tl { centering }
{
\captionsetup* [ algorithm ]
{ singlelinecheck = false, justification = centerlast }
@@ -1378,19 +1378,23 @@
{
\bool_if:NT \l__xdu_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
+ }
}
+ { }
}
}
\ctex_at_end_preamble:n
{
- \cs_if_exist:NT \thealgocf
+ \@ifpackageloaded { algorithm2e }
{
\SetAlgoCaptionSeparator { \hbox_to_wd:nn { \l__xdu_cap_label_sep_tl } { } }
\bool_if:NTF \l__xdu_alg_small_cap_bool
@@ -1450,18 +1454,23 @@
}
}
}
- \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 } } }
}
+ { }
}
\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 }
+ \@ifpackageloaded { algorithm2e }
+ {
+ \dim_set:Nn \interspacetitleruled { 5pt }
+ \dim_set:Nn \interspacealgoruled { 5pt }
+ }
+ { }
}
}
\cs_new:Npn \__xdu_tblr_caption_box:n #1
diff --git a/Master/texmf-dist/tex/xelatex/xduts/xduugthesis.cls b/Master/texmf-dist/tex/xelatex/xduts/xduugthesis.cls
index 47fadda456e..b490feb6bce 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/02/03}{4.4.0.0}
+ {2023/02/06}{4.4.2.0}
{Xidian University Undergraduate Thesis document class}
\RequirePackage { xparse, l3keys2e }
\PassOptionsToPackage { quiet } { xeCJK }
@@ -1132,13 +1132,13 @@
{ \captionsetup* [ algorithm ] { format = hang } }
{ \captionsetup* [ algorithm ] { format = plain } }
\captionsetup* [ ruled ] { strut = off }
- \tl_if_eq:NnTF \l__xdu_ft_cap_align_tl { left }
+ \tl_if_eq:NnTF \l__xdu_alg_cap_align_tl { left }
{
\captionsetup* [ algorithm ]
{ singlelinecheck = false, justification = justified }
}
{
- \tl_if_eq:NnTF \l__xdu_ft_cap_align_tl { centering }
+ \tl_if_eq:NnTF \l__xdu_alg_cap_align_tl { centering }
{
\captionsetup* [ algorithm ]
{ singlelinecheck = false, justification = centerlast }
@@ -1153,19 +1153,23 @@
{
\bool_if:NT \l__xdu_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
+ }
}
+ { }
}
}
\ctex_at_end_preamble:n
{
- \cs_if_exist:NT \thealgocf
+ \@ifpackageloaded { algorithm2e }
{
\SetAlgoCaptionSeparator { \hbox_to_wd:nn { \l__xdu_cap_label_sep_tl } { } }
\bool_if:NTF \l__xdu_alg_small_cap_bool
@@ -1225,18 +1229,23 @@
}
}
}
- \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 } } }
}
+ { }
}
\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 }
+ \@ifpackageloaded { algorithm2e }
+ {
+ \dim_set:Nn \interspacetitleruled { 5pt }
+ \dim_set:Nn \interspacealgoruled { 5pt }
+ }
+ { }
}
}
\cs_new:Npn \__xdu_tblr_caption_box:n #1
diff --git a/Master/texmf-dist/tex/xelatex/xduts/xduugtp.cls b/Master/texmf-dist/tex/xelatex/xduts/xduugtp.cls
index db12268573c..b9a2ed5cf88 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/02/03}{4.4.0.0}
+ {2023/02/06}{4.4.2.0}
{Xidian University Undergraduate Thesis Proposal class}
\RequirePackage { xparse, l3keys2e }
\PassOptionsToPackage { quiet } { xeCJK }