From c93facea4fb1315716e06f7949299868ca1b3422 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sun, 27 Nov 2022 20:51:59 +0000 Subject: xduts (27nov22) git-svn-id: svn://tug.org/texlive/trunk@65123 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/xelatex/xduts/README.md | 19 +- Master/texmf-dist/doc/xelatex/xduts/xduts.pdf | Bin 711387 -> 722686 bytes Master/texmf-dist/source/xelatex/xduts/xduts.dtx | 294 ++++++++++----------- Master/texmf-dist/tex/xelatex/xduts/xdufont.sty | 54 ++-- .../texmf-dist/tex/xelatex/xduts/xdupgthesis.cls | 54 ++-- .../texmf-dist/tex/xelatex/xduts/xduugthesis.cls | 54 ++-- 6 files changed, 227 insertions(+), 248 deletions(-) diff --git a/Master/texmf-dist/doc/xelatex/xduts/README.md b/Master/texmf-dist/doc/xelatex/xduts/README.md index 3597bc118c5..64f28ff260a 100644 --- a/Master/texmf-dist/doc/xelatex/xduts/README.md +++ b/Master/texmf-dist/doc/xelatex/xduts/README.md @@ -15,6 +15,15 @@ In the future, we plan to add the following document classes, including - `xduugtp.cls`, Xidian University Undergraduate Thesis Proposal document class - `xdupgtp.cls`, Xidian University Postgraduate Thesis Proposal document class +## Preparation + +If using TeX Live/MacTeX, TeX Live/MacTeX 2022+ is recommended, and update all packages to the latest version by running command below. If on Windows, it may be necessary to start a Command Prompt as an Administrator. If on macOS or GNU/Linux, it may be necessary to run the command with `sudo`. + +```shell +tlmgr option repository https://mirrors.cloud.tencent.com/CTAN/systems/texlive/tlnet/ +tlmgr update --all --self +``` + ## Installation You can install XDUTS from either CTAN or GitHub by following the instructions below. @@ -23,13 +32,7 @@ You can install XDUTS from either CTAN or GitHub by following the instructions b #### TeX Live/MacTeX -Make sure the latest version of TeX Live/MacTeX is installed. Then, you can install XDUTS by running command below. If on Windows, it may be necessary to start a Command Prompt as an Administrator. If on macOS or GNU/Linux, please run the command with `sudo`. - -```shell -tlmgr update --self xduts -``` - -Run command below to open the documentation in TeX Live/MacTeX. +After completing the preparation, XDUTS is already contained in TeX Live/MacTeX. Run command below to open the documentation. ```shell texdoc xduts @@ -52,7 +55,7 @@ texdoc xduts ### GitHub -Generally speaking, CTAN updates XDUTS slowly. If you want to use the latest version of XDUTS, download this repository and run the following command to get the document class/package files. +Generally speaking, CTAN updates XDUTS slowly. If you want to use the latest version of XDUTS, [download this repository](https://github.com/note286/xduts/archive/refs/heads/main.zip) and run the following command to get the document class/package files. ```shell xetex xduts.ins diff --git a/Master/texmf-dist/doc/xelatex/xduts/xduts.pdf b/Master/texmf-dist/doc/xelatex/xduts/xduts.pdf index f4beb5fd67f..842d7605035 100644 Binary files a/Master/texmf-dist/doc/xelatex/xduts/xduts.pdf and b/Master/texmf-dist/doc/xelatex/xduts/xduts.pdf differ diff --git a/Master/texmf-dist/source/xelatex/xduts/xduts.dtx b/Master/texmf-dist/source/xelatex/xduts/xduts.dtx index fb4520bbc8f..85fb4ca102a 100644 --- a/Master/texmf-dist/source/xelatex/xduts/xduts.dtx +++ b/Master/texmf-dist/source/xelatex/xduts/xduts.dtx @@ -1,14 +1,14 @@ % \iffalse %<*driver> \ProvidesFile{xduts.dtx} -[2022/11/23 v2.14.1.3 Xidian University TeX Suite] +[2022/11/27 v2.16.1.3 Xidian University TeX Suite] % %\NeedsTeXFormat{LaTeX2e} %\RequirePackage{expl3} %\ProvidesExplPackage{xdufont} %\ProvidesExplClass{xdupgthesis} %\ProvidesExplClass{xduugthesis} -% {2022/11/23}{2.14.1.3} +% {2022/11/27}{2.16.1.3} % {Xidian University Font package} % {Xidian University Postgraduate Thesis document class} % {Xidian University Undergraduate Thesis document class} @@ -46,14 +46,19 @@ \usepackage{multirow} \usepackage{pifont} \newcommand{\cmark}{\ding{51}} +\usepackage{subcaption} +\captionsetup{font=bf} \usepackage{tabularray} +\changes{v2.16.1.3}{2022/11/27}{修改文档中caption字体样式} \SetTblrStyle{caption-tag}{font=\bfseries} +\SetTblrStyle{caption-text}{font=\bfseries} \DefTblrTemplate{caption-sep}{default}{\quad} -\DefTblrTemplate{conthead-text}{default}{(续表)} -\DefTblrTemplate{contfoot-text}{default}{接下页} +\DefTblrTemplate{conthead-text}{default}{\textbf{(续表)}} +\DefTblrTemplate{contfoot-text}{default}{\textbf{接下页}} % 交叉引用 \newcommand{\secrefx}[1]{第\xspace\ref{#1}\xspace 节} \newcommand{\tabrefx}[1]{\tablename\xspace\ref{#1}\xspace} +\newcommand{\figrefx}[1]{\figurename\xspace\ref{#1}\xspace} % 文档类选项 \newcommand{\optx}[1]{\xspace{\ttfamily\seqsplit{#1}}\xspace} % \name LaTeX3控制序列 @@ -134,6 +139,8 @@ literate = {\$}{{\textcolor{purple3}{\$}}}{1} \lst@AddToHook{SelectCharTable} {\ifx\lst@literate\@empty\else\expandafter\lst@Literate\lst@literate{}\relax\z@\fi} \makeatother +\RenewDocumentCommand{\floatpagefraction}{}{.8} +\usepackage[nolinks]{qrcode} \begin{document} \DocInput{\jobname.dtx} \IndexLayout @@ -404,31 +411,35 @@ literate = {\$}{{\textcolor{purple3}{\$}}}{1} % 设置中文字体,具体配置见\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[none] 关闭内置中文字体配置,需自行配置中文字体。 % \end{optdesc} +% \changes{v2.16.1.1}{2022/11/27}{修改中文字体配置表文档样式} % \begin{table} -% \begin{threeparttable} % \caption{中文字体配置} % \label{tab:cjk-font} -% \centering -% \begin{tabularx}{\linewidth}{cccc} -% \toprule -% \strong{选项名称} & \strong{罗马字体族} & \strong{无衬线字体族} & \strong{打字机字体族} \\ -% \midrule -% |adobe|\tnote{1} & Adobe 宋体 Std/Adobe 楷体 Std & Adobe 黑体 Std & Adobe 仿宋 Std \\ -% |fandol| & FandolSong/FandolKai & FandolHei & FandolFang \\ -% |founder|\tnote{2} & 方正书宋_GBK/方正楷体_GBK & 方正黑体_GBK & 方正仿宋_GBK \\ -% |sinotype|\tnote{3} & 华文宋体/华文楷体 & 华文细黑/华文黑体 & 华文仿宋 \\ -% |win|\tnote{4} & 中易宋体/中易楷体 & 中易黑体 & 中易仿宋 \\ -% \bottomrule -% \end{tabularx} -% \begin{tablenotes} -% \item [1] \filex{adobesongstd-light.otf}、\filex{adobekaitistd-regular.otf}、\filex{adobeheitistd-regular.otf}和\filex{Adobe-Fangsong-Std-R-Font.otf}。 -% \item [2] \filex{FZShuSong-Z01.ttf}、\filex{FZKai-Z03.ttf}、\filex{FZHei-B01.ttf}和\filex{FZFSK.TTF}。 -% \item [3] \filex{STSONG.TTF}、\filex{STKAITI.TTF}、\filex{STXIHEI.TTF}、\filex{STHeiti.ttf}和\filex{STFANGSO.TTF}。 -% \item [4] \filex{simsun.ttc}、\filex{simkai.ttf}、\filex{simhei.ttf}和\filex{simfang.ttf}。 -% \end{tablenotes} -% \end{threeparttable} +% \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}, +% cell{1}{2} = {c=2}{}, +% cell{1}{1,4,5} = {r=2}{}, +% row{1-2} = {cmd=\strong} +% } +% 选项名称 & 罗马族 & & 无衬线族 & 打字机族 \\ +% & 直立/倾斜形状 & 意大利形状 & & \\ +% |adobe| & Adobe 宋体 Std & Adobe 楷体 Std & Adobe 黑体 Std & Adobe 仿宋 Std \\ +% |fandol| & FandolSong & FandolKai & FandolHei & FandolFang \\ +% |founder| & 方正书宋\_GBK & 方正楷体\_GBK & 方正黑体\_GBK & 方正仿宋\_GBK \\ +% |sinotype| & 华文宋体 & 华文楷体 & 华文细黑/华文黑体 & 华文仿宋 \\ +% |win| & 中易宋体 & 中易楷体 & 中易黑体 & 中易仿宋 \\ +% \end{tblr} % \end{table} % \begin{function}[added=2022-04-01]{style/cjk-fake-bold} % \begin{syntax} @@ -449,29 +460,29 @@ 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[none] 关闭内置英文字体配置,需自行配置英文字体。 % \end{optdesc} +% \changes{v2.16.1.1}{2022/11/27}{修改英文字体配置表文档样式} % \begin{table} -% \begin{threeparttable} % \caption{英文字体配置} % \label{tab:latin-font} -% \centering -% \begin{tabularx}{\linewidth}{cYYY} -% \toprule -% \strong{选项名称} & \strong{罗马字体族} & \strong{无衬线字体族} & \strong{打字机字体族} \\ -% \midrule -% |tac|\tnote{1} & Times New Roman & Arial & Consolas \\ -% |tacn|\tnote{2} & Times New Roman & Arial & Courier New \\ -% |thcs|\tnote{3} & Times New Roman & Helvetica & Courier Std \\ -% |gyre| & TeX Gyre Termes & TeX Gyre Heros & TeX Gyre Cursor \\ -% \bottomrule -% \end{tabularx} -% \begin{tablenotes} -% \item [1] \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 [2] \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 [3] \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}。 -% \end{tablenotes} -% \end{threeparttable} +% \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} +% } +% 选项名称 & 罗马族 & 无衬线族 & 打字机族 \\ +% |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 \\ +% \end{tblr} % \end{table} % \begin{function}[added=2022-03-06,updated=2022-03-09]{style/math-font} % \begin{syntax} @@ -479,51 +490,50 @@ literate = {\$}{{\textcolor{purple3}{\$}}}{1} % \end{syntax} % 设置数学字体,具体配置见\tabrefx{tab:math-font}。除Computer Modern字体外,均使用\pkgx{unicode-math}宏包调用字体。 % \end{function} +% \changes{v2.16.1.1}{2022/11/27}{修改数学字体配置表文档样式} % \changes{v0.1.4.1}{2022/04/04}{数学字体风格介绍} % \begin{optdesc} -% \item[cambria] 微软Office预装的数学字体。 -% \item[fira] 无衬线数学字体。 -% \item[garamond] Garamond风格。 -% \item[lm] 基于Computer Modern风格。 -% \item[libertinus] Linux Libertine风格。 -% \item[stix] Times风格。 -% \item[dejavu] DejaVu风格。 -% \item[pagella] Palatino风格。 -% \item[termes] Times风格。 -% \item[xits] 基于STIX,Times风格,有粗体XITS Math Bold可用。 +% \item[cambria] \filex{cambria.ttc}。 % \item[none] 关闭内置数学字体配置,需自行配置数学字体。 % \end{optdesc} -% \begin{table} -% \begin{threeparttable} -% \caption{数学字体配置} -% \label{tab:math-font} -% \centering -% \begin{tabularx}{\linewidth}{cY} -% \toprule -% \strong{选项名称} & \strong{字体名称} \\ -% \midrule -% |asana| & Asana Math \\ -% |cambria|\tnote{1} & Cambria Math \\ -% |cm| & Computer Modern \\ -% |fira| & Fira Math \\ -% |garamond| & Garamond Math \\ -% |lm| & Latin Modern Math \\ -% |erewhon| & Erewhon Math \\ -% |libertinus| & Libertinus Math \\ -% |stix| & STIX 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 \\ -% |xits| & XITS Math \\ -% \bottomrule -% \end{tabularx} -% \begin{tablenotes} -% \item [1] \filex{cambria.ttc}。 -% \end{tablenotes} -% \end{threeparttable} -% \end{table} +% \begin{tblr} +% [ +% long, +% caption = {数学字体配置}, +% label = {tab:math-font} +% ] +% { +% width = \linewidth, +% colspec = {X[2,c]X[3,c]}, +% hline{1,2,Z} = {.08em}, +% row{even[2-Z]} = {gray9!40}, +% row{1} = {cmd=\strong}, +% rowhead = 1 +% } +% 选项名称 & 字体名称 \\ +% |asana| & Asana Math \\ +% |cambria|\tnote{1} & 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} % \optx{style/unicode-math}=\argx{unicode-math宏包选项} @@ -895,6 +905,7 @@ literate = {\$}{{\textcolor{purple3}{\$}}}{1} % \end{function} % \subsection{信息录入} % \label{信息录入} +% \changes{v2.16.1.1}{2022/11/27}{修改信息录入选项分类表文档样式} % \changes{v1.9.0.0}{2022/05/03}{增加信息录入选项分类表} % \changes{v1.10.3.1}{2022/05/04}{移除专业博士校外导师信息录入} % 用户根据\tabrefx{tblr:info}选择相应的选项并使用\secrefx{参数设置}中的方式进行信息录入。 @@ -902,23 +913,21 @@ literate = {\$}{{\textcolor{purple3}{\$}}}{1} % [ % long, % caption = {信息录入选项分类}, -% label = {tblr:info} +% label = {tblr:info} % ] % { -% width = \linewidth, -% colspec = lX[c]X[c]X[c]X[c]X[c]X[c], -% cell{1}{1} = {r = 2}{}, -% cell{1}{2} = {c = 2}{}, -% cell{1}{4} = {c = 2}{}, -% cell{1}{6} = {c = 2}{}, -% hline{1,Z} = {.08em}, -% hline{2} = {2-3}{.08em, leftpos = -1, rightpos = -1, endpos}, -% hline{2} = {4-5}{.08em, leftpos = -1, rightpos = -1, endpos}, -% hline{2} = {6-7}{.08em, leftpos = -1, rightpos = -1, endpos}, -% hline{3} = {.08em}, -% cell{odd[3-Z]}{1-Z} = {gray9}, -% cell{3-Z}{1} = {cmd = \texttt}, -% rowhead = 2 +% width = \linewidth, +% colspec = lX[c]X[c]X[c]X[c]X[c]X[c], +% cell{1}{1} = {r=2}{}, +% cell{1}{2,4,6} = {c=2}{}, +% hline{1,Z} = {.08em}, +% hline{2} = {2-3}{.08em,leftpos=-1,rightpos=-1,endpos}, +% hline{2} = {4-5}{.08em,leftpos=-1,rightpos=-1,endpos}, +% hline{2} = {6-7}{.08em,leftpos=-1,rightpos=-1,endpos}, +% hline{3} = {.08em}, +% row{odd[3-Z]} = {gray9!40}, +% cell{3-Z}{1} = {cmd=\texttt}, +% rowhead = 2 % } % & 本科 & & 硕士 & & 博士 & \\ % & 校内 & 校外 & 学术 & 专业 & 学术 & 专业 \\ @@ -1556,6 +1565,17 @@ literate = {\$}{{\textcolor{purple3}{\$}}}{1} % 和《Good things come in little packages: An introduction to writing .ins and .dtx files》\footurl{https://www.tug.org/TUGboat/tb29-2/tb92pakin.pdf} % 提供了很大帮助。 % 在文档的编写过程中,参考了\filex{ctex.dtx}、\filex{fduthesis.dtx}、\filex{njuthesis.dtx}和\filex{thuthesis.dtx}。 +% \changes{v2.16.1.2}{2022/11/27}{修正文档中图片引用间距} +% \changes{v2.15.0.1}{2022/11/26}{增加赞助二维码} +% \section{赞助} +% 如果觉得\xduts{}对您有所帮助,可以扫描\figrefx{fig:zanzhu}中的二维码来赞助\xduts{},赞助主要用于给作者补充营养。 +% \begin{figure}[h] +% \centering +% \subcaptionbox{支付宝}{\textcolor[RGB]{22,120,255}{\qrcode[height=4cm]{https://qr.alipay.com/fkx159591dqeuttcwbaurb5}}}\qquad\qquad +% \subcaptionbox{微信支付}{\textcolor[RGB]{7,193,96}{\qrcode[height=4cm]{wxp://f2f0Pkqu8eK5cgsln6RSPWFQi4SGT\_bM8hMuuIp2vk7Y0Zc}}} +% \caption{赞助二维码} +% \label{fig:zanzhu} +% \end{figure} % \clearpage % \end{documentation} % \begin{implementation} @@ -1706,8 +1726,9 @@ literate = {\$}{{\textcolor{purple3}{\$}}}{1} % \begin{macrocode} math-font .choices:nn = { - asana, cambria, cm, fira, garamond, lm, libertinus, stix, - bonum, dejavu, pagella, schola, termes, xits, erewhon, none + asana, bonum, cambria, cm, concrete, dejavu, erewhon, euler, + fira, garamond, gfsneohellenic, kp, libertinus, lm, newcm, + pagella, schola, stix, stix2, termes, xcharter, xits, none } { \tl_set_eq:NN \l_@@_math_font_tl \l_keys_choice_tl }, unicode-math .tl_set:N = \l_@@_unicode_math_tl, @@ -1740,30 +1761,8 @@ literate = {\$}{{\textcolor{purple3}{\$}}}{1} } % \end{macrocode} % \end{macro} -% \begin{macro}{\@@_if_platform_macos:FT} % \changes{v0.5.1.0}{2022/04/06}{判断操作系统是否是macOS} -% 判断操作系统是否是macOS。 -% \begin{arguments} -% \item 非macOS。 -% \item macOS。 -% \end{arguments} -% \begin{macrocode} -\cs_new:Npn \@@_if_platform_macos:FT #1#2 - { \file_if_exist:nTF { /System/Library/Fonts/Menlo.ttc } { #2 } { #1 } } -% \end{macrocode} -% \end{macro} -% \begin{macro}{\@@_texmf_font:nn} % \changes{v0.5.1.0}{2022/04/06}{加载字体时自动判断是否为macOS平台} -% 调用TEXMF中的字体时根据操作系统是否是macOS自动选择调用字体名或文件名。 -% \begin{arguments} -% \item 字体名。 -% \item 文件名。 -% \end{arguments} -% \begin{macrocode} -\cs_new:Npn \@@_texmf_font:nn #1#2 - { \@@_if_platform_macos:FT { #1 } { #2 } } -% \end{macrocode} -% \end{macro} % \begin{macro}{\@@_select_font:nn} % 自动选择字体文件名称或字体名称。 % \begin{arguments} @@ -2360,6 +2359,9 @@ literate = {\$}{{\textcolor{purple3}{\$}}}{1} % \end{macro} % \begin{macro}{\@@_define_math_font:nn} % 批量定义数学字体配置。 +% \changes{v2.16.1.0}{2022/11/27}{修改XITS Math数学字体调用方式} +% \changes{v2.16.0.0}{2022/11/27}{增加若干数学字体} +% \changes{v2.15.0.0}{2022/11/26}{增加New Computer Modern Math数学字体} % \changes{v2.13.0.0}{2022/11/21}{增加Erewhon Math数学字体} % \changes{v0.2.0.0}{2022/04/04}{增加Garamond Math数学字体} % \changes{v0.5.1.0}{2022/04/06}{适配macOS平台MacTeX内置数学字体} @@ -2378,40 +2380,32 @@ literate = {\$}{{\textcolor{purple3}{\$}}}{1} } \clist_map_inline:nn { - { asana } { Asana-Math.otf }, - { fira } { FiraMath-Regular.otf }, - { garamond } { Garamond-Math.otf }, - { lm } { latinmodern-math.otf }, - { erewhon } { Erewhon-Math.otf }, - { libertinus } { LibertinusMath-Regular.otf }, - { stix } { STIXMath-Regular.otf }, - { bonum } { texgyrebonum-math.otf }, - { dejavu } { texgyredejavu-math.otf }, - { pagella } { texgyrepagella-math.otf }, - { schola } { texgyreschola-math.otf }, - { termes } { texgyretermes-math.otf } + { asana } { Asana-Math.otf }, + { concrete } { Concrete-Math.otf }, + { erewhon } { Erewhon-Math.otf }, + { euler } { Euler-Math.otf }, + { fira } { FiraMath-Regular.otf }, + { garamond } { Garamond-Math.otf }, + { gfsneohellenic } { GFSNeohellenicMath.otf }, + { kp } { KpMath-Regular.otf }, + { libertinus } { LibertinusMath-Regular.otf }, + { lm } { latinmodern-math.otf }, + { newcm } { NewCMMath-Regular.otf }, + { stix } { STIXMath-Regular.otf }, + { stix2 } { STIXTwoMath-Regular.otf }, + { xcharter } { XCharter-Math.otf }, + { xits } { XITSMath-Regular.otf }, + { bonum } { texgyrebonum-math.otf }, + { dejavu } { texgyredejavu-math.otf }, + { pagella } { texgyrepagella-math.otf }, + { schola } { texgyreschola-math.otf }, + { termes } { texgyretermes-math.otf } } { \@@_define_math_font:nn #1 } % \end{macrocode} % \end{macro} -% \begin{macro}{\@@_load_math_font_xits:} % \changes{v0.5.1.0}{2022/04/06}{适配macOS平台MacTeX内置XITSMath数学字体} % \changes{v2.12.1.0}{2022/07/03}{移除XITSMath数学字体冗余语句} -% 数学字体配置\valuex{xits}。 -% \begin{macrocode} -\cs_new:Npn \@@_load_math_font_xits: - { - \@@_load_unicode_math_pkg: - \@@_if_platform_macos:FT - { \setmathfont { XITS~Math } } - { - \setmathfont { XITSMath-Regular.otf } - \setmathfont { XITSMath-Bold.otf } - [ range= { bfup -> up, bfit -> it } ] - } - } -% \end{macrocode} -% \end{macro} % \begin{macro}{\@@_load_math_font_cm:} % 数学字体配置\valuex{cm}。 % \begin{macrocode} diff --git a/Master/texmf-dist/tex/xelatex/xduts/xdufont.sty b/Master/texmf-dist/tex/xelatex/xduts/xdufont.sty index 46631292cef..4233f10dfc5 100644 --- a/Master/texmf-dist/tex/xelatex/xduts/xdufont.sty +++ b/Master/texmf-dist/tex/xelatex/xduts/xdufont.sty @@ -28,7 +28,7 @@ \NeedsTeXFormat{LaTeX2e} \RequirePackage{expl3} \ProvidesExplPackage{xdufont} - {2022/11/23}{2.14.1.3} + {2022/11/27}{2.16.1.3} {Xidian University Font package} \RequirePackage { xparse, l3keys2e } \PassOptionsToPackage { quiet } { xeCJK } @@ -52,8 +52,9 @@ { \tl_set_eq:NN \l__xdu_latin_font_tl \l_keys_choice_tl }, math-font .choices:nn = { - asana, cambria, cm, fira, garamond, lm, libertinus, stix, - bonum, dejavu, pagella, schola, termes, xits, erewhon, none + asana, bonum, cambria, cm, concrete, dejavu, erewhon, euler, + fira, garamond, gfsneohellenic, kp, libertinus, lm, newcm, + pagella, schola, stix, stix2, termes, xcharter, xits, none } { \tl_set_eq:NN \l__xdu_math_font_tl \l_keys_choice_tl }, unicode-math .tl_set:N = \l__xdu_unicode_math_tl, @@ -72,10 +73,6 @@ style / font-type = font, style / font-path = fonts } -\cs_new:Npn \__xdu_if_platform_macos:FT #1#2 - { \file_if_exist:nTF { /System/Library/Fonts/Menlo.ttc } { #2 } { #1 } } -\cs_new:Npn \__xdu_texmf_font:nn #1#2 - { \__xdu_if_platform_macos:FT { #1 } { #2 } } \cs_new:Npn \__xdu_select_font:nn #1#2 { \str_if_eq:NNTF { \l__xdu_font_type_tl } { font } @@ -405,31 +402,28 @@ } \clist_map_inline:nn { - { asana } { Asana-Math.otf }, - { fira } { FiraMath-Regular.otf }, - { garamond } { Garamond-Math.otf }, - { lm } { latinmodern-math.otf }, - { erewhon } { Erewhon-Math.otf }, - { libertinus } { LibertinusMath-Regular.otf }, - { stix } { STIXMath-Regular.otf }, - { bonum } { texgyrebonum-math.otf }, - { dejavu } { texgyredejavu-math.otf }, - { pagella } { texgyrepagella-math.otf }, - { schola } { texgyreschola-math.otf }, - { termes } { texgyretermes-math.otf } + { asana } { Asana-Math.otf }, + { concrete } { Concrete-Math.otf }, + { erewhon } { Erewhon-Math.otf }, + { euler } { Euler-Math.otf }, + { fira } { FiraMath-Regular.otf }, + { garamond } { Garamond-Math.otf }, + { gfsneohellenic } { GFSNeohellenicMath.otf }, + { kp } { KpMath-Regular.otf }, + { libertinus } { LibertinusMath-Regular.otf }, + { lm } { latinmodern-math.otf }, + { newcm } { NewCMMath-Regular.otf }, + { stix } { STIXMath-Regular.otf }, + { stix2 } { STIXTwoMath-Regular.otf }, + { xcharter } { XCharter-Math.otf }, + { xits } { XITSMath-Regular.otf }, + { bonum } { texgyrebonum-math.otf }, + { dejavu } { texgyredejavu-math.otf }, + { pagella } { texgyrepagella-math.otf }, + { schola } { texgyreschola-math.otf }, + { termes } { texgyretermes-math.otf } } { \__xdu_define_math_font:nn #1 } -\cs_new:Npn \__xdu_load_math_font_xits: - { - \__xdu_load_unicode_math_pkg: - \__xdu_if_platform_macos:FT - { \setmathfont { XITS~Math } } - { - \setmathfont { XITSMath-Regular.otf } - \setmathfont { XITSMath-Bold.otf } - [ range= { bfup -> up, bfit -> it } ] - } - } \cs_new:Npn \__xdu_load_math_font_cm: { } \cs_new:Npn \__xdu_load_math_font_none: { } \cs_new:Npn \__xdu_load_font: diff --git a/Master/texmf-dist/tex/xelatex/xduts/xdupgthesis.cls b/Master/texmf-dist/tex/xelatex/xduts/xdupgthesis.cls index 56bf7154be2..c6f32e9f0f2 100644 --- a/Master/texmf-dist/tex/xelatex/xduts/xdupgthesis.cls +++ b/Master/texmf-dist/tex/xelatex/xduts/xdupgthesis.cls @@ -28,7 +28,7 @@ \NeedsTeXFormat{LaTeX2e} \RequirePackage{expl3} \ProvidesExplClass{xdupgthesis} - {2022/11/23}{2.14.1.3} + {2022/11/27}{2.16.1.3} {Xidian University Postgraduate Thesis document class} \RequirePackage { xparse, l3keys2e } \PassOptionsToPackage { quiet } { xeCJK } @@ -65,8 +65,9 @@ { \tl_set_eq:NN \l__xdu_latin_font_tl \l_keys_choice_tl }, math-font .choices:nn = { - asana, cambria, cm, fira, garamond, lm, libertinus, stix, - bonum, dejavu, pagella, schola, termes, xits, erewhon, none + asana, bonum, cambria, cm, concrete, dejavu, erewhon, euler, + fira, garamond, gfsneohellenic, kp, libertinus, lm, newcm, + pagella, schola, stix, stix2, termes, xcharter, xits, none } { \tl_set_eq:NN \l__xdu_math_font_tl \l_keys_choice_tl }, unicode-math .tl_set:N = \l__xdu_unicode_math_tl, @@ -85,10 +86,6 @@ style / font-type = font, style / font-path = fonts } -\cs_new:Npn \__xdu_if_platform_macos:FT #1#2 - { \file_if_exist:nTF { /System/Library/Fonts/Menlo.ttc } { #2 } { #1 } } -\cs_new:Npn \__xdu_texmf_font:nn #1#2 - { \__xdu_if_platform_macos:FT { #1 } { #2 } } \cs_new:Npn \__xdu_select_font:nn #1#2 { \str_if_eq:NNTF { \l__xdu_font_type_tl } { font } @@ -418,31 +415,28 @@ } \clist_map_inline:nn { - { asana } { Asana-Math.otf }, - { fira } { FiraMath-Regular.otf }, - { garamond } { Garamond-Math.otf }, - { lm } { latinmodern-math.otf }, - { erewhon } { Erewhon-Math.otf }, - { libertinus } { LibertinusMath-Regular.otf }, - { stix } { STIXMath-Regular.otf }, - { bonum } { texgyrebonum-math.otf }, - { dejavu } { texgyredejavu-math.otf }, - { pagella } { texgyrepagella-math.otf }, - { schola } { texgyreschola-math.otf }, - { termes } { texgyretermes-math.otf } + { asana } { Asana-Math.otf }, + { concrete } { Concrete-Math.otf }, + { erewhon } { Erewhon-Math.otf }, + { euler } { Euler-Math.otf }, + { fira } { FiraMath-Regular.otf }, + { garamond } { Garamond-Math.otf }, + { gfsneohellenic } { GFSNeohellenicMath.otf }, + { kp } { KpMath-Regular.otf }, + { libertinus } { LibertinusMath-Regular.otf }, + { lm } { latinmodern-math.otf }, + { newcm } { NewCMMath-Regular.otf }, + { stix } { STIXMath-Regular.otf }, + { stix2 } { STIXTwoMath-Regular.otf }, + { xcharter } { XCharter-Math.otf }, + { xits } { XITSMath-Regular.otf }, + { bonum } { texgyrebonum-math.otf }, + { dejavu } { texgyredejavu-math.otf }, + { pagella } { texgyrepagella-math.otf }, + { schola } { texgyreschola-math.otf }, + { termes } { texgyretermes-math.otf } } { \__xdu_define_math_font:nn #1 } -\cs_new:Npn \__xdu_load_math_font_xits: - { - \__xdu_load_unicode_math_pkg: - \__xdu_if_platform_macos:FT - { \setmathfont { XITS~Math } } - { - \setmathfont { XITSMath-Regular.otf } - \setmathfont { XITSMath-Bold.otf } - [ range= { bfup -> up, bfit -> it } ] - } - } \cs_new:Npn \__xdu_load_math_font_cm: { } \cs_new:Npn \__xdu_load_math_font_none: { } \cs_new:Npn \__xdu_load_font: diff --git a/Master/texmf-dist/tex/xelatex/xduts/xduugthesis.cls b/Master/texmf-dist/tex/xelatex/xduts/xduugthesis.cls index 5a8cbf3d84e..f4b4c5fbca0 100644 --- a/Master/texmf-dist/tex/xelatex/xduts/xduugthesis.cls +++ b/Master/texmf-dist/tex/xelatex/xduts/xduugthesis.cls @@ -28,7 +28,7 @@ \NeedsTeXFormat{LaTeX2e} \RequirePackage{expl3} \ProvidesExplClass{xduugthesis} - {2022/11/23}{2.14.1.3} + {2022/11/27}{2.16.1.3} {Xidian University Undergraduate Thesis document class} \RequirePackage { xparse, l3keys2e } \PassOptionsToPackage { quiet } { xeCJK } @@ -66,8 +66,9 @@ { \tl_set_eq:NN \l__xdu_latin_font_tl \l_keys_choice_tl }, math-font .choices:nn = { - asana, cambria, cm, fira, garamond, lm, libertinus, stix, - bonum, dejavu, pagella, schola, termes, xits, erewhon, none + asana, bonum, cambria, cm, concrete, dejavu, erewhon, euler, + fira, garamond, gfsneohellenic, kp, libertinus, lm, newcm, + pagella, schola, stix, stix2, termes, xcharter, xits, none } { \tl_set_eq:NN \l__xdu_math_font_tl \l_keys_choice_tl }, unicode-math .tl_set:N = \l__xdu_unicode_math_tl, @@ -86,10 +87,6 @@ style / font-type = font, style / font-path = fonts } -\cs_new:Npn \__xdu_if_platform_macos:FT #1#2 - { \file_if_exist:nTF { /System/Library/Fonts/Menlo.ttc } { #2 } { #1 } } -\cs_new:Npn \__xdu_texmf_font:nn #1#2 - { \__xdu_if_platform_macos:FT { #1 } { #2 } } \cs_new:Npn \__xdu_select_font:nn #1#2 { \str_if_eq:NNTF { \l__xdu_font_type_tl } { font } @@ -419,31 +416,28 @@ } \clist_map_inline:nn { - { asana } { Asana-Math.otf }, - { fira } { FiraMath-Regular.otf }, - { garamond } { Garamond-Math.otf }, - { lm } { latinmodern-math.otf }, - { erewhon } { Erewhon-Math.otf }, - { libertinus } { LibertinusMath-Regular.otf }, - { stix } { STIXMath-Regular.otf }, - { bonum } { texgyrebonum-math.otf }, - { dejavu } { texgyredejavu-math.otf }, - { pagella } { texgyrepagella-math.otf }, - { schola } { texgyreschola-math.otf }, - { termes } { texgyretermes-math.otf } + { asana } { Asana-Math.otf }, + { concrete } { Concrete-Math.otf }, + { erewhon } { Erewhon-Math.otf }, + { euler } { Euler-Math.otf }, + { fira } { FiraMath-Regular.otf }, + { garamond } { Garamond-Math.otf }, + { gfsneohellenic } { GFSNeohellenicMath.otf }, + { kp } { KpMath-Regular.otf }, + { libertinus } { LibertinusMath-Regular.otf }, + { lm } { latinmodern-math.otf }, + { newcm } { NewCMMath-Regular.otf }, + { stix } { STIXMath-Regular.otf }, + { stix2 } { STIXTwoMath-Regular.otf }, + { xcharter } { XCharter-Math.otf }, + { xits } { XITSMath-Regular.otf }, + { bonum } { texgyrebonum-math.otf }, + { dejavu } { texgyredejavu-math.otf }, + { pagella } { texgyrepagella-math.otf }, + { schola } { texgyreschola-math.otf }, + { termes } { texgyretermes-math.otf } } { \__xdu_define_math_font:nn #1 } -\cs_new:Npn \__xdu_load_math_font_xits: - { - \__xdu_load_unicode_math_pkg: - \__xdu_if_platform_macos:FT - { \setmathfont { XITS~Math } } - { - \setmathfont { XITSMath-Regular.otf } - \setmathfont { XITSMath-Bold.otf } - [ range= { bfup -> up, bfit -> it } ] - } - } \cs_new:Npn \__xdu_load_math_font_cm: { } \cs_new:Npn \__xdu_load_math_font_none: { } \cs_new:Npn \__xdu_load_font: -- cgit v1.2.3