texlive[66096] Master/texmf-dist: xduts (23feb23)
commits+karl at tug.org
commits+karl at tug.org
Thu Feb 23 22:14:05 CET 2023
Revision: 66096
http://tug.org/svn/texlive?view=revision&revision=66096
Author: karl
Date: 2023-02-23 22:14:04 +0100 (Thu, 23 Feb 2023)
Log Message:
-----------
xduts (23feb23)
Modified Paths:
--------------
trunk/Master/texmf-dist/doc/xelatex/xduts/xduts.pdf
trunk/Master/texmf-dist/source/xelatex/xduts/xduts.dtx
trunk/Master/texmf-dist/tex/xelatex/xduts/xdufont.sty
trunk/Master/texmf-dist/tex/xelatex/xduts/xdupgthesis.cls
trunk/Master/texmf-dist/tex/xelatex/xduts/xduugthesis.cls
trunk/Master/texmf-dist/tex/xelatex/xduts/xduugtp.cls
Modified: trunk/Master/texmf-dist/doc/xelatex/xduts/xduts.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/source/xelatex/xduts/xduts.dtx
===================================================================
--- trunk/Master/texmf-dist/source/xelatex/xduts/xduts.dtx 2023-02-23 21:10:15 UTC (rev 66095)
+++ trunk/Master/texmf-dist/source/xelatex/xduts/xduts.dtx 2023-02-23 21:14:04 UTC (rev 66096)
@@ -1,7 +1,7 @@
% \iffalse
%<*driver>
\ProvidesFile{xduts.dtx}
-[2023/02/20 v5.1.0.0 Xidian University TeX Suite]
+[2023/02/23 v5.4.0.1 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/20}{5.1.0.0}
+%<class|sty> {2023/02/23}{5.4.0.1}
%<xdufont> {Xidian University Font package}
%<xduugtp> {Xidian University Undergraduate Thesis Proposal class}
%<xdupgthesis> {Xidian University Postgraduate Thesis document class}
@@ -25,7 +25,7 @@
\changes{v1.9.0.0}{2022/05/03}{增大function环境盒子宽度}
\addtolength{\marginparwidth}{5mm}
\geometry{hmargin={0mm,10mm}}
-\changes{v0.6.0.0}{2022/04/10}{新增xdufont宏包}
+\changes{v0.6.0.0}{2022/04/10}{增加xdufont宏包}
\changes{v0.5.2.1}{2022/04/09}{修改项目名称}
\changes{v0.4.2.1}{2022/04/05}{调整文档目录缩进}
\usepackage{tocloft}
@@ -46,12 +46,16 @@
\usepackage{pifont}
\newcommand{\cmark}{\ding{51}}
\usepackage{subcaption}
-\captionsetup{font=bf}
+\changes{v5.1.0.1}{2023/02/22}{修改文档内表格样式}
+\DeclareCaptionLabelSeparator{customskip}{\hskip.75em}
+\captionsetup{font=bf,labelsep=customskip}
\usepackage{tabularray}
\changes{v2.16.1.3}{2022/11/27}{修改文档中caption字体样式}
+\setlength{\intextsep}{\the\abovecaptionskip}
+\SetTblrOuter[tblr,longtblr]{presep=\belowcaptionskip+\intextsep,headsep=\abovecaptionskip}
\SetTblrStyle{caption-tag}{font=\bfseries}
\SetTblrStyle{caption-text}{font=\bfseries}
-\DefTblrTemplate{caption-sep}{default}{\quad}
+\DefTblrTemplate{caption-sep}{default}{\hskip.75em}
\DefTblrTemplate{conthead-text}{default}{\textbf{(续表)}}
\DefTblrTemplate{contfoot-text}{default}{\textbf{接下页}}
\changes{v4.4.5.1}{2023/02/11}{移除文档对xspace的依赖}
@@ -68,7 +72,7 @@
% <name> 键值
\NewDocumentCommand{\metax}{O{\space}mO{\space}}{#1\meta{#2}#3}
% LaTeX3键值对
-\newcommand{\breakablethinspace}{\hskip 0.16667em\relax}
+\newcommand{\breakablethinspace}{\hskip.16667em\relax}
\NewDocumentCommand{\kvoptx}{O{\space}mmO{\space}}{#1\texttt{#2\breakablethinspace=\breakablethinspace#3}#4}
% {<name>} 必选参数
\NewDocumentCommand{\margx}{O{\space}mO{\space}}{#1\marg{#2}#3}
@@ -316,7 +320,7 @@
% 支持的信息录入选项见\secrefx{信息录入}。
% \par
% 学会以上用法后即可使用\clsx{xduugthesis}文档类。
-% \changes{v1.4.0.0}{2022/04/26}{新增研究生学位论文}
+% \changes{v1.4.0.0}{2022/04/26}{增加研究生学位论文}
% \changes{v1.30.0.2}{2022/06/20}{研究生学位论文文档}
% \changes{v2.2.1.1}{2022/06/23}{移除研究生学位论文中关于章节配置的文档}
% \subsection{\clsx[]{xdupgthesis}文档类}
@@ -469,7 +473,7 @@
% \end{lstlisting}
% \subsection{字体选项}
% \label{字体选项}
-% \begin{function}[added=2022-03-06]{style/cjk-font}
+% \begin{function}[added=2022-03-06,updated=2023-02-20]{style/cjk-font}
% \begin{syntax}
% \opt{style/cjk-font} = adobe|(fandol)|founder|hanyi|sinotype|win|none
% \end{syntax}
@@ -490,22 +494,23 @@
% \begin{tblr}
% {
% width = \linewidth,
-% colspec = {cX[c]X[c]X[1.2,c]X[c]},
-% hline{1,3,Z} = {.08em},
-% hline{2} = {2-3}{.08em,leftpos=-1,rightpos=-1,endpos},
-% row{odd[3-Z]} = {gray9!40},
+% colspec = {Q[c,m]*{4}{X[c,m]}},
+% hline{1,3,Z} = {wd=.08em},
+% hline{2} = {2-3}{wd=.08em,leftpos=-1,rightpos=-1,endpos=true},
+% row{odd[3-Z]} = {bg=gray9!40},
% cell{1}{2} = {c=2}{},
% cell{1}{1,4,5} = {r=2}{},
-% row{1-2} = {cmd=\strong}
+% cell{3-Z}{1} = {font=\ttfamily},
+% row{1-2} = {font=\bfseries}
% }
-% 选项名称 & 罗马族 & & 无衬线族 & 打字机族 \\
-% & 直立/倾斜形状 & 意大利形状 & & \\
-% |adobe| & Adobe 宋体 Std & Adobe 楷体 Std & Adobe 黑体 Std & Adobe 仿宋 Std \\
-% |fandol| & FandolSong & FandolKai & FandolHei & FandolFang \\
-% |founder| & 方正书宋\_GBK & 方正楷体\_GBK & 方正黑体\_GBK & 方正仿宋\_GBK \\
-% |hanyi| & 汉仪书宋二S & 汉仪楷体S & 汉仪中黑S & 汉仪仿宋S \\
-% |sinotype| & 华文宋体 & 华文楷体 & 华文细黑/华文黑体 & 华文仿宋 \\
-% |win| & 中易宋体 & 中易楷体 & 中易黑体 & 中易仿宋 \\
+% 选项名称 & 罗马族 & & 无衬线族 & 打字机族 \\
+% & 直立/倾斜形状 & 意大利形状 & & \\
+% adobe & Adobe 宋体 Std & Adobe 楷体 Std & Adobe 黑体 Std & Adobe 仿宋 Std \\
+% fandol & FandolSong & FandolKai & FandolHei & FandolFang \\
+% founder & 方正书宋\_GBK & 方正楷体\_GBK & 方正黑体\_GBK & 方正仿宋\_GBK \\
+% hanyi & 汉仪书宋二S & 汉仪楷体S & 汉仪中黑S & 汉仪仿宋S \\
+% sinotype & 华文宋体 & 华文楷体 & 华文细黑/黑体 & 华文仿宋 \\
+% win & 中易宋体 & 中易楷体 & 中易黑体 & 中易仿宋 \\
% \end{tblr}
% \end{table}
% \begin{function}[added=2022-04-01]{style/cjk-fake-bold}
@@ -520,9 +525,10 @@
% \end{syntax}
% 设置中文字体伪斜体倾斜程度。默认为\valuex{0.2}[]。
% \end{function}
-% \begin{function}[added=2022-03-06,updated=2022-05-06]{style/latin-font}
+% \changes{v5.4.0.1}{2023/02/23}{修正文档内英文字体配置表格错误}
+% \begin{function}[added=2022-03-06,updated=2023-02-23]{style/latin-font}
% \begin{syntax}
-% \opt{style/latin-font} = tac|tacn|thcs|(gyre)|none
+% \opt{style/latin-font} = (gyre)|tac|tacn|tcc|thcs|tll|none
% \end{syntax}
% 设置英文字体，具体配置见\tabrefx{tab:latin-font}[]。
% \end{function}
@@ -529,7 +535,9 @@
% \begin{optdesc}
% \item[tac] \filex[]{times.ttf}[]、\filex[]{timesbd.ttf}[]、\filex[]{timesi.ttf}[]、\filex[]{timesbi.ttf}[]、\filex[]{arial.ttf}[]、\filex[]{arialbd.ttf}[]、\filex[]{ariali.ttf}[]、\filex[]{arialbi.ttf}[]、\filex[]{consola.ttf}[]、\filex[]{consolab.ttf}[]、\filex[]{consolai.ttf}和\filex{consolaz.ttf}[]。
% \item[tacn] \filex[]{times.ttf}[]、\filex[]{timesbd.ttf}[]、\filex[]{timesi.ttf}[]、\filex[]{timesbi.ttf}[]、\filex[]{arial.ttf}[]、\filex[]{arialbd.ttf}[]、\filex[]{ariali.ttf}[]、\filex[]{arialbi.ttf}[]、\filex[]{cour.ttf}[]、\filex[]{courbd.ttf}[]、\filex[]{couri.ttf}和\filex{courbi.ttf}[]。
+% \item[tcc] \filex[]{times.ttf}[]、\filex[]{timesbd.ttf}[]、\filex[]{timesi.ttf}和\filex{timesbi.ttf}[]。
% \item[thcs] \filex[]{times.ttf}[]、\filex[]{timesbd.ttf}[]、\filex[]{timesi.ttf}[]、\filex[]{timesbi.ttf}[]、\filex[]{Helvetica.ttf}[]、\filex[]{Helvetica~Bold.ttf}[]、\filex[]{Helvetica~Oblique.ttf}[]、\filex[]{Helvetica~Bold~Oblique.ttf}[]、\filex[]{CourierStd.otf}[]、\filex[]{CourierStd-Bold.otf}[]、\filex[]{CourierStd-Oblique.otf}和\filex{CourierStd-BoldOblique.otf}[]。
+% \item[tll] \filex[]{times.ttf}[]、\filex[]{timesbd.ttf}[]、\filex[]{timesi.ttf}和\filex{timesbi.ttf}[]。
% \item[none] 关闭内置英文字体配置，需自行配置英文字体。
% \end{optdesc}
% \changes{v2.16.1.1}{2022/11/27}{修改英文字体配置表文档样式}
@@ -539,16 +547,19 @@
% \begin{tblr}
% {
% width = \linewidth,
-% colspec = {cX[c]X[c]X[c]},
-% hline{1,2,Z} = {.08em},
-% row{even[2-Z]} = {gray9!40},
-% row{1} = {cmd=\strong}
+% colspec = {Q[c,m]*{3}{X[-1,c,m]}},
+% hline{1,2,Z} = {wd=.08em},
+% row{even[2-Z]} = {bg=gray9!40},
+% cell{2-Z}{1} = {font=\ttfamily},
+% row{1} = {font=\bfseries}
% }
-% 选项名称 & 罗马族 & 无衬线族 & 打字机族 \\
-% |tac| & Times New Roman & Arial & Consolas \\
-% |tacn| & Times New Roman & Arial & Courier New \\
-% |thcs| & Times New Roman & Helvetica & Courier Std \\
-% |gyre| & TeX Gyre Termes & TeX Gyre Heros & TeX Gyre Cursor \\
+% 选项名称 & 罗马族 & 无衬线族 & 打字机族 \\
+% gyre & TeX Gyre Termes & TeX Gyre Heros & TeX Gyre Cursor \\
+% tac & Times New Roman & Arial & Consolas \\
+% tacn & Times New Roman & Arial & Courier New \\
+% tcc & Times New Roman & CMU Sans Serif & CMU Typewriter Text \\
+% thcs & Times New Roman & Helvetica & Courier Std \\
+% tll & Times New Roman & Linux Biolinum O & Linux Libertine Mono O \\
% \end{tblr}
% \end{table}
% \begin{function}[added=2023-01-28]{style/latin-sans-scale,style/latin-mono-scale}
@@ -563,7 +574,7 @@
% \item[lower] 按小写字母的高度缩放以匹配罗马族字体。
% \item[off] 不缩放。
% \end{optdesc}
-% \begin{function}[added=2022-03-06,updated=2022-03-09]{style/math-font}
+% \begin{function}[added=2022-03-06,updated=2022-11-27]{style/math-font}
% \begin{syntax}
% \opt{style/math-font} = asana|cambria|(cm)|fira|garamond|lm|...|termes|xits|none
% \end{syntax}
@@ -583,35 +594,36 @@
% ]
% {
% width = \linewidth,
-% colspec = {X[2,c]X[3,c]},
-% hline{1,2,Z} = {.08em},
-% row{even[2-Z]} = {gray9!40},
-% row{1} = {cmd=\strong},
+% colspec = {X[2,c,m]X[3,c,m]},
+% hline{1,2,Z} = {wd=.08em},
+% row{even[2-Z]} = {bg=gray9!40},
+% cell{2-Z}{1} = {font=\ttfamily},
+% row{1} = {font=\bfseries},
% rowhead = 1
% }
-% 选项名称 & 字体名称 \\
-% |asana| & Asana Math \\
-% |cambria| & Cambria Math \\
-% |cm| & Computer Modern \\
-% |concrete| & Concrete Math \\
-% |erewhon| & Erewhon Math \\
-% |euler| & Euler Math \\
-% |fira| & Fira Math \\
-% |garamond| & Garamond Math \\
-% |gfsneohellenic| & GFS Neohellenic Math \\
-% |kp| & KpMath \\
-% |libertinus| & Libertinus Math \\
-% |lm| & Latin Modern Math \\
-% |newcm| & New Computer Modern Math \\
-% |stix2| & STIX Two Math \\
-% |stix| & STIX Math \\
-% |xcharter| & XCharter Math \\
-% |xits| & XITS Math \\
-% |bonum| & TeX Gyre Bonum Math \\
-% |dejavu| & TeX Gyre DejaVu Math \\
-% |pagella| & TeX Gyre Pagella Math \\
-% |schola| & TeX Gyre Schola Math \\
-% |termes| & TeX Gyre Termes Math \\
+% 选项名称 & 字体名称 \\
+% asana & Asana Math \\
+% cambria & Cambria Math \\
+% cm & Computer Modern \\
+% concrete & Concrete Math \\
+% erewhon & Erewhon Math \\
+% euler & Euler Math \\
+% fira & Fira Math \\
+% garamond & Garamond Math \\
+% gfsneohellenic & GFS Neohellenic Math \\
+% kp & KpMath \\
+% libertinus & Libertinus Math \\
+% lm & Latin Modern Math \\
+% newcm & New Computer Modern Math \\
+% stix2 & STIX Two Math \\
+% stix & STIX Math \\
+% xcharter & XCharter Math \\
+% xits & XITS Math \\
+% bonum & TeX Gyre Bonum Math \\
+% dejavu & TeX Gyre DejaVu Math \\
+% pagella & TeX Gyre Pagella Math \\
+% schola & TeX Gyre Schola Math \\
+% termes & TeX Gyre Termes Math \\
% \end{tblr}
% \begin{function}[added=2022-03-14]{style/unicode-math}
% \begin{syntax}
@@ -1040,20 +1052,21 @@
% ]
% {
% width = \linewidth,
-% colspec = lX[c]X[c]X[c]X[c]X[c]X[c]X[c],
+% colspec = {Q[l,m]*{7}{X[c,m]}},
% cell{1}{3} = {c=2}{},
% cell{1}{5} = {c=4}{},
% cell{2}{2} = {r=2}{},
% cell{2}{3,5,7} = {c=2}{},
-% hline{1,4,Z} = {.08em},
-% hline{2} = {2-2}{.08em,leftpos=-1,rightpos=-1,endpos},
-% hline{2} = {3-4}{.08em,leftpos=-1,rightpos=-1,endpos},
-% hline{2} = {5-8}{.08em,leftpos=-1,rightpos=-1,endpos},
-% hline{3} = {3-4}{.08em,leftpos=-1,rightpos=-1,endpos},
-% hline{3} = {5-6}{.08em,leftpos=-1,rightpos=-1,endpos},
-% hline{3} = {7-8}{.08em,leftpos=-1,rightpos=-1,endpos},
-% row{odd[4-Z]} = {gray9!40},
-% cell{4-Z}{1} = {cmd=\texttt},
+% hline{1,4,Z} = {wd=.08em},
+% hline{2} = {2-2}{wd=.08em,leftpos=-1,rightpos=-1,endpos=true},
+% hline{2} = {3-4}{wd=.08em,leftpos=-1,rightpos=-1,endpos=true},
+% hline{2} = {5-8}{wd=.08em,leftpos=-1,rightpos=-1,endpos=true},
+% hline{3} = {3-4}{wd=.08em,leftpos=-1,rightpos=-1,endpos=true},
+% hline{3} = {5-6}{wd=.08em,leftpos=-1,rightpos=-1,endpos=true},
+% hline{3} = {7-8}{wd=.08em,leftpos=-1,rightpos=-1,endpos=true},
+% row{odd[4-Z]} = {bg=gray9!40},
+% cell{4-Z}{1} = {font=\ttfamily},
+% row{1-3} = {font=\bfseries},
% rowhead = 3
% }
% & 开题 & 毕业设计 & & 学位论文 & & & \\
@@ -1959,7 +1972,7 @@
% \end{macrocode}
% 英文字体配置。
% \begin{macrocode}
- latin-font .choices:nn = { tac, tacn, thcs, gyre, none }
+ latin-font .choices:nn = { gyre, tac, tacn, tcc, thcs, tll, none }
{ \tl_set_eq:NN \l_@@_latin_font_tl \l_keys_choice_tl },
% \end{macrocode}
% 数学字体配置。
@@ -2283,7 +2296,7 @@
}
% \end{macrocode}
% \end{macro}
-% \changes{v5.1.0.0}{2023/02/20}{新增汉仪字体}
+% \changes{v5.1.0.0}{2023/02/20}{增加汉仪字体}
% \begin{macro}{\@@_load_cjk_font_hanyi:}
% 中文字体配置\valuex{hanyi}[]。
% \begin{macrocode}
@@ -2523,7 +2536,7 @@
% \end{macrocode}
% \end{macro}
% \begin{macro}{\@@_load_latin_font_tac:}
-% \changes{v1.12.0.0}{2022/05/06}{新增Arial和Consolas英文字体配置}
+% \changes{v1.12.0.0}{2022/05/06}{增加Arial和Consolas英文字体配置}
% 英文字体配置\valuex{tac}[]。
% \begin{macrocode}
\cs_new:Npn \@@_load_latin_font_tac:
@@ -2551,6 +2564,31 @@
}
% \end{macrocode}
% \end{macro}
+% \begin{macro}{\@@_load_latin_font_tcc:}
+% \changes{v5.3.0.0}{2023/02/23}{增加tcc系列英文字体配置}
+% 英文字体配置\valuex{tcc}[]。
+% \begin{macrocode}
+\cs_new:Npn \@@_load_latin_font_tcc:
+ {
+ \@@_set_latin_main_font:nnnnn
+ { Times~New~Roman }
+ { times.ttf }
+ { timesbd.ttf }
+ { timesi.ttf }
+ { timesbi.ttf }
+ \@@_set_latin_sans_font:nnnn
+ { cmunss.otf }
+ { cmunsx.otf }
+ { cmunsi.otf }
+ { cmunso.otf }
+ \@@_set_latin_mono_font:nnnn
+ { cmuntt.otf }
+ { cmuntb.otf }
+ { cmunit.otf }
+ { cmuntx.otf }
+ }
+% \end{macrocode}
+% \end{macro}
% \begin{macro}{\@@_load_latin_font_thcs:}
% 英文字体配置\valuex{thcs}[]。
% \begin{macrocode}
@@ -2577,8 +2615,33 @@
}
% \end{macrocode}
% \end{macro}
+% \begin{macro}{\@@_load_latin_font_tll:}
+% \changes{v5.3.0.0}{2023/02/23}{增加tll系列英文字体配置}
+% 英文字体配置\valuex{tll}[]。
+% \begin{macrocode}
+\cs_new:Npn \@@_load_latin_font_tll:
+ {
+ \@@_set_latin_main_font:nnnnn
+ { Times~New~Roman }
+ { times.ttf }
+ { timesbd.ttf }
+ { timesi.ttf }
+ { timesbi.ttf }
+ \@@_set_latin_sans_font:nnnn
+ { LinBiolinum_R.otf }
+ { LinBiolinum_RB.otf }
+ { LinBiolinum_RI.otf }
+ { LinBiolinum_RBO.otf }
+ \@@_set_latin_mono_font:nnnn
+ { LinLibertine_M.otf }
+ { LinLibertine_MB.otf }
+ { LinLibertine_MO.otf }
+ { LinLibertine_MBO.otf }
+ }
+% \end{macrocode}
+% \end{macro}
% \begin{macro}{\@@_load_latin_font_gyre:}
-% \changes{v0.9.0.0}{2022/04/13}{新增gyre系列英文字体配置}
+% \changes{v0.9.0.0}{2022/04/13}{增加gyre系列英文字体配置}
% 英文字体配置\valuex{gyre}[]。
% \begin{macrocode}
\cs_new:Npn \@@_load_latin_font_gyre:
@@ -5194,8 +5257,9 @@
% \end{macro}
% \subsection{Caption}
% \begin{macro}{\DeclareCaptionLabelSeparator,\DeclareCaptionFont,\captionsetup}
-% \changes{v3.0.0.0}{2022/12/03}{设置图、表caption格式}
-% \changes{v2.17.0.0}{2022/11/28}{设置图、表caption格式}
+% \changes{v5.2.0.0}{2023/02/23}{设置图表caption前后垂直间距}
+% \changes{v3.0.0.0}{2022/12/03}{设置图表caption格式}
+% \changes{v2.17.0.0}{2022/11/28}{设置图表caption格式}
% \changes{v0.1.2.0}{2022/04/03}{设置图片标签与后面标题之间的间距}
% \changes{v0.1.3.0}{2022/04/03}{设置图片标签与标题字体字号}
% \changes{v2.10.1.0}{2022/06/26}{修复算法标签与标题字体字号警告}
@@ -5207,9 +5271,11 @@
\DeclareCaptionFont { customfont } { \@@_rm_family: \zihao { 5 } }
\captionsetup
{
+ strut = off,
labelsep = customskip,
font = customfont
}
+\dim_set_eq:NN \intextsep \abovecaptionskip
\ctex_at_end_preamble:n
{
\tl_if_eq:NnTF \l_@@_ft_cap_format_tl { hang }
@@ -5409,6 +5475,7 @@
% \end{macrocode}
% \end{macro}
% \begin{macro}{\SetTblrStyle,\DefTblrTemplate}
+% \changes{v5.2.0.0}{2023/02/23}{适配\pkgx{tabularray}宏包caption前后垂直间距}
% \changes{v2.17.0.0}{2022/11/28}{设置\pkgx{tabularray}中\envx{longtblr}环境caption格式}
% \changes{v2.16.3.0}{2022/11/27}{适配不同语言下的\envx{longtblr}环境中标题和尾部的续表文本}
% \changes{v2.16.2.0}{2022/11/27}{修正\envx{longtblr}环境caption宽度}
@@ -5419,6 +5486,8 @@
{
\@ifpackageloaded { tabularray }
{
+ \SetTblrOuter [ tblr, longtblr, talltblr ]
+ { presep = \belowcaptionskip + \intextsep, headsep = \abovecaptionskip }
\SetTblrStyle { head } { font = \@@_rm_family: \zihao { 5 } }
\DefTblrTemplate { caption-sep } { default }
{ \hskip \l_@@_cap_label_sep_tl }
@@ -5705,7 +5774,7 @@
% \subsection{附录}
% \begin{macro}{\@@_appendix:}
% 附录环境。
-% \changes{v0.3.0.0}{2022/04/04}{新增附录环境}
+% \changes{v0.3.0.0}{2022/04/04}{增加附录环境}
% \changes{v0.3.1.0}{2022/04/04}{修正附录中图表编号样式}
% \changes{v0.10.2.0}{2022/04/14}{修正附录中算法编号样式}
% \changes{v0.10.4.0}{2022/04/14}{修正附录中\pkgx{algorithm2e}算法编号样式}
@@ -7603,7 +7672,7 @@
%</thesis>
%<*xduugtp>
% \end{macrocode}
-% \changes{v4.1.0.0}{2022/12/31}{新增本科生毕业设计开题报告}
+% \changes{v4.1.0.0}{2022/12/31}{增加本科生毕业设计开题报告}
% \subsection{本科生毕业设计开题报告}
% \begin{macro}{\tcbset}
% 自定义线框样式。
Modified: trunk/Master/texmf-dist/tex/xelatex/xduts/xdufont.sty
===================================================================
--- trunk/Master/texmf-dist/tex/xelatex/xduts/xdufont.sty 2023-02-23 21:10:15 UTC (rev 66095)
+++ trunk/Master/texmf-dist/tex/xelatex/xduts/xdufont.sty 2023-02-23 21:14:04 UTC (rev 66096)
@@ -29,7 +29,7 @@
\NeedsTeXFormat{LaTeX2e}
\RequirePackage{expl3}
\ProvidesExplPackage{xdufont}
- {2023/02/20}{5.1.0.0}
+ {2023/02/23}{5.4.0.1}
{Xidian University Font package}
\RequirePackage { xparse, l3keys2e }
\PassOptionsToPackage { quiet } { xeCJK }
@@ -55,7 +55,7 @@
{ \tl_set_eq:NN \l__xdu_latin_sans_scale_tl \l_keys_choice_tl },
latin-mono-scale .choices:nn = { upper, lower, off }
{ \tl_set_eq:NN \l__xdu_latin_mono_scale_tl \l_keys_choice_tl },
- latin-font .choices:nn = { tac, tacn, thcs, gyre, none }
+ latin-font .choices:nn = { gyre, tac, tacn, tcc, thcs, tll, none }
{ \tl_set_eq:NN \l__xdu_latin_font_tl \l_keys_choice_tl },
math-font .choices:nn =
{
@@ -374,6 +374,25 @@
\__xdu_set_latin_mono_font:nnnnn
{ Courier~New } { cour.ttf } { courbd.ttf } { couri.ttf } { courbi.ttf }
}
+\cs_new:Npn \__xdu_load_latin_font_tcc:
+ {
+ \__xdu_set_latin_main_font:nnnnn
+ { Times~New~Roman }
+ { times.ttf }
+ { timesbd.ttf }
+ { timesi.ttf }
+ { timesbi.ttf }
+ \__xdu_set_latin_sans_font:nnnn
+ { cmunss.otf }
+ { cmunsx.otf }
+ { cmunsi.otf }
+ { cmunso.otf }
+ \__xdu_set_latin_mono_font:nnnn
+ { cmuntt.otf }
+ { cmuntb.otf }
+ { cmunit.otf }
+ { cmuntx.otf }
+ }
\cs_new:Npn \__xdu_load_latin_font_thcs:
{
\__xdu_set_latin_main_font:nnnnn
@@ -395,6 +414,25 @@
{ CourierStd-Oblique.otf }
{ CourierStd-BoldOblique.otf }
}
+\cs_new:Npn \__xdu_load_latin_font_tll:
+ {
+ \__xdu_set_latin_main_font:nnnnn
+ { Times~New~Roman }
+ { times.ttf }
+ { timesbd.ttf }
+ { timesi.ttf }
+ { timesbi.ttf }
+ \__xdu_set_latin_sans_font:nnnn
+ { LinBiolinum_R.otf }
+ { LinBiolinum_RB.otf }
+ { LinBiolinum_RI.otf }
+ { LinBiolinum_RBO.otf }
+ \__xdu_set_latin_mono_font:nnnn
+ { LinLibertine_M.otf }
+ { LinLibertine_MB.otf }
+ { LinLibertine_MO.otf }
+ { LinLibertine_MBO.otf }
+ }
\cs_new:Npn \__xdu_load_latin_font_gyre:
{
\__xdu_set_latin_main_font:nnnn
Modified: trunk/Master/texmf-dist/tex/xelatex/xduts/xdupgthesis.cls
===================================================================
--- trunk/Master/texmf-dist/tex/xelatex/xduts/xdupgthesis.cls 2023-02-23 21:10:15 UTC (rev 66095)
+++ trunk/Master/texmf-dist/tex/xelatex/xduts/xdupgthesis.cls 2023-02-23 21:14:04 UTC (rev 66096)
@@ -29,7 +29,7 @@
\NeedsTeXFormat{LaTeX2e}
\RequirePackage{expl3}
\ProvidesExplClass{xdupgthesis}
- {2023/02/20}{5.1.0.0}
+ {2023/02/23}{5.4.0.1}
{Xidian University Postgraduate Thesis document class}
\RequirePackage { xparse, l3keys2e }
\PassOptionsToPackage { quiet } { xeCJK }
@@ -68,7 +68,7 @@
{ \tl_set_eq:NN \l__xdu_latin_sans_scale_tl \l_keys_choice_tl },
latin-mono-scale .choices:nn = { upper, lower, off }
{ \tl_set_eq:NN \l__xdu_latin_mono_scale_tl \l_keys_choice_tl },
- latin-font .choices:nn = { tac, tacn, thcs, gyre, none }
+ latin-font .choices:nn = { gyre, tac, tacn, tcc, thcs, tll, none }
{ \tl_set_eq:NN \l__xdu_latin_font_tl \l_keys_choice_tl },
math-font .choices:nn =
{
@@ -387,6 +387,25 @@
\__xdu_set_latin_mono_font:nnnnn
{ Courier~New } { cour.ttf } { courbd.ttf } { couri.ttf } { courbi.ttf }
}
+\cs_new:Npn \__xdu_load_latin_font_tcc:
+ {
+ \__xdu_set_latin_main_font:nnnnn
+ { Times~New~Roman }
+ { times.ttf }
+ { timesbd.ttf }
+ { timesi.ttf }
+ { timesbi.ttf }
+ \__xdu_set_latin_sans_font:nnnn
+ { cmunss.otf }
+ { cmunsx.otf }
+ { cmunsi.otf }
+ { cmunso.otf }
+ \__xdu_set_latin_mono_font:nnnn
+ { cmuntt.otf }
+ { cmuntb.otf }
+ { cmunit.otf }
+ { cmuntx.otf }
+ }
\cs_new:Npn \__xdu_load_latin_font_thcs:
{
\__xdu_set_latin_main_font:nnnnn
@@ -408,6 +427,25 @@
{ CourierStd-Oblique.otf }
{ CourierStd-BoldOblique.otf }
}
+\cs_new:Npn \__xdu_load_latin_font_tll:
+ {
+ \__xdu_set_latin_main_font:nnnnn
+ { Times~New~Roman }
+ { times.ttf }
+ { timesbd.ttf }
+ { timesi.ttf }
+ { timesbi.ttf }
+ \__xdu_set_latin_sans_font:nnnn
+ { LinBiolinum_R.otf }
+ { LinBiolinum_RB.otf }
+ { LinBiolinum_RI.otf }
+ { LinBiolinum_RBO.otf }
+ \__xdu_set_latin_mono_font:nnnn
+ { LinLibertine_M.otf }
+ { LinLibertine_MB.otf }
+ { LinLibertine_MO.otf }
+ { LinLibertine_MBO.otf }
+ }
\cs_new:Npn \__xdu_load_latin_font_gyre:
{
\__xdu_set_latin_main_font:nnnn
@@ -1351,9 +1389,11 @@
\DeclareCaptionFont { customfont } { \__xdu_rm_family: \zihao { 5 } }
\captionsetup
{
+ strut = off,
labelsep = customskip,
font = customfont
}
+\dim_set_eq:NN \intextsep \abovecaptionskip
\ctex_at_end_preamble:n
{
\tl_if_eq:NnTF \l__xdu_ft_cap_format_tl { hang }
@@ -1508,6 +1548,8 @@
{
\@ifpackageloaded { tabularray }
{
+ \SetTblrOuter [ tblr, longtblr, talltblr ]
+ { presep = \belowcaptionskip + \intextsep, headsep = \abovecaptionskip }
\SetTblrStyle { head } { font = \__xdu_rm_family: \zihao { 5 } }
\DefTblrTemplate { caption-sep } { default }
{ \hskip \l__xdu_cap_label_sep_tl }
Modified: trunk/Master/texmf-dist/tex/xelatex/xduts/xduugthesis.cls
===================================================================
--- trunk/Master/texmf-dist/tex/xelatex/xduts/xduugthesis.cls 2023-02-23 21:10:15 UTC (rev 66095)
+++ trunk/Master/texmf-dist/tex/xelatex/xduts/xduugthesis.cls 2023-02-23 21:14:04 UTC (rev 66096)
@@ -29,7 +29,7 @@
\NeedsTeXFormat{LaTeX2e}
\RequirePackage{expl3}
\ProvidesExplClass{xduugthesis}
- {2023/02/20}{5.1.0.0}
+ {2023/02/23}{5.4.0.1}
{Xidian University Undergraduate Thesis document class}
\RequirePackage { xparse, l3keys2e }
\PassOptionsToPackage { quiet } { xeCJK }
@@ -69,7 +69,7 @@
{ \tl_set_eq:NN \l__xdu_latin_sans_scale_tl \l_keys_choice_tl },
latin-mono-scale .choices:nn = { upper, lower, off }
{ \tl_set_eq:NN \l__xdu_latin_mono_scale_tl \l_keys_choice_tl },
- latin-font .choices:nn = { tac, tacn, thcs, gyre, none }
+ latin-font .choices:nn = { gyre, tac, tacn, tcc, thcs, tll, none }
{ \tl_set_eq:NN \l__xdu_latin_font_tl \l_keys_choice_tl },
math-font .choices:nn =
{
@@ -388,6 +388,25 @@
\__xdu_set_latin_mono_font:nnnnn
{ Courier~New } { cour.ttf } { courbd.ttf } { couri.ttf } { courbi.ttf }
}
+\cs_new:Npn \__xdu_load_latin_font_tcc:
+ {
+ \__xdu_set_latin_main_font:nnnnn
+ { Times~New~Roman }
+ { times.ttf }
+ { timesbd.ttf }
+ { timesi.ttf }
+ { timesbi.ttf }
+ \__xdu_set_latin_sans_font:nnnn
+ { cmunss.otf }
+ { cmunsx.otf }
+ { cmunsi.otf }
+ { cmunso.otf }
+ \__xdu_set_latin_mono_font:nnnn
+ { cmuntt.otf }
+ { cmuntb.otf }
+ { cmunit.otf }
+ { cmuntx.otf }
+ }
\cs_new:Npn \__xdu_load_latin_font_thcs:
{
\__xdu_set_latin_main_font:nnnnn
@@ -409,6 +428,25 @@
{ CourierStd-Oblique.otf }
{ CourierStd-BoldOblique.otf }
}
+\cs_new:Npn \__xdu_load_latin_font_tll:
+ {
+ \__xdu_set_latin_main_font:nnnnn
+ { Times~New~Roman }
+ { times.ttf }
+ { timesbd.ttf }
+ { timesi.ttf }
+ { timesbi.ttf }
+ \__xdu_set_latin_sans_font:nnnn
+ { LinBiolinum_R.otf }
+ { LinBiolinum_RB.otf }
+ { LinBiolinum_RI.otf }
+ { LinBiolinum_RBO.otf }
+ \__xdu_set_latin_mono_font:nnnn
+ { LinLibertine_M.otf }
+ { LinLibertine_MB.otf }
+ { LinLibertine_MO.otf }
+ { LinLibertine_MBO.otf }
+ }
\cs_new:Npn \__xdu_load_latin_font_gyre:
{
\__xdu_set_latin_main_font:nnnn
@@ -1120,9 +1158,11 @@
\DeclareCaptionFont { customfont } { \__xdu_rm_family: \zihao { 5 } }
\captionsetup
{
+ strut = off,
labelsep = customskip,
font = customfont
}
+\dim_set_eq:NN \intextsep \abovecaptionskip
\ctex_at_end_preamble:n
{
\tl_if_eq:NnTF \l__xdu_ft_cap_format_tl { hang }
@@ -1277,6 +1317,8 @@
{
\@ifpackageloaded { tabularray }
{
+ \SetTblrOuter [ tblr, longtblr, talltblr ]
+ { presep = \belowcaptionskip + \intextsep, headsep = \abovecaptionskip }
\SetTblrStyle { head } { font = \__xdu_rm_family: \zihao { 5 } }
\DefTblrTemplate { caption-sep } { default }
{ \hskip \l__xdu_cap_label_sep_tl }
Modified: trunk/Master/texmf-dist/tex/xelatex/xduts/xduugtp.cls
===================================================================
--- trunk/Master/texmf-dist/tex/xelatex/xduts/xduugtp.cls 2023-02-23 21:10:15 UTC (rev 66095)
+++ trunk/Master/texmf-dist/tex/xelatex/xduts/xduugtp.cls 2023-02-23 21:14:04 UTC (rev 66096)
@@ -29,7 +29,7 @@
\NeedsTeXFormat{LaTeX2e}
\RequirePackage{expl3}
\ProvidesExplClass{xduugtp}
- {2023/02/20}{5.1.0.0}
+ {2023/02/23}{5.4.0.1}
{Xidian University Undergraduate Thesis Proposal class}
\RequirePackage { xparse, l3keys2e }
\PassOptionsToPackage { quiet } { xeCJK }
@@ -65,7 +65,7 @@
{ \tl_set_eq:NN \l__xdu_latin_sans_scale_tl \l_keys_choice_tl },
latin-mono-scale .choices:nn = { upper, lower, off }
{ \tl_set_eq:NN \l__xdu_latin_mono_scale_tl \l_keys_choice_tl },
- latin-font .choices:nn = { tac, tacn, thcs, gyre, none }
+ latin-font .choices:nn = { gyre, tac, tacn, tcc, thcs, tll, none }
{ \tl_set_eq:NN \l__xdu_latin_font_tl \l_keys_choice_tl },
math-font .choices:nn =
{
@@ -384,6 +384,25 @@
\__xdu_set_latin_mono_font:nnnnn
{ Courier~New } { cour.ttf } { courbd.ttf } { couri.ttf } { courbi.ttf }
}
+\cs_new:Npn \__xdu_load_latin_font_tcc:
+ {
+ \__xdu_set_latin_main_font:nnnnn
+ { Times~New~Roman }
+ { times.ttf }
+ { timesbd.ttf }
+ { timesi.ttf }
+ { timesbi.ttf }
+ \__xdu_set_latin_sans_font:nnnn
+ { cmunss.otf }
+ { cmunsx.otf }
+ { cmunsi.otf }
+ { cmunso.otf }
+ \__xdu_set_latin_mono_font:nnnn
+ { cmuntt.otf }
+ { cmuntb.otf }
+ { cmunit.otf }
+ { cmuntx.otf }
+ }
\cs_new:Npn \__xdu_load_latin_font_thcs:
{
\__xdu_set_latin_main_font:nnnnn
@@ -405,6 +424,25 @@
{ CourierStd-Oblique.otf }
{ CourierStd-BoldOblique.otf }
}
+\cs_new:Npn \__xdu_load_latin_font_tll:
+ {
+ \__xdu_set_latin_main_font:nnnnn
+ { Times~New~Roman }
+ { times.ttf }
+ { timesbd.ttf }
+ { timesi.ttf }
+ { timesbi.ttf }
+ \__xdu_set_latin_sans_font:nnnn
+ { LinBiolinum_R.otf }
+ { LinBiolinum_RB.otf }
+ { LinBiolinum_RI.otf }
+ { LinBiolinum_RBO.otf }
+ \__xdu_set_latin_mono_font:nnnn
+ { LinLibertine_M.otf }
+ { LinLibertine_MB.otf }
+ { LinLibertine_MO.otf }
+ { LinLibertine_MBO.otf }
+ }
\cs_new:Npn \__xdu_load_latin_font_gyre:
{
\__xdu_set_latin_main_font:nnnn
More information about the tex-live-commits
mailing list.