xduts (8mar23)

git-svn-id: svn://tug.org/texlive/trunk@66472 c570f23f-e606-0410-a88d-b1316a301751

6 files changed, 31 insertions, 20 deletions

diff --git a/Master/texmf-dist/doc/xelatex/xduts/xduts.pdf b/Master/texmf-dist/doc/xelatex/xduts/xduts.pdf
index 3aaa8cecfc2..93cc563f14d 100644
--- a/Master/texmf-dist/doc/xelatex/xduts/xduts.pdf
+++ b/Master/texmf-dist/doc/xelatex/xduts/xduts.pdf
diff --git a/Master/texmf-dist/source/xelatex/xduts/xduts.dtx b/Master/texmf-dist/source/xelatex/xduts/xduts.dtx
index 2212a981cbb..0a6743ee4e2 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/03/05 v6.1.0.1 Xidian University TeX Suite]
+[2023/03/07 v6.1.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/03/05}{6.1.0.1}
+%<class|sty>  {2023/03/07}{6.1.2.0}
 %<xdufont>  {Xidian University Font package}
 %<xduugtp>  {Xidian University Undergraduate Thesis Proposal class}
 %<xdupgthesis>  {Xidian University Postgraduate Thesis document class}
@@ -1648,13 +1648,17 @@ literate        = {\$}{{\textcolor{purple3}{\$}}}{1}
 % \setlength\parindent{2em}
 % \subsection{页面和信息移除}
 % \label{页面和信息移除}
+% \changes{v6.1.1.1}{2023/03/06}{修正文档中页面移除值样式}
 % \changes{v6.0.0.0}{2023/03/02}{修正题名页键值}
 % \changes{v2.12.1.0}{2022/07/03}{页面和信息移除选项增加分组}
 % \begin{function}[added=2022-06-26,updated=2023-03-02]{style/remove-page}
 %   \begin{syntax}
-%     \opt{style/remove-page} = \marg{封面|题名页|声明页|摘要|索引|对照表|目录|附录|参考文献|致谢|作者简介}
+%     \opt{style/remove-page} = \texttt{\char`\{}封面|题名页|声明页|摘要|索引|对照表|目录|附录|参考文献|致谢|作者简介\texttt{\char`\}}
 %   \end{syntax}
-% 设置移除的页面，可多选，多个值之间需要使用英文半角逗号隔开。
+% 设置移除的页面，可多选，多个值之间需要使用英文半角逗号隔开，例如：
+% \begin{lstlisting}
+% \xdusetup{ style / remove-page = { 封面, 题名页, 致谢 } }
+% \end{lstlisting}
 % \end{function}
 % \begin{optdesc}
 %   \item[题名页] 中英文题名页。
@@ -2392,9 +2396,10 @@ literate        = {\$}{{\textcolor{purple3}{\$}}}{1}
   }
 %    \end{macrocode}
 % \end{macro}
-% \begin{macro}{\@@_set_latin_sans_scale:,\@@_set_latin_mono_scale:}
+% \changes{v6.1.2.0}{2023/03/07}{修正匹配打字机族字符高度}
 % \changes{v4.3.0.0}{2023/01/28}{匹配无衬线族和打字机族字符高度}
 % \changes{v0.8.3.0}{2022/04/13}{匹配小写字母字符高度}
+% \begin{macro}{\@@_set_latin_sans_scale:,\@@_set_latin_mono_scale:}
 % 匹配无衬线族和打字机族字符高度。
 %    \begin{macrocode}
 \cs_new:Npn \@@_set_latin_sans_scale: { }
@@ -2407,10 +2412,10 @@ literate        = {\$}{{\textcolor{purple3}{\$}}}{1}
         \tl_if_eq:NnT \l_@@_latin_sans_scale_tl { lower }
           { \cs_set:Npn \@@_set_latin_sans_scale: { Scale = MatchLowercase , } }
       }
-    \tl_if_eq:NnTF \l_@@_set_latin_mono_scale { upper }
+    \tl_if_eq:NnTF \l_@@_latin_mono_scale_tl { upper }
       { \cs_set:Npn \@@_set_latin_mono_scale: { Scale = MatchUppercase , } }
       {
-        \tl_if_eq:NnT \l_@@_set_latin_mono_scale { lower }
+        \tl_if_eq:NnT \l_@@_latin_mono_scale_tl { lower }
           { \cs_set:Npn \@@_set_latin_mono_scale: { Scale = MatchLowercase , } }
       }
   }
@@ -2697,9 +2702,10 @@ literate        = {\$}{{\textcolor{purple3}{\$}}}{1}
 %    \end{macrocode}
 % \end{macro}
 % \subsubsection{数学字体}
-% \begin{macro}{\@@_load_unicode_math_pkg:}
+% \changes{v6.1.1.0}{2023/03/06}{修复\pkgx{unicode-math}下书签中公式}
 % \changes{v5.6.0.0}{2023/03/01}{设置\pkgx{unicode-math}下算符字体为数学字体}
 % \changes{v1.14.1.0}{2022/05/10}{使用\tnx{PassOptionsToPackage}传递\pkgx{unicode-math}宏包参数}
+% \begin{macro}{\@@_load_unicode_math_pkg:}
 % 加载\pkgx{unicode-math}宏包并设置算符字体为数学字体。
 %    \begin{macrocode}
 \cs_new:Npn \@@_load_unicode_math_pkg:
@@ -2707,6 +2713,7 @@ literate        = {\$}{{\textcolor{purple3}{\$}}}{1}
     \PassOptionsToPackage { \l_@@_unicode_math_tl } { unicode-math }
     \RequirePackage  { unicode-math }
     \setoperatorfont { \symup       }
+    \hypersetup      { psdextra     }
   }
 %    \end{macrocode}
 % \end{macro}
diff --git a/Master/texmf-dist/tex/xelatex/xduts/xdufont.sty b/Master/texmf-dist/tex/xelatex/xduts/xdufont.sty
index 6dc7d34d368..088008805c8 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/03/05}{6.1.0.1}
+  {2023/03/07}{6.1.2.0}
   {Xidian University Font package}
 \RequirePackage { xparse, l3keys2e }
 \PassOptionsToPackage { no-math } { fontspec }
@@ -285,10 +285,10 @@
         \tl_if_eq:NnT \l__xdu_latin_sans_scale_tl { lower }
           { \cs_set:Npn \__xdu_set_latin_sans_scale: { Scale = MatchLowercase , } }
       }
-    \tl_if_eq:NnTF \l__xdu_set_latin_mono_scale { upper }
+    \tl_if_eq:NnTF \l__xdu_latin_mono_scale_tl { upper }
       { \cs_set:Npn \__xdu_set_latin_mono_scale: { Scale = MatchUppercase , } }
       {
-        \tl_if_eq:NnT \l__xdu_set_latin_mono_scale { lower }
+        \tl_if_eq:NnT \l__xdu_latin_mono_scale_tl { lower }
           { \cs_set:Npn \__xdu_set_latin_mono_scale: { Scale = MatchLowercase , } }
       }
   }
@@ -458,6 +458,7 @@
     \PassOptionsToPackage { \l__xdu_unicode_math_tl } { unicode-math }
     \RequirePackage  { unicode-math }
     \setoperatorfont { \symup       }
+    \hypersetup      { psdextra     }
   }
 \cs_new:Npn \__xdu_load_math_font_cambria:
   {
diff --git a/Master/texmf-dist/tex/xelatex/xduts/xdupgthesis.cls b/Master/texmf-dist/tex/xelatex/xduts/xdupgthesis.cls
index 90fdda39819..0d87f754afe 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/03/05}{6.1.0.1}
+  {2023/03/07}{6.1.2.0}
   {Xidian University Postgraduate Thesis document class}
 \RequirePackage { xparse, l3keys2e }
 \PassOptionsToPackage { no-math } { fontspec }
@@ -298,10 +298,10 @@
         \tl_if_eq:NnT \l__xdu_latin_sans_scale_tl { lower }
           { \cs_set:Npn \__xdu_set_latin_sans_scale: { Scale = MatchLowercase , } }
       }
-    \tl_if_eq:NnTF \l__xdu_set_latin_mono_scale { upper }
+    \tl_if_eq:NnTF \l__xdu_latin_mono_scale_tl { upper }
       { \cs_set:Npn \__xdu_set_latin_mono_scale: { Scale = MatchUppercase , } }
       {
-        \tl_if_eq:NnT \l__xdu_set_latin_mono_scale { lower }
+        \tl_if_eq:NnT \l__xdu_latin_mono_scale_tl { lower }
           { \cs_set:Npn \__xdu_set_latin_mono_scale: { Scale = MatchLowercase , } }
       }
   }
@@ -471,6 +471,7 @@
     \PassOptionsToPackage { \l__xdu_unicode_math_tl } { unicode-math }
     \RequirePackage  { unicode-math }
     \setoperatorfont { \symup       }
+    \hypersetup      { psdextra     }
   }
 \cs_new:Npn \__xdu_load_math_font_cambria:
   {
diff --git a/Master/texmf-dist/tex/xelatex/xduts/xduugthesis.cls b/Master/texmf-dist/tex/xelatex/xduts/xduugthesis.cls
index 871d843377c..73e31f1668a 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/03/05}{6.1.0.1}
+  {2023/03/07}{6.1.2.0}
   {Xidian University Undergraduate Thesis document class}
 \RequirePackage { xparse, l3keys2e }
 \PassOptionsToPackage { no-math } { fontspec }
@@ -299,10 +299,10 @@
         \tl_if_eq:NnT \l__xdu_latin_sans_scale_tl { lower }
           { \cs_set:Npn \__xdu_set_latin_sans_scale: { Scale = MatchLowercase , } }
       }
-    \tl_if_eq:NnTF \l__xdu_set_latin_mono_scale { upper }
+    \tl_if_eq:NnTF \l__xdu_latin_mono_scale_tl { upper }
       { \cs_set:Npn \__xdu_set_latin_mono_scale: { Scale = MatchUppercase , } }
       {
-        \tl_if_eq:NnT \l__xdu_set_latin_mono_scale { lower }
+        \tl_if_eq:NnT \l__xdu_latin_mono_scale_tl { lower }
           { \cs_set:Npn \__xdu_set_latin_mono_scale: { Scale = MatchLowercase , } }
       }
   }
@@ -472,6 +472,7 @@
     \PassOptionsToPackage { \l__xdu_unicode_math_tl } { unicode-math }
     \RequirePackage  { unicode-math }
     \setoperatorfont { \symup       }
+    \hypersetup      { psdextra     }
   }
 \cs_new:Npn \__xdu_load_math_font_cambria:
   {
diff --git a/Master/texmf-dist/tex/xelatex/xduts/xduugtp.cls b/Master/texmf-dist/tex/xelatex/xduts/xduugtp.cls
index 7dcb04b5738..539dff11273 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/03/05}{6.1.0.1}
+  {2023/03/07}{6.1.2.0}
   {Xidian University Undergraduate Thesis Proposal class}
 \RequirePackage { xparse, l3keys2e }
 \PassOptionsToPackage { no-math } { fontspec }
@@ -295,10 +295,10 @@
         \tl_if_eq:NnT \l__xdu_latin_sans_scale_tl { lower }
           { \cs_set:Npn \__xdu_set_latin_sans_scale: { Scale = MatchLowercase , } }
       }
-    \tl_if_eq:NnTF \l__xdu_set_latin_mono_scale { upper }
+    \tl_if_eq:NnTF \l__xdu_latin_mono_scale_tl { upper }
       { \cs_set:Npn \__xdu_set_latin_mono_scale: { Scale = MatchUppercase , } }
       {
-        \tl_if_eq:NnT \l__xdu_set_latin_mono_scale { lower }
+        \tl_if_eq:NnT \l__xdu_latin_mono_scale_tl { lower }
           { \cs_set:Npn \__xdu_set_latin_mono_scale: { Scale = MatchLowercase , } }
       }
   }
@@ -468,6 +468,7 @@
     \PassOptionsToPackage { \l__xdu_unicode_math_tl } { unicode-math }
     \RequirePackage  { unicode-math }
     \setoperatorfont { \symup       }
+    \hypersetup      { psdextra     }
   }
 \cs_new:Npn \__xdu_load_math_font_cambria:
   {