summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/tex/latex')
-rw-r--r--Master/texmf-dist/tex/latex/beautybook/beautybook-CN.cls (renamed from Master/texmf-dist/tex/latex/beautybook/Beautybook-CN.cls)231
-rw-r--r--Master/texmf-dist/tex/latex/beautybook/beautybook-EN.cls (renamed from Master/texmf-dist/tex/latex/beautybook/Beautybook-EN.cls)117
-rw-r--r--Master/texmf-dist/tex/latex/beautybook/stys/beautybook-bottompage.sty (renamed from Master/texmf-dist/tex/latex/beautybook/stys/Beautybook-bottompage.sty)2
-rw-r--r--Master/texmf-dist/tex/latex/beautybook/stys/beautybook-cover-birkar.sty (renamed from Master/texmf-dist/tex/latex/beautybook/stys/Beautybook-cover-birkar.sty)118
-rw-r--r--Master/texmf-dist/tex/latex/beautybook/stys/beautybook-cover-cn.sty (renamed from Master/texmf-dist/tex/latex/beautybook/stys/Beautybook-cover-cn.sty)28
-rw-r--r--Master/texmf-dist/tex/latex/beautybook/stys/beautybook-cover-en.sty (renamed from Master/texmf-dist/tex/latex/beautybook/stys/Beautybook-cover-en.sty)6
-rw-r--r--Master/texmf-dist/tex/latex/beautybook/stys/beautybook-cover-enfig.sty (renamed from Master/texmf-dist/tex/latex/beautybook/stys/Beautybook-cover-enfig.sty)5
-rw-r--r--Master/texmf-dist/tex/latex/nicematrix/nicematrix.sty73
-rw-r--r--Master/texmf-dist/tex/latex/preview/prauctex.cfg6
-rw-r--r--Master/texmf-dist/tex/latex/preview/preview.sty4
-rw-r--r--Master/texmf-dist/tex/latex/sjtutex/font/sjtu-cjk-font-adobe-ja.def4
-rw-r--r--Master/texmf-dist/tex/latex/sjtutex/font/sjtu-cjk-font-adobe-zh.def4
-rw-r--r--Master/texmf-dist/tex/latex/sjtutex/font/sjtu-cjk-font-adobe.def4
-rw-r--r--Master/texmf-dist/tex/latex/sjtutex/font/sjtu-cjk-font-fandol-ja.def4
-rw-r--r--Master/texmf-dist/tex/latex/sjtutex/font/sjtu-cjk-font-fandol-zh.def4
-rw-r--r--Master/texmf-dist/tex/latex/sjtutex/font/sjtu-cjk-font-fandol.def4
-rw-r--r--Master/texmf-dist/tex/latex/sjtutex/font/sjtu-cjk-font-founder-ja.def4
-rw-r--r--Master/texmf-dist/tex/latex/sjtutex/font/sjtu-cjk-font-founder-zh.def4
-rw-r--r--Master/texmf-dist/tex/latex/sjtutex/font/sjtu-cjk-font-founder.def4
-rw-r--r--Master/texmf-dist/tex/latex/sjtutex/font/sjtu-cjk-font-mac-ja.def4
-rw-r--r--Master/texmf-dist/tex/latex/sjtutex/font/sjtu-cjk-font-mac-zh.def4
-rw-r--r--Master/texmf-dist/tex/latex/sjtutex/font/sjtu-cjk-font-mac.def4
-rw-r--r--Master/texmf-dist/tex/latex/sjtutex/font/sjtu-cjk-font-ubuntu-ja.def4
-rw-r--r--Master/texmf-dist/tex/latex/sjtutex/font/sjtu-cjk-font-ubuntu-zh.def4
-rw-r--r--Master/texmf-dist/tex/latex/sjtutex/font/sjtu-cjk-font-ubuntu.def4
-rw-r--r--Master/texmf-dist/tex/latex/sjtutex/font/sjtu-cjk-font-windows-ja.def4
-rw-r--r--Master/texmf-dist/tex/latex/sjtutex/font/sjtu-cjk-font-windows-zh.def4
-rw-r--r--Master/texmf-dist/tex/latex/sjtutex/font/sjtu-cjk-font-windows.def4
-rw-r--r--Master/texmf-dist/tex/latex/sjtutex/font/sjtu-math-font-cambria.def4
-rw-r--r--Master/texmf-dist/tex/latex/sjtutex/font/sjtu-math-font-libertinus.def4
-rw-r--r--Master/texmf-dist/tex/latex/sjtutex/font/sjtu-math-font-lm.def4
-rw-r--r--Master/texmf-dist/tex/latex/sjtutex/font/sjtu-math-font-newcm.def4
-rw-r--r--Master/texmf-dist/tex/latex/sjtutex/font/sjtu-math-font-newpx.def4
-rw-r--r--Master/texmf-dist/tex/latex/sjtutex/font/sjtu-math-font-newtx.def4
-rw-r--r--Master/texmf-dist/tex/latex/sjtutex/font/sjtu-math-font-stixtwo.def4
-rw-r--r--Master/texmf-dist/tex/latex/sjtutex/font/sjtu-math-font-times.def4
-rw-r--r--Master/texmf-dist/tex/latex/sjtutex/font/sjtu-math-font-xits.def4
-rw-r--r--Master/texmf-dist/tex/latex/sjtutex/font/sjtu-text-font-cambria.def4
-rw-r--r--Master/texmf-dist/tex/latex/sjtutex/font/sjtu-text-font-libertinus.def4
-rw-r--r--Master/texmf-dist/tex/latex/sjtutex/font/sjtu-text-font-lm.def4
-rw-r--r--Master/texmf-dist/tex/latex/sjtutex/font/sjtu-text-font-newcm.def4
-rw-r--r--Master/texmf-dist/tex/latex/sjtutex/font/sjtu-text-font-newpx.def4
-rw-r--r--Master/texmf-dist/tex/latex/sjtutex/font/sjtu-text-font-newtx.def4
-rw-r--r--Master/texmf-dist/tex/latex/sjtutex/font/sjtu-text-font-stixtwo.def4
-rw-r--r--Master/texmf-dist/tex/latex/sjtutex/font/sjtu-text-font-times.def4
-rw-r--r--Master/texmf-dist/tex/latex/sjtutex/font/sjtu-text-font-xits.def4
-rw-r--r--Master/texmf-dist/tex/latex/sjtutex/lang/sjtu-lang-generic-de.def4
-rw-r--r--Master/texmf-dist/tex/latex/sjtutex/lang/sjtu-lang-generic-en.def4
-rw-r--r--Master/texmf-dist/tex/latex/sjtutex/lang/sjtu-lang-generic-ja.def4
-rw-r--r--Master/texmf-dist/tex/latex/sjtutex/lang/sjtu-lang-generic-zh.def4
-rw-r--r--Master/texmf-dist/tex/latex/sjtutex/lang/sjtu-lang-thesis-de.def4
-rw-r--r--Master/texmf-dist/tex/latex/sjtutex/lang/sjtu-lang-thesis-en.def4
-rw-r--r--Master/texmf-dist/tex/latex/sjtutex/lang/sjtu-lang-thesis-ja.def4
-rw-r--r--Master/texmf-dist/tex/latex/sjtutex/lang/sjtu-lang-thesis-zh.def4
-rw-r--r--Master/texmf-dist/tex/latex/sjtutex/name/sjtu-name-generic-de.def4
-rw-r--r--Master/texmf-dist/tex/latex/sjtutex/name/sjtu-name-generic-en.def4
-rw-r--r--Master/texmf-dist/tex/latex/sjtutex/name/sjtu-name-generic-ja.def4
-rw-r--r--Master/texmf-dist/tex/latex/sjtutex/name/sjtu-name-generic-zh.def4
-rw-r--r--Master/texmf-dist/tex/latex/sjtutex/name/sjtu-name-thesis-de.def4
-rw-r--r--Master/texmf-dist/tex/latex/sjtutex/name/sjtu-name-thesis-en.def6
-rw-r--r--Master/texmf-dist/tex/latex/sjtutex/name/sjtu-name-thesis-ja.def4
-rw-r--r--Master/texmf-dist/tex/latex/sjtutex/name/sjtu-name-thesis-zh.def4
-rw-r--r--Master/texmf-dist/tex/latex/sjtutex/scheme/sjtu-scheme-de.def4
-rw-r--r--Master/texmf-dist/tex/latex/sjtutex/scheme/sjtu-scheme-en.def4
-rw-r--r--Master/texmf-dist/tex/latex/sjtutex/scheme/sjtu-scheme-ja.def4
-rw-r--r--Master/texmf-dist/tex/latex/sjtutex/scheme/sjtu-scheme-zh.def4
-rw-r--r--Master/texmf-dist/tex/latex/sjtutex/sjtuarticle.cls12
-rw-r--r--Master/texmf-dist/tex/latex/sjtutex/sjtureport.cls12
-rw-r--r--Master/texmf-dist/tex/latex/sjtutex/sjtuthesis.cls12
69 files changed, 517 insertions, 335 deletions
diff --git a/Master/texmf-dist/tex/latex/beautybook/Beautybook-CN.cls b/Master/texmf-dist/tex/latex/beautybook/beautybook-CN.cls
index d3ab12a333e..49f94464bf6 100644
--- a/Master/texmf-dist/tex/latex/beautybook/Beautybook-CN.cls
+++ b/Master/texmf-dist/tex/latex/beautybook/beautybook-CN.cls
@@ -1,14 +1,12 @@
%This Class is based on the default book class and options will be passed
\NeedsTeXFormat{LaTeX2e}
-\ProvidesClass{Beautybook-CN}[02-10-2023 V8.0 Beautybook Class]
+\ProvidesClass{beautybook-CN}[30-06-2024 V10.0 Beautybook Class]
\DeclareOption*{\PassOptionsToClass{\CurrentOption}{ctexbook}}
\ProcessOptions\relax
\LoadClass[twoside,a4paper]{ctexbook}
\RequirePackage[dvipsnames,svgnames,x11names,table]{xcolor}
\RequirePackage{cncolours}
-\setmainfont{Times New Roman}
-\setsansfont{HONOR Sans}
-\setmonofont{Latin Modern Mono}
+\usepackage{fontspec}
\colorlet{outermarginfgcolor}{DarkCyan} % foregroundcolor 较深
\colorlet{outermarginbgcolor}{DarkCyan!30} % backgroundcolor 较浅
\RequirePackage{bropd} % math 自适应数学括号命令 \br{} !!!
@@ -21,64 +19,68 @@
\RequirePackage{pgfplots} %画图 %%页面样式设计核心包 %提供\pgfonlayer命令以及下列图层指令
\pgfplotsset{compat=1.18}
%
+% /* -------------------------------------------------------------------------- */
+% /* 解决birkar封面不能用于a4paper问题 */
+% /* -------------------------------------------------------------------------- */
+\makeatletter
+\ExplSyntaxOn
+\cs_new:Npn \ifaivpaper@TF
+ {
+ \bool_lazy_and:nnTF
+ { \dim_compare_p:nNn { 297mm } = { \paperheight } } % 不能是 29.7cm
+ { \dim_compare_p:nNn { 210mm } = { \paperwidth } }
+ }
+\ExplSyntaxOff
+% \ifaivpaper@TF{a4paper内容}{not a4paper内容} % 这个用在想要判断a4paper的地方
+\makeatother
+% /* -------------------------------------------------------------------------- */
+% /* 解决birkar封面不能用于a4paper问题 */
+% /* -------------------------------------------------------------------------- */
\ExplSyntaxOn
% 封面切换程序 (LaTeX3)!
-\keys_define:nn {Beautybook/coverstyle}
+\keys_define:nn {beautybook/coverstyle}
{
cover-choose.choice:,
cover-choose.value_required:n = true,
- cover-choose/cn.code:n = {\RequirePackage{stys/Beautybook-cover-cn}},
- cover-choose/en.code:n = {\RequirePackage{stys/Beautybook-cover-en}},
- cover-choose/enfig.code:n = {\RequirePackage{stys/Beautybook-cover-enfig}},
- cover-choose/birkar.code:n = {\RequirePackage{stys/Beautybook-cover-birkar}},
+ cover-choose/cn.code:n = {\RequirePackage{stys/beautybook-cover-cn}},
+ cover-choose/en.code:n = {\RequirePackage{stys/beautybook-cover-en}},
+ cover-choose/enfig.code:n = {\RequirePackage{stys/beautybook-cover-enfig}},
+ cover-choose/birkar.code:n = {\RequirePackage{stys/beautybook-cover-birkar}},
%cover-choose .initial:n = en , % 设置 en 为初始值
}
-\newtoks \l__Beautybook_tmpa_toks
+\newtoks \l__beautybook_tmpa_toks
\cs_new_protected:Npn \coverstyle
{
- \tex_afterassignment:D \__Beautybook_set_coverstyle:
- \l__Beautybook_tmpa_toks
+ \tex_afterassignment:D \__beautybook_set_coverstyle:
+ \l__beautybook_tmpa_toks
}
-\cs_new:Npn \__Beautybook_set_coverstyle:
- { \keys_set:nV { Beautybook / coverstyle } \l__Beautybook_tmpa_toks }
+\cs_new:Npn \__beautybook_set_coverstyle:
+ { \keys_set:nV { beautybook / coverstyle } \l__beautybook_tmpa_toks }
% Math fonts
-\keys_define:nn {Beautybook/mathstyle}
+\keys_define:nn {beautybook/mathstyle}
{
math-font.choice:,
math-font.value_required:n = true,
- math-font/plain.code:n={},
- math-font/stix.code:n={
- \RequirePackage{stix}
- },
+ math-font/plain.code:n={
+ \RequirePackage{amssymb,amsfonts,upgreek}
+ },
math-font/mtpro2.code:n = {
+ \RequirePackage{amssymb,amsfonts,upgreek}
+ \let\Bbbk\relex
\RequirePackage{mtpro2}
\RequirePackage{bm}
- \DeclareFontFamily{U}{nxlmi}{}
- \DeclareFontSubstitution{U}{nxlmi}{m}{it}
- \DeclareFontShape{U}{nxlmi}{m}{it}{
- <-6.3> nxlmi05
- <6.3-8.6> nxlmi07
- <8.6-> nxlmi0
- }{}
-
- \DeclareFontShape{U}{nxlmi}{b}{it}{
- <-6.3> nxlbmi05
- <6.3-8.6> nxlbmi07
- <8.6-> nxlbmi0
- }{}
- \renewcommand{\partial}{{\text{\usefont{U}{nxlmi}{m}{it}\symbol{64}}\mspace{1mu}}}
},
%cover-choose .initial:n = plain , % 设置 en 为初始值
}
\cs_new_protected:Npn \mathstyle
{
- \tex_afterassignment:D \__Beautybook_set_mathstyle:
- \l__Beautybook_tmpa_toks
+ \tex_afterassignment:D \__beautybook_set_mathstyle:
+ \l__beautybook_tmpa_toks
}
-\cs_new:Npn \__Beautybook_set_mathstyle:
- { \keys_set:nV { Beautybook / mathstyle } \l__Beautybook_tmpa_toks }
+\cs_new:Npn \__beautybook_set_mathstyle:
+ { \keys_set:nV { beautybook / mathstyle } \l__beautybook_tmpa_toks }
\ExplSyntaxOff
-\RequirePackage{stys/Beautybook-bottompage} %封底
+\RequirePackage{stys/beautybook-bottompage} %封底
\RequirePackage{rotating}
\tikzset{>=Stealth}
\setlist{font=\upshape} % 取消所有列表默认距离 nosep,
@@ -110,7 +112,6 @@
\RequirePackage{appendix} % 附录
% \RequirePackage{stys/symbols}
%
-\RequirePackage{amssymb,amsfonts,upgreek}
\RequirePackage{makeidx}
\RequirePackage{etoolbox} % 判断函数
\RequirePackage{paracol}
@@ -300,38 +301,38 @@ fuzzy shadow={0.4mm}{-0.4mm}{0mm}{0.2mm}{fill=white!40!gray},%下
\makeatletter
% titleimage
\ExplSyntaxOn
-\seq_new:N \g__Beautybook_chapter_oimage_seq % odd
-\seq_new:N \g__Beautybook_chapter_eimage_seq % even
-\seq_new:N \g__Beautybook_part_oimage_seq % odd
-\seq_new:N \g__Beautybook_part_eimage_seq % even
+\seq_new:N \g__beautybook_chapter_oimage_seq % odd
+\seq_new:N \g__beautybook_chapter_eimage_seq % even
+\seq_new:N \g__beautybook_part_oimage_seq % odd
+\seq_new:N \g__beautybook_part_eimage_seq % even
%
-\keys_define:nn { Beautybook/titleimage }
+\keys_define:nn { beautybook/titleimage }
{
chapteroddimage .code:n =
- \seq_gset_from_clist:Nn \g__Beautybook_chapter_oimage_seq {#1} ,
+ \seq_gset_from_clist:Nn \g__beautybook_chapter_oimage_seq {#1} ,
chapterevenimage .code:n =
- \seq_gset_from_clist:Nn \g__Beautybook_chapter_eimage_seq {#1} ,
+ \seq_gset_from_clist:Nn \g__beautybook_chapter_eimage_seq {#1} ,
partoddimage .code:n =
- \seq_gset_from_clist:Nn \g__Beautybook_part_oimage_seq {#1} ,
+ \seq_gset_from_clist:Nn \g__beautybook_part_oimage_seq {#1} ,
partevenimage .code:n =
- \seq_gset_from_clist:Nn \g__Beautybook_part_eimage_seq {#1} ,
+ \seq_gset_from_clist:Nn \g__beautybook_part_eimage_seq {#1} ,
}
-\cs_new:Npn \__Beautybook_title_image:Nn #1#2 % image seq, number
+\cs_new:Npn \__beautybook_title_image:Nn #1#2 % image seq, number
{ \seq_item:Nn #1 { \int_mod:nn {#2} { \seq_count:N #1 } + 1 } } %对照表-对录入的字符串进行编号
-\cs_new:Npn \Beautybook@chapterimagename %生成索契表 : 判断奇偶数页并按(章节编号)!!读取相应的列表组中的字符串
+\cs_new:Npn \beautybook@chapterimagename %生成索契表 : 判断奇偶数页并按(章节编号)!!读取相应的列表组中的字符串
{
\int_if_odd:nTF { \value{page} }
- { \__Beautybook_title_image:Nn \g__Beautybook_chapter_oimage_seq { \value{chapter} } }
- { \__Beautybook_title_image:Nn \g__Beautybook_chapter_eimage_seq { \value{chapter} } }
+ { \__beautybook_title_image:Nn \g__beautybook_chapter_oimage_seq { \value{chapter} } }
+ { \__beautybook_title_image:Nn \g__beautybook_chapter_eimage_seq { \value{chapter} } }
}
-\cs_new:Npn \Beautybook@partimagename
+\cs_new:Npn \beautybook@partimagename
{
\int_if_odd:nTF { \value{page} }
- { \__Beautybook_title_image:Nn \g__Beautybook_part_oimage_seq { \value{part} } }
- { \__Beautybook_title_image:Nn \g__Beautybook_part_eimage_seq { \value{part} } }
+ { \__beautybook_title_image:Nn \g__beautybook_part_oimage_seq { \value{part} } }
+ { \__beautybook_title_image:Nn \g__beautybook_part_eimage_seq { \value{part} } }
}
\cs_new_protected:Npn \titleimage #1
- { \keys_set:nn { Beautybook/titleimage } {#1} }
+ { \keys_set:nn { beautybook/titleimage } {#1} }
\ExplSyntaxOff
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\titleformat{\chapter}{\huge\bfseries\filcenter}{}{1em}{
@@ -398,14 +399,14 @@ fuzzy shadow={0.4mm}{-0.4mm}{0mm}{0.2mm}{fill=white!40!gray},%下
\end{pgfonlayer}
\ifodd\value{page}
\begin{pgfonlayer}{top}
- \node[above left,font=\sc\fontsize{25pt}{25pt}\selectfont,align=center] (contents name) at ([shift={(0cm,-4.45cm)}]current page.north east) {\begin{varwidth}{.7\linewidth}\baselineskip=2ex #1\end{varwidth}};
+ \node[above left,font=\sc\fontsize{25pt}{25pt}\selectfont,align=center] (contents name) at ([shift={(0cm,-4.45cm)}]current page.north east) {\begin{varwidth}{.7\linewidth}\baselineskip=25pt #1\end{varwidth}};
\end{pgfonlayer}
\begin{pgfonlayer}{bottom}
\node[right] (image) at ([shift={(-0.5cm,-2.8cm)}]current page.north west) {\includegraphics[width=7cm]{\@chapimage}};
\end{pgfonlayer}
\else
\begin{pgfonlayer}{top}
- \node[above right,font=\sc\fontsize{25pt}{25pt}\selectfont,align=center] (contents name) at ([shift={(0cm,-4.45cm)}]current page.north west) {\begin{varwidth}{.7\linewidth}\baselineskip=2ex #1\end{varwidth}};
+ \node[above right,font=\sc\fontsize{25pt}{25pt}\selectfont,align=center] (contents name) at ([shift={(0cm,-4.45cm)}]current page.north west) {\begin{varwidth}{.7\linewidth}\baselineskip=25pt #1\end{varwidth}};
\end{pgfonlayer}
\begin{pgfonlayer}{background}
\node[left] (image) at ([shift={(0.5cm,-2.8cm)}]current page.north east) {\includegraphics[width=7cm]{\@chapimage}};
@@ -419,6 +420,15 @@ fuzzy shadow={0.4mm}{-0.4mm}{0mm}{0.2mm}{fill=white!40!gray},%下
\titlespacing{\chapter}{0pt}{0pt}{70pt}
\makeatother
% -------- Part定制
+%%定义标题文字长度%%
+\newlength{\partstarlen}
+%%设置临界长度%%
+\newlength{\criticstarlen}
+\setlength{\criticstarlen}{\textwidth}
+% 定义垂直方向的渐变
+\tikzfading[name=fade bottom to top,
+ bottom color=transparent!0, % 底部完全透明
+ top color=transparent!100] % 顶部不透明
\tikzfading[name=middle, top color=transparent!90, bottom
color=transparent!90, middle color=transparent!20]
\makeatletter
@@ -428,7 +438,8 @@ color=transparent!90, middle color=transparent!20]
{\normalfont\huge\filcenter}
{}
{20pt}
-{\begin{tikzpicture}[remember picture,overlay]
+{\settowidth{\partstarlen}{\sc\huge #1} % 计算\partabstract的长度并写入到\partstarlen中
+ \begin{tikzpicture}[remember picture,overlay]
\def\barwidth{2cm}
\fill[outermarginbgcolor,opacity=0.6]
(current page.north west) rectangle (current page.south east);
@@ -448,8 +459,10 @@ color=transparent!90, middle color=transparent!20]
\fill[outermarginfgcolor,rounded corners=2pt] (current page.south east) --++(-5pt,0.15cm)--++(-\outermarginwidth+10pt,0) --++(-5pt,-0.15cm)--cycle; % 页码横线
\node[] (hbar) at ($(current page.north)!0.33!(current page.south)$) {
\begin{tikzpicture}
- \fill[white]
- (0,0) rectangle ++(\paperwidth,-1cm);
+ %%--------------- Horizontal Line --------------------%%
+ \fill[outermarginbgcolor!70]
+ (0,0) rectangle ++(\paperwidth,-1cm);
+ %%--------------- Horizontal Line -------------------%%
\fill[outermarginbgcolor]
(0,-.25cm) rectangle ++(\paperwidth,-.5cm);
\fill[outermarginfgcolor]
@@ -461,10 +474,19 @@ color=transparent!90, middle color=transparent!20]
\end{tikzpicture}
};
\node[above,font=\sc\huge,shift={(.33\linewidth,.5\barwidth)}] (partname) at (hbar) {Part\ \thepart};
- \node[below,left,font=\sc\huge,shift={(.146\linewidth,-1.5*\barwidth)}] (partcontents) at (partname) {\begin{varwidth}{.8\linewidth}\raggedright\baselineskip=2ex #1 \end{varwidth}}; % 标题名称
+ \node[below left,font=\sc\huge,shift={(.146\linewidth,-\barwidth)}] (partcontents) at (partname) {\begin{varwidth}{.9\linewidth}\raggedright\baselineskip=25pt #1 \end{varwidth}}; % 标题名称
\begin{pgfonlayer}{background}
\node[above,shift={(-.4\linewidth,-4*\barwidth)}] at (partname) {\ifdefvoid{\@partimage}{}{\includegraphics[width=1.2\linewidth]{\@partimage}}}; % 图片位置调整
+ % % 应用渐变效果
+\fill[path fading=fade bottom to top, fill=nuanbai] (current page.north west) rectangle ([xshift=-\outermarginwidth]current page.south east);
\end{pgfonlayer}
+%判断标题文字长度与临界长度的关系
+\ifdim\partstarlen<\criticstarlen
+%如果标题长度小于临界长度则使用(hbar)定位
+\node[below,font=\itshape\fontsize{13}{13}\selectfont,shift={(0,-1.2*\barwidth)}] at (hbar) {\ifdefvoid{\@partabstract}{}{\begin{varwidth}{.9\linewidth}\baselineskip=3ex \@partabstract\end{varwidth}}}; % 简介文字调整
+\else
+\node[below,font=\itshape\fontsize{13}{13}\selectfont,shift={(0,-1.2*\barwidth)}] at (partcontents) {\ifdefvoid{\@partabstract}{}{\begin{varwidth}{.9\linewidth}\baselineskip=3ex \@partabstract\end{varwidth}}}; % 简介文字调整
+\fi
\else
\fill [outermarginfgcolor!20]%
(current page.north west) rectangle ++(\outermarginwidth,-\paperheight);
@@ -481,8 +503,10 @@ color=transparent!90, middle color=transparent!20]
\fill[outermarginfgcolor,rounded corners=2pt] (current page.south west) --++(5pt,0.15cm)--++(\outermarginwidth-10pt,0) --++(5pt,-0.15cm)--cycle; % 页码横线
\node[] (hbar) at ($(current page.north)!0.33!(current page.south)$) {
\begin{tikzpicture}
- \fill[white]
- (0,0) rectangle ++(\paperwidth,-1cm);
+ %%--------------- Horizontal Line --------------------%%
+ \fill[outermarginbgcolor!70]
+ (0,0) rectangle ++(\paperwidth,-1cm);
+ %%--------------- Horizontal Line -------------------%%
\fill[outermarginbgcolor]
(0,-.25cm) rectangle ++(\paperwidth,-.5cm);
\fill[outermarginfgcolor]
@@ -494,12 +518,20 @@ color=transparent!90, middle color=transparent!20]
\end{tikzpicture}
};
\node[above,font=\sc\huge,shift={(-.31\linewidth,.5\barwidth)}] (partname) at (hbar) {Part\ \thepart};
- \node[below right,font=\sc\huge,shift={(-.125\linewidth,-1.2*\barwidth)}] (partcontents) at (partname) {\begin{varwidth}{.8\linewidth}\raggedright\baselineskip=2ex #1 \end{varwidth}}; % 标题名称
+ \node[below right,font=\sc\huge,shift={(-.125\linewidth,-\barwidth)}] (partcontents) at (partname) {\begin{varwidth}{.9\linewidth}\raggedright\baselineskip=25pt #1 \end{varwidth}}; % 标题名称
\begin{pgfonlayer}{background}
\node[above,shift={(.35\linewidth,-4*\barwidth)}] at (partname) {\ifdefvoid{\@partimage}{}{\includegraphics[width=1.2\linewidth]{\@partimage}}}; % 图片位置调整
+ % % 应用渐变效果
+ \fill[path fading=fade bottom to top, fill=nuanbai] (current page.north east) rectangle ([xshift=\outermarginwidth]current page.south west);
\end{pgfonlayer}
+%判断标题文字长度与临界长度的关系
+\ifdim\partstarlen<\criticstarlen
+%如果标题长度小于临界长度则使用(hbar)定位
+\node[below,font=\itshape\fontsize{13}{13}\selectfont,shift={(0,-1.2*\barwidth)}] at (hbar) {\ifdefvoid{\@partabstract}{}{\begin{varwidth}{.9\linewidth}\baselineskip=3ex \@partabstract\end{varwidth}}}; % 简介文字调整
+\else
+\node[below,font=\itshape\fontsize{13}{13}\selectfont,shift={(0,-1.2*\barwidth)}] at (partcontents) {\ifdefvoid{\@partabstract}{}{\begin{varwidth}{.9\linewidth}\baselineskip=3ex \@partabstract\end{varwidth}}}; % 简介文字调整
+\fi
\fi
- \node[below,,font=\itshape\fontsize{13}{13}\selectfont,shift={(0\linewidth,-1.65*\barwidth)}] at (hbar) {\ifdefvoid{\@partabstract}{}{\begin{varwidth}{.85\linewidth}\baselineskip=3ex \@partabstract\end{varwidth}}}; % 简介文字调整
\end{tikzpicture}}
\makeatother
\assignpagestyle{\part}{empty}
@@ -535,6 +567,59 @@ color=transparent!90, middle color=transparent!20]
\titlespacing*{\section}{0pt}{3.5ex plus 1ex minus .2ex}{2.3ex plus .2ex}
+% /* -------------------------------------------------------------------------- */
+% /* Subsection Style */
+% /* -------------------------------------------------------------------------- */
+\usepackage{pifont}
+\newcommand{\subsectionnumstyle}[2]{
+\makebox[0pt][l]{\def\rad{5pt}%
+\def\inrad{3pt}
+ \begin{tikzpicture}[remember picture]
+ \path[fill=#2,drop shadow={opacity=0.3,shadow xshift=0.5mm,shadow yshift=-0.5mm}]node[append after command={
+ % 主体
+ ([shift={(\rad,\rad)}]sec.north west) arc[start angle=90, end angle=180, radius=\rad] {[rounded corners=\inrad]--(sec.south west)}--([yshift=-3mm]$(sec.south west)!0.5!(sec.south east)$) {[rounded corners=\inrad]--(sec.south east)} -- (sec.north east) arc[start angle=180, end angle=90, radius=\rad]--cycle
+ },
+ text=white,font=\sffamily\large\bfseries,align=center,inner ysep=1.5mm,inner xsep=1mm] (sec) at (0,0) {\thesubsection};
+ % 阴影
+ \begin{pgfonlayer}{bottom}
+ \fill[#2!30!black!70,opacity=0.8] ([xshift=\rad,yshift=\rad]sec.north east) to[out=0,in=-81,looseness=1.5] ([xshift=1.8*\rad]sec.north east)--(sec.north east) |-cycle;
+ \end{pgfonlayer}
+ \node[text=black,font=\large,below right] (sectitle) at ([shift={(2mm,6.5mm)}]sec.south east) {\begin{varwidth}{.9\linewidth}\setlength\baselineskip{18pt}#1\end{varwidth}};
+ \begin{pgfonlayer}{bottom}
+ \draw[gray,dashed,opacity=0.5] ([xshift=0]sec.north west) --([xshift=4*\rad]sec.north east);
+ \end{pgfonlayer}
+ \end{tikzpicture}}
+}
+
+\newcommand{\subsectionnonumstyle}[2]{
+\makebox[0pt][l]{\def\rad{5pt}%
+\def\inrad{3pt}
+ \begin{tikzpicture}[remember picture]
+ \path[fill=#2,drop shadow={opacity=0.3,shadow xshift=0.5mm,shadow yshift=-0.5mm}]node[append after command={
+ % 主体
+ ([shift={(\rad,\rad)}]sec.north west) arc[start angle=90, end angle=180, radius=\rad] {[rounded corners=\inrad]--(sec.south west)}--([yshift=-3mm]$(sec.south west)!0.5!(sec.south east)$) {[rounded corners=\inrad]--(sec.south east)} -- (sec.north east) arc[start angle=180, end angle=90, radius=\rad] --cycle
+ },
+ text=white,font=\sffamily\large\bfseries,align=center,inner ysep=0.5mm,inner xsep=1.5mm] (sec) at (0,0) {\Huge\ding{99}};
+ % 阴影
+ \begin{pgfonlayer}{bottom}
+ \fill[#2!30!black!70,opacity=0.8] ([xshift=\rad,yshift=\rad]sec.north east) to[out=0,in=-81,looseness=1.5] ([xshift=1.8*\rad]sec.north east)--(sec.north east) |-cycle;
+ \end{pgfonlayer}
+ \node[text=black,font=\large,below right] (sectitle) at ([shift={(2mm,6.5mm)}]sec.south east) {\begin{varwidth}{.9\linewidth}\setlength\baselineskip{18pt}#1\end{varwidth}};
+ \begin{pgfonlayer}{bottom}
+ \draw[gray,dashed,opacity=0.5] (sec.north west) --([xshift=4*\rad]sec.north east);
+ \end{pgfonlayer}
+ \end{tikzpicture}}
+}
+%% -- Subsection
+\titleformat{\subsection}
+{}
+{}
+{-.5em} %左右移动\thesection标签位置
+{\subsectionnumstyle{#1}{outermarginfgcolor}}
+
+\titleformat{name=\subsection,numberless}{}{}{-.5em}{\subsectionnonumstyle{#1}{outermarginfgcolor}}
+
+% \titlespacing*{\subsection}{0pt}{3.5ex plus 1ex minus .2ex}{2.3ex plus .2ex}
%%-------------------------------- SCRLAYER-SCRPAGE -------------------------------------%%
%% SIDE-BAR
\newlength\chapternumbersize
@@ -574,7 +659,7 @@ color=transparent!90, middle color=transparent!20]
\newcommand*\outermarginchapternumberbox{%
\if@mainmatter
\tikzoverlay{
- \shade[top color=outermarginfgcolor!90,bottom color=outermarginbgcolor]
+ \shade[top color=outermarginfgcolor!90,bottom color=outermarginbgcolor]
(\outermarginwidth,-.5\outermarginwidth+2mm) rectangle (0,-1.5\outermarginwidth+2mm);
\node[anchor=center,text=white,font=\sffamily\bfseries] at (1/2*\outermarginwidth,-\outermarginwidth+2mm) {\usekomafont{chapternumber}{\botmarks\chapternum}};%
}
@@ -627,12 +712,24 @@ color=transparent!90, middle color=transparent!20]
contents={\color{outermarginbgcolor}\rule{\layerwidth}{\layerheight}} %色彩装饰条
]{scth.outermargin.bg.even}%
%%=============% 页边条颜色 %=======================%%
+% /* -------------------------------------------------------------------------- */
+% /* 透明度渐变填充设定 */
+% /* -------------------------------------------------------------------------- */
\tikzfading[name=fade south,
top color =transparent!0,
bottom color=transparent!80]
\tikzfading[name=fade north,
top color =transparent!100,
bottom color=transparent!0]
+\tikzfading[name=fade right,
+ right color =transparent!100,
+ left color=transparent!0]
+\tikzfading[name=fade left,
+ left color =transparent!100,
+ right color=transparent!0]
+% /* -------------------------------------------------------------------------- */
+% /* 透明度渐变填充设定 */
+% /* -------------------------------------------------------------------------- */
%偶数页边纹理效果设置
\newcommand{\evensidbardeepcolor}{%
\tikzoverlay{
diff --git a/Master/texmf-dist/tex/latex/beautybook/Beautybook-EN.cls b/Master/texmf-dist/tex/latex/beautybook/beautybook-EN.cls
index 63e3e038dff..1aa67be4a39 100644
--- a/Master/texmf-dist/tex/latex/beautybook/Beautybook-EN.cls
+++ b/Master/texmf-dist/tex/latex/beautybook/beautybook-EN.cls
@@ -1,6 +1,6 @@
%This Class is based on the default book class and options will be passed
\NeedsTeXFormat{LaTeX2e}
-\ProvidesClass{Beautybook-EN}[02-10-2023 V8.0 Beautybook Class]
+\ProvidesClass{beautybook-EN}[30-06-2024 V10.0 beautybook Class]
\DeclareOption*{\PassOptionsToClass{\CurrentOption}{book}}
\ProcessOptions\relax
\LoadClass[twoside]{book}
@@ -24,26 +24,26 @@
%
\ExplSyntaxOn
% 封面切换程序 (LaTeX3)!
-\keys_define:nn {Beautybook/coverstyle}
+\keys_define:nn {beautybook/coverstyle}
{
cover-choose.choice:,
cover-choose.value_required:n = true,
- cover-choose/cn.code:n = {\RequirePackage{stys/Beautybook-cover-cn}},
- cover-choose/en.code:n = {\RequirePackage{stys/Beautybook-cover-en}},
- cover-choose/enfig.code:n = {\RequirePackage{stys/Beautybook-cover-enfig}},
- cover-choose/birkar.code:n = {\RequirePackage{stys/Beautybook-cover-birkar}},
+ cover-choose/cn.code:n = {\RequirePackage{stys/beautybook-cover-cn}},
+ cover-choose/en.code:n = {\RequirePackage{stys/beautybook-cover-en}},
+ cover-choose/enfig.code:n = {\RequirePackage{stys/beautybook-cover-enfig}},
+ cover-choose/birkar.code:n = {\RequirePackage{stys/beautybook-cover-birkar}},
%cover-choose .initial:n = en , % 设置 en 为初始值
}
-\newtoks \l__Beautybook_tmpa_toks
+\newtoks \l__beautybook_tmpa_toks
\cs_new_protected:Npn \coverstyle
{
- \tex_afterassignment:D \__Beautybook_set_coverstyle:
- \l__Beautybook_tmpa_toks
+ \tex_afterassignment:D \__beautybook_set_coverstyle:
+ \l__beautybook_tmpa_toks
}
-\cs_new:Npn \__Beautybook_set_coverstyle:
- { \keys_set:nV { Beautybook / coverstyle } \l__Beautybook_tmpa_toks }
+\cs_new:Npn \__beautybook_set_coverstyle:
+ { \keys_set:nV { beautybook / coverstyle } \l__beautybook_tmpa_toks }
% Math fonts
-\keys_define:nn {Beautybook/mathstyle}
+\keys_define:nn {beautybook/mathstyle}
{
math-font.choice:,
math-font.value_required:n = true,
@@ -73,13 +73,13 @@
}
\cs_new_protected:Npn \mathstyle
{
- \tex_afterassignment:D \__Beautybook_set_mathstyle:
- \l__Beautybook_tmpa_toks
+ \tex_afterassignment:D \__beautybook_set_mathstyle:
+ \l__beautybook_tmpa_toks
}
-\cs_new:Npn \__Beautybook_set_mathstyle:
- { \keys_set:nV { Beautybook / mathstyle } \l__Beautybook_tmpa_toks }
+\cs_new:Npn \__beautybook_set_mathstyle:
+ { \keys_set:nV { beautybook / mathstyle } \l__beautybook_tmpa_toks }
\ExplSyntaxOff
-\RequirePackage{stys/Beautybook-bottompage} %封底
+\RequirePackage{stys/beautybook-bottompage} %封底
\RequirePackage{rotating}
\tikzset{>=Stealth}
\setlist{font=\upshape} % 取消所有列表默认距离 nosep,
@@ -301,38 +301,38 @@ fuzzy shadow={0.4mm}{-0.4mm}{0mm}{0.2mm}{fill=white!40!gray},%下
\makeatletter
% titleimage
\ExplSyntaxOn
-\seq_new:N \g__Beautybook_chapter_oimage_seq % odd
-\seq_new:N \g__Beautybook_chapter_eimage_seq % even
-\seq_new:N \g__Beautybook_part_oimage_seq % odd
-\seq_new:N \g__Beautybook_part_eimage_seq % even
+\seq_new:N \g__beautybook_chapter_oimage_seq % odd
+\seq_new:N \g__beautybook_chapter_eimage_seq % even
+\seq_new:N \g__beautybook_part_oimage_seq % odd
+\seq_new:N \g__beautybook_part_eimage_seq % even
%
-\keys_define:nn { Beautybook/titleimage }
+\keys_define:nn { beautybook/titleimage }
{
chapteroddimage .code:n =
- \seq_gset_from_clist:Nn \g__Beautybook_chapter_oimage_seq {#1} ,
+ \seq_gset_from_clist:Nn \g__beautybook_chapter_oimage_seq {#1} ,
chapterevenimage .code:n =
- \seq_gset_from_clist:Nn \g__Beautybook_chapter_eimage_seq {#1} ,
+ \seq_gset_from_clist:Nn \g__beautybook_chapter_eimage_seq {#1} ,
partoddimage .code:n =
- \seq_gset_from_clist:Nn \g__Beautybook_part_oimage_seq {#1} ,
+ \seq_gset_from_clist:Nn \g__beautybook_part_oimage_seq {#1} ,
partevenimage .code:n =
- \seq_gset_from_clist:Nn \g__Beautybook_part_eimage_seq {#1} ,
+ \seq_gset_from_clist:Nn \g__beautybook_part_eimage_seq {#1} ,
}
-\cs_new:Npn \__Beautybook_title_image:Nn #1#2 % image seq, number
+\cs_new:Npn \__beautybook_title_image:Nn #1#2 % image seq, number
{ \seq_item:Nn #1 { \int_mod:nn {#2} { \seq_count:N #1 } + 1 } } %对照表-对录入的字符串进行编号
-\cs_new:Npn \Beautybook@chapterimagename %生成索契表 : 判断奇偶数页并按(章节编号)!!读取相应的列表组中的字符串
+\cs_new:Npn \beautybook@chapterimagename %生成索契表 : 判断奇偶数页并按(章节编号)!!读取相应的列表组中的字符串
{
\int_if_odd:nTF { \value{page} }
- { \__Beautybook_title_image:Nn \g__Beautybook_chapter_oimage_seq { \value{chapter} } }
- { \__Beautybook_title_image:Nn \g__Beautybook_chapter_eimage_seq { \value{chapter} } }
+ { \__beautybook_title_image:Nn \g__beautybook_chapter_oimage_seq { \value{chapter} } }
+ { \__beautybook_title_image:Nn \g__beautybook_chapter_eimage_seq { \value{chapter} } }
}
-\cs_new:Npn \Beautybook@partimagename
+\cs_new:Npn \beautybook@partimagename
{
\int_if_odd:nTF { \value{page} }
- { \__Beautybook_title_image:Nn \g__Beautybook_part_oimage_seq { \value{part} } }
- { \__Beautybook_title_image:Nn \g__Beautybook_part_eimage_seq { \value{part} } }
+ { \__beautybook_title_image:Nn \g__beautybook_part_oimage_seq { \value{part} } }
+ { \__beautybook_title_image:Nn \g__beautybook_part_eimage_seq { \value{part} } }
}
\cs_new_protected:Npn \titleimage #1
- { \keys_set:nn { Beautybook/titleimage } {#1} }
+ { \keys_set:nn { beautybook/titleimage } {#1} }
\ExplSyntaxOff
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\titleformat{\chapter}{\huge\bfseries\filcenter}{}{1em}{
@@ -420,6 +420,15 @@ fuzzy shadow={0.4mm}{-0.4mm}{0mm}{0.2mm}{fill=white!40!gray},%下
\titlespacing{\chapter}{0pt}{0pt}{80pt}
\makeatother
% -------- Part定制
+%%定义标题文字长度%%
+\newlength{\partstarlen}
+%%设置临界长度%%
+\newlength{\criticstarlen}
+\setlength{\criticstarlen}{\textwidth}
+% 定义垂直方向的渐变
+\tikzfading[name=fade bottom to top,
+ bottom color=transparent!0, % 底部完全透明
+ top color=transparent!100] % 顶部不透明
\tikzfading[name=middle, top color=transparent!90, bottom
color=transparent!90, middle color=transparent!20]
\makeatletter
@@ -429,7 +438,8 @@ color=transparent!90, middle color=transparent!20]
{\normalfont\huge\filcenter}
{}
{20pt}
-{\begin{tikzpicture}[remember picture,overlay]
+{\settowidth{\partstarlen}{\sc\huge #1} % 计算\partabstract的长度并写入到\partstarlen中
+ \begin{tikzpicture}[remember picture,overlay]
\def\barwidth{2cm}
\fill[outermarginbgcolor,opacity=0.6]
(current page.north west) rectangle (current page.south east);
@@ -449,8 +459,10 @@ color=transparent!90, middle color=transparent!20]
\fill[outermarginfgcolor,rounded corners=2pt] (current page.south east) --++(-5pt,0.15cm)--++(-\outermarginwidth+10pt,0) --++(-5pt,-0.15cm)--cycle; % 页码横线
\node[] (hbar) at ($(current page.north)!0.33!(current page.south)$) {
\begin{tikzpicture}
- \fill[white]
- (0,0) rectangle ++(\paperwidth,-1cm);
+ %%--------------- Horizontal Line --------------------%%
+ \fill[outermarginbgcolor!70]
+ (0,0) rectangle ++(\paperwidth,-1cm);
+ %%--------------- Horizontal Line -------------------%%
\fill[outermarginbgcolor]
(0,-.25cm) rectangle ++(\paperwidth,-.5cm);
\fill[outermarginfgcolor]
@@ -462,10 +474,19 @@ color=transparent!90, middle color=transparent!20]
\end{tikzpicture}
};
\node[above,font=\sc\huge,shift={(.33\linewidth,.5\barwidth)}] (partname) at (hbar) {Part\ \thepart};
- \node[below,left,font=\sc\huge,shift={(.146\linewidth,-1.5*\barwidth)}] (partcontents) at (partname) {\begin{varwidth}{.8\linewidth}\raggedright\baselineskip=2ex #1 \end{varwidth}}; % 标题名称
+ \node[below left,font=\sc\huge,shift={(.146\linewidth,-\barwidth)}] (partcontents) at (partname) {\begin{varwidth}{.9\linewidth}\raggedright\baselineskip=25pt #1 \end{varwidth}}; % 标题名称
\begin{pgfonlayer}{background}
\node[above,shift={(-.4\linewidth,-4*\barwidth)}] at (partname) {\ifdefvoid{\@partimage}{}{\includegraphics[width=1.2\linewidth]{\@partimage}}}; % 图片位置调整
+ % % 应用渐变效果
+\fill[path fading=fade bottom to top, fill=nuanbai] (current page.north west) rectangle ([xshift=-\outermarginwidth]current page.south east);
\end{pgfonlayer}
+%判断标题文字长度与临界长度的关系
+\ifdim\partstarlen<\criticstarlen
+%如果标题长度小于临界长度则使用(hbar)定位
+\node[below,font=\itshape\fontsize{13}{13}\selectfont,shift={(0,-1.2*\barwidth)}] at (hbar) {\ifdefvoid{\@partabstract}{}{\begin{varwidth}{.9\linewidth}\baselineskip=3ex \@partabstract\end{varwidth}}}; % 简介文字调整
+\else
+\node[below,font=\itshape\fontsize{13}{13}\selectfont,shift={(0,-1.2*\barwidth)}] at (partcontents) {\ifdefvoid{\@partabstract}{}{\begin{varwidth}{.9\linewidth}\baselineskip=3ex \@partabstract\end{varwidth}}}; % 简介文字调整
+\fi
\else
\fill [outermarginfgcolor!20]%
(current page.north west) rectangle ++(\outermarginwidth,-\paperheight);
@@ -482,8 +503,10 @@ color=transparent!90, middle color=transparent!20]
\fill[outermarginfgcolor,rounded corners=2pt] (current page.south west) --++(5pt,0.15cm)--++(\outermarginwidth-10pt,0) --++(5pt,-0.15cm)--cycle; % 页码横线
\node[] (hbar) at ($(current page.north)!0.33!(current page.south)$) {
\begin{tikzpicture}
- \fill[white]
- (0,0) rectangle ++(\paperwidth,-1cm);
+ %%--------------- Horizontal Line --------------------%%
+ \fill[outermarginbgcolor!70]
+ (0,0) rectangle ++(\paperwidth,-1cm);
+ %%--------------- Horizontal Line -------------------%%
\fill[outermarginbgcolor]
(0,-.25cm) rectangle ++(\paperwidth,-.5cm);
\fill[outermarginfgcolor]
@@ -495,12 +518,20 @@ color=transparent!90, middle color=transparent!20]
\end{tikzpicture}
};
\node[above,font=\sc\huge,shift={(-.31\linewidth,.5\barwidth)}] (partname) at (hbar) {Part\ \thepart};
- \node[below right,font=\sc\huge,shift={(-.125\linewidth,-1.2*\barwidth)}] (partcontents) at (partname) {\begin{varwidth}{.8\linewidth}\raggedright\baselineskip=2ex #1 \end{varwidth}}; % 标题名称
+ \node[below right,font=\sc\huge,shift={(-.125\linewidth,-\barwidth)}] (partcontents) at (partname) {\begin{varwidth}{.9\linewidth}\raggedright\baselineskip=25pt #1 \end{varwidth}}; % 标题名称
\begin{pgfonlayer}{background}
\node[above,shift={(.35\linewidth,-4*\barwidth)}] at (partname) {\ifdefvoid{\@partimage}{}{\includegraphics[width=1.2\linewidth]{\@partimage}}}; % 图片位置调整
+ % % 应用渐变效果
+ \fill[path fading=fade bottom to top, fill=nuanbai] (current page.north east) rectangle ([xshift=\outermarginwidth]current page.south west);
\end{pgfonlayer}
+%判断标题文字长度与临界长度的关系
+\ifdim\partstarlen<\criticstarlen
+%如果标题长度小于临界长度则使用(hbar)定位
+\node[below,font=\itshape\fontsize{13}{13}\selectfont,shift={(0,-1.2*\barwidth)}] at (hbar) {\ifdefvoid{\@partabstract}{}{\begin{varwidth}{.9\linewidth}\baselineskip=3ex \@partabstract\end{varwidth}}}; % 简介文字调整
+\else
+\node[below,font=\itshape\fontsize{13}{13}\selectfont,shift={(0,-1.2*\barwidth)}] at (partcontents) {\ifdefvoid{\@partabstract}{}{\begin{varwidth}{.9\linewidth}\baselineskip=3ex \@partabstract\end{varwidth}}}; % 简介文字调整
+\fi
\fi
- \node[below,,font=\itshape\fontsize{13}{13}\selectfont,shift={(0\linewidth,-1.65*\barwidth)}] at (hbar) {\ifdefvoid{\@partabstract}{}{\begin{varwidth}{.85\linewidth}\baselineskip=3ex \@partabstract\end{varwidth}}}; % 简介文字调整
\end{tikzpicture}}
\makeatother
\assignpagestyle{\part}{empty}
@@ -1143,7 +1174,7 @@ anchor=west,rounded corners=3pt,font=\bfseries\normalsize] at ([xshift=0cm,yshif
bodyfont=\normalfont,
postheadspace=.5em,
headpunct={.},
- qed=$\blacksquare$,%\qedsymbol
+ qed=\color{cyan!40!black}$\blacksquare$,%\qedsymbol
]{Proofstyle}
\declaretheorem[style=Proofstyle,numbered=no,name={\itbf{Proof}}]{Proof}
\renewenvironment{proof}{\begin{Proof} }{\end{Proof}}
diff --git a/Master/texmf-dist/tex/latex/beautybook/stys/Beautybook-bottompage.sty b/Master/texmf-dist/tex/latex/beautybook/stys/beautybook-bottompage.sty
index 892cf4fbac0..069dc61f60f 100644
--- a/Master/texmf-dist/tex/latex/beautybook/stys/Beautybook-bottompage.sty
+++ b/Master/texmf-dist/tex/latex/beautybook/stys/beautybook-bottompage.sty
@@ -1,5 +1,5 @@
\NeedsTeXFormat{LaTeX2e}[1995/12/01]
-\ProvidesPackage{stys/Beautybook-bottompage}[2023/01/18,v2.0]
+\ProvidesPackage{stys/beautybook-bottompage}[2024/06/30,v2.0]
\usepackage[ISBN=978-80-85955-35-4,SC0]{ean13isbn}
\makeatletter
%%----------------------------------封面信息定义--------------------------------------------------------%%
diff --git a/Master/texmf-dist/tex/latex/beautybook/stys/Beautybook-cover-birkar.sty b/Master/texmf-dist/tex/latex/beautybook/stys/beautybook-cover-birkar.sty
index 8a2c51aa082..4253b6a3a0e 100644
--- a/Master/texmf-dist/tex/latex/beautybook/stys/Beautybook-cover-birkar.sty
+++ b/Master/texmf-dist/tex/latex/beautybook/stys/beautybook-cover-birkar.sty
@@ -1,5 +1,5 @@
\NeedsTeXFormat{LaTeX2e}[1995/12/01]
-\ProvidesPackage{stys/Beautybook-cover-birkar}[2022/05/21,v1.0]
+\ProvidesPackage{stys/beautybook-cover-birkar}[2024/06/30,v2.0]
\usepackage{anyfontsize} % 提供\fontsize{}{}\selectfont命令
\usepackage{etoolbox} %提供自定义封面选项接口
\usepackage[dvipsnames,svgnames,x11names,table]{xcolor}%颜色宏包 % Driver-independent color extensions
@@ -33,22 +33,33 @@ decorations.pathmorphing, graphs, quotes, angles, calc, through, backgrounds} %
bottom color =transparent!100,
top color=transparent!50]
\makeatletter
-\newcommand*\makecover{
- %% Use the Tikz library positioning and clear the page header and footer
- \usetikzlibrary{positioning}
- \thispagestyle{empty}
- \begin{tikzpicture}[remember picture,overlay]
- \begin{pgfonlayer}{bottom}
- \fill[coverfgcolor]
- (current page.north west) rectangle (current page.south east);% 填充封面背景颜色 (coverbgcolor)
- \fill[RED]
- ([shift={(2.05cm,0)}]current page.north west) rectangle ([shift={(2.35cm,-6cm)}]current page.north west);
- \fill[coverfgcolor!80,opacity=0.5]
- ([shift={(0,-2cm)}]current page.north west) arc (90:-90:.3\paperheight) --cycle;
- \fill[coverfgcolor!80,opacity=0.5]
- ([shift={(0,-4cm)}]current page.north east) arc (90:270:.2\paperheight) --cycle;
- \fill[coverfgcolor!80]
- (current page.north west) rectangle ([shift={(2cm,0)}]current page.south west);
+\newcommand{\aivcover}{
+ \begin{scope}[opacity=0.8]
+ \coordinate (triangleA) at ([shift={(1cm,-1.5cm)}]current page.north);
+ \coordinate (triangleB) at ([shift={(-.75\linewidth,-.44\paperheight)}]triangleA);
+ \coordinate (triangleC) at ([shift={(.5\linewidth,-.44\paperheight)}]triangleA);
+ \draw[name path=triangle,very thick,coverfgcolor!70!white]
+ (triangleA)--(triangleB)--(triangleC)--cycle;
+ \draw[name path=circle,very thick,coverfgcolor!70!white]
+ ([shift={(-1.65cm,-7.8cm)}]triangleA) coordinate (O) circle(6cm);
+ %标注每个交点坐标
+ \fill [name intersections={of=triangle and circle, name=i, total=\t}]
+ [coverbar,opacity=0.5, every node/.style={above left, white, opacity=1}]
+ \foreach \s in {1,...,\t}{(i-\s) circle (1em) node {}};
+ \draw[name path=l,very thick,coverfgcolor!70!white] (i-1) -- (triangleC);
+ \draw[very thick,coverfgcolor!70!white] (i-6) -- (triangleB);
+ \draw[name path=l2,very thick,coverfgcolor!70!white] (i-4) -- (triangleA);
+ \fill[name intersections={of=l and circle,name=j,total=\l}]
+ [coverbar,opacity=0.5, every node/.style={above left, white, opacity=1}]
+ \foreach \c in {1,...,\l}{(j-\c) circle (1em) node {}};
+
+ \fill[name intersections={of=l2 and l,name=jj,total=\ll}]
+ [coverbar,opacity=0.5, every node/.style={above left, white, opacity=1}]
+ \foreach \cc in {1,...,\ll}{(jj-\cc) circle (1em) node {}};
+ \end{scope}
+}
+
+\newcommand{\lettercover}{
\begin{scope}[opacity=0.8]
\coordinate (triangleA) at ([shift={(1cm,-1cm)}]current page.north);
\coordinate (triangleB) at ([shift={(-.85\linewidth,-.46\paperheight)}]triangleA);
@@ -72,31 +83,54 @@ decorations.pathmorphing, graphs, quotes, angles, calc, through, backgrounds} %
[coverbar,opacity=0.5, every node/.style={above left, white, opacity=1}]
\foreach \cc in {1,...,\ll}{(jj-\cc) circle (1em) node {}};
\end{scope}
- \end{pgfonlayer}
- \begin{pgfonlayer}{foreground}
- \fill[coverbar,opacity=.5]
- ([yshift=2\outermarginwidth]current page.west) rectangle ([xshift=\outermarginwidth,yshift=-.2\outermarginwidth]current page.west); % 最左侧装饰矩形
- \end{pgfonlayer}
- \shade[left color=coverfgcolor,right color=coverfgcolor!60,opacity=.3]
- ([xshift=\outermarginwidth,yshift=2\outermarginwidth]current page.west) rectangle (current page.south east); % 标题背景大矩形
- \node[anchor=south] at ([xshift=.3\outermarginwidth,yshift=-.4\covershift]current page.north) {%
- \parbox{.8\paperwidth}{
- \filright
- \color{white}\sffamily\fontsize{20}{23}\selectfont\@bookseries}
- }; %系列丛书名称
- \node[ anchor=south] at ([xshift=.3\outermarginwidth,yshift=-.57\paperheight]current page.north)
- {\parbox{.8\paperwidth}{%
- \raggedright%
- {\renewcommand\baselinestretch{1.1}\selectfont \color{white}\sffamily\bfseries\fontsize{40}{40}\selectfont\@title\\[0.5ex]
- \color{white}\sffamily\fontsize{30}{30}\selectfont
- \ifdefvoid{\@subtitle}{}{\@subtitle}\par}
- }};% 封面标题与副标题
- \node[anchor=west,font=\sffamily\fontsize{23}{23}\selectfont,text=white] at ([xshift=1.8\outermarginwidth,yshift=-.6\covershift]current page.west) {\@edition};
- \node[anchor=west,font=\sffamily\Huge,text=white] at ([xshift=1.8\outermarginwidth,yshift=\covershift]current page.west) {\@author};
- \node[left,text=white,font=\rmfamily\Large,] at
- ([shift={(-1cm,2cm)}]current page.south east) %
- {\raisebox{-1.1cm}{\includegraphics[width=0.2\linewidth]{\@presslogo}}\hspace*{-3.5ex}\begin{varwidth}{.4\textwidth}\tikz\draw[white,line width=1.25pt] (0,0)--++(0,1cm);\,\raisebox{.25cm}{\@pressname} \end{varwidth}};%
- \end{tikzpicture}%
+}
+
+\newcommand*\makecover{
+ \thispagestyle{empty}
+ \begin{tikzpicture}[remember picture,overlay]
+ \begin{pgfonlayer}{bottom}
+ \fill[coverfgcolor]
+ (current page.north west) rectangle (current page.south east);% 填充封面背景颜色 (coverbgcolor)
+ \fill[RED]
+ ([shift={(2.05cm,0)}]current page.north west) rectangle ([shift={(2.35cm,-6cm)}]current page.north west);
+ \fill[coverfgcolor!80,opacity=0.5]
+ ([shift={(0,-2cm)}]current page.north west) arc (90:-90:.3\paperheight) --cycle;
+ \fill[coverfgcolor!80,opacity=0.5]
+ ([shift={(0,-4cm)}]current page.north east) arc (90:270:.2\paperheight) --cycle;
+ \fill[coverfgcolor!80]
+ (current page.north west) rectangle ([shift={(2cm,0)}]current page.south west);
+ % /* -------------------------------------------------------------------------- */
+ % /* 判断a4paper */
+ % /* -------------------------------------------------------------------------- */
+ \ifaivpaper@TF{\aivcover}{\lettercover}
+ % /* -------------------------------------------------------------------------- */
+ % /* 判断a4paper */
+ % /* -------------------------------------------------------------------------- */
+\end{pgfonlayer}
+\begin{pgfonlayer}{foreground}
+ \fill[coverbar,opacity=.5]
+([yshift=2\outermarginwidth]current page.west) rectangle ([xshift=\outermarginwidth,yshift=-.2\outermarginwidth]current page.west); % 最左侧装饰矩形
+\end{pgfonlayer}
+\shade[left color=coverfgcolor,right color=coverfgcolor!60,opacity=.3]
+([xshift=\outermarginwidth,yshift=2\outermarginwidth]current page.west) rectangle (current page.south east); % 标题背景大矩形
+\node[anchor=south] at ([xshift=.3\outermarginwidth,yshift=-.4\covershift]current page.north) {%
+\parbox{.8\paperwidth}{
+\filright
+\color{white}\sffamily\fontsize{20}{23}\selectfont\@bookseries}
+}; %系列丛书名称
+\node[ anchor=south] at ([xshift=.3\outermarginwidth,yshift=-.57\paperheight]current page.north)
+{\parbox{.8\paperwidth}{%
+ \raggedright%
+{\renewcommand\baselinestretch{1.1}\selectfont \color{white}\sffamily\bfseries\fontsize{40}{40}\selectfont\@title\\[0.5ex]
+ \color{white}\sffamily\fontsize{30}{30}\selectfont
+ \ifdefvoid{\@subtitle}{}{\@subtitle}\par}
+}};% 封面标题与副标题
+\node[anchor=west,font=\sffamily\fontsize{23}{23}\selectfont,text=white] at ([xshift=1.8\outermarginwidth,yshift=-.6\covershift]current page.west) {\@edition};
+\node[anchor=west,font=\sffamily\Huge,text=white] at ([xshift=1.8\outermarginwidth,yshift=\covershift]current page.west) {\@author};
+\node[left,text=white,font=\rmfamily\Large,] at
+([shift={(-1cm,2cm)}]current page.south east) %
+{\raisebox{-1.1cm}{\includegraphics[width=0.2\linewidth]{\@presslogo}}\hspace*{-3.5ex}\begin{varwidth}{.4\textwidth}\tikz\draw[white,line width=1.25pt] (0,0)--++(0,1cm);\,\raisebox{.25cm}{\@pressname} \end{varwidth}};%
+\end{tikzpicture}%
{\newpage\thispagestyle{empty}}
}
\makeatother
diff --git a/Master/texmf-dist/tex/latex/beautybook/stys/Beautybook-cover-cn.sty b/Master/texmf-dist/tex/latex/beautybook/stys/beautybook-cover-cn.sty
index b151d4e5fc2..176e740f6f3 100644
--- a/Master/texmf-dist/tex/latex/beautybook/stys/Beautybook-cover-cn.sty
+++ b/Master/texmf-dist/tex/latex/beautybook/stys/beautybook-cover-cn.sty
@@ -1,5 +1,5 @@
\NeedsTeXFormat{LaTeX2e}[1995/12/01]
-\ProvidesPackage{stys/Beautybook-cover-cn}[2023/05/10,v1.0]
+\ProvidesPackage{stys/beautybook-cover-cn}[2024/06/30,v2.0]
\usetikzlibrary{calc,fadings,patterns}
\usepackage{adjustbox} %修正minipage顶部对齐问题
%%%%===============================================================%%%%%
@@ -13,8 +13,8 @@
left color =transparent!100,
right color=transparent!50]
\tikzfading[name=fade up,
-top color =transparent!100,
-bottom color=transparent!50]
+ top color =transparent!100,
+ bottom color=transparent!50]
\tikzfading[name=fade down,
bottom color =transparent!100,
top color=transparent!50]
@@ -40,7 +40,7 @@ bottom color=transparent!50]
\node[right] at ([xshift=\outermarginwidth,yshift=1.5*\covershift]current page.west)
{\parbox{.8\paperwidth}{%
\filright%
- \color{white}\sffamily\bfseries\fontsize{30}{30}\selectfont\@title\\[-1.6ex]
+ \color{white}\sffamily\bfseries\fontsize{30}{30}\selectfont\@title\\[-1.2ex]
\begin{tikzpicture}
\draw[white,line width=1pt] (0,0) --++ (\paperwidth-3\outermarginwidth,0);
\end{tikzpicture}\\[-.5ex]
@@ -64,17 +64,17 @@ bottom color=transparent!50]
\end{minipage}}
};% 封面作者信息栏
\fill [path picture={ \node at (path picture bounding box.center)
- {\includegraphics[height=1.1\linewidth]{\@coverimage}};}]
+ {\includegraphics[height=1.1\linewidth,keepaspectratio]{\@coverimage}};}]
([xshift=\outermarginwidth]current page.south west) rectangle ++(1.8*\covershift,.575\paperheight);
- \fill[pattern color=coverfgcolor!70,pattern=horizontal lines,opacity=0.8]
- ([xshift=\outermarginwidth,yshift=.2\covershift]current page.south west) rectangle ([xshift=-\outermarginwidth,yshift=1.43\covershift]current page.south east);
- \fill [coverfgcolor!80,path fading=fade right]%
- ([xshift=\outermarginwidth+.5\linewidth+.5cm,yshift=.2\covershift]current page.south west) rectangle ([xshift=-\outermarginwidth,yshift=1.43\covershift]current page.south east);
- \fill [coverfgcolor!80,path fading=fade left]%
- ([xshift=\outermarginwidth+.5\linewidth+.5cm,yshift=.2\covershift]current page.south west) rectangle ([xshift=-\outermarginwidth,yshift=1.43\covershift]current page.south east);
- \node[left,text=white,font=\rmfamily\Large,] at
- ([shift={(-2cm,2cm)}]current page.south east) %
- {\raisebox{-1.1cm}{\includegraphics[width=0.2\linewidth]{\@presslogo}}\hspace*{-3.5ex}\begin{varwidth}{.4\textwidth}\tikz\draw[white,line width=1.25pt] (0,0)--++(0,1cm);\,\raisebox{.25cm}{\@pressname} \end{varwidth}};%
+ \fill[pattern color=coverfgcolor!70,pattern=horizontal lines,opacity=0.8]
+ ([xshift=\outermarginwidth,yshift=.2\covershift]current page.south west) rectangle ([xshift=-\outermarginwidth,yshift=1.43\covershift]current page.south east);
+ \fill [coverfgcolor!80,path fading=fade right]%
+ ([xshift=\outermarginwidth+.5\linewidth+.5cm,yshift=.2\covershift]current page.south west) rectangle ([xshift=-\outermarginwidth,yshift=1.43\covershift]current page.south east);
+ \fill [coverfgcolor!80,path fading=fade left]%
+ ([xshift=\outermarginwidth+.5\linewidth+.5cm,yshift=.2\covershift]current page.south west) rectangle ([xshift=-\outermarginwidth,yshift=1.43\covershift]current page.south east);
+ \node[left,text=white,font=\rmfamily\Large,] at
+ ([shift={(-2cm,2cm)}]current page.south east) %
+ {\raisebox{-1.1cm}{\includegraphics[width=0.2\linewidth]{\@presslogo}}\hspace*{-3.5ex}\begin{varwidth}{.4\textwidth}\tikz\draw[white,line width=1.25pt] (0,0)--++(0,1cm);\,\raisebox{.25cm}{\@pressname} \end{varwidth}};%
\end{tikzpicture}%
{\newpage\thispagestyle{empty}}}
\makeatother
diff --git a/Master/texmf-dist/tex/latex/beautybook/stys/Beautybook-cover-en.sty b/Master/texmf-dist/tex/latex/beautybook/stys/beautybook-cover-en.sty
index 2279661d945..1c868103804 100644
--- a/Master/texmf-dist/tex/latex/beautybook/stys/Beautybook-cover-en.sty
+++ b/Master/texmf-dist/tex/latex/beautybook/stys/beautybook-cover-en.sty
@@ -1,5 +1,5 @@
\NeedsTeXFormat{LaTeX2e}[1995/12/01]
-\ProvidesPackage{stys/Beautybook-cover-en}[2022/05/21,v1.0]
+\ProvidesPackage{stys/beautybook-cover-en}[2024/06/30,v2.0]
\usepackage{anyfontsize} % 提供\fontsize{}{}\selectfont命令
\usepackage{etoolbox} %提供自定义封面选项接口
\usepackage[dvipsnames,svgnames,x11names,table]{xcolor}%颜色宏包 % Driver-independent color extensions
@@ -14,8 +14,8 @@
left color =transparent!100,
right color=transparent!50]
\tikzfading[name=fade up,
- top color =transparent!100,
- bottom color=transparent!50]
+ top color =transparent!100, % 完全透明
+ bottom color=transparent!50] % 半透明
\tikzfading[name=fade down,
bottom color =transparent!100,
top color=transparent!50]
diff --git a/Master/texmf-dist/tex/latex/beautybook/stys/Beautybook-cover-enfig.sty b/Master/texmf-dist/tex/latex/beautybook/stys/beautybook-cover-enfig.sty
index 005518a6d96..e84129ddea0 100644
--- a/Master/texmf-dist/tex/latex/beautybook/stys/Beautybook-cover-enfig.sty
+++ b/Master/texmf-dist/tex/latex/beautybook/stys/beautybook-cover-enfig.sty
@@ -1,8 +1,5 @@
\NeedsTeXFormat{LaTeX2e}[1995/12/01]
-\ProvidesPackage{stys/Beautybook-cover-enfig}[2023/02/03,v1.0]
-\definecolor{coverbgcolor}{HTML}{004183}
-\definecolor{coverfgcolor}{HTML}{826e68}
-\definecolor{coverbar}{HTML}{7c9092}
+\ProvidesPackage{stys/beautybook-cover-enfig}[2024/06/30,v2.0]
\tikzfading[name=fade right,
right color =transparent!100,
left color=transparent!0]
diff --git a/Master/texmf-dist/tex/latex/nicematrix/nicematrix.sty b/Master/texmf-dist/tex/latex/nicematrix/nicematrix.sty
index fa18034aa09..f08f221f1d0 100644
--- a/Master/texmf-dist/tex/latex/nicematrix/nicematrix.sty
+++ b/Master/texmf-dist/tex/latex/nicematrix/nicematrix.sty
@@ -18,8 +18,8 @@
%% and version 1.3 or later is part of all distributions of
%% LaTeX version 2005/12/01 or later.
%%
-\def\myfileversion{6.28a}
-\def\myfiledate{2024/06/24}
+\def\myfileversion{6.28b}
+\def\myfiledate{2024/06/29}
\RequirePackage{pgfcore}
\usepgfmodule{shapes}
\RequirePackage{l3keys2e}
@@ -33,7 +33,8 @@
\bool_const:Nn \c__nicematrix_tagging_array_bool
{ \IfPackageAtLeastTF { array } { 2024/05/01 } \c_true_bool \c_false_bool }
\bool_const:Nn \c__nicematrix_testphase_table_bool
- { \IfPackageLoadedTF { latex-lab-testphase-table } \c_true_bool \c_false_bool }
+ { \IfPackageLoadedTF { latex-lab-testphase-table } \c_true_bool \c_false_bool
+ }
\cs_new_protected:Npn \__nicematrix_error:n { \msg_error:nn { nicematrix } }
\cs_new_protected:Npn \__nicematrix_warning:n { \msg_warning:nn { nicematrix } }
\cs_new_protected:Npn \__nicematrix_error:nn { \msg_error:nnn { nicematrix } }
@@ -485,7 +486,6 @@
\bool_new:N \l__nicematrix_p_block_bool
\bool_new:N \l__nicematrix_nocolor_used_bool
\str_new:N \l__nicematrix_vpos_block_str
-\str_set:Nn \l__nicematrix_vpos_block_str { c }
\bool_new:N \l__nicematrix_draw_first_bool
\bool_new:N \l__nicematrix_vlines_block_bool
\bool_new:N \l__nicematrix_hlines_block_bool
@@ -543,6 +543,8 @@
\dim_const:Nn \c__nicematrix_innersep_middle_dim { 0.17 em }
}
\newcounter { tabularnote }
+\int_new:N \g__nicematrix_tabularnote_int
+\cs_set:Npn \theHtabularnote { \int_use:N \g__nicematrix_tabularnote_int }
\seq_new:N \g__nicematrix_notes_seq
\seq_new:N \g__nicematrix_notes_in_caption_seq
\tl_new:N \g__nicematrix_tabularnote_tl
@@ -658,6 +660,7 @@
}
\int_gdecr:N \c@tabularnote
\int_set_eq:NN \l_tmpa_int \c@tabularnote
+ \int_gincr:N \g__nicematrix_tabularnote_int
\refstepcounter { tabularnote }
\int_compare:nNnT \l_tmpa_int = \c@tabularnote
{ \int_gincr:N \c@tabularnote }
@@ -7104,6 +7107,9 @@
b .value_forbidden:n = true ,
B .code:n = \str_set:Nn \l__nicematrix_vpos_block_str B ,
B .value_forbidden:n = true ,
+ m .code:n = \str_set:Nn \l__nicematrix_vpos_block_str c ,
+ m .value_forbidden:n = true ,
+ v-center .meta:n = m ,
p .code:n = \bool_set_true:N \l__nicematrix_p_block_bool ,
p .value_forbidden:n = true ,
color .code:n =
@@ -7167,26 +7173,18 @@
\bool_set_false:N \l_tmpa_bool
\bool_if:NT \l__nicematrix_amp_in_blocks_bool
{ \tl_if_in:nnT { #5 } { & } { \bool_set_true:N \l_tmpa_bool } }
- \bool_if:NTF \l_tmpa_bool
- { \exp_args:Nee \__nicematrix_Block_vii:nnnnn }
- {
- \bool_if:NTF \l__nicematrix_p_block_bool
- { \exp_args:Nee \__nicematrix_Block_vi:nnnnn }
- {
- \bool_if:nTF
- {
- (
- \int_compare_p:nNn \l_tmpa_int = \c_one_int
- ||
- \int_compare_p:nNn \l_tmpb_int = \c_one_int
- )
- && ! \tl_if_empty_p:n { #5 }
- && ! \l__nicematrix_X_bool
- }
- { \exp_args:Nee \__nicematrix_Block_iv:nnnnn }
- { \exp_args:Nee \__nicematrix_Block_v:nnnnn }
- }
- }
+ \bool_case:nF
+ {
+ \l_tmpa_bool { \exp_args:Nee \__nicematrix_Block_vii:nnnnn }
+ \l__nicematrix_p_block_bool { \exp_args:Nee \__nicematrix_Block_vi:nnnnn }
+ \l__nicematrix_X_bool { \exp_args:Nee \__nicematrix_Block_v:nnnnn }
+ { \tl_if_empty_p:n { #5 } } { \exp_args:Nee \__nicematrix_Block_v:nnnnn }
+ { \int_compare_p:nNn \l_tmpa_int = \c_one_int }
+ { \exp_args:Nee \__nicematrix_Block_iv:nnnnn }
+ { \int_compare_p:nNn \l_tmpb_int = \c_one_int }
+ { \exp_args:Nee \__nicematrix_Block_iv:nnnnn }
+ }
+ { \exp_args:Nee \__nicematrix_Block_v:nnnnn }
{ \l_tmpa_int } { \l_tmpb_int } { #3 } { #4 } { #5 }
}
\cs_new_protected:Npn \__nicematrix_Block_iv:nnnnn #1 #2 #3 #4 #5
@@ -7284,7 +7282,9 @@
}
}
}
- \int_compare:nNnT { #1 } = \c_one_int
+ \bool_lazy_and:nnT
+ { \int_compare_p:nNn { #1 } = \c_one_int }
+ { \str_if_empty_p:N \l__nicematrix_vpos_block_str }
{
\dim_gset:Nn \g__nicematrix_blocks_ht_dim
{
@@ -7317,7 +7317,6 @@
{ m }
{ \int_compare:nNnT \c@iRow = \l__nicematrix_last_row_int T }
}
-
}
{
\box_use_drop:c
@@ -7877,6 +7876,7 @@
\pgf@relevantforpicturesizefalse
\bool_lazy_any:nTF
{
+ { \str_if_empty_p:N \l__nicematrix_vpos_block_str } % added 2024/06/29
{ \str_if_eq_p:on \l__nicematrix_vpos_block_str { c } }
{ \str_if_eq_p:on \l__nicematrix_vpos_block_str { T } }
{ \str_if_eq_p:on \l__nicematrix_vpos_block_str { B } }
@@ -7892,6 +7892,15 @@
{
\str_case:on \l__nicematrix_vpos_block_str
{
+ { } { % added 2024-06-29
+ \str_case:on \l__nicematrix_hpos_block_str
+ {
+ c { center }
+ l { west }
+ r { east }
+ j { center }
+ }
+ }
c {
\str_case:on \l__nicematrix_hpos_block_str
{
@@ -8847,6 +8856,7 @@
{
\nullfont
\c_math_toggle_token
+ \colorlet { current-color } { . }
\__nicematrix_color:o \l__nicematrix_delimiters_color_tl
\left .
\vcenter
@@ -8858,7 +8868,7 @@
}
\right #1
\tl_if_empty:nF { #3 } { _ { \smash { #3 } } }
- ^ { \smash { #4 } }
+ ^ { \color { current-color } \smash { #4 } }
\c_math_toggle_token
}
{ #2 }
@@ -8878,9 +8888,12 @@
{
left-shorten .bool_set:N = \l__nicematrix_brace_left_shorten_bool ,
left-shorten .default:n = true ,
+ left-shorten .value_forbidden:n = true ,
right-shorten .bool_set:N = \l__nicematrix_brace_right_shorten_bool ,
- shorten .meta:n = { left-shorten , right-shorten } ,
right-shorten .default:n = true ,
+ right-shorten .value_forbidden:n = true ,
+ shorten .meta:n = { left-shorten , right-shorten } ,
+ shorten .value_forbidden:n = true ,
yshift .dim_set:N = \l__nicematrix_brace_yshift_dim ,
yshift .value_required:n = true ,
yshift .initial:n = \c_zero_dim ,
@@ -10113,6 +10126,7 @@
}
{
The~available~keys~are~(in~alphabetic~order):~
+ &-in-blocks,~
allow-duplicate-names,~
ampersand-in-blocks,~
caption-above,~
@@ -10167,6 +10181,7 @@
}
{
The~available~keys~are~(in~alphabetic~order):~
+ &-in-blocks,~
ampersand-in-blocks,~
b,~
baseline,~
@@ -10225,6 +10240,7 @@
}
{
The~available~keys~are~(in~alphabetic~order):~
+ &-in-blocks,~
ampersand-in-blocks,~
b,~
baseline,~
@@ -10286,6 +10302,7 @@
}
{
The~available~keys~are~(in~alphabetic~order):~
+ &-in-blocks,~
ampersand-in-blocks,~
b,~
baseline,~
diff --git a/Master/texmf-dist/tex/latex/preview/prauctex.cfg b/Master/texmf-dist/tex/latex/preview/prauctex.cfg
index 39922c989a8..f9273829b11 100644
--- a/Master/texmf-dist/tex/latex/preview/prauctex.cfg
+++ b/Master/texmf-dist/tex/latex/preview/prauctex.cfg
@@ -26,11 +26,17 @@
\PreviewMacro*[?[{@{[]}}{}][#1]\item
\PreviewMacro*\emph
\PreviewMacro*\textrm
+\PreviewMacro*\textbf
\PreviewMacro*\textit
\PreviewMacro*\textsc
\PreviewMacro*\textsf
\PreviewMacro*\textsl
\PreviewMacro*\texttt
+\PreviewMacro*\textulc
+\PreviewMacro*\textmd
+\PreviewMacro*\textnormal
+\PreviewMacro*\textup
+\PreviewMacro*\textsw
\PreviewMacro*\textcolor
\PreviewMacro*\mbox
\PreviewMacro*[][#1{}]\author
diff --git a/Master/texmf-dist/tex/latex/preview/preview.sty b/Master/texmf-dist/tex/latex/preview/preview.sty
index 1002230ffb0..39895bea005 100644
--- a/Master/texmf-dist/tex/latex/preview/preview.sty
+++ b/Master/texmf-dist/tex/latex/preview/preview.sty
@@ -24,8 +24,8 @@
%% The preview style for extracting previews from LaTeX documents.
%% Developed as part of AUCTeX <URL:https://www.gnu.org/software/auctex/>.
\NeedsTeXFormat{LaTeX2e}
-\def\pr@version{13.3}
-\def\pr@date{2024/01/17}
+\def\pr@version{14.0.6}
+\def\pr@date{2024/06/30}
\ProvidesPackage{preview}[\pr@date\space \pr@version\space (AUCTeX/preview-latex)]
\let\ifPreview\iffalse
\let\preview@delay=\@gobble
diff --git a/Master/texmf-dist/tex/latex/sjtutex/font/sjtu-cjk-font-adobe-ja.def b/Master/texmf-dist/tex/latex/sjtutex/font/sjtu-cjk-font-adobe-ja.def
index f87235ae97c..ce55e644817 100644
--- a/Master/texmf-dist/tex/latex/sjtutex/font/sjtu-cjk-font-adobe-ja.def
+++ b/Master/texmf-dist/tex/latex/sjtutex/font/sjtu-cjk-font-adobe-ja.def
@@ -20,10 +20,10 @@
%% and version 1.3 or later is part of all distributions of
%% LaTeX version 2005/12/01 or later.
%%
-\GetIdInfo$Id: sjtutex.dtx 6d52363 2024-04-05 19:40:30 +0800 Alexara Wu <alexarawu@outlook.com> $
+\GetIdInfo$Id: sjtutex.dtx 78f11bc 2024-06-29 23:01:32 +0800 Alexara Wu <alexarawu@outlook.com> $
{Adobe CJK fonts definition for Japanese (SJTUTeX)}
\ProvidesExplFile{sjtu-cjk-font-adobe-ja.def}
- {\ExplFileDate}{2.1.2}{\ExplFileDescription}
+ {\ExplFileDate}{2.1.3}{\ExplFileDescription}
\__sjtu_fontset_case:nn
{ \__sjtu_fontset_error:nn { cjk } { adobe } }
{
diff --git a/Master/texmf-dist/tex/latex/sjtutex/font/sjtu-cjk-font-adobe-zh.def b/Master/texmf-dist/tex/latex/sjtutex/font/sjtu-cjk-font-adobe-zh.def
index 79335545c6b..37b96e47c4a 100644
--- a/Master/texmf-dist/tex/latex/sjtutex/font/sjtu-cjk-font-adobe-zh.def
+++ b/Master/texmf-dist/tex/latex/sjtutex/font/sjtu-cjk-font-adobe-zh.def
@@ -20,10 +20,10 @@
%% and version 1.3 or later is part of all distributions of
%% LaTeX version 2005/12/01 or later.
%%
-\GetIdInfo$Id: sjtutex.dtx 6d52363 2024-04-05 19:40:30 +0800 Alexara Wu <alexarawu@outlook.com> $
+\GetIdInfo$Id: sjtutex.dtx 78f11bc 2024-06-29 23:01:32 +0800 Alexara Wu <alexarawu@outlook.com> $
{Adobe CJK fonts definition for Chinese (SJTUTeX)}
\ProvidesExplFile{sjtu-cjk-font-adobe-zh.def}
- {\ExplFileDate}{2.1.2}{\ExplFileDescription}
+ {\ExplFileDate}{2.1.3}{\ExplFileDescription}
\__sjtu_fontset_case:nnn
{ \__sjtu_fontset_error:nn { cjk } { adobe } }
{
diff --git a/Master/texmf-dist/tex/latex/sjtutex/font/sjtu-cjk-font-adobe.def b/Master/texmf-dist/tex/latex/sjtutex/font/sjtu-cjk-font-adobe.def
index 86b935e0cca..d61429b1aca 100644
--- a/Master/texmf-dist/tex/latex/sjtutex/font/sjtu-cjk-font-adobe.def
+++ b/Master/texmf-dist/tex/latex/sjtutex/font/sjtu-cjk-font-adobe.def
@@ -20,10 +20,10 @@
%% and version 1.3 or later is part of all distributions of
%% LaTeX version 2005/12/01 or later.
%%
-\GetIdInfo$Id: sjtutex.dtx 6d52363 2024-04-05 19:40:30 +0800 Alexara Wu <alexarawu@outlook.com> $
+\GetIdInfo$Id: sjtutex.dtx 78f11bc 2024-06-29 23:01:32 +0800 Alexara Wu <alexarawu@outlook.com> $
{Adobe CJK fonts definition (SJTUTeX)}
\ProvidesExplFile{sjtu-cjk-font-adobe.def}
- {\ExplFileDate}{2.1.2}{\ExplFileDescription}
+ {\ExplFileDate}{2.1.3}{\ExplFileDescription}
\tl_if_eq:NNTF \g__sjtu_lang_tl \c__sjtu_lang_ja_tl
{ \ctex_file_input:n { sjtu-cjk-font-adobe-ja.def } }
{ \ctex_file_input:n { sjtu-cjk-font-adobe-zh.def } }
diff --git a/Master/texmf-dist/tex/latex/sjtutex/font/sjtu-cjk-font-fandol-ja.def b/Master/texmf-dist/tex/latex/sjtutex/font/sjtu-cjk-font-fandol-ja.def
index 504a6d81f84..798a2319eef 100644
--- a/Master/texmf-dist/tex/latex/sjtutex/font/sjtu-cjk-font-fandol-ja.def
+++ b/Master/texmf-dist/tex/latex/sjtutex/font/sjtu-cjk-font-fandol-ja.def
@@ -20,10 +20,10 @@
%% and version 1.3 or later is part of all distributions of
%% LaTeX version 2005/12/01 or later.
%%
-\GetIdInfo$Id: sjtutex.dtx 6d52363 2024-04-05 19:40:30 +0800 Alexara Wu <alexarawu@outlook.com> $
+\GetIdInfo$Id: sjtutex.dtx 78f11bc 2024-06-29 23:01:32 +0800 Alexara Wu <alexarawu@outlook.com> $
{Fandol CJK fonts definition for Japanese (SJTUTeX)}
\ProvidesExplFile{sjtu-cjk-font-fandol-ja.def}
- {\ExplFileDate}{2.1.2}{\ExplFileDescription}
+ {\ExplFileDate}{2.1.3}{\ExplFileDescription}
\__sjtu_fontset_case:nn
{ \__sjtu_fontset_error:nn { cjk } { fandol } }
{
diff --git a/Master/texmf-dist/tex/latex/sjtutex/font/sjtu-cjk-font-fandol-zh.def b/Master/texmf-dist/tex/latex/sjtutex/font/sjtu-cjk-font-fandol-zh.def
index 6baf4706f0d..9a64be9d385 100644
--- a/Master/texmf-dist/tex/latex/sjtutex/font/sjtu-cjk-font-fandol-zh.def
+++ b/Master/texmf-dist/tex/latex/sjtutex/font/sjtu-cjk-font-fandol-zh.def
@@ -20,10 +20,10 @@
%% and version 1.3 or later is part of all distributions of
%% LaTeX version 2005/12/01 or later.
%%
-\GetIdInfo$Id: sjtutex.dtx 6d52363 2024-04-05 19:40:30 +0800 Alexara Wu <alexarawu@outlook.com> $
+\GetIdInfo$Id: sjtutex.dtx 78f11bc 2024-06-29 23:01:32 +0800 Alexara Wu <alexarawu@outlook.com> $
{Fandol CJK fonts definition for Chinese (SJTUTeX)}
\ProvidesExplFile{sjtu-cjk-font-fandol-zh.def}
- {\ExplFileDate}{2.1.2}{\ExplFileDescription}
+ {\ExplFileDate}{2.1.3}{\ExplFileDescription}
\__sjtu_fontset_case:nnn
{ \__sjtu_fontset_error:nn { cjk } { fandol } }
{
diff --git a/Master/texmf-dist/tex/latex/sjtutex/font/sjtu-cjk-font-fandol.def b/Master/texmf-dist/tex/latex/sjtutex/font/sjtu-cjk-font-fandol.def
index e1662945ad9..ad3d0e5978b 100644
--- a/Master/texmf-dist/tex/latex/sjtutex/font/sjtu-cjk-font-fandol.def
+++ b/Master/texmf-dist/tex/latex/sjtutex/font/sjtu-cjk-font-fandol.def
@@ -20,10 +20,10 @@
%% and version 1.3 or later is part of all distributions of
%% LaTeX version 2005/12/01 or later.
%%
-\GetIdInfo$Id: sjtutex.dtx 6d52363 2024-04-05 19:40:30 +0800 Alexara Wu <alexarawu@outlook.com> $
+\GetIdInfo$Id: sjtutex.dtx 78f11bc 2024-06-29 23:01:32 +0800 Alexara Wu <alexarawu@outlook.com> $
{Fandol CJK fonts definition (SJTUTeX)}
\ProvidesExplFile{sjtu-cjk-font-fandol.def}
- {\ExplFileDate}{2.1.2}{\ExplFileDescription}
+ {\ExplFileDate}{2.1.3}{\ExplFileDescription}
\tl_if_eq:NNTF \g__sjtu_lang_tl \c__sjtu_lang_ja_tl
{ \ctex_file_input:n { sjtu-cjk-font-fandol-ja.def } }
{ \ctex_file_input:n { sjtu-cjk-font-fandol-zh.def } }
diff --git a/Master/texmf-dist/tex/latex/sjtutex/font/sjtu-cjk-font-founder-ja.def b/Master/texmf-dist/tex/latex/sjtutex/font/sjtu-cjk-font-founder-ja.def
index 8b43b70d983..8aba1cb30aa 100644
--- a/Master/texmf-dist/tex/latex/sjtutex/font/sjtu-cjk-font-founder-ja.def
+++ b/Master/texmf-dist/tex/latex/sjtutex/font/sjtu-cjk-font-founder-ja.def
@@ -20,10 +20,10 @@
%% and version 1.3 or later is part of all distributions of
%% LaTeX version 2005/12/01 or later.
%%
-\GetIdInfo$Id: sjtutex.dtx 6d52363 2024-04-05 19:40:30 +0800 Alexara Wu <alexarawu@outlook.com> $
+\GetIdInfo$Id: sjtutex.dtx 78f11bc 2024-06-29 23:01:32 +0800 Alexara Wu <alexarawu@outlook.com> $
{Founder CJK fonts definition for Japanese (SJTUTeX)}
\ProvidesExplFile{sjtu-cjk-font-founder-ja.def}
- {\ExplFileDate}{2.1.2}{\ExplFileDescription}
+ {\ExplFileDate}{2.1.3}{\ExplFileDescription}
\__sjtu_fontset_case:nn
{ \__sjtu_fontset_error:nn { cjk } { founder } }
{
diff --git a/Master/texmf-dist/tex/latex/sjtutex/font/sjtu-cjk-font-founder-zh.def b/Master/texmf-dist/tex/latex/sjtutex/font/sjtu-cjk-font-founder-zh.def
index 2a5d1f657c1..1e93ecb54b1 100644
--- a/Master/texmf-dist/tex/latex/sjtutex/font/sjtu-cjk-font-founder-zh.def
+++ b/Master/texmf-dist/tex/latex/sjtutex/font/sjtu-cjk-font-founder-zh.def
@@ -20,10 +20,10 @@
%% and version 1.3 or later is part of all distributions of
%% LaTeX version 2005/12/01 or later.
%%
-\GetIdInfo$Id: sjtutex.dtx 6d52363 2024-04-05 19:40:30 +0800 Alexara Wu <alexarawu@outlook.com> $
+\GetIdInfo$Id: sjtutex.dtx 78f11bc 2024-06-29 23:01:32 +0800 Alexara Wu <alexarawu@outlook.com> $
{Founder CJK fonts definition for Chinese (SJTUTeX)}
\ProvidesExplFile{sjtu-cjk-font-founder-zh.def}
- {\ExplFileDate}{2.1.2}{\ExplFileDescription}
+ {\ExplFileDate}{2.1.3}{\ExplFileDescription}
\__sjtu_fontset_case:nn
{
\ctex_load_zhmap:nnnn { zhsong } { zhhei } { zhfs } { founder }
diff --git a/Master/texmf-dist/tex/latex/sjtutex/font/sjtu-cjk-font-founder.def b/Master/texmf-dist/tex/latex/sjtutex/font/sjtu-cjk-font-founder.def
index 20d50b9647b..73e5cac53d1 100644
--- a/Master/texmf-dist/tex/latex/sjtutex/font/sjtu-cjk-font-founder.def
+++ b/Master/texmf-dist/tex/latex/sjtutex/font/sjtu-cjk-font-founder.def
@@ -20,10 +20,10 @@
%% and version 1.3 or later is part of all distributions of
%% LaTeX version 2005/12/01 or later.
%%
-\GetIdInfo$Id: sjtutex.dtx 6d52363 2024-04-05 19:40:30 +0800 Alexara Wu <alexarawu@outlook.com> $
+\GetIdInfo$Id: sjtutex.dtx 78f11bc 2024-06-29 23:01:32 +0800 Alexara Wu <alexarawu@outlook.com> $
{Founder CJK fonts definition (SJTUTeX)}
\ProvidesExplFile{sjtu-cjk-font-founder.def}
- {\ExplFileDate}{2.1.2}{\ExplFileDescription}
+ {\ExplFileDate}{2.1.3}{\ExplFileDescription}
\tl_if_eq:NNTF \g__sjtu_lang_tl \c__sjtu_lang_ja_tl
{ \ctex_file_input:n { sjtu-cjk-font-founder-ja.def } }
{ \ctex_file_input:n { sjtu-cjk-font-founder-zh.def } }
diff --git a/Master/texmf-dist/tex/latex/sjtutex/font/sjtu-cjk-font-mac-ja.def b/Master/texmf-dist/tex/latex/sjtutex/font/sjtu-cjk-font-mac-ja.def
index e30cfc78945..7923336bea5 100644
--- a/Master/texmf-dist/tex/latex/sjtutex/font/sjtu-cjk-font-mac-ja.def
+++ b/Master/texmf-dist/tex/latex/sjtutex/font/sjtu-cjk-font-mac-ja.def
@@ -20,10 +20,10 @@
%% and version 1.3 or later is part of all distributions of
%% LaTeX version 2005/12/01 or later.
%%
-\GetIdInfo$Id: sjtutex.dtx 6d52363 2024-04-05 19:40:30 +0800 Alexara Wu <alexarawu@outlook.com> $
+\GetIdInfo$Id: sjtutex.dtx 78f11bc 2024-06-29 23:01:32 +0800 Alexara Wu <alexarawu@outlook.com> $
{macOS CJK fonts definition for Japanese (SJTUTeX)}
\ProvidesExplFile{sjtu-cjk-font-mac-ja.def}
- {\ExplFileDate}{2.1.2}{\ExplFileDescription}
+ {\ExplFileDate}{2.1.3}{\ExplFileDescription}
\__sjtu_fontset_case:nn
{ \__sjtu_fontset_error:nn { cjk } { mac } }
{
diff --git a/Master/texmf-dist/tex/latex/sjtutex/font/sjtu-cjk-font-mac-zh.def b/Master/texmf-dist/tex/latex/sjtutex/font/sjtu-cjk-font-mac-zh.def
index 86fd138ac49..e38d0f08e09 100644
--- a/Master/texmf-dist/tex/latex/sjtutex/font/sjtu-cjk-font-mac-zh.def
+++ b/Master/texmf-dist/tex/latex/sjtutex/font/sjtu-cjk-font-mac-zh.def
@@ -20,10 +20,10 @@
%% and version 1.3 or later is part of all distributions of
%% LaTeX version 2005/12/01 or later.
%%
-\GetIdInfo$Id: sjtutex.dtx 6d52363 2024-04-05 19:40:30 +0800 Alexara Wu <alexarawu@outlook.com> $
+\GetIdInfo$Id: sjtutex.dtx 78f11bc 2024-06-29 23:01:32 +0800 Alexara Wu <alexarawu@outlook.com> $
{macOS CJK fonts definition for Chinese (SJTUTeX)}
\ProvidesExplFile{sjtu-cjk-font-mac-zh.def}
- {\ExplFileDate}{2.1.2}{\ExplFileDescription}
+ {\ExplFileDate}{2.1.3}{\ExplFileDescription}
\__sjtu_fontset_case:nnn
{ \__sjtu_fontset_error:nn { cjk } { mac } }
{
diff --git a/Master/texmf-dist/tex/latex/sjtutex/font/sjtu-cjk-font-mac.def b/Master/texmf-dist/tex/latex/sjtutex/font/sjtu-cjk-font-mac.def
index 34f77b841fb..0e5a94d1900 100644
--- a/Master/texmf-dist/tex/latex/sjtutex/font/sjtu-cjk-font-mac.def
+++ b/Master/texmf-dist/tex/latex/sjtutex/font/sjtu-cjk-font-mac.def
@@ -20,10 +20,10 @@
%% and version 1.3 or later is part of all distributions of
%% LaTeX version 2005/12/01 or later.
%%
-\GetIdInfo$Id: sjtutex.dtx 6d52363 2024-04-05 19:40:30 +0800 Alexara Wu <alexarawu@outlook.com> $
+\GetIdInfo$Id: sjtutex.dtx 78f11bc 2024-06-29 23:01:32 +0800 Alexara Wu <alexarawu@outlook.com> $
{macOS CJK fonts definition (SJTUTeX)}
\ProvidesExplFile{sjtu-cjk-font-mac.def}
- {\ExplFileDate}{2.1.2}{\ExplFileDescription}
+ {\ExplFileDate}{2.1.3}{\ExplFileDescription}
\tl_if_eq:NNTF \g__sjtu_lang_tl \c__sjtu_lang_ja_tl
{ \ctex_file_input:n { sjtu-cjk-font-mac-ja.def } }
{ \ctex_file_input:n { sjtu-cjk-font-mac-zh.def } }
diff --git a/Master/texmf-dist/tex/latex/sjtutex/font/sjtu-cjk-font-ubuntu-ja.def b/Master/texmf-dist/tex/latex/sjtutex/font/sjtu-cjk-font-ubuntu-ja.def
index 7036d1b7151..9cb1ed81233 100644
--- a/Master/texmf-dist/tex/latex/sjtutex/font/sjtu-cjk-font-ubuntu-ja.def
+++ b/Master/texmf-dist/tex/latex/sjtutex/font/sjtu-cjk-font-ubuntu-ja.def
@@ -20,10 +20,10 @@
%% and version 1.3 or later is part of all distributions of
%% LaTeX version 2005/12/01 or later.
%%
-\GetIdInfo$Id: sjtutex.dtx 6d52363 2024-04-05 19:40:30 +0800 Alexara Wu <alexarawu@outlook.com> $
+\GetIdInfo$Id: sjtutex.dtx 78f11bc 2024-06-29 23:01:32 +0800 Alexara Wu <alexarawu@outlook.com> $
{Ubuntu CJK fonts definition for Japanese (SJTUTeX)}
\ProvidesExplFile{sjtu-cjk-font-ubuntu-ja.def}
- {\ExplFileDate}{2.1.2}{\ExplFileDescription}
+ {\ExplFileDate}{2.1.3}{\ExplFileDescription}
\__sjtu_fontset_case:nn
{ \__sjtu_fontset_error:nn { cjk } { ubuntu } }
{
diff --git a/Master/texmf-dist/tex/latex/sjtutex/font/sjtu-cjk-font-ubuntu-zh.def b/Master/texmf-dist/tex/latex/sjtutex/font/sjtu-cjk-font-ubuntu-zh.def
index 27274a91536..cf6f87a7a27 100644
--- a/Master/texmf-dist/tex/latex/sjtutex/font/sjtu-cjk-font-ubuntu-zh.def
+++ b/Master/texmf-dist/tex/latex/sjtutex/font/sjtu-cjk-font-ubuntu-zh.def
@@ -20,10 +20,10 @@
%% and version 1.3 or later is part of all distributions of
%% LaTeX version 2005/12/01 or later.
%%
-\GetIdInfo$Id: sjtutex.dtx 6d52363 2024-04-05 19:40:30 +0800 Alexara Wu <alexarawu@outlook.com> $
+\GetIdInfo$Id: sjtutex.dtx 78f11bc 2024-06-29 23:01:32 +0800 Alexara Wu <alexarawu@outlook.com> $
{Ubuntu CJK fonts definition for Chinese (SJTUTeX)}
\ProvidesExplFile{sjtu-cjk-font-ubuntu-zh.def}
- {\ExplFileDate}{2.1.2}{\ExplFileDescription}
+ {\ExplFileDate}{2.1.3}{\ExplFileDescription}
\__sjtu_fontset_case:nnn
{ \__sjtu_fontset_error:nn { cjk } { ubuntu } }
{
diff --git a/Master/texmf-dist/tex/latex/sjtutex/font/sjtu-cjk-font-ubuntu.def b/Master/texmf-dist/tex/latex/sjtutex/font/sjtu-cjk-font-ubuntu.def
index 8bf9a452564..82c2c26154c 100644
--- a/Master/texmf-dist/tex/latex/sjtutex/font/sjtu-cjk-font-ubuntu.def
+++ b/Master/texmf-dist/tex/latex/sjtutex/font/sjtu-cjk-font-ubuntu.def
@@ -20,10 +20,10 @@
%% and version 1.3 or later is part of all distributions of
%% LaTeX version 2005/12/01 or later.
%%
-\GetIdInfo$Id: sjtutex.dtx 6d52363 2024-04-05 19:40:30 +0800 Alexara Wu <alexarawu@outlook.com> $
+\GetIdInfo$Id: sjtutex.dtx 78f11bc 2024-06-29 23:01:32 +0800 Alexara Wu <alexarawu@outlook.com> $
{Ubuntu CJK fonts definition (SJTUTeX)}
\ProvidesExplFile{sjtu-cjk-font-ubuntu.def}
- {\ExplFileDate}{2.1.2}{\ExplFileDescription}
+ {\ExplFileDate}{2.1.3}{\ExplFileDescription}
\tl_if_eq:NNTF \g__sjtu_lang_tl \c__sjtu_lang_ja_tl
{ \ctex_file_input:n { sjtu-cjk-font-ubuntu-ja.def } }
{ \ctex_file_input:n { sjtu-cjk-font-ubuntu-zh.def } }
diff --git a/Master/texmf-dist/tex/latex/sjtutex/font/sjtu-cjk-font-windows-ja.def b/Master/texmf-dist/tex/latex/sjtutex/font/sjtu-cjk-font-windows-ja.def
index e8f80987255..af93cc24389 100644
--- a/Master/texmf-dist/tex/latex/sjtutex/font/sjtu-cjk-font-windows-ja.def
+++ b/Master/texmf-dist/tex/latex/sjtutex/font/sjtu-cjk-font-windows-ja.def
@@ -20,10 +20,10 @@
%% and version 1.3 or later is part of all distributions of
%% LaTeX version 2005/12/01 or later.
%%
-\GetIdInfo$Id: sjtutex.dtx 6d52363 2024-04-05 19:40:30 +0800 Alexara Wu <alexarawu@outlook.com> $
+\GetIdInfo$Id: sjtutex.dtx 78f11bc 2024-06-29 23:01:32 +0800 Alexara Wu <alexarawu@outlook.com> $
{Windows CJK fonts definition for Japanese (SJTUTeX)}
\ProvidesExplFile{sjtu-cjk-font-windows-ja.def}
- {\ExplFileDate}{2.1.2}{\ExplFileDescription}
+ {\ExplFileDate}{2.1.3}{\ExplFileDescription}
\__sjtu_fontset_case:nn
{ \__sjtu_fontset_error:nn { cjk } { windows } }
{
diff --git a/Master/texmf-dist/tex/latex/sjtutex/font/sjtu-cjk-font-windows-zh.def b/Master/texmf-dist/tex/latex/sjtutex/font/sjtu-cjk-font-windows-zh.def
index 87b3980af68..2fcb8ba3c26 100644
--- a/Master/texmf-dist/tex/latex/sjtutex/font/sjtu-cjk-font-windows-zh.def
+++ b/Master/texmf-dist/tex/latex/sjtutex/font/sjtu-cjk-font-windows-zh.def
@@ -20,10 +20,10 @@
%% and version 1.3 or later is part of all distributions of
%% LaTeX version 2005/12/01 or later.
%%
-\GetIdInfo$Id: sjtutex.dtx 6d52363 2024-04-05 19:40:30 +0800 Alexara Wu <alexarawu@outlook.com> $
+\GetIdInfo$Id: sjtutex.dtx 78f11bc 2024-06-29 23:01:32 +0800 Alexara Wu <alexarawu@outlook.com> $
{Windows CJK fonts definition for Chinese (SJTUTeX)}
\ProvidesExplFile{sjtu-cjk-font-windows-zh.def}
- {\ExplFileDate}{2.1.2}{\ExplFileDescription}
+ {\ExplFileDate}{2.1.3}{\ExplFileDescription}
\__sjtu_fontset_case:nn
{
\ctex_load_zhmap:nnnn { zhsong } { zhhei } { zhfs } { windows }
diff --git a/Master/texmf-dist/tex/latex/sjtutex/font/sjtu-cjk-font-windows.def b/Master/texmf-dist/tex/latex/sjtutex/font/sjtu-cjk-font-windows.def
index f37980423e4..a9575e0ac53 100644
--- a/Master/texmf-dist/tex/latex/sjtutex/font/sjtu-cjk-font-windows.def
+++ b/Master/texmf-dist/tex/latex/sjtutex/font/sjtu-cjk-font-windows.def
@@ -20,10 +20,10 @@
%% and version 1.3 or later is part of all distributions of
%% LaTeX version 2005/12/01 or later.
%%
-\GetIdInfo$Id: sjtutex.dtx 6d52363 2024-04-05 19:40:30 +0800 Alexara Wu <alexarawu@outlook.com> $
+\GetIdInfo$Id: sjtutex.dtx 78f11bc 2024-06-29 23:01:32 +0800 Alexara Wu <alexarawu@outlook.com> $
{Windows CJK fonts definition (SJTUTeX)}
\ProvidesExplFile{sjtu-cjk-font-windows.def}
- {\ExplFileDate}{2.1.2}{\ExplFileDescription}
+ {\ExplFileDate}{2.1.3}{\ExplFileDescription}
\tl_if_eq:NNTF \g__sjtu_lang_tl \c__sjtu_lang_ja_tl
{ \ctex_file_input:n { sjtu-cjk-font-windows-ja.def } }
{ \ctex_file_input:n { sjtu-cjk-font-windows-zh.def } }
diff --git a/Master/texmf-dist/tex/latex/sjtutex/font/sjtu-math-font-cambria.def b/Master/texmf-dist/tex/latex/sjtutex/font/sjtu-math-font-cambria.def
index 7434d428f04..66fa4aee1ac 100644
--- a/Master/texmf-dist/tex/latex/sjtutex/font/sjtu-math-font-cambria.def
+++ b/Master/texmf-dist/tex/latex/sjtutex/font/sjtu-math-font-cambria.def
@@ -20,10 +20,10 @@
%% and version 1.3 or later is part of all distributions of
%% LaTeX version 2005/12/01 or later.
%%
-\GetIdInfo$Id: sjtutex.dtx 6d52363 2024-04-05 19:40:30 +0800 Alexara Wu <alexarawu@outlook.com> $
+\GetIdInfo$Id: sjtutex.dtx 78f11bc 2024-06-29 23:01:32 +0800 Alexara Wu <alexarawu@outlook.com> $
{Cambria math fonts definition (SJTUTeX)}
\ProvidesExplFile{sjtu-math-font-cambria.def}
- {\ExplFileDate}{2.1.2}{\ExplFileDescription}
+ {\ExplFileDate}{2.1.3}{\ExplFileDescription}
\__sjtu_fontset_case:nn
{ \__sjtu_fontset_error:nn { math } { cambria } }
{
diff --git a/Master/texmf-dist/tex/latex/sjtutex/font/sjtu-math-font-libertinus.def b/Master/texmf-dist/tex/latex/sjtutex/font/sjtu-math-font-libertinus.def
index 97db96be2d1..adcbcf10540 100644
--- a/Master/texmf-dist/tex/latex/sjtutex/font/sjtu-math-font-libertinus.def
+++ b/Master/texmf-dist/tex/latex/sjtutex/font/sjtu-math-font-libertinus.def
@@ -20,10 +20,10 @@
%% and version 1.3 or later is part of all distributions of
%% LaTeX version 2005/12/01 or later.
%%
-\GetIdInfo$Id: sjtutex.dtx 6d52363 2024-04-05 19:40:30 +0800 Alexara Wu <alexarawu@outlook.com> $
+\GetIdInfo$Id: sjtutex.dtx 78f11bc 2024-06-29 23:01:32 +0800 Alexara Wu <alexarawu@outlook.com> $
{Libertinus math fonts definition (SJTUTeX)}
\ProvidesExplFile{sjtu-math-font-libertinus.def}
- {\ExplFileDate}{2.1.2}{\ExplFileDescription}
+ {\ExplFileDate}{2.1.3}{\ExplFileDescription}
\__sjtu_fontset_case:nn
{
\exp_args:No \PassOptionsToPackage
diff --git a/Master/texmf-dist/tex/latex/sjtutex/font/sjtu-math-font-lm.def b/Master/texmf-dist/tex/latex/sjtutex/font/sjtu-math-font-lm.def
index 35acaa1f21c..600933baa76 100644
--- a/Master/texmf-dist/tex/latex/sjtutex/font/sjtu-math-font-lm.def
+++ b/Master/texmf-dist/tex/latex/sjtutex/font/sjtu-math-font-lm.def
@@ -20,10 +20,10 @@
%% and version 1.3 or later is part of all distributions of
%% LaTeX version 2005/12/01 or later.
%%
-\GetIdInfo$Id: sjtutex.dtx 6d52363 2024-04-05 19:40:30 +0800 Alexara Wu <alexarawu@outlook.com> $
+\GetIdInfo$Id: sjtutex.dtx 78f11bc 2024-06-29 23:01:32 +0800 Alexara Wu <alexarawu@outlook.com> $
{Latin Modern math fonts definition (SJTUTeX)}
\ProvidesExplFile{sjtu-math-font-lm.def}
- {\ExplFileDate}{2.1.2}{\ExplFileDescription}
+ {\ExplFileDate}{2.1.3}{\ExplFileDescription}
\RequirePackage { amssymb, upgreek }
\SetSymbolFont { operators } { normal } { OT1 } { lmr } { m } { n }
\SetSymbolFont { letters } { normal } { OML } { lmm } { m } { it }
diff --git a/Master/texmf-dist/tex/latex/sjtutex/font/sjtu-math-font-newcm.def b/Master/texmf-dist/tex/latex/sjtutex/font/sjtu-math-font-newcm.def
index e794b07f272..116ae6f33b7 100644
--- a/Master/texmf-dist/tex/latex/sjtutex/font/sjtu-math-font-newcm.def
+++ b/Master/texmf-dist/tex/latex/sjtutex/font/sjtu-math-font-newcm.def
@@ -20,10 +20,10 @@
%% and version 1.3 or later is part of all distributions of
%% LaTeX version 2005/12/01 or later.
%%
-\GetIdInfo$Id: sjtutex.dtx 6d52363 2024-04-05 19:40:30 +0800 Alexara Wu <alexarawu@outlook.com> $
+\GetIdInfo$Id: sjtutex.dtx 78f11bc 2024-06-29 23:01:32 +0800 Alexara Wu <alexarawu@outlook.com> $
{New Computer Modern math fonts definition (SJTUTeX)}
\ProvidesExplFile{sjtu-math-font-newcm.def}
- {\ExplFileDate}{2.1.2}{\ExplFileDescription}
+ {\ExplFileDate}{2.1.3}{\ExplFileDescription}
\__sjtu_fontset_case:nn
{ \__sjtu_fontset_error:nn { math } { newcm } }
{
diff --git a/Master/texmf-dist/tex/latex/sjtutex/font/sjtu-math-font-newpx.def b/Master/texmf-dist/tex/latex/sjtutex/font/sjtu-math-font-newpx.def
index 07519ba9470..94af3799272 100644
--- a/Master/texmf-dist/tex/latex/sjtutex/font/sjtu-math-font-newpx.def
+++ b/Master/texmf-dist/tex/latex/sjtutex/font/sjtu-math-font-newpx.def
@@ -20,10 +20,10 @@
%% and version 1.3 or later is part of all distributions of
%% LaTeX version 2005/12/01 or later.
%%
-\GetIdInfo$Id: sjtutex.dtx 6d52363 2024-04-05 19:40:30 +0800 Alexara Wu <alexarawu@outlook.com> $
+\GetIdInfo$Id: sjtutex.dtx 78f11bc 2024-06-29 23:01:32 +0800 Alexara Wu <alexarawu@outlook.com> $
{New PX math fonts definition (SJTUTeX)}
\ProvidesExplFile{sjtu-math-font-newpx.def}
- {\ExplFileDate}{2.1.2}{\ExplFileDescription}
+ {\ExplFileDate}{2.1.3}{\ExplFileDescription}
\tl_set_eq:NN \l__sjtu_save_encodingdefault_tl \encodingdefault
\tl_set_eq:NN \l__sjtu_save_rmdefault_tl \rmdefault
\tl_set_eq:NN \l__sjtu_save_sfdefault_tl \sfdefault
diff --git a/Master/texmf-dist/tex/latex/sjtutex/font/sjtu-math-font-newtx.def b/Master/texmf-dist/tex/latex/sjtutex/font/sjtu-math-font-newtx.def
index 5a5cbc91f0d..bc819b36161 100644
--- a/Master/texmf-dist/tex/latex/sjtutex/font/sjtu-math-font-newtx.def
+++ b/Master/texmf-dist/tex/latex/sjtutex/font/sjtu-math-font-newtx.def
@@ -20,10 +20,10 @@
%% and version 1.3 or later is part of all distributions of
%% LaTeX version 2005/12/01 or later.
%%
-\GetIdInfo$Id: sjtutex.dtx 6d52363 2024-04-05 19:40:30 +0800 Alexara Wu <alexarawu@outlook.com> $
+\GetIdInfo$Id: sjtutex.dtx 78f11bc 2024-06-29 23:01:32 +0800 Alexara Wu <alexarawu@outlook.com> $
{New TX math fonts definition (SJTUTeX)}
\ProvidesExplFile{sjtu-math-font-newtx.def}
- {\ExplFileDate}{2.1.2}{\ExplFileDescription}
+ {\ExplFileDate}{2.1.3}{\ExplFileDescription}
\tl_set_eq:NN \l__sjtu_save_encodingdefault_tl \encodingdefault
\tl_set_eq:NN \l__sjtu_save_rmdefault_tl \rmdefault
\tl_set_eq:NN \l__sjtu_save_sfdefault_tl \sfdefault
diff --git a/Master/texmf-dist/tex/latex/sjtutex/font/sjtu-math-font-stixtwo.def b/Master/texmf-dist/tex/latex/sjtutex/font/sjtu-math-font-stixtwo.def
index 8506116f3ab..326609e123b 100644
--- a/Master/texmf-dist/tex/latex/sjtutex/font/sjtu-math-font-stixtwo.def
+++ b/Master/texmf-dist/tex/latex/sjtutex/font/sjtu-math-font-stixtwo.def
@@ -20,10 +20,10 @@
%% and version 1.3 or later is part of all distributions of
%% LaTeX version 2005/12/01 or later.
%%
-\GetIdInfo$Id: sjtutex.dtx 6d52363 2024-04-05 19:40:30 +0800 Alexara Wu <alexarawu@outlook.com> $
+\GetIdInfo$Id: sjtutex.dtx 78f11bc 2024-06-29 23:01:32 +0800 Alexara Wu <alexarawu@outlook.com> $
{STIX Two math fonts definition (SJTUTeX)}
\ProvidesExplFile{sjtu-math-font-stixtwo.def}
- {\ExplFileDate}{2.1.2}{\ExplFileDescription}
+ {\ExplFileDate}{2.1.3}{\ExplFileDescription}
\__sjtu_fontset_case:nn
{
\DeclareSizeFunction { sub } { \sub@sfcnt \@font@info }
diff --git a/Master/texmf-dist/tex/latex/sjtutex/font/sjtu-math-font-times.def b/Master/texmf-dist/tex/latex/sjtutex/font/sjtu-math-font-times.def
index 037c8643f00..8d516d6cab5 100644
--- a/Master/texmf-dist/tex/latex/sjtutex/font/sjtu-math-font-times.def
+++ b/Master/texmf-dist/tex/latex/sjtutex/font/sjtu-math-font-times.def
@@ -20,10 +20,10 @@
%% and version 1.3 or later is part of all distributions of
%% LaTeX version 2005/12/01 or later.
%%
-\GetIdInfo$Id: sjtutex.dtx 6d52363 2024-04-05 19:40:30 +0800 Alexara Wu <alexarawu@outlook.com> $
+\GetIdInfo$Id: sjtutex.dtx 78f11bc 2024-06-29 23:01:32 +0800 Alexara Wu <alexarawu@outlook.com> $
{Times math fonts definition (SJTUTeX)}
\ProvidesExplFile{sjtu-math-font-times.def}
- {\ExplFileDate}{2.1.2}{\ExplFileDescription}
+ {\ExplFileDate}{2.1.3}{\ExplFileDescription}
\PassOptionsToPackage { Symbol } { upgreek }
\RequirePackage { amssymb, upgreek }
\tl_set_eq:NN \l__sjtu_save_rmdefault_tl \rmdefault
diff --git a/Master/texmf-dist/tex/latex/sjtutex/font/sjtu-math-font-xits.def b/Master/texmf-dist/tex/latex/sjtutex/font/sjtu-math-font-xits.def
index c9a070af188..b8e08efd59b 100644
--- a/Master/texmf-dist/tex/latex/sjtutex/font/sjtu-math-font-xits.def
+++ b/Master/texmf-dist/tex/latex/sjtutex/font/sjtu-math-font-xits.def
@@ -20,10 +20,10 @@
%% and version 1.3 or later is part of all distributions of
%% LaTeX version 2005/12/01 or later.
%%
-\GetIdInfo$Id: sjtutex.dtx 6d52363 2024-04-05 19:40:30 +0800 Alexara Wu <alexarawu@outlook.com> $
+\GetIdInfo$Id: sjtutex.dtx 78f11bc 2024-06-29 23:01:32 +0800 Alexara Wu <alexarawu@outlook.com> $
{XITS math fonts definition (SJTUTeX)}
\ProvidesExplFile{sjtu-math-font-xits.def}
- {\ExplFileDate}{2.1.2}{\ExplFileDescription}
+ {\ExplFileDate}{2.1.3}{\ExplFileDescription}
\__sjtu_fontset_case:nn
{ \__sjtu_fontset_error:nn { math } { xits } }
{
diff --git a/Master/texmf-dist/tex/latex/sjtutex/font/sjtu-text-font-cambria.def b/Master/texmf-dist/tex/latex/sjtutex/font/sjtu-text-font-cambria.def
index c0358750a04..95fbeb8f5de 100644
--- a/Master/texmf-dist/tex/latex/sjtutex/font/sjtu-text-font-cambria.def
+++ b/Master/texmf-dist/tex/latex/sjtutex/font/sjtu-text-font-cambria.def
@@ -20,10 +20,10 @@
%% and version 1.3 or later is part of all distributions of
%% LaTeX version 2005/12/01 or later.
%%
-\GetIdInfo$Id: sjtutex.dtx 6d52363 2024-04-05 19:40:30 +0800 Alexara Wu <alexarawu@outlook.com> $
+\GetIdInfo$Id: sjtutex.dtx 78f11bc 2024-06-29 23:01:32 +0800 Alexara Wu <alexarawu@outlook.com> $
{Cambria text fonts definition (SJTUTeX)}
\ProvidesExplFile{sjtu-text-font-cambria.def}
- {\ExplFileDate}{2.1.2}{\ExplFileDescription}
+ {\ExplFileDate}{2.1.3}{\ExplFileDescription}
\__sjtu_fontset_case:nn
{ \__sjtu_fontset_error:nn { text } { cambria } }
{
diff --git a/Master/texmf-dist/tex/latex/sjtutex/font/sjtu-text-font-libertinus.def b/Master/texmf-dist/tex/latex/sjtutex/font/sjtu-text-font-libertinus.def
index 3e183387fe6..3bbf819a4cb 100644
--- a/Master/texmf-dist/tex/latex/sjtutex/font/sjtu-text-font-libertinus.def
+++ b/Master/texmf-dist/tex/latex/sjtutex/font/sjtu-text-font-libertinus.def
@@ -20,10 +20,10 @@
%% and version 1.3 or later is part of all distributions of
%% LaTeX version 2005/12/01 or later.
%%
-\GetIdInfo$Id: sjtutex.dtx 6d52363 2024-04-05 19:40:30 +0800 Alexara Wu <alexarawu@outlook.com> $
+\GetIdInfo$Id: sjtutex.dtx 78f11bc 2024-06-29 23:01:32 +0800 Alexara Wu <alexarawu@outlook.com> $
{Libertinus text fonts definition (SJTUTeX)}
\ProvidesExplFile{sjtu-text-font-libertinus.def}
- {\ExplFileDate}{2.1.2}{\ExplFileDescription}
+ {\ExplFileDate}{2.1.3}{\ExplFileDescription}
\__sjtu_fontset_case:nn
{
\tl_set:Nn \encodingdefault { T1 }
diff --git a/Master/texmf-dist/tex/latex/sjtutex/font/sjtu-text-font-lm.def b/Master/texmf-dist/tex/latex/sjtutex/font/sjtu-text-font-lm.def
index 96b276fda61..656fe6a64af 100644
--- a/Master/texmf-dist/tex/latex/sjtutex/font/sjtu-text-font-lm.def
+++ b/Master/texmf-dist/tex/latex/sjtutex/font/sjtu-text-font-lm.def
@@ -20,10 +20,10 @@
%% and version 1.3 or later is part of all distributions of
%% LaTeX version 2005/12/01 or later.
%%
-\GetIdInfo$Id: sjtutex.dtx 6d52363 2024-04-05 19:40:30 +0800 Alexara Wu <alexarawu@outlook.com> $
+\GetIdInfo$Id: sjtutex.dtx 78f11bc 2024-06-29 23:01:32 +0800 Alexara Wu <alexarawu@outlook.com> $
{Latin Modern text fonts definition (SJTUTeX)}
\ProvidesExplFile{sjtu-text-font-lm.def}
- {\ExplFileDate}{2.1.2}{\ExplFileDescription}
+ {\ExplFileDate}{2.1.3}{\ExplFileDescription}
\__sjtu_fontset_case:nn
{
\tl_set:Nn \encodingdefault { T1 }
diff --git a/Master/texmf-dist/tex/latex/sjtutex/font/sjtu-text-font-newcm.def b/Master/texmf-dist/tex/latex/sjtutex/font/sjtu-text-font-newcm.def
index 1165cf0f758..0c27b2305ef 100644
--- a/Master/texmf-dist/tex/latex/sjtutex/font/sjtu-text-font-newcm.def
+++ b/Master/texmf-dist/tex/latex/sjtutex/font/sjtu-text-font-newcm.def
@@ -20,10 +20,10 @@
%% and version 1.3 or later is part of all distributions of
%% LaTeX version 2005/12/01 or later.
%%
-\GetIdInfo$Id: sjtutex.dtx 6d52363 2024-04-05 19:40:30 +0800 Alexara Wu <alexarawu@outlook.com> $
+\GetIdInfo$Id: sjtutex.dtx 78f11bc 2024-06-29 23:01:32 +0800 Alexara Wu <alexarawu@outlook.com> $
{New Computer Modern text fonts definition (SJTUTeX)}
\ProvidesExplFile{sjtu-text-font-newcm.def}
- {\ExplFileDate}{2.1.2}{\ExplFileDescription}
+ {\ExplFileDate}{2.1.3}{\ExplFileDescription}
\__sjtu_fontset_case:nn
{ \__sjtu_fontset_error:nn { text } { newcm } }
{
diff --git a/Master/texmf-dist/tex/latex/sjtutex/font/sjtu-text-font-newpx.def b/Master/texmf-dist/tex/latex/sjtutex/font/sjtu-text-font-newpx.def
index 0ebab67f3d0..dfbe2bb1778 100644
--- a/Master/texmf-dist/tex/latex/sjtutex/font/sjtu-text-font-newpx.def
+++ b/Master/texmf-dist/tex/latex/sjtutex/font/sjtu-text-font-newpx.def
@@ -20,10 +20,10 @@
%% and version 1.3 or later is part of all distributions of
%% LaTeX version 2005/12/01 or later.
%%
-\GetIdInfo$Id: sjtutex.dtx 6d52363 2024-04-05 19:40:30 +0800 Alexara Wu <alexarawu@outlook.com> $
+\GetIdInfo$Id: sjtutex.dtx 78f11bc 2024-06-29 23:01:32 +0800 Alexara Wu <alexarawu@outlook.com> $
{New PX text fonts definition (SJTUTeX)}
\ProvidesExplFile{sjtu-text-font-newpx.def}
- {\ExplFileDate}{2.1.2}{\ExplFileDescription}
+ {\ExplFileDate}{2.1.3}{\ExplFileDescription}
\__sjtu_fontset_case:nn
{
\tl_set:Nn \encodingdefault { T1 }
diff --git a/Master/texmf-dist/tex/latex/sjtutex/font/sjtu-text-font-newtx.def b/Master/texmf-dist/tex/latex/sjtutex/font/sjtu-text-font-newtx.def
index b055b10466b..85095ff0d22 100644
--- a/Master/texmf-dist/tex/latex/sjtutex/font/sjtu-text-font-newtx.def
+++ b/Master/texmf-dist/tex/latex/sjtutex/font/sjtu-text-font-newtx.def
@@ -20,10 +20,10 @@
%% and version 1.3 or later is part of all distributions of
%% LaTeX version 2005/12/01 or later.
%%
-\GetIdInfo$Id: sjtutex.dtx 6d52363 2024-04-05 19:40:30 +0800 Alexara Wu <alexarawu@outlook.com> $
+\GetIdInfo$Id: sjtutex.dtx 78f11bc 2024-06-29 23:01:32 +0800 Alexara Wu <alexarawu@outlook.com> $
{New TX text fonts definition (SJTUTeX)}
\ProvidesExplFile{sjtu-text-font-newtx.def}
- {\ExplFileDate}{2.1.2}{\ExplFileDescription}
+ {\ExplFileDate}{2.1.3}{\ExplFileDescription}
\__sjtu_fontset_case:nn
{
\tl_set:Nn \encodingdefault { T1 }
diff --git a/Master/texmf-dist/tex/latex/sjtutex/font/sjtu-text-font-stixtwo.def b/Master/texmf-dist/tex/latex/sjtutex/font/sjtu-text-font-stixtwo.def
index 659db2437a3..1fb82eabf3d 100644
--- a/Master/texmf-dist/tex/latex/sjtutex/font/sjtu-text-font-stixtwo.def
+++ b/Master/texmf-dist/tex/latex/sjtutex/font/sjtu-text-font-stixtwo.def
@@ -20,10 +20,10 @@
%% and version 1.3 or later is part of all distributions of
%% LaTeX version 2005/12/01 or later.
%%
-\GetIdInfo$Id: sjtutex.dtx 6d52363 2024-04-05 19:40:30 +0800 Alexara Wu <alexarawu@outlook.com> $
+\GetIdInfo$Id: sjtutex.dtx 78f11bc 2024-06-29 23:01:32 +0800 Alexara Wu <alexarawu@outlook.com> $
{STIX Two text fonts definition (SJTUTeX)}
\ProvidesExplFile{sjtu-text-font-stixtwo.def}
- {\ExplFileDate}{2.1.2}{\ExplFileDescription}
+ {\ExplFileDate}{2.1.3}{\ExplFileDescription}
\__sjtu_fontset_case:nn
{
\tl_set:Nn \encodingdefault { T1 }
diff --git a/Master/texmf-dist/tex/latex/sjtutex/font/sjtu-text-font-times.def b/Master/texmf-dist/tex/latex/sjtutex/font/sjtu-text-font-times.def
index b9f69e0970d..d368168d3d4 100644
--- a/Master/texmf-dist/tex/latex/sjtutex/font/sjtu-text-font-times.def
+++ b/Master/texmf-dist/tex/latex/sjtutex/font/sjtu-text-font-times.def
@@ -20,10 +20,10 @@
%% and version 1.3 or later is part of all distributions of
%% LaTeX version 2005/12/01 or later.
%%
-\GetIdInfo$Id: sjtutex.dtx 6d52363 2024-04-05 19:40:30 +0800 Alexara Wu <alexarawu@outlook.com> $
+\GetIdInfo$Id: sjtutex.dtx 78f11bc 2024-06-29 23:01:32 +0800 Alexara Wu <alexarawu@outlook.com> $
{Times text fonts definition (SJTUTeX)}
\ProvidesExplFile{sjtu-text-font-times.def}
- {\ExplFileDate}{2.1.2}{\ExplFileDescription}
+ {\ExplFileDate}{2.1.3}{\ExplFileDescription}
\__sjtu_fontset_case:nn
{
\tl_set:Nn \encodingdefault { T1 }
diff --git a/Master/texmf-dist/tex/latex/sjtutex/font/sjtu-text-font-xits.def b/Master/texmf-dist/tex/latex/sjtutex/font/sjtu-text-font-xits.def
index c1c03432df6..6c921e96092 100644
--- a/Master/texmf-dist/tex/latex/sjtutex/font/sjtu-text-font-xits.def
+++ b/Master/texmf-dist/tex/latex/sjtutex/font/sjtu-text-font-xits.def
@@ -20,10 +20,10 @@
%% and version 1.3 or later is part of all distributions of
%% LaTeX version 2005/12/01 or later.
%%
-\GetIdInfo$Id: sjtutex.dtx 6d52363 2024-04-05 19:40:30 +0800 Alexara Wu <alexarawu@outlook.com> $
+\GetIdInfo$Id: sjtutex.dtx 78f11bc 2024-06-29 23:01:32 +0800 Alexara Wu <alexarawu@outlook.com> $
{XITS text fonts definition (SJTUTeX)}
\ProvidesExplFile{sjtu-text-font-xits.def}
- {\ExplFileDate}{2.1.2}{\ExplFileDescription}
+ {\ExplFileDate}{2.1.3}{\ExplFileDescription}
\__sjtu_fontset_case:nn
{ \__sjtu_fontset_error:nn { text } { xits } }
{
diff --git a/Master/texmf-dist/tex/latex/sjtutex/lang/sjtu-lang-generic-de.def b/Master/texmf-dist/tex/latex/sjtutex/lang/sjtu-lang-generic-de.def
index b1b81b552ed..2e18ecf30c9 100644
--- a/Master/texmf-dist/tex/latex/sjtutex/lang/sjtu-lang-generic-de.def
+++ b/Master/texmf-dist/tex/latex/sjtutex/lang/sjtu-lang-generic-de.def
@@ -20,10 +20,10 @@
%% and version 1.3 or later is part of all distributions of
%% LaTeX version 2005/12/01 or later.
%%
-\GetIdInfo$Id: sjtutex.dtx 6d52363 2024-04-05 19:40:30 +0800 Alexara Wu <alexarawu@outlook.com> $
+\GetIdInfo$Id: sjtutex.dtx 78f11bc 2024-06-29 23:01:32 +0800 Alexara Wu <alexarawu@outlook.com> $
{German specific definition for generic (SJTUTeX)}
\ProvidesExplFile{sjtu-lang-generic-de.def}
- {\ExplFileDate}{2.1.2}{\ExplFileDescription}
+ {\ExplFileDate}{2.1.3}{\ExplFileDescription}
\cs_new:Npn \__sjtu_date_aux_de:nnn #1#2#3
{
\clist_item:Nn \c__sjtu_name_month_de_clist {#2} ~
diff --git a/Master/texmf-dist/tex/latex/sjtutex/lang/sjtu-lang-generic-en.def b/Master/texmf-dist/tex/latex/sjtutex/lang/sjtu-lang-generic-en.def
index efd9b7fb095..15f1b627a5f 100644
--- a/Master/texmf-dist/tex/latex/sjtutex/lang/sjtu-lang-generic-en.def
+++ b/Master/texmf-dist/tex/latex/sjtutex/lang/sjtu-lang-generic-en.def
@@ -20,10 +20,10 @@
%% and version 1.3 or later is part of all distributions of
%% LaTeX version 2005/12/01 or later.
%%
-\GetIdInfo$Id: sjtutex.dtx 6d52363 2024-04-05 19:40:30 +0800 Alexara Wu <alexarawu@outlook.com> $
+\GetIdInfo$Id: sjtutex.dtx 78f11bc 2024-06-29 23:01:32 +0800 Alexara Wu <alexarawu@outlook.com> $
{English specific definition for generic (SJTUTeX)}
\ProvidesExplFile{sjtu-lang-generic-en.def}
- {\ExplFileDate}{2.1.2}{\ExplFileDescription}
+ {\ExplFileDate}{2.1.3}{\ExplFileDescription}
\cs_new:Npn \__sjtu_ordinal_en:n #1
{
\int_to_arabic:n {#1}
diff --git a/Master/texmf-dist/tex/latex/sjtutex/lang/sjtu-lang-generic-ja.def b/Master/texmf-dist/tex/latex/sjtutex/lang/sjtu-lang-generic-ja.def
index fc62e60fd4a..641b8bcb57a 100644
--- a/Master/texmf-dist/tex/latex/sjtutex/lang/sjtu-lang-generic-ja.def
+++ b/Master/texmf-dist/tex/latex/sjtutex/lang/sjtu-lang-generic-ja.def
@@ -20,10 +20,10 @@
%% and version 1.3 or later is part of all distributions of
%% LaTeX version 2005/12/01 or later.
%%
-\GetIdInfo$Id: sjtutex.dtx 6d52363 2024-04-05 19:40:30 +0800 Alexara Wu <alexarawu@outlook.com> $
+\GetIdInfo$Id: sjtutex.dtx 78f11bc 2024-06-29 23:01:32 +0800 Alexara Wu <alexarawu@outlook.com> $
{Japanese specific definition for generic (SJTUTeX)}
\ProvidesExplFile{sjtu-lang-generic-ja.def}
- {\ExplFileDate}{2.1.2}{\ExplFileDescription}
+ {\ExplFileDate}{2.1.3}{\ExplFileDescription}
\cs_new:Npn \__sjtu_date_aux_ja:nnn #1#2#3
{
\int_to_arabic:n {#1} ~ { \exp_not:V \c__sjtu_name_year_ja_tl } ~
diff --git a/Master/texmf-dist/tex/latex/sjtutex/lang/sjtu-lang-generic-zh.def b/Master/texmf-dist/tex/latex/sjtutex/lang/sjtu-lang-generic-zh.def
index 18e715c9f66..5a116ad7634 100644
--- a/Master/texmf-dist/tex/latex/sjtutex/lang/sjtu-lang-generic-zh.def
+++ b/Master/texmf-dist/tex/latex/sjtutex/lang/sjtu-lang-generic-zh.def
@@ -20,10 +20,10 @@
%% and version 1.3 or later is part of all distributions of
%% LaTeX version 2005/12/01 or later.
%%
-\GetIdInfo$Id: sjtutex.dtx 6d52363 2024-04-05 19:40:30 +0800 Alexara Wu <alexarawu@outlook.com> $
+\GetIdInfo$Id: sjtutex.dtx 78f11bc 2024-06-29 23:01:32 +0800 Alexara Wu <alexarawu@outlook.com> $
{Chinese specific definition for generic (SJTUTeX)}
\ProvidesExplFile{sjtu-lang-generic-zh.def}
- {\ExplFileDate}{2.1.2}{\ExplFileDescription}
+ {\ExplFileDate}{2.1.3}{\ExplFileDescription}
\cs_new:Npn \__sjtu_date_aux_zh:nnn #1#2#3
{
\int_to_arabic:n {#1} ~ { \exp_not:V \c__sjtu_name_year_zh_tl } ~
diff --git a/Master/texmf-dist/tex/latex/sjtutex/lang/sjtu-lang-thesis-de.def b/Master/texmf-dist/tex/latex/sjtutex/lang/sjtu-lang-thesis-de.def
index e35513f886f..be0b3e14915 100644
--- a/Master/texmf-dist/tex/latex/sjtutex/lang/sjtu-lang-thesis-de.def
+++ b/Master/texmf-dist/tex/latex/sjtutex/lang/sjtu-lang-thesis-de.def
@@ -20,10 +20,10 @@
%% and version 1.3 or later is part of all distributions of
%% LaTeX version 2005/12/01 or later.
%%
-\GetIdInfo$Id: sjtutex.dtx 6d52363 2024-04-05 19:40:30 +0800 Alexara Wu <alexarawu@outlook.com> $
+\GetIdInfo$Id: sjtutex.dtx 78f11bc 2024-06-29 23:01:32 +0800 Alexara Wu <alexarawu@outlook.com> $
{German specific definition for thesis (SJTUTeX)}
\ProvidesExplFile{sjtu-lang-thesis-de.def}
- {\ExplFileDate}{2.1.2}{\ExplFileDescription}
+ {\ExplFileDate}{2.1.3}{\ExplFileDescription}
\__sjtu_info_keys_define:n { de }
\keys_define:nn { sjtu / info / de }
{
diff --git a/Master/texmf-dist/tex/latex/sjtutex/lang/sjtu-lang-thesis-en.def b/Master/texmf-dist/tex/latex/sjtutex/lang/sjtu-lang-thesis-en.def
index dcd0e20d190..5c83d773dd0 100644
--- a/Master/texmf-dist/tex/latex/sjtutex/lang/sjtu-lang-thesis-en.def
+++ b/Master/texmf-dist/tex/latex/sjtutex/lang/sjtu-lang-thesis-en.def
@@ -20,10 +20,10 @@
%% and version 1.3 or later is part of all distributions of
%% LaTeX version 2005/12/01 or later.
%%
-\GetIdInfo$Id: sjtutex.dtx 6d52363 2024-04-05 19:40:30 +0800 Alexara Wu <alexarawu@outlook.com> $
+\GetIdInfo$Id: sjtutex.dtx 78f11bc 2024-06-29 23:01:32 +0800 Alexara Wu <alexarawu@outlook.com> $
{English specific definition for thesis (SJTUTeX)}
\ProvidesExplFile{sjtu-lang-thesis-en.def}
- {\ExplFileDate}{2.1.2}{\ExplFileDescription}
+ {\ExplFileDate}{2.1.3}{\ExplFileDescription}
\__sjtu_info_keys_define:n { en }
\keys_define:nn { sjtu / info / en }
{
diff --git a/Master/texmf-dist/tex/latex/sjtutex/lang/sjtu-lang-thesis-ja.def b/Master/texmf-dist/tex/latex/sjtutex/lang/sjtu-lang-thesis-ja.def
index 84c46addadc..c3ca7db4b61 100644
--- a/Master/texmf-dist/tex/latex/sjtutex/lang/sjtu-lang-thesis-ja.def
+++ b/Master/texmf-dist/tex/latex/sjtutex/lang/sjtu-lang-thesis-ja.def
@@ -20,10 +20,10 @@
%% and version 1.3 or later is part of all distributions of
%% LaTeX version 2005/12/01 or later.
%%
-\GetIdInfo$Id: sjtutex.dtx 6d52363 2024-04-05 19:40:30 +0800 Alexara Wu <alexarawu@outlook.com> $
+\GetIdInfo$Id: sjtutex.dtx 78f11bc 2024-06-29 23:01:32 +0800 Alexara Wu <alexarawu@outlook.com> $
{Japanese specific definition for thesis (SJTUTeX)}
\ProvidesExplFile{sjtu-lang-thesis-ja.def}
- {\ExplFileDate}{2.1.2}{\ExplFileDescription}
+ {\ExplFileDate}{2.1.3}{\ExplFileDescription}
\__sjtu_info_keys_define:n { ja }
\keys_define:nn { sjtu / info / ja }
{
diff --git a/Master/texmf-dist/tex/latex/sjtutex/lang/sjtu-lang-thesis-zh.def b/Master/texmf-dist/tex/latex/sjtutex/lang/sjtu-lang-thesis-zh.def
index 0c1127e6313..a92088896dd 100644
--- a/Master/texmf-dist/tex/latex/sjtutex/lang/sjtu-lang-thesis-zh.def
+++ b/Master/texmf-dist/tex/latex/sjtutex/lang/sjtu-lang-thesis-zh.def
@@ -20,10 +20,10 @@
%% and version 1.3 or later is part of all distributions of
%% LaTeX version 2005/12/01 or later.
%%
-\GetIdInfo$Id: sjtutex.dtx 6d52363 2024-04-05 19:40:30 +0800 Alexara Wu <alexarawu@outlook.com> $
+\GetIdInfo$Id: sjtutex.dtx 78f11bc 2024-06-29 23:01:32 +0800 Alexara Wu <alexarawu@outlook.com> $
{Chinese specific definition for thesis (SJTUTeX)}
\ProvidesExplFile{sjtu-lang-thesis-zh.def}
- {\ExplFileDate}{2.1.2}{\ExplFileDescription}
+ {\ExplFileDate}{2.1.3}{\ExplFileDescription}
\__sjtu_info_keys_define:n { zh }
\keys_define:nn { sjtu / info / zh }
{
diff --git a/Master/texmf-dist/tex/latex/sjtutex/name/sjtu-name-generic-de.def b/Master/texmf-dist/tex/latex/sjtutex/name/sjtu-name-generic-de.def
index e9ff8d45061..cef48f0b3dc 100644
--- a/Master/texmf-dist/tex/latex/sjtutex/name/sjtu-name-generic-de.def
+++ b/Master/texmf-dist/tex/latex/sjtutex/name/sjtu-name-generic-de.def
@@ -20,10 +20,10 @@
%% and version 1.3 or later is part of all distributions of
%% LaTeX version 2005/12/01 or later.
%%
-\GetIdInfo$Id: sjtutex.dtx 6d52363 2024-04-05 19:40:30 +0800 Alexara Wu <alexarawu@outlook.com> $
+\GetIdInfo$Id: sjtutex.dtx 78f11bc 2024-06-29 23:01:32 +0800 Alexara Wu <alexarawu@outlook.com> $
{German name config for generic (SJTUTeX)}
\ProvidesExplFile{sjtu-name-generic-de.def}
- {\ExplFileDate}{2.1.2}{\ExplFileDescription}
+ {\ExplFileDate}{2.1.3}{\ExplFileDescription}
\clist_const:Nn \c__sjtu_name_month_de_clist
{
Januar, Februar, März, April, Mai, Juni,
diff --git a/Master/texmf-dist/tex/latex/sjtutex/name/sjtu-name-generic-en.def b/Master/texmf-dist/tex/latex/sjtutex/name/sjtu-name-generic-en.def
index 6f17b07dd0e..ef8933ef801 100644
--- a/Master/texmf-dist/tex/latex/sjtutex/name/sjtu-name-generic-en.def
+++ b/Master/texmf-dist/tex/latex/sjtutex/name/sjtu-name-generic-en.def
@@ -20,10 +20,10 @@
%% and version 1.3 or later is part of all distributions of
%% LaTeX version 2005/12/01 or later.
%%
-\GetIdInfo$Id: sjtutex.dtx 6d52363 2024-04-05 19:40:30 +0800 Alexara Wu <alexarawu@outlook.com> $
+\GetIdInfo$Id: sjtutex.dtx 78f11bc 2024-06-29 23:01:32 +0800 Alexara Wu <alexarawu@outlook.com> $
{English name config for generic (SJTUTeX)}
\ProvidesExplFile{sjtu-name-generic-en.def}
- {\ExplFileDate}{2.1.2}{\ExplFileDescription}
+ {\ExplFileDate}{2.1.3}{\ExplFileDescription}
\clist_const:Nn \c__sjtu_name_month_en_clist
{
January, February, March, April, May, June,
diff --git a/Master/texmf-dist/tex/latex/sjtutex/name/sjtu-name-generic-ja.def b/Master/texmf-dist/tex/latex/sjtutex/name/sjtu-name-generic-ja.def
index 6b7f0c79419..b6b3d5ef33f 100644
--- a/Master/texmf-dist/tex/latex/sjtutex/name/sjtu-name-generic-ja.def
+++ b/Master/texmf-dist/tex/latex/sjtutex/name/sjtu-name-generic-ja.def
@@ -20,10 +20,10 @@
%% and version 1.3 or later is part of all distributions of
%% LaTeX version 2005/12/01 or later.
%%
-\GetIdInfo$Id: sjtutex.dtx 6d52363 2024-04-05 19:40:30 +0800 Alexara Wu <alexarawu@outlook.com> $
+\GetIdInfo$Id: sjtutex.dtx 78f11bc 2024-06-29 23:01:32 +0800 Alexara Wu <alexarawu@outlook.com> $
{Japanese name config for generic (SJTUTeX)}
\ProvidesExplFile{sjtu-name-generic-ja.def}
- {\ExplFileDate}{2.1.2}{\ExplFileDescription}
+ {\ExplFileDate}{2.1.3}{\ExplFileDescription}
\clist_map_inline:nn
{
{ year } { 年 } ,
diff --git a/Master/texmf-dist/tex/latex/sjtutex/name/sjtu-name-generic-zh.def b/Master/texmf-dist/tex/latex/sjtutex/name/sjtu-name-generic-zh.def
index 1efc8d65031..d8674da5a80 100644
--- a/Master/texmf-dist/tex/latex/sjtutex/name/sjtu-name-generic-zh.def
+++ b/Master/texmf-dist/tex/latex/sjtutex/name/sjtu-name-generic-zh.def
@@ -20,10 +20,10 @@
%% and version 1.3 or later is part of all distributions of
%% LaTeX version 2005/12/01 or later.
%%
-\GetIdInfo$Id: sjtutex.dtx 6d52363 2024-04-05 19:40:30 +0800 Alexara Wu <alexarawu@outlook.com> $
+\GetIdInfo$Id: sjtutex.dtx 78f11bc 2024-06-29 23:01:32 +0800 Alexara Wu <alexarawu@outlook.com> $
{Chinese name config for generic (SJTUTeX)}
\ProvidesExplFile{sjtu-name-generic-zh.def}
- {\ExplFileDate}{2.1.2}{\ExplFileDescription}
+ {\ExplFileDate}{2.1.3}{\ExplFileDescription}
\clist_map_inline:nn
{
{ year } { 年 } ,
diff --git a/Master/texmf-dist/tex/latex/sjtutex/name/sjtu-name-thesis-de.def b/Master/texmf-dist/tex/latex/sjtutex/name/sjtu-name-thesis-de.def
index 71ffa3b2dc0..a514200058b 100644
--- a/Master/texmf-dist/tex/latex/sjtutex/name/sjtu-name-thesis-de.def
+++ b/Master/texmf-dist/tex/latex/sjtutex/name/sjtu-name-thesis-de.def
@@ -20,10 +20,10 @@
%% and version 1.3 or later is part of all distributions of
%% LaTeX version 2005/12/01 or later.
%%
-\GetIdInfo$Id: sjtutex.dtx 6d52363 2024-04-05 19:40:30 +0800 Alexara Wu <alexarawu@outlook.com> $
+\GetIdInfo$Id: sjtutex.dtx 78f11bc 2024-06-29 23:01:32 +0800 Alexara Wu <alexarawu@outlook.com> $
{German name config for thesis (SJTUTeX)}
\ProvidesExplFile{sjtu-name-thesis-de.def}
- {\ExplFileDate}{2.1.2}{\ExplFileDescription}
+ {\ExplFileDate}{2.1.3}{\ExplFileDescription}
\clist_const:Nn \c__sjtu_name_month_de_clist
{
Januar, Februar, März, April, Mai, Juni,
diff --git a/Master/texmf-dist/tex/latex/sjtutex/name/sjtu-name-thesis-en.def b/Master/texmf-dist/tex/latex/sjtutex/name/sjtu-name-thesis-en.def
index e69eae4805a..3fd6fa5a86b 100644
--- a/Master/texmf-dist/tex/latex/sjtutex/name/sjtu-name-thesis-en.def
+++ b/Master/texmf-dist/tex/latex/sjtutex/name/sjtu-name-thesis-en.def
@@ -20,10 +20,10 @@
%% and version 1.3 or later is part of all distributions of
%% LaTeX version 2005/12/01 or later.
%%
-\GetIdInfo$Id: sjtutex.dtx 6d52363 2024-04-05 19:40:30 +0800 Alexara Wu <alexarawu@outlook.com> $
+\GetIdInfo$Id: sjtutex.dtx 78f11bc 2024-06-29 23:01:32 +0800 Alexara Wu <alexarawu@outlook.com> $
{English name config for thesis (SJTUTeX)}
\ProvidesExplFile{sjtu-name-thesis-en.def}
- {\ExplFileDate}{2.1.2}{\ExplFileDescription}
+ {\ExplFileDate}{2.1.3}{\ExplFileDescription}
\clist_const:Nn \c__sjtu_name_month_en_clist
{
January, February, March, April, May, June,
@@ -38,7 +38,7 @@
{ address } { Shanghai,~ P.R.~ China } ,
{ author } { Author } ,
{ supervisor } { Supervisor } ,
- { assoc_supervisor } { Assoc.~ Supervisor } ,
+ { assoc_supervisor } { Assoc.\ Supervisor } ,
{ co_supervisor } { Co-supervisor } ,
{ title_page } { Title~ Page } ,
{ declaration } { Statutory~ Declaration } ,
diff --git a/Master/texmf-dist/tex/latex/sjtutex/name/sjtu-name-thesis-ja.def b/Master/texmf-dist/tex/latex/sjtutex/name/sjtu-name-thesis-ja.def
index 2b9876762f8..1a8ebb66106 100644
--- a/Master/texmf-dist/tex/latex/sjtutex/name/sjtu-name-thesis-ja.def
+++ b/Master/texmf-dist/tex/latex/sjtutex/name/sjtu-name-thesis-ja.def
@@ -20,10 +20,10 @@
%% and version 1.3 or later is part of all distributions of
%% LaTeX version 2005/12/01 or later.
%%
-\GetIdInfo$Id: sjtutex.dtx 6d52363 2024-04-05 19:40:30 +0800 Alexara Wu <alexarawu@outlook.com> $
+\GetIdInfo$Id: sjtutex.dtx 78f11bc 2024-06-29 23:01:32 +0800 Alexara Wu <alexarawu@outlook.com> $
{Japanese name config for thesis (SJTUTeX)}
\ProvidesExplFile{sjtu-name-thesis-ja.def}
- {\ExplFileDate}{2.1.2}{\ExplFileDescription}
+ {\ExplFileDate}{2.1.3}{\ExplFileDescription}
\clist_map_inline:nn
{
{ year } { 年 } ,
diff --git a/Master/texmf-dist/tex/latex/sjtutex/name/sjtu-name-thesis-zh.def b/Master/texmf-dist/tex/latex/sjtutex/name/sjtu-name-thesis-zh.def
index abf037fd3a1..07e547f3225 100644
--- a/Master/texmf-dist/tex/latex/sjtutex/name/sjtu-name-thesis-zh.def
+++ b/Master/texmf-dist/tex/latex/sjtutex/name/sjtu-name-thesis-zh.def
@@ -20,10 +20,10 @@
%% and version 1.3 or later is part of all distributions of
%% LaTeX version 2005/12/01 or later.
%%
-\GetIdInfo$Id: sjtutex.dtx 6d52363 2024-04-05 19:40:30 +0800 Alexara Wu <alexarawu@outlook.com> $
+\GetIdInfo$Id: sjtutex.dtx 78f11bc 2024-06-29 23:01:32 +0800 Alexara Wu <alexarawu@outlook.com> $
{Chinese name config for thesis (SJTUTeX)}
\ProvidesExplFile{sjtu-name-thesis-zh.def}
- {\ExplFileDate}{2.1.2}{\ExplFileDescription}
+ {\ExplFileDate}{2.1.3}{\ExplFileDescription}
\clist_map_inline:nn
{
{ year } { 年 } ,
diff --git a/Master/texmf-dist/tex/latex/sjtutex/scheme/sjtu-scheme-de.def b/Master/texmf-dist/tex/latex/sjtutex/scheme/sjtu-scheme-de.def
index 4439b9c7c7c..a4fc305f5a7 100644
--- a/Master/texmf-dist/tex/latex/sjtutex/scheme/sjtu-scheme-de.def
+++ b/Master/texmf-dist/tex/latex/sjtutex/scheme/sjtu-scheme-de.def
@@ -20,10 +20,10 @@
%% and version 1.3 or later is part of all distributions of
%% LaTeX version 2005/12/01 or later.
%%
-\GetIdInfo$Id: sjtutex.dtx 6d52363 2024-04-05 19:40:30 +0800 Alexara Wu <alexarawu@outlook.com> $
+\GetIdInfo$Id: sjtutex.dtx 78f11bc 2024-06-29 23:01:32 +0800 Alexara Wu <alexarawu@outlook.com> $
{German scheme (SJTUTeX)}
\ProvidesExplFile{sjtu-scheme-de.def}
- {\ExplFileDate}{2.1.2}{\ExplFileDescription}
+ {\ExplFileDate}{2.1.3}{\ExplFileDescription}
\keys_set_known:nn { sjtu / name }
{
contents = { Inhaltsverzeichnis } ,
diff --git a/Master/texmf-dist/tex/latex/sjtutex/scheme/sjtu-scheme-en.def b/Master/texmf-dist/tex/latex/sjtutex/scheme/sjtu-scheme-en.def
index d081700e257..5feec1fe222 100644
--- a/Master/texmf-dist/tex/latex/sjtutex/scheme/sjtu-scheme-en.def
+++ b/Master/texmf-dist/tex/latex/sjtutex/scheme/sjtu-scheme-en.def
@@ -20,10 +20,10 @@
%% and version 1.3 or later is part of all distributions of
%% LaTeX version 2005/12/01 or later.
%%
-\GetIdInfo$Id: sjtutex.dtx 6d52363 2024-04-05 19:40:30 +0800 Alexara Wu <alexarawu@outlook.com> $
+\GetIdInfo$Id: sjtutex.dtx 78f11bc 2024-06-29 23:01:32 +0800 Alexara Wu <alexarawu@outlook.com> $
{English scheme (SJTUTeX)}
\ProvidesExplFile{sjtu-scheme-en.def}
- {\ExplFileDate}{2.1.2}{\ExplFileDescription}
+ {\ExplFileDate}{2.1.3}{\ExplFileDescription}
\ctex_if_autoindent_touched:F
{ \ctex_set:n { autoindent = 1.5 em } }
\ctex_patch_cmd:Nnn \quotation { 1.5em } { \parindent }
diff --git a/Master/texmf-dist/tex/latex/sjtutex/scheme/sjtu-scheme-ja.def b/Master/texmf-dist/tex/latex/sjtutex/scheme/sjtu-scheme-ja.def
index 0c4877b2ae8..9df2d3efc8c 100644
--- a/Master/texmf-dist/tex/latex/sjtutex/scheme/sjtu-scheme-ja.def
+++ b/Master/texmf-dist/tex/latex/sjtutex/scheme/sjtu-scheme-ja.def
@@ -20,10 +20,10 @@
%% and version 1.3 or later is part of all distributions of
%% LaTeX version 2005/12/01 or later.
%%
-\GetIdInfo$Id: sjtutex.dtx 6d52363 2024-04-05 19:40:30 +0800 Alexara Wu <alexarawu@outlook.com> $
+\GetIdInfo$Id: sjtutex.dtx 78f11bc 2024-06-29 23:01:32 +0800 Alexara Wu <alexarawu@outlook.com> $
{Japanese scheme (SJTUTeX)}
\ProvidesExplFile{sjtu-scheme-ja.def}
- {\ExplFileDate}{2.1.2}{\ExplFileDescription}
+ {\ExplFileDate}{2.1.3}{\ExplFileDescription}
\keys_set_known:nn { sjtu / name }
{
contents = { 目 \protect \quad 次 } ,
diff --git a/Master/texmf-dist/tex/latex/sjtutex/scheme/sjtu-scheme-zh.def b/Master/texmf-dist/tex/latex/sjtutex/scheme/sjtu-scheme-zh.def
index 1cd1f52e7ba..b19a38cf830 100644
--- a/Master/texmf-dist/tex/latex/sjtutex/scheme/sjtu-scheme-zh.def
+++ b/Master/texmf-dist/tex/latex/sjtutex/scheme/sjtu-scheme-zh.def
@@ -20,10 +20,10 @@
%% and version 1.3 or later is part of all distributions of
%% LaTeX version 2005/12/01 or later.
%%
-\GetIdInfo$Id: sjtutex.dtx 6d52363 2024-04-05 19:40:30 +0800 Alexara Wu <alexarawu@outlook.com> $
+\GetIdInfo$Id: sjtutex.dtx 78f11bc 2024-06-29 23:01:32 +0800 Alexara Wu <alexarawu@outlook.com> $
{Chinese scheme (SJTUTeX)}
\ProvidesExplFile{sjtu-scheme-zh.def}
- {\ExplFileDate}{2.1.2}{\ExplFileDescription}
+ {\ExplFileDate}{2.1.3}{\ExplFileDescription}
\keys_set_known:nn { sjtu / name }
{
contents = { 目 \protect \quad 录 } ,
diff --git a/Master/texmf-dist/tex/latex/sjtutex/sjtuarticle.cls b/Master/texmf-dist/tex/latex/sjtutex/sjtuarticle.cls
index 0dbe1830e6b..e1f07a922e1 100644
--- a/Master/texmf-dist/tex/latex/sjtutex/sjtuarticle.cls
+++ b/Master/texmf-dist/tex/latex/sjtutex/sjtuarticle.cls
@@ -28,10 +28,10 @@
Release `2020/10/01' or newer is required to\MessageBreak
compile this document.\MessageBreak\MessageBreak
Please update your TeX distribution}{}}
-\GetIdInfo$Id: sjtutex.dtx 6d52363 2024-04-05 19:40:30 +0800 Alexara Wu <alexarawu@outlook.com> $
+\GetIdInfo$Id: sjtutex.dtx 78f11bc 2024-06-29 23:01:32 +0800 Alexara Wu <alexarawu@outlook.com> $
{Article document class for Shanghai Jiao Tong University (SJTUTeX)}
\ProvidesExplClass{sjtuarticle}
- {\ExplFileDate}{2.1.2}{\ExplFileDescription}
+ {\ExplFileDate}{2.1.3}{\ExplFileDescription}
\dim_new:N \l__sjtu_tmp_dim
\skip_new:N \l__sjtu_tmp_skip
\box_new:N \l__sjtu_tmp_box
@@ -859,15 +859,15 @@
\contentsmargin [ 2.55 em ] { 0 pt }
\titlecontents { section }
[ 0 pt ] { \addvspace { 6 bp } \bfseries }
- { \contentspush { \thecontentslabel \quad } } { }
+ { \contentspush { \thecontentslabel \enskip } } { }
{ \SJTU@leaders \thecontentspage }
\titlecontents { subsection }
[ 2 em ] { }
- { \contentspush { \thecontentslabel \quad } } { }
+ { \contentspush { \thecontentslabel \enskip } } { }
{ \SJTU@leaders \thecontentspage }
\titlecontents { subsubsection }
[ 4 em ] { }
- { \contentspush { \thecontentslabel \quad } } { }
+ { \contentspush { \thecontentslabel \enskip } } { }
{ \SJTU@leaders \thecontentspage }
\NewDocumentCommand \SJTU@listof { m m s }
{
@@ -882,7 +882,7 @@
{ \SJTU@listof {#4} {#2} }
\titlecontents {#2}
[ 0 pt ] { }
- { \contentspush { #3 \space \thecontentslabel \quad } } { }
+ { \contentspush { #3 \space \thecontentslabel \enskip } } { }
{ \SJTU@leaders \thecontentspage }
\exp_args:Nnv \contentsuse {#2} { ext@ #2 }
}
diff --git a/Master/texmf-dist/tex/latex/sjtutex/sjtureport.cls b/Master/texmf-dist/tex/latex/sjtutex/sjtureport.cls
index aa358407559..a407f871745 100644
--- a/Master/texmf-dist/tex/latex/sjtutex/sjtureport.cls
+++ b/Master/texmf-dist/tex/latex/sjtutex/sjtureport.cls
@@ -28,10 +28,10 @@
Release `2020/10/01' or newer is required to\MessageBreak
compile this document.\MessageBreak\MessageBreak
Please update your TeX distribution}{}}
-\GetIdInfo$Id: sjtutex.dtx 6d52363 2024-04-05 19:40:30 +0800 Alexara Wu <alexarawu@outlook.com> $
+\GetIdInfo$Id: sjtutex.dtx 78f11bc 2024-06-29 23:01:32 +0800 Alexara Wu <alexarawu@outlook.com> $
{Report document class for Shanghai Jiao Tong University (SJTUTeX)}
\ProvidesExplClass{sjtureport}
- {\ExplFileDate}{2.1.2}{\ExplFileDescription}
+ {\ExplFileDate}{2.1.3}{\ExplFileDescription}
\dim_new:N \l__sjtu_tmp_dim
\skip_new:N \l__sjtu_tmp_skip
\box_new:N \l__sjtu_tmp_box
@@ -889,15 +889,15 @@
\contentsmargin [ 2.55 em ] { 0 pt }
\titlecontents { chapter }
[ 0 pt ] { \addvspace { 6 bp } \bfseries }
- { \contentspush { \thecontentslabel \quad } } { }
+ { \contentspush { \thecontentslabel \enskip } } { }
{ \SJTU@leaders \thecontentspage }
\titlecontents { section }
[ 2 em ] { }
- { \contentspush { \thecontentslabel \quad } } { }
+ { \contentspush { \thecontentslabel \enskip } } { }
{ \SJTU@leaders \thecontentspage }
\titlecontents { subsection }
[ 4 em ] { }
- { \contentspush { \thecontentslabel \quad } } { }
+ { \contentspush { \thecontentslabel \enskip } } { }
{ \SJTU@leaders \thecontentspage }
\NewDocumentCommand \SJTU@listof { m m s }
{
@@ -912,7 +912,7 @@
{ \SJTU@listof {#4} {#2} }
\titlecontents {#2}
[ 0 pt ] { }
- { \contentspush { #3 \space \thecontentslabel \quad } } { }
+ { \contentspush { #3 \space \thecontentslabel \enskip } } { }
{ \SJTU@leaders \thecontentspage }
\exp_args:Nnv \contentsuse {#2} { ext@ #2 }
}
diff --git a/Master/texmf-dist/tex/latex/sjtutex/sjtuthesis.cls b/Master/texmf-dist/tex/latex/sjtutex/sjtuthesis.cls
index e658870cadd..11d49273a31 100644
--- a/Master/texmf-dist/tex/latex/sjtutex/sjtuthesis.cls
+++ b/Master/texmf-dist/tex/latex/sjtutex/sjtuthesis.cls
@@ -28,10 +28,10 @@
Release `2020/10/01' or newer is required to\MessageBreak
compile this document.\MessageBreak\MessageBreak
Please update your TeX distribution}{}}
-\GetIdInfo$Id: sjtutex.dtx 6d52363 2024-04-05 19:40:30 +0800 Alexara Wu <alexarawu@outlook.com> $
+\GetIdInfo$Id: sjtutex.dtx 78f11bc 2024-06-29 23:01:32 +0800 Alexara Wu <alexarawu@outlook.com> $
{Thesis document class for Shanghai Jiao Tong University (SJTUTeX)}
\ProvidesExplClass{sjtuthesis}
- {\ExplFileDate}{2.1.2}{\ExplFileDescription}
+ {\ExplFileDate}{2.1.3}{\ExplFileDescription}
\bool_new:N \l__sjtu_tmp_bool
\clist_new:N \l__sjtu_tmp_clist
\dim_new:N \l__sjtu_tmp_dim
@@ -1308,15 +1308,15 @@
\contentsmargin [ 2.55 em ] { 0 pt }
\titlecontents { chapter }
[ 0 pt ] { \addvspace { 6 bp } \bfseries }
- { \contentspush { \thecontentslabel \quad } } { }
+ { \contentspush { \thecontentslabel \enskip } } { }
{ \SJTU@leaders \thecontentspage }
\titlecontents { section }
[ 2 em ] { }
- { \contentspush { \thecontentslabel \quad } } { }
+ { \contentspush { \thecontentslabel \enskip } } { }
{ \SJTU@leaders \thecontentspage }
\titlecontents { subsection }
[ 4 em ] { }
- { \contentspush { \thecontentslabel \quad } } { }
+ { \contentspush { \thecontentslabel \enskip } } { }
{ \SJTU@leaders \thecontentspage }
\NewDocumentCommand \SJTU@listof { m m s }
{
@@ -1331,7 +1331,7 @@
{ \SJTU@listof {#4} {#2} }
\titlecontents {#2}
[ 0 pt ] { }
- { \contentspush { #3 \space \thecontentslabel \quad } } { }
+ { \contentspush { #3 \space \thecontentslabel \enskip } } { }
{ \SJTU@leaders \thecontentspage }
\exp_args:Nnv \contentsuse {#2} { ext@ #2 }
}