summaryrefslogtreecommitdiff
path: root/Master
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2023-02-21 20:48:23 +0000
committerKarl Berry <karl@freefriends.org>2023-02-21 20:48:23 +0000
commitf835916383938906bbc542bd52f86e18bcb6a9e9 (patch)
tree489838a5eac2669c402e8d52bdf4b20d4efde37f /Master
parentdb79b729227f816dfd7946b8a9bb2ee7cd674211 (diff)
xduts (21feb23)
git-svn-id: svn://tug.org/texlive/trunk@66022 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
-rw-r--r--Master/texmf-dist/doc/xelatex/xduts/xduts.pdfbin330063 -> 330444 bytes
-rw-r--r--Master/texmf-dist/source/xelatex/xduts/xduts.dtx40
-rw-r--r--Master/texmf-dist/tex/xelatex/xduts/xdufont.sty14
-rw-r--r--Master/texmf-dist/tex/xelatex/xduts/xdupgthesis.cls14
-rw-r--r--Master/texmf-dist/tex/xelatex/xduts/xduugthesis.cls14
-rw-r--r--Master/texmf-dist/tex/xelatex/xduts/xduugtp.cls14
6 files changed, 77 insertions, 19 deletions
diff --git a/Master/texmf-dist/doc/xelatex/xduts/xduts.pdf b/Master/texmf-dist/doc/xelatex/xduts/xduts.pdf
index e945d5fe18c..31a4d15b9f2 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 c2956085522..a0117a6d4f0 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/17 v5.0.0.0 Xidian University TeX Suite]
+[2023/02/20 v5.1.0.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/17}{5.0.0.0}
+%<class|sty> {2023/02/20}{5.1.0.0}
%<xdufont> {Xidian University Font package}
%<xduugtp> {Xidian University Undergraduate Thesis Proposal class}
%<xdupgthesis> {Xidian University Postgraduate Thesis document class}
@@ -471,15 +471,16 @@ literate = {\$}{{\textcolor{purple3}{\$}}}{1}
% \label{字体选项}
% \begin{function}[added=2022-03-06]{style/cjk-font}
% \begin{syntax}
-% \opt{style/cjk-font} = adobe|(fandol)|founder|sinotype|win|none
+% \opt{style/cjk-font} = adobe|(fandol)|founder|hanyi|sinotype|win|none
% \end{syntax}
% 设置中文字体,具体配置见\tabrefx{tab:cjk-font}[]。
% \end{function}
% \begin{optdesc}
-% \item[adobe] \filex[]{adobesongstd-light.otf}[]、\filex[]{adobekaitistd-regular.otf}[]、\filex[]{adobeheitistd-regular.otf}和\filex{Adobe-Fangsong-Std-R-Font.otf}。
-% \item[founder] \filex[]{FZShuSong-Z01.ttf}[]、\filex[]{FZKai-Z03.ttf}[]、\filex[]{FZHei-B01.ttf}和\filex{FZFSK.TTF}。
-% \item[sinotype] \filex[]{STSONG.TTF}[]、\filex[]{STKAITI.TTF}[]、\filex[]{STXIHEI.TTF}[]、\filex[]{STHeiti.ttf}和\filex{STFANGSO.TTF}。
-% \item[win] \filex[]{simsun.ttc}[]、\filex[]{simkai.ttf}[]、\filex[]{simhei.ttf}和\filex{simfang.ttf}。
+% \item[adobe] \filex[]{adobesongstd-light.otf}[]、\filex[]{adobekaitistd-regular.otf}[]、\filex[]{adobeheitistd-regular.otf}和\filex{Adobe-Fangsong-Std-R-Font.otf}[]。
+% \item[founder] \filex[]{FZShuSong-Z01.ttf}[]、\filex[]{FZKai-Z03.ttf}[]、\filex[]{FZHei-B01.ttf}和\filex{FZFSK.TTF}[]。
+% \item[hanyi] \filex[]{HYShuSongErS.ttf}[]、\filex[]{HYKaiTiS.ttf}[]、\filex[]{HYZhongHeiTiS.ttf}和\filex{HYFangSongS.ttf}[]。
+% \item[sinotype] \filex[]{STSONG.TTF}[]、\filex[]{STKAITI.TTF}[]、\filex[]{STXIHEI.TTF}[]、\filex[]{STHeiti.ttf}和\filex{STFANGSO.TTF}[]。
+% \item[win] \filex[]{simsun.ttc}[]、\filex[]{simkai.ttf}[]、\filex[]{simhei.ttf}和\filex{simfang.ttf}[]。
% \item[none] 关闭内置中文字体配置,需自行配置中文字体。
% \end{optdesc}
% \changes{v2.16.1.1}{2022/11/27}{修改中文字体配置表文档样式}
@@ -502,6 +503,7 @@ literate = {\$}{{\textcolor{purple3}{\$}}}{1}
% |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}
@@ -525,9 +527,9 @@ literate = {\$}{{\textcolor{purple3}{\$}}}{1}
% 设置英文字体,具体配置见\tabrefx{tab:latin-font}[]。
% \end{function}
% \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[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[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[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[none] 关闭内置英文字体配置,需自行配置英文字体。
% \end{optdesc}
% \changes{v2.16.1.1}{2022/11/27}{修改英文字体配置表文档样式}
@@ -1937,7 +1939,7 @@ literate = {\$}{{\textcolor{purple3}{\$}}}{1}
% 中文字体配置。
% \begin{macrocode}
cjk-font .choices:nn =
- { win, adobe, founder, sinotype, fandol, none }
+ { win, adobe, founder, hanyi, sinotype, fandol, none }
{ \tl_set_eq:NN \l_@@_cjk_font_tl \l_keys_choice_tl },
% \end{macrocode}
% 中文字体伪粗体粗细程度。
@@ -2281,6 +2283,22 @@ literate = {\$}{{\textcolor{purple3}{\$}}}{1}
}
% \end{macrocode}
% \end{macro}
+% \changes{v5.1.0.0}{2023/02/20}{新增汉仪字体}
+% \begin{macro}{\@@_load_cjk_font_hanyi:}
+% 中文字体配置\valuex{hanyi}[]。
+% \begin{macrocode}
+\cs_new:Npn \@@_load_cjk_font_hanyi:
+ {
+ \@@_set_cjk_main_font:nn
+ { \@@_select_font:nn { HYShuSongErS } { HYShuSongErS.ttf } }
+ { \@@_select_font:nn { HYKaiTiS } { HYKaiTiS.ttf } }
+ \@@_set_cjk_sans_font:n
+ { \@@_select_font:nn { HYZhongHei } { HYZhongHeiTiS.ttf } }
+ \@@_set_cjk_mono_font:n
+ { \@@_select_font:nn { HYFangSongS } { HYFangSongS.ttf } }
+ }
+% \end{macrocode}
+% \end{macro}
% \begin{macro}{\@@_load_cjk_font_sinotype:}
% 中文字体配置\valuex{sinotype}[]。
% \begin{macrocode}
diff --git a/Master/texmf-dist/tex/xelatex/xduts/xdufont.sty b/Master/texmf-dist/tex/xelatex/xduts/xdufont.sty
index 4888659e551..afe08f01f71 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/17}{5.0.0.0}
+ {2023/02/20}{5.1.0.0}
{Xidian University Font package}
\RequirePackage { xparse, l3keys2e }
\PassOptionsToPackage { quiet } { xeCJK }
@@ -47,7 +47,7 @@
\keys_define:nn { xdu / style }
{
cjk-font .choices:nn =
- { win, adobe, founder, sinotype, fandol, none }
+ { win, adobe, founder, hanyi, sinotype, fandol, none }
{ \tl_set_eq:NN \l__xdu_cjk_font_tl \l_keys_choice_tl },
cjk-fake-bold .tl_set:N = \l__xdu_fake_bold_tl,
cjk-fake-slant .tl_set:N = \l__xdu_fake_slant_tl,
@@ -232,6 +232,16 @@
\__xdu_set_cjk_mono_font:n
{ \__xdu_select_font:nn { FZFangSong-Z02 } { FZFSK.TTF } }
}
+\cs_new:Npn \__xdu_load_cjk_font_hanyi:
+ {
+ \__xdu_set_cjk_main_font:nn
+ { \__xdu_select_font:nn { HYShuSongErS } { HYShuSongErS.ttf } }
+ { \__xdu_select_font:nn { HYKaiTiS } { HYKaiTiS.ttf } }
+ \__xdu_set_cjk_sans_font:n
+ { \__xdu_select_font:nn { HYZhongHei } { HYZhongHeiTiS.ttf } }
+ \__xdu_set_cjk_mono_font:n
+ { \__xdu_select_font:nn { HYFangSongS } { HYFangSongS.ttf } }
+ }
\cs_new:Npn \__xdu_load_cjk_font_sinotype:
{
\__xdu_set_cjk_main_font:nn
diff --git a/Master/texmf-dist/tex/xelatex/xduts/xdupgthesis.cls b/Master/texmf-dist/tex/xelatex/xduts/xdupgthesis.cls
index 896f21fb5b0..5682e9451c9 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/17}{5.0.0.0}
+ {2023/02/20}{5.1.0.0}
{Xidian University Postgraduate Thesis document class}
\RequirePackage { xparse, l3keys2e }
\PassOptionsToPackage { quiet } { xeCJK }
@@ -60,7 +60,7 @@
\keys_define:nn { xdu / style }
{
cjk-font .choices:nn =
- { win, adobe, founder, sinotype, fandol, none }
+ { win, adobe, founder, hanyi, sinotype, fandol, none }
{ \tl_set_eq:NN \l__xdu_cjk_font_tl \l_keys_choice_tl },
cjk-fake-bold .tl_set:N = \l__xdu_fake_bold_tl,
cjk-fake-slant .tl_set:N = \l__xdu_fake_slant_tl,
@@ -245,6 +245,16 @@
\__xdu_set_cjk_mono_font:n
{ \__xdu_select_font:nn { FZFangSong-Z02 } { FZFSK.TTF } }
}
+\cs_new:Npn \__xdu_load_cjk_font_hanyi:
+ {
+ \__xdu_set_cjk_main_font:nn
+ { \__xdu_select_font:nn { HYShuSongErS } { HYShuSongErS.ttf } }
+ { \__xdu_select_font:nn { HYKaiTiS } { HYKaiTiS.ttf } }
+ \__xdu_set_cjk_sans_font:n
+ { \__xdu_select_font:nn { HYZhongHei } { HYZhongHeiTiS.ttf } }
+ \__xdu_set_cjk_mono_font:n
+ { \__xdu_select_font:nn { HYFangSongS } { HYFangSongS.ttf } }
+ }
\cs_new:Npn \__xdu_load_cjk_font_sinotype:
{
\__xdu_set_cjk_main_font:nn
diff --git a/Master/texmf-dist/tex/xelatex/xduts/xduugthesis.cls b/Master/texmf-dist/tex/xelatex/xduts/xduugthesis.cls
index fae41fcdf4e..1c57302738b 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/17}{5.0.0.0}
+ {2023/02/20}{5.1.0.0}
{Xidian University Undergraduate Thesis document class}
\RequirePackage { xparse, l3keys2e }
\PassOptionsToPackage { quiet } { xeCJK }
@@ -61,7 +61,7 @@
\keys_define:nn { xdu / style }
{
cjk-font .choices:nn =
- { win, adobe, founder, sinotype, fandol, none }
+ { win, adobe, founder, hanyi, sinotype, fandol, none }
{ \tl_set_eq:NN \l__xdu_cjk_font_tl \l_keys_choice_tl },
cjk-fake-bold .tl_set:N = \l__xdu_fake_bold_tl,
cjk-fake-slant .tl_set:N = \l__xdu_fake_slant_tl,
@@ -246,6 +246,16 @@
\__xdu_set_cjk_mono_font:n
{ \__xdu_select_font:nn { FZFangSong-Z02 } { FZFSK.TTF } }
}
+\cs_new:Npn \__xdu_load_cjk_font_hanyi:
+ {
+ \__xdu_set_cjk_main_font:nn
+ { \__xdu_select_font:nn { HYShuSongErS } { HYShuSongErS.ttf } }
+ { \__xdu_select_font:nn { HYKaiTiS } { HYKaiTiS.ttf } }
+ \__xdu_set_cjk_sans_font:n
+ { \__xdu_select_font:nn { HYZhongHei } { HYZhongHeiTiS.ttf } }
+ \__xdu_set_cjk_mono_font:n
+ { \__xdu_select_font:nn { HYFangSongS } { HYFangSongS.ttf } }
+ }
\cs_new:Npn \__xdu_load_cjk_font_sinotype:
{
\__xdu_set_cjk_main_font:nn
diff --git a/Master/texmf-dist/tex/xelatex/xduts/xduugtp.cls b/Master/texmf-dist/tex/xelatex/xduts/xduugtp.cls
index 4ccb6586dd1..b891f9d9bfe 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/17}{5.0.0.0}
+ {2023/02/20}{5.1.0.0}
{Xidian University Undergraduate Thesis Proposal class}
\RequirePackage { xparse, l3keys2e }
\PassOptionsToPackage { quiet } { xeCJK }
@@ -57,7 +57,7 @@
\keys_define:nn { xdu / style }
{
cjk-font .choices:nn =
- { win, adobe, founder, sinotype, fandol, none }
+ { win, adobe, founder, hanyi, sinotype, fandol, none }
{ \tl_set_eq:NN \l__xdu_cjk_font_tl \l_keys_choice_tl },
cjk-fake-bold .tl_set:N = \l__xdu_fake_bold_tl,
cjk-fake-slant .tl_set:N = \l__xdu_fake_slant_tl,
@@ -242,6 +242,16 @@
\__xdu_set_cjk_mono_font:n
{ \__xdu_select_font:nn { FZFangSong-Z02 } { FZFSK.TTF } }
}
+\cs_new:Npn \__xdu_load_cjk_font_hanyi:
+ {
+ \__xdu_set_cjk_main_font:nn
+ { \__xdu_select_font:nn { HYShuSongErS } { HYShuSongErS.ttf } }
+ { \__xdu_select_font:nn { HYKaiTiS } { HYKaiTiS.ttf } }
+ \__xdu_set_cjk_sans_font:n
+ { \__xdu_select_font:nn { HYZhongHei } { HYZhongHeiTiS.ttf } }
+ \__xdu_set_cjk_mono_font:n
+ { \__xdu_select_font:nn { HYFangSongS } { HYFangSongS.ttf } }
+ }
\cs_new:Npn \__xdu_load_cjk_font_sinotype:
{
\__xdu_set_cjk_main_font:nn