texlive[70867] Master/texmf-dist: sjtutex (5apr24)

commits+karl at tug.org commits+karl at tug.org
Fri Apr 5 23:21:55 CEST 2024


Revision: 70867
          https://tug.org/svn/texlive?view=revision&revision=70867
Author:   karl
Date:     2024-04-05 23:21:55 +0200 (Fri, 05 Apr 2024)
Log Message:
-----------
sjtutex (5apr24)

Modified Paths:
--------------
    trunk/Master/texmf-dist/doc/latex/sjtutex/sjtutex.pdf
    trunk/Master/texmf-dist/source/latex/sjtutex/sjtutex.dtx
    trunk/Master/texmf-dist/tex/latex/sjtutex/font/sjtu-cjk-font-adobe-ja.def
    trunk/Master/texmf-dist/tex/latex/sjtutex/font/sjtu-cjk-font-adobe-zh.def
    trunk/Master/texmf-dist/tex/latex/sjtutex/font/sjtu-cjk-font-adobe.def
    trunk/Master/texmf-dist/tex/latex/sjtutex/font/sjtu-cjk-font-fandol-ja.def
    trunk/Master/texmf-dist/tex/latex/sjtutex/font/sjtu-cjk-font-fandol-zh.def
    trunk/Master/texmf-dist/tex/latex/sjtutex/font/sjtu-cjk-font-fandol.def
    trunk/Master/texmf-dist/tex/latex/sjtutex/font/sjtu-cjk-font-founder-ja.def
    trunk/Master/texmf-dist/tex/latex/sjtutex/font/sjtu-cjk-font-founder-zh.def
    trunk/Master/texmf-dist/tex/latex/sjtutex/font/sjtu-cjk-font-founder.def
    trunk/Master/texmf-dist/tex/latex/sjtutex/font/sjtu-cjk-font-mac-ja.def
    trunk/Master/texmf-dist/tex/latex/sjtutex/font/sjtu-cjk-font-mac-zh.def
    trunk/Master/texmf-dist/tex/latex/sjtutex/font/sjtu-cjk-font-mac.def
    trunk/Master/texmf-dist/tex/latex/sjtutex/font/sjtu-cjk-font-ubuntu-ja.def
    trunk/Master/texmf-dist/tex/latex/sjtutex/font/sjtu-cjk-font-ubuntu-zh.def
    trunk/Master/texmf-dist/tex/latex/sjtutex/font/sjtu-cjk-font-ubuntu.def
    trunk/Master/texmf-dist/tex/latex/sjtutex/font/sjtu-cjk-font-windows-ja.def
    trunk/Master/texmf-dist/tex/latex/sjtutex/font/sjtu-cjk-font-windows-zh.def
    trunk/Master/texmf-dist/tex/latex/sjtutex/font/sjtu-cjk-font-windows.def
    trunk/Master/texmf-dist/tex/latex/sjtutex/font/sjtu-math-font-cambria.def
    trunk/Master/texmf-dist/tex/latex/sjtutex/font/sjtu-math-font-libertinus.def
    trunk/Master/texmf-dist/tex/latex/sjtutex/font/sjtu-math-font-lm.def
    trunk/Master/texmf-dist/tex/latex/sjtutex/font/sjtu-math-font-newcm.def
    trunk/Master/texmf-dist/tex/latex/sjtutex/font/sjtu-math-font-newpx.def
    trunk/Master/texmf-dist/tex/latex/sjtutex/font/sjtu-math-font-newtx.def
    trunk/Master/texmf-dist/tex/latex/sjtutex/font/sjtu-math-font-stixtwo.def
    trunk/Master/texmf-dist/tex/latex/sjtutex/font/sjtu-math-font-times.def
    trunk/Master/texmf-dist/tex/latex/sjtutex/font/sjtu-math-font-xits.def
    trunk/Master/texmf-dist/tex/latex/sjtutex/font/sjtu-text-font-cambria.def
    trunk/Master/texmf-dist/tex/latex/sjtutex/font/sjtu-text-font-libertinus.def
    trunk/Master/texmf-dist/tex/latex/sjtutex/font/sjtu-text-font-lm.def
    trunk/Master/texmf-dist/tex/latex/sjtutex/font/sjtu-text-font-newcm.def
    trunk/Master/texmf-dist/tex/latex/sjtutex/font/sjtu-text-font-newpx.def
    trunk/Master/texmf-dist/tex/latex/sjtutex/font/sjtu-text-font-newtx.def
    trunk/Master/texmf-dist/tex/latex/sjtutex/font/sjtu-text-font-stixtwo.def
    trunk/Master/texmf-dist/tex/latex/sjtutex/font/sjtu-text-font-times.def
    trunk/Master/texmf-dist/tex/latex/sjtutex/font/sjtu-text-font-xits.def
    trunk/Master/texmf-dist/tex/latex/sjtutex/lang/sjtu-lang-generic-de.def
    trunk/Master/texmf-dist/tex/latex/sjtutex/lang/sjtu-lang-generic-en.def
    trunk/Master/texmf-dist/tex/latex/sjtutex/lang/sjtu-lang-generic-ja.def
    trunk/Master/texmf-dist/tex/latex/sjtutex/lang/sjtu-lang-generic-zh.def
    trunk/Master/texmf-dist/tex/latex/sjtutex/lang/sjtu-lang-thesis-de.def
    trunk/Master/texmf-dist/tex/latex/sjtutex/lang/sjtu-lang-thesis-en.def
    trunk/Master/texmf-dist/tex/latex/sjtutex/lang/sjtu-lang-thesis-ja.def
    trunk/Master/texmf-dist/tex/latex/sjtutex/lang/sjtu-lang-thesis-zh.def
    trunk/Master/texmf-dist/tex/latex/sjtutex/name/sjtu-name-generic-de.def
    trunk/Master/texmf-dist/tex/latex/sjtutex/name/sjtu-name-generic-en.def
    trunk/Master/texmf-dist/tex/latex/sjtutex/name/sjtu-name-generic-ja.def
    trunk/Master/texmf-dist/tex/latex/sjtutex/name/sjtu-name-generic-zh.def
    trunk/Master/texmf-dist/tex/latex/sjtutex/name/sjtu-name-thesis-de.def
    trunk/Master/texmf-dist/tex/latex/sjtutex/name/sjtu-name-thesis-en.def
    trunk/Master/texmf-dist/tex/latex/sjtutex/name/sjtu-name-thesis-ja.def
    trunk/Master/texmf-dist/tex/latex/sjtutex/name/sjtu-name-thesis-zh.def
    trunk/Master/texmf-dist/tex/latex/sjtutex/scheme/sjtu-scheme-de.def
    trunk/Master/texmf-dist/tex/latex/sjtutex/scheme/sjtu-scheme-en.def
    trunk/Master/texmf-dist/tex/latex/sjtutex/scheme/sjtu-scheme-ja.def
    trunk/Master/texmf-dist/tex/latex/sjtutex/scheme/sjtu-scheme-zh.def
    trunk/Master/texmf-dist/tex/latex/sjtutex/sjtuarticle.cls
    trunk/Master/texmf-dist/tex/latex/sjtutex/sjtureport.cls
    trunk/Master/texmf-dist/tex/latex/sjtutex/sjtuthesis.cls

Modified: trunk/Master/texmf-dist/doc/latex/sjtutex/sjtutex.pdf
===================================================================
(Binary files differ)

Modified: trunk/Master/texmf-dist/source/latex/sjtutex/sjtutex.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/sjtutex/sjtutex.dtx	2024-04-05 21:21:27 UTC (rev 70866)
+++ trunk/Master/texmf-dist/source/latex/sjtutex/sjtutex.dtx	2024-04-05 21:21:55 UTC (rev 70867)
@@ -216,7 +216,7 @@
     Please update your TeX distribution}{}}
 %</class>
 %<*!(driver|install)>
-%<+!driver>\GetIdInfo$Id: sjtutex.dtx ab42a74 2024-03-23 20:09:29 +0800 Alexara Wu <alexarawu at outlook.com> $
+%<+!driver>\GetIdInfo$Id: sjtutex.dtx 6d52363 2024-04-05 19:40:30 +0800 Alexara Wu <alexarawu at outlook.com> $
 %<class&thesis>  {Thesis document class for Shanghai Jiao Tong University (SJTUTeX)}
 %<class&thesis>\ProvidesExplClass{sjtuthesis}
 %<class&report>  {Report document class for Shanghai Jiao Tong University (SJTUTeX)}
@@ -335,7 +335,7 @@
 %<font&cjk&founder&zh>\ProvidesExplFile{sjtu-cjk-font-founder-zh.def}
 %<font&cjk&founder&ja>  {Founder CJK fonts definition for Japanese (SJTUTeX)}
 %<font&cjk&founder&ja>\ProvidesExplFile{sjtu-cjk-font-founder-ja.def}
-%<!driver>  {\ExplFileDate}{2.1.1}{\ExplFileDescription}
+%<!driver>  {\ExplFileDate}{2.1.2}{\ExplFileDescription}
 %</!(driver|install)>
 %
 %<*driver>
@@ -343,7 +343,7 @@
 \documentclass{ctxdoc}
 \newcommand{\sjtutex}{SJTU\TeX}
 \expandafter\def\csname ver@\jobname.dtx\endcsname
-  {2024/03/23 v2.1.1 SJTUTeX}
+  {2024/04/05 v2.1.2 SJTUTeX}
 \usepackage{float}
 \usepackage{multirow}
 \usepackage{longtable}
@@ -1547,7 +1547,7 @@
 %         是 \pkg{amsmath} 的扩充。
 %       \item \pkg{geometry},用于调整页面尺寸。
 %       \item \pkg{fancyhdr},处理页眉页脚。
-%       \item \pkg{tocloft},设置目录格式。
+%       \item \pkg{titletoc},设置目录格式。
 %       \item \pkg{caption}、\cls{bicaption} 和 \cls{subcaption},用于设置题注。
 %       \item \pkg{xcolor},提供彩色支持。
 %       \item \pkg{graphicx},提供图形插入的接口。
@@ -1585,9 +1585,15 @@
 %   \footnote{此代码只可作为学习之用。未经 Knuth 本人同意,您不应当编译此文档。}:]^^A
 %   {systems/knuth/dist/tex/texbook.tex}
 %
+% \bibitem{MittelbachF2023}
+% \textsc{Mittelbach F} and \textsc{Fischer U}.
+% \newblock \textit{The \LaTeX{} Companion}\allowbreak[M].
+% \newblock 3rd ed.
+% \newblock Boston: Addison--Wesley Publishing Company, 2023.
+%
 % \bibitem{LiuHY2013}
 % 刘海洋.
-% \newblock \textit{\LaTeX{} 入门} [M].
+% \newblock \textit{\LaTeX{} 入门}\allowbreak[M].
 % \newblock 北京: 电子工业出版社, 2013.
 %
 % \subsection*{标准、规范}
@@ -2138,7 +2144,6 @@
 \clist_set:Nx \g_@@_options_to_packages_clist
   {
     { no-math           } { fontspec     } ,
-    { titles            } { tocloft      } ,
     { list = off        } { bicaption    } ,
     { warnings-off =
       {
@@ -2177,7 +2182,7 @@
     mathtools,
     geometry,
     fancyhdr,
-    tocloft,
+    titletoc,
     caption,
     bicaption,
     subcaption,
@@ -3020,8 +3025,8 @@
         ItalicFont          = *-BookItalic,
         BoldItalicFont      = *-BoldItalic,
         SlantedFont         = *-Book,
+        SlantedFeatures     = { FakeSlant = 0.25 },
         BoldSlantedFont     = *-Bold,
-        SlantedFeatures     = { FakeSlant = 0.25 },
         BoldSlantedFeatures = { FakeSlant = 0.25 }
       ]
 %<math>    \setmathsf
@@ -3261,18 +3266,18 @@
 %</zh>
   {
 %<*zh>
-    \setCJKmainfont { Noto~Serif~CJK~SC     }
+    \setCJKmainfont { Noto~Serif~CJK~SC }
       [
         UprightFont = *~Light ,
         BoldFont    = *~Bold ,
         ItalicFont  = AR~PL~KaitiM~GB
       ]
-    \setCJKsansfont { Noto~Sans~CJK~SC      }
+    \setCJKsansfont { Noto~Sans~CJK~SC  }
       [
         UprightFont = *~Medium ,
         BoldFont    = *~Bold
       ]
-    \setCJKmonofont { Noto~Serif~CJK~SC     }
+    \setCJKmonofont { Noto~Serif~CJK~SC }
       [
         UprightFont = *~Light ,
         BoldFont    = *~Bold
@@ -3279,17 +3284,17 @@
       ]
 %</zh>
 %<*ja>
-    \setCJKmainfont { Noto~Serif~CJK~JP     }
+    \setCJKmainfont { Noto~Serif~CJK~JP }
       [
         UprightFont = *~Light ,
         BoldFont    = *~Bold
       ]
-    \setCJKsansfont { Noto~Sans~CJK~JP      }
+    \setCJKsansfont { Noto~Sans~CJK~JP  }
       [
         UprightFont = *~Medium ,
         BoldFont    = *~Bold
       ]
-    \setCJKmonofont { Noto~Serif~CJK~JP     }
+    \setCJKmonofont { Noto~Serif~CJK~JP }
       [
         UprightFont = *~Light ,
         BoldFont    = *~Bold
@@ -3305,19 +3310,18 @@
         BoldFont    = *~Bold
       ]
 %</ja>
-    \setCJKfamilyfont { zhsong } { Noto~Serif~CJK~SC     }
+    \setCJKfamilyfont { zhsong } { Noto~Serif~CJK~SC }
       [
         UprightFont = *~Light ,
         BoldFont    = *~Bold ,
         ItalicFont  = AR~PL~KaitiM~GB
       ]
-    \setCJKfamilyfont { zhhei  } { Noto~Sans~CJK~SC      }
+    \setCJKfamilyfont { zhhei  } { Noto~Sans~CJK~SC  }
       [
         UprightFont = *~Medium ,
         BoldFont    = *~Bold
       ]
-    \setCJKfamilyfont { zhfs   } { Noto~Sans~Mono~CJK~JP }
-    \setCJKfamilyfont { zhkai  } { AR~PL~KaitiM~GB       }
+    \setCJKfamilyfont { zhkai  } { AR~PL~KaitiM~GB   }
   }
 %</zh|ja>
 %</ubuntu>
@@ -5308,15 +5312,35 @@
     \IfBooleanTF {#1}
       { \SJTU at head* { \contentsname } }
       { \SJTU at head  { \contentsname } }
-    \group_begin:
-      \cs_set:Npn \makebox [##1][##2]##3 { \, ##3 }
-      \@starttoc { toc }
-    \group_end:
+    \@starttoc { toc }
   }
 %    \end{macrocode}
 % \end{macro}
 %
-% \begin{macro}[int]{\SJTU at listof}
+% \changes{v2.1.2}{2024/03/31}{改用 \pkg{titletoc} 设置目录格式。}
+%    \begin{macrocode}
+\tl_set:Nn \SJTU at leaders { \titlerule* [ 4bp ] { . } }
+\contentsmargin [ 2.55 em ] { 0 pt }
+%<article>\titlecontents { section }
+%<!article>\titlecontents { chapter }
+  [ 0 pt ] { \addvspace { 6 bp } \bfseries }
+  { \contentspush { \thecontentslabel \quad } } { }
+  { \SJTU at leaders \thecontentspage }
+%<article>\titlecontents { subsection }
+%<!article>\titlecontents { section }
+  [ 2 em ] { }
+  { \contentspush { \thecontentslabel \quad } } { }
+  { \SJTU at leaders \thecontentspage }
+%<article>\titlecontents { subsubsection }
+%<!article>\titlecontents { subsection }
+  [ 4 em ] { }
+  { \contentspush { \thecontentslabel \quad } } { }
+  { \SJTU at leaders \thecontentspage }
+%    \end{macrocode}
+%
+% \changes{v2.0.1}{2023/03/31}{插图、表格和算法等索引不缩进。}
+% \changes{v2.0.1}{2023/03/31}{调整插图、表格和算法等索引编号宽度。}
+% \begin{macro}[int]{\SJTU at listof,\@@_new_list_of:Nnnn}
 % \begin{macro}{\listoffigures,\listoffigures*,\listoftables,\listoftables*}
 % 图表索引。
 %    \begin{macrocode}
@@ -5325,63 +5349,25 @@
     \IfBooleanTF {#3}
       { \SJTU at head* {#1} }
       { \SJTU at head  {#1} }
-    \group_begin:
-      \cs_set:Npn \makebox [##1][##2]##3 { \, ##3 }
-      \exp_args:Nv \@starttoc { ext@ #2 }
-    \group_end:
+    \exp_args:Nv \@starttoc { ext@ #2 }
   }
-\DeclareDocumentCommand \listoffigures { }
-  { \SJTU at listof { \listfigurename } { figure } }
-\DeclareDocumentCommand \listoftables  { }
-  { \SJTU at listof { \listtablename  } { table  } }
-%    \end{macrocode}
-% \end{macro}
-% \end{macro}
-%
-%    \begin{macrocode}
-\tl_set:Nn \cftdotsep { 0.5 }
-%<!article>\tl_set:Nn \cftchapleader { \bfseries \cftdotfill { \cftdotsep } }
-%<*thesis>
-\clist_map_inline:nn
+\cs_new_protected:Npn \@@_new_list_of:Nnnn #1#2#3#4
   {
-    { cft before chap skip } { 10 bp plus 1 pt } ,
-    { cft chap   numwidth  } { 3.5 em } ,
-    { cft sec    indent    } { 2   em } ,
-    { cft sec    numwidth  } { 1.5 em } ,
-    { cft subsec indent    } { 4   em } ,
-    { cft subsec numwidth  } { 2.3 em }
+    \DeclareDocumentCommand #1 { }
+      { \SJTU at listof {#4} {#2} }
+    \titlecontents {#2}
+      [ 0 pt ] { }
+      { \contentspush { #3 \space \thecontentslabel \quad } } { }
+      { \SJTU at leaders \thecontentspage }
+    \exp_args:Nnv \contentsuse {#2} { ext@ #2 }
   }
-  { \skip_set:cn #1 }
-%</thesis>
+\@@_new_list_of:Nnnn \listoffigures { figure }
+  { \figurename } { \listfigurename }
+\@@_new_list_of:Nnnn \listoftables  { table  }
+  { \tablename  } { \listtablename  }
 %    \end{macrocode}
-%
-% \changes{v2.0.1}{2023/03/31}{插图、表格和算法等索引不缩进。}
-% \changes{v2.0.1}{2023/03/31}{调整插图、表格和算法等索引编号宽度。}
-% \begin{macro}[int]{\@@_update_cft_presnum:nn}
-% \begin{variable}{\l_@@_cft_presnum_clist}
-% 图表清单标题前添加名称。
-%    \begin{macrocode}
-\clist_set:Nn \l_@@_cft_presnum_clist
-  {
-    { fig } { \figurename } ,
-    { tab } { \tablename  }
-  }
-\cs_new:Npn \@@_update_cft_presnum:nn #1#2
-  {
-    \tl_set:cn { cft #1 presnum } { #2 \c_space_tl }
-    \skip_zero:c { cft #1 indent }
-%<article>    \skip_set:cn { cft #1 numwidth } { 1.8 em }
-%<!article>    \skip_set:cn { cft #1 numwidth } { 2.8 em }
-    \@@_skip_add_to_wd:cv { cft #1 numwidth } { cft #1 presnum }
-  }
-\ctex_at_end_preamble:n
-  {
-    \clist_map_inline:Nn \l_@@_cft_presnum_clist
-      { \@@_update_cft_presnum:nn #1 }
-  }
-%    \end{macrocode}
-% \end{variable}
 % \end{macro}
+% \end{macro}
 %
 % \subsection{预定义环境}
 %
@@ -5830,18 +5816,19 @@
 % \changes{v2.1.1}{2024/03/22}{添加 \pkg{thmtools} 宏包支持。}
 % \subsubsection{\pkg{thmtools} 宏包}
 %
-% 使用 \pkg{tocloft} 包设置 \tn{listoftheorems} 的样式。
+% 使用 \pkg{titletoc} 包设置 \tn{listoftheorems} 的样式。
 %    \begin{macrocode}
 \ctex_at_end_package:nn { thmtools }
   {
-    \newlistentry { thm } { loe } { 0 }
-    \newcounter { loedepth }
-    \setcounter { loedepth } { 1 }
-    \skip_set:Nn \cftthmnumwidth { 2.3 em }
-    \define at key { thmt-listof } { numwidth }
-      { \skip_set:Nn \cftthmnumwidth {#1} }
     \cs_set:Npn \thmtlo at newentry
-      { \cs_set_eq:cN { l@ \thmt at envname } \l at thm }
+      {
+        \exp_args:NV \titlecontents \thmt at envname
+          [ \thmt at listnumwidth ] { }
+          { \contentslabel { \thmt at listnumwidth } }
+          { \hspace* { - \thmt at listnumwidth } }
+          { \SJTU at leaders \thecontentspage }
+        \exp_args:NV \contentsuse \thmt at envname { loe }
+      }
     \cs_set:Npn \thmtlo at chaptervspacehack { }
     \RenewDocumentCommand \listoftheorems { s O{ } }
       {
@@ -5868,7 +5855,6 @@
                   } { }
               \fi
             }
-          \cs_set:Npn \makebox [##1][##2]##3 { \, ##3 }
           \@starttoc { loe }
         \group_end:
       }
@@ -5877,21 +5863,6 @@
 %
 % \subsubsection{\pkg{algorithm} 宏包和 \pkg{algorithm2e} 宏包}
 %
-%    \begin{macrocode}
-\cs_new_protected:Npn \@@_newlistof:nnnnn #1#2#3#4#5
-  {
-    \exp_args:Nnv \newlistentry {#2} { ext@ #3 } { 0 }
-    \exp_args:Ne \newcounter { \tl_use:c { ext@ #3 } depth }
-    \exp_args:Ne \setcounter { \tl_use:c { ext@ #3 } depth } { 1 }
-    \clist_put_right:Nn \l_@@_cft_presnum_clist { {#2} {#4} }
-    \cs_set_eq:cc { l@ #3 } { l@ #2 }
-    \exp_args:Nc \DeclareDocumentCommand { listof #1 s } { }
-      { \SJTU at listof {#5} {#3} }
-%<!article>    \SJTU at counterwithin { #3 } { chapter }
-%<thesis>    \clist_put_right:Nn \l_@@_counter_without_chapter_clist {#3}
-  }
-%    \end{macrocode}
-%
 % \pkg{algorithm} 宏包。
 %    \begin{macrocode}
 \ctex_at_end_package:nn { algorithm }
@@ -5898,7 +5869,9 @@
   {
     \tl_set:Nn \fname at algorithm   { \SJTU at algorithmname     }
     \tl_set:Nn \listalgorithmname { \SJTU at listalgorithmname }
-    \@@_newlistof:nnnnn { algorithm } { alg } { algorithm }
+%<!article>    \SJTU at counterwithin { algorithm } { chapter }
+%<thesis>    \clist_put_right:Nn \l_@@_counter_without_chapter_clist { algorithm }
+    \@@_new_list_of:Nnnn \listofalgorithms { algorithm }
       { \fname at algorithm } { \listalgorithmname }
   }
 %    \end{macrocode}
@@ -5914,7 +5887,9 @@
                       { \SJTU at algorithmname     }
                       { \SJTU at listalgorithmname }
     \SetAlgoCaptionSeparator { \enskip }
-    \@@_newlistof:nnnnn { algorithm } { alg } { algocf }
+%<!article>    \SJTU at counterwithin { algocf } { chapter }
+%<thesis>    \clist_put_right:Nn \l_@@_counter_without_chapter_clist { algocf }
+    \@@_new_list_of:Nnnn \listofalgorithms { algocf }
       { \algorithmcfname } { \listalgorithmcfname }
     \ctex_patch_cmd:Nnn \algocf at latexcaption
       { \addcontentsline }

Modified: trunk/Master/texmf-dist/tex/latex/sjtutex/font/sjtu-cjk-font-adobe-ja.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/sjtutex/font/sjtu-cjk-font-adobe-ja.def	2024-04-05 21:21:27 UTC (rev 70866)
+++ trunk/Master/texmf-dist/tex/latex/sjtutex/font/sjtu-cjk-font-adobe-ja.def	2024-04-05 21:21:55 UTC (rev 70867)
@@ -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 ab42a74 2024-03-23 20:09:29 +0800 Alexara Wu <alexarawu at outlook.com> $
+\GetIdInfo$Id: sjtutex.dtx 6d52363 2024-04-05 19:40:30 +0800 Alexara Wu <alexarawu at outlook.com> $
   {Adobe CJK fonts definition for Japanese (SJTUTeX)}
 \ProvidesExplFile{sjtu-cjk-font-adobe-ja.def}
-  {\ExplFileDate}{2.1.1}{\ExplFileDescription}
+  {\ExplFileDate}{2.1.2}{\ExplFileDescription}
 \__sjtu_fontset_case:nn
   { \__sjtu_fontset_error:nn { cjk } { adobe } }
   {

Modified: trunk/Master/texmf-dist/tex/latex/sjtutex/font/sjtu-cjk-font-adobe-zh.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/sjtutex/font/sjtu-cjk-font-adobe-zh.def	2024-04-05 21:21:27 UTC (rev 70866)
+++ trunk/Master/texmf-dist/tex/latex/sjtutex/font/sjtu-cjk-font-adobe-zh.def	2024-04-05 21:21:55 UTC (rev 70867)
@@ -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 ab42a74 2024-03-23 20:09:29 +0800 Alexara Wu <alexarawu at outlook.com> $
+\GetIdInfo$Id: sjtutex.dtx 6d52363 2024-04-05 19:40:30 +0800 Alexara Wu <alexarawu at outlook.com> $
   {Adobe CJK fonts definition for Chinese (SJTUTeX)}
 \ProvidesExplFile{sjtu-cjk-font-adobe-zh.def}
-  {\ExplFileDate}{2.1.1}{\ExplFileDescription}
+  {\ExplFileDate}{2.1.2}{\ExplFileDescription}
 \__sjtu_fontset_case:nnn
   { \__sjtu_fontset_error:nn { cjk } { adobe } }
   {

Modified: trunk/Master/texmf-dist/tex/latex/sjtutex/font/sjtu-cjk-font-adobe.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/sjtutex/font/sjtu-cjk-font-adobe.def	2024-04-05 21:21:27 UTC (rev 70866)
+++ trunk/Master/texmf-dist/tex/latex/sjtutex/font/sjtu-cjk-font-adobe.def	2024-04-05 21:21:55 UTC (rev 70867)
@@ -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 ab42a74 2024-03-23 20:09:29 +0800 Alexara Wu <alexarawu at outlook.com> $
+\GetIdInfo$Id: sjtutex.dtx 6d52363 2024-04-05 19:40:30 +0800 Alexara Wu <alexarawu at outlook.com> $
   {Adobe CJK fonts definition (SJTUTeX)}
 \ProvidesExplFile{sjtu-cjk-font-adobe.def}
-  {\ExplFileDate}{2.1.1}{\ExplFileDescription}
+  {\ExplFileDate}{2.1.2}{\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 } }

Modified: trunk/Master/texmf-dist/tex/latex/sjtutex/font/sjtu-cjk-font-fandol-ja.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/sjtutex/font/sjtu-cjk-font-fandol-ja.def	2024-04-05 21:21:27 UTC (rev 70866)
+++ trunk/Master/texmf-dist/tex/latex/sjtutex/font/sjtu-cjk-font-fandol-ja.def	2024-04-05 21:21:55 UTC (rev 70867)
@@ -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 ab42a74 2024-03-23 20:09:29 +0800 Alexara Wu <alexarawu at outlook.com> $
+\GetIdInfo$Id: sjtutex.dtx 6d52363 2024-04-05 19:40:30 +0800 Alexara Wu <alexarawu at outlook.com> $
   {Fandol CJK fonts definition for Japanese (SJTUTeX)}
 \ProvidesExplFile{sjtu-cjk-font-fandol-ja.def}
-  {\ExplFileDate}{2.1.1}{\ExplFileDescription}
+  {\ExplFileDate}{2.1.2}{\ExplFileDescription}
 \__sjtu_fontset_case:nn
   { \__sjtu_fontset_error:nn { cjk } { fandol } }
   {

Modified: trunk/Master/texmf-dist/tex/latex/sjtutex/font/sjtu-cjk-font-fandol-zh.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/sjtutex/font/sjtu-cjk-font-fandol-zh.def	2024-04-05 21:21:27 UTC (rev 70866)
+++ trunk/Master/texmf-dist/tex/latex/sjtutex/font/sjtu-cjk-font-fandol-zh.def	2024-04-05 21:21:55 UTC (rev 70867)
@@ -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 ab42a74 2024-03-23 20:09:29 +0800 Alexara Wu <alexarawu at outlook.com> $
+\GetIdInfo$Id: sjtutex.dtx 6d52363 2024-04-05 19:40:30 +0800 Alexara Wu <alexarawu at outlook.com> $
   {Fandol CJK fonts definition for Chinese (SJTUTeX)}
 \ProvidesExplFile{sjtu-cjk-font-fandol-zh.def}
-  {\ExplFileDate}{2.1.1}{\ExplFileDescription}
+  {\ExplFileDate}{2.1.2}{\ExplFileDescription}
 \__sjtu_fontset_case:nnn
   { \__sjtu_fontset_error:nn { cjk } { fandol } }
   {

Modified: trunk/Master/texmf-dist/tex/latex/sjtutex/font/sjtu-cjk-font-fandol.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/sjtutex/font/sjtu-cjk-font-fandol.def	2024-04-05 21:21:27 UTC (rev 70866)
+++ trunk/Master/texmf-dist/tex/latex/sjtutex/font/sjtu-cjk-font-fandol.def	2024-04-05 21:21:55 UTC (rev 70867)
@@ -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 ab42a74 2024-03-23 20:09:29 +0800 Alexara Wu <alexarawu at outlook.com> $
+\GetIdInfo$Id: sjtutex.dtx 6d52363 2024-04-05 19:40:30 +0800 Alexara Wu <alexarawu at outlook.com> $
   {Fandol CJK fonts definition (SJTUTeX)}
 \ProvidesExplFile{sjtu-cjk-font-fandol.def}
-  {\ExplFileDate}{2.1.1}{\ExplFileDescription}
+  {\ExplFileDate}{2.1.2}{\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 } }

Modified: trunk/Master/texmf-dist/tex/latex/sjtutex/font/sjtu-cjk-font-founder-ja.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/sjtutex/font/sjtu-cjk-font-founder-ja.def	2024-04-05 21:21:27 UTC (rev 70866)
+++ trunk/Master/texmf-dist/tex/latex/sjtutex/font/sjtu-cjk-font-founder-ja.def	2024-04-05 21:21:55 UTC (rev 70867)
@@ -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 ab42a74 2024-03-23 20:09:29 +0800 Alexara Wu <alexarawu at outlook.com> $
+\GetIdInfo$Id: sjtutex.dtx 6d52363 2024-04-05 19:40:30 +0800 Alexara Wu <alexarawu at outlook.com> $
   {Founder CJK fonts definition for Japanese (SJTUTeX)}
 \ProvidesExplFile{sjtu-cjk-font-founder-ja.def}
-  {\ExplFileDate}{2.1.1}{\ExplFileDescription}
+  {\ExplFileDate}{2.1.2}{\ExplFileDescription}
 \__sjtu_fontset_case:nn
   { \__sjtu_fontset_error:nn { cjk } { founder } }
   {

Modified: trunk/Master/texmf-dist/tex/latex/sjtutex/font/sjtu-cjk-font-founder-zh.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/sjtutex/font/sjtu-cjk-font-founder-zh.def	2024-04-05 21:21:27 UTC (rev 70866)
+++ trunk/Master/texmf-dist/tex/latex/sjtutex/font/sjtu-cjk-font-founder-zh.def	2024-04-05 21:21:55 UTC (rev 70867)
@@ -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 ab42a74 2024-03-23 20:09:29 +0800 Alexara Wu <alexarawu at outlook.com> $
+\GetIdInfo$Id: sjtutex.dtx 6d52363 2024-04-05 19:40:30 +0800 Alexara Wu <alexarawu at outlook.com> $
   {Founder CJK fonts definition for Chinese (SJTUTeX)}
 \ProvidesExplFile{sjtu-cjk-font-founder-zh.def}
-  {\ExplFileDate}{2.1.1}{\ExplFileDescription}
+  {\ExplFileDate}{2.1.2}{\ExplFileDescription}
 \__sjtu_fontset_case:nn
   {
     \ctex_load_zhmap:nnnn { zhsong } { zhhei } { zhfs } { founder }

Modified: trunk/Master/texmf-dist/tex/latex/sjtutex/font/sjtu-cjk-font-founder.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/sjtutex/font/sjtu-cjk-font-founder.def	2024-04-05 21:21:27 UTC (rev 70866)
+++ trunk/Master/texmf-dist/tex/latex/sjtutex/font/sjtu-cjk-font-founder.def	2024-04-05 21:21:55 UTC (rev 70867)
@@ -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 ab42a74 2024-03-23 20:09:29 +0800 Alexara Wu <alexarawu at outlook.com> $
+\GetIdInfo$Id: sjtutex.dtx 6d52363 2024-04-05 19:40:30 +0800 Alexara Wu <alexarawu at outlook.com> $
   {Founder CJK fonts definition (SJTUTeX)}
 \ProvidesExplFile{sjtu-cjk-font-founder.def}
-  {\ExplFileDate}{2.1.1}{\ExplFileDescription}
+  {\ExplFileDate}{2.1.2}{\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 } }

Modified: trunk/Master/texmf-dist/tex/latex/sjtutex/font/sjtu-cjk-font-mac-ja.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/sjtutex/font/sjtu-cjk-font-mac-ja.def	2024-04-05 21:21:27 UTC (rev 70866)
+++ trunk/Master/texmf-dist/tex/latex/sjtutex/font/sjtu-cjk-font-mac-ja.def	2024-04-05 21:21:55 UTC (rev 70867)
@@ -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 ab42a74 2024-03-23 20:09:29 +0800 Alexara Wu <alexarawu at outlook.com> $
+\GetIdInfo$Id: sjtutex.dtx 6d52363 2024-04-05 19:40:30 +0800 Alexara Wu <alexarawu at outlook.com> $
   {macOS CJK fonts definition for Japanese (SJTUTeX)}
 \ProvidesExplFile{sjtu-cjk-font-mac-ja.def}
-  {\ExplFileDate}{2.1.1}{\ExplFileDescription}
+  {\ExplFileDate}{2.1.2}{\ExplFileDescription}
 \__sjtu_fontset_case:nn
   { \__sjtu_fontset_error:nn { cjk } { mac } }
   {

Modified: trunk/Master/texmf-dist/tex/latex/sjtutex/font/sjtu-cjk-font-mac-zh.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/sjtutex/font/sjtu-cjk-font-mac-zh.def	2024-04-05 21:21:27 UTC (rev 70866)
+++ trunk/Master/texmf-dist/tex/latex/sjtutex/font/sjtu-cjk-font-mac-zh.def	2024-04-05 21:21:55 UTC (rev 70867)
@@ -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 ab42a74 2024-03-23 20:09:29 +0800 Alexara Wu <alexarawu at outlook.com> $
+\GetIdInfo$Id: sjtutex.dtx 6d52363 2024-04-05 19:40:30 +0800 Alexara Wu <alexarawu at outlook.com> $
   {macOS CJK fonts definition for Chinese (SJTUTeX)}
 \ProvidesExplFile{sjtu-cjk-font-mac-zh.def}
-  {\ExplFileDate}{2.1.1}{\ExplFileDescription}
+  {\ExplFileDate}{2.1.2}{\ExplFileDescription}
 \__sjtu_fontset_case:nnn
   { \__sjtu_fontset_error:nn { cjk } { mac } }
   {

Modified: trunk/Master/texmf-dist/tex/latex/sjtutex/font/sjtu-cjk-font-mac.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/sjtutex/font/sjtu-cjk-font-mac.def	2024-04-05 21:21:27 UTC (rev 70866)
+++ trunk/Master/texmf-dist/tex/latex/sjtutex/font/sjtu-cjk-font-mac.def	2024-04-05 21:21:55 UTC (rev 70867)
@@ -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 ab42a74 2024-03-23 20:09:29 +0800 Alexara Wu <alexarawu at outlook.com> $
+\GetIdInfo$Id: sjtutex.dtx 6d52363 2024-04-05 19:40:30 +0800 Alexara Wu <alexarawu at outlook.com> $
   {macOS CJK fonts definition (SJTUTeX)}
 \ProvidesExplFile{sjtu-cjk-font-mac.def}
-  {\ExplFileDate}{2.1.1}{\ExplFileDescription}
+  {\ExplFileDate}{2.1.2}{\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 } }

Modified: trunk/Master/texmf-dist/tex/latex/sjtutex/font/sjtu-cjk-font-ubuntu-ja.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/sjtutex/font/sjtu-cjk-font-ubuntu-ja.def	2024-04-05 21:21:27 UTC (rev 70866)
+++ trunk/Master/texmf-dist/tex/latex/sjtutex/font/sjtu-cjk-font-ubuntu-ja.def	2024-04-05 21:21:55 UTC (rev 70867)
@@ -20,24 +20,24 @@
 %%     and version 1.3 or later is part of all distributions of
 %%     LaTeX version 2005/12/01 or later.
 %% 
-\GetIdInfo$Id: sjtutex.dtx ab42a74 2024-03-23 20:09:29 +0800 Alexara Wu <alexarawu at outlook.com> $
+\GetIdInfo$Id: sjtutex.dtx 6d52363 2024-04-05 19:40:30 +0800 Alexara Wu <alexarawu at outlook.com> $
   {Ubuntu CJK fonts definition for Japanese (SJTUTeX)}
 \ProvidesExplFile{sjtu-cjk-font-ubuntu-ja.def}
-  {\ExplFileDate}{2.1.1}{\ExplFileDescription}
+  {\ExplFileDate}{2.1.2}{\ExplFileDescription}
 \__sjtu_fontset_case:nn
   { \__sjtu_fontset_error:nn { cjk } { ubuntu } }
   {
-    \setCJKmainfont { Noto~Serif~CJK~JP     }
+    \setCJKmainfont { Noto~Serif~CJK~JP }
       [
         UprightFont = *~Light ,
         BoldFont    = *~Bold
       ]
-    \setCJKsansfont { Noto~Sans~CJK~JP      }
+    \setCJKsansfont { Noto~Sans~CJK~JP  }
       [
         UprightFont = *~Medium ,
         BoldFont    = *~Bold
       ]
-    \setCJKmonofont { Noto~Serif~CJK~JP     }
+    \setCJKmonofont { Noto~Serif~CJK~JP }
       [
         UprightFont = *~Light ,
         BoldFont    = *~Bold
@@ -52,19 +52,18 @@
         UprightFont = *~Medium ,
         BoldFont    = *~Bold
       ]
-    \setCJKfamilyfont { zhsong } { Noto~Serif~CJK~SC     }
+    \setCJKfamilyfont { zhsong } { Noto~Serif~CJK~SC }
       [
         UprightFont = *~Light ,
         BoldFont    = *~Bold ,
         ItalicFont  = AR~PL~KaitiM~GB
       ]
-    \setCJKfamilyfont { zhhei  } { Noto~Sans~CJK~SC      }
+    \setCJKfamilyfont { zhhei  } { Noto~Sans~CJK~SC  }
       [
         UprightFont = *~Medium ,
         BoldFont    = *~Bold
       ]
-    \setCJKfamilyfont { zhfs   } { Noto~Sans~Mono~CJK~JP }
-    \setCJKfamilyfont { zhkai  } { AR~PL~KaitiM~GB       }
+    \setCJKfamilyfont { zhkai  } { AR~PL~KaitiM~GB   }
   }
 \NewDocumentCommand \songti   { } { \CJKfamily { zhsong  } }
 \NewDocumentCommand \heiti    { } { \CJKfamily { zhhei   } }

Modified: trunk/Master/texmf-dist/tex/latex/sjtutex/font/sjtu-cjk-font-ubuntu-zh.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/sjtutex/font/sjtu-cjk-font-ubuntu-zh.def	2024-04-05 21:21:27 UTC (rev 70866)
+++ trunk/Master/texmf-dist/tex/latex/sjtutex/font/sjtu-cjk-font-ubuntu-zh.def	2024-04-05 21:21:55 UTC (rev 70867)
@@ -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 ab42a74 2024-03-23 20:09:29 +0800 Alexara Wu <alexarawu at outlook.com> $
+\GetIdInfo$Id: sjtutex.dtx 6d52363 2024-04-05 19:40:30 +0800 Alexara Wu <alexarawu at outlook.com> $
   {Ubuntu CJK fonts definition for Chinese (SJTUTeX)}
 \ProvidesExplFile{sjtu-cjk-font-ubuntu-zh.def}
-  {\ExplFileDate}{2.1.1}{\ExplFileDescription}
+  {\ExplFileDate}{2.1.2}{\ExplFileDescription}
 \__sjtu_fontset_case:nnn
   { \__sjtu_fontset_error:nn { cjk } { ubuntu } }
   {
@@ -34,35 +34,34 @@
     \ctex_punct_map_itshape:nn  { \CJKrmdefault } { zhkai  }
   }
   {
-    \setCJKmainfont { Noto~Serif~CJK~SC     }
+    \setCJKmainfont { Noto~Serif~CJK~SC }
       [
         UprightFont = *~Light ,
         BoldFont    = *~Bold ,
         ItalicFont  = AR~PL~KaitiM~GB
       ]
-    \setCJKsansfont { Noto~Sans~CJK~SC      }
+    \setCJKsansfont { Noto~Sans~CJK~SC  }
       [
         UprightFont = *~Medium ,
         BoldFont    = *~Bold
       ]
-    \setCJKmonofont { Noto~Serif~CJK~SC     }
+    \setCJKmonofont { Noto~Serif~CJK~SC }
       [
         UprightFont = *~Light ,
         BoldFont    = *~Bold
       ]
-    \setCJKfamilyfont { zhsong } { Noto~Serif~CJK~SC     }
+    \setCJKfamilyfont { zhsong } { Noto~Serif~CJK~SC }
       [
         UprightFont = *~Light ,
         BoldFont    = *~Bold ,
         ItalicFont  = AR~PL~KaitiM~GB
       ]
-    \setCJKfamilyfont { zhhei  } { Noto~Sans~CJK~SC      }
+    \setCJKfamilyfont { zhhei  } { Noto~Sans~CJK~SC  }
       [
         UprightFont = *~Medium ,
         BoldFont    = *~Bold
       ]
-    \setCJKfamilyfont { zhfs   } { Noto~Sans~Mono~CJK~JP }
-    \setCJKfamilyfont { zhkai  } { AR~PL~KaitiM~GB       }
+    \setCJKfamilyfont { zhkai  } { AR~PL~KaitiM~GB   }
   }
 \NewDocumentCommand \songti   { } { \CJKfamily { zhsong  } }
 \NewDocumentCommand \heiti    { } { \CJKfamily { zhhei   } }

Modified: trunk/Master/texmf-dist/tex/latex/sjtutex/font/sjtu-cjk-font-ubuntu.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/sjtutex/font/sjtu-cjk-font-ubuntu.def	2024-04-05 21:21:27 UTC (rev 70866)
+++ trunk/Master/texmf-dist/tex/latex/sjtutex/font/sjtu-cjk-font-ubuntu.def	2024-04-05 21:21:55 UTC (rev 70867)
@@ -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 ab42a74 2024-03-23 20:09:29 +0800 Alexara Wu <alexarawu at outlook.com> $
+\GetIdInfo$Id: sjtutex.dtx 6d52363 2024-04-05 19:40:30 +0800 Alexara Wu <alexarawu at outlook.com> $
   {Ubuntu CJK fonts definition (SJTUTeX)}
 \ProvidesExplFile{sjtu-cjk-font-ubuntu.def}
-  {\ExplFileDate}{2.1.1}{\ExplFileDescription}
+  {\ExplFileDate}{2.1.2}{\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 } }

Modified: trunk/Master/texmf-dist/tex/latex/sjtutex/font/sjtu-cjk-font-windows-ja.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/sjtutex/font/sjtu-cjk-font-windows-ja.def	2024-04-05 21:21:27 UTC (rev 70866)
+++ trunk/Master/texmf-dist/tex/latex/sjtutex/font/sjtu-cjk-font-windows-ja.def	2024-04-05 21:21:55 UTC (rev 70867)
@@ -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 ab42a74 2024-03-23 20:09:29 +0800 Alexara Wu <alexarawu at outlook.com> $
+\GetIdInfo$Id: sjtutex.dtx 6d52363 2024-04-05 19:40:30 +0800 Alexara Wu <alexarawu at outlook.com> $
   {Windows CJK fonts definition for Japanese (SJTUTeX)}
 \ProvidesExplFile{sjtu-cjk-font-windows-ja.def}
-  {\ExplFileDate}{2.1.1}{\ExplFileDescription}
+  {\ExplFileDate}{2.1.2}{\ExplFileDescription}
 \__sjtu_fontset_case:nn
   { \__sjtu_fontset_error:nn { cjk } { windows } }
   {

Modified: trunk/Master/texmf-dist/tex/latex/sjtutex/font/sjtu-cjk-font-windows-zh.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/sjtutex/font/sjtu-cjk-font-windows-zh.def	2024-04-05 21:21:27 UTC (rev 70866)
+++ trunk/Master/texmf-dist/tex/latex/sjtutex/font/sjtu-cjk-font-windows-zh.def	2024-04-05 21:21:55 UTC (rev 70867)
@@ -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 ab42a74 2024-03-23 20:09:29 +0800 Alexara Wu <alexarawu at outlook.com> $
+\GetIdInfo$Id: sjtutex.dtx 6d52363 2024-04-05 19:40:30 +0800 Alexara Wu <alexarawu at outlook.com> $
   {Windows CJK fonts definition for Chinese (SJTUTeX)}
 \ProvidesExplFile{sjtu-cjk-font-windows-zh.def}
-  {\ExplFileDate}{2.1.1}{\ExplFileDescription}
+  {\ExplFileDate}{2.1.2}{\ExplFileDescription}
 \__sjtu_fontset_case:nn
   {
     \ctex_load_zhmap:nnnn { zhsong } { zhhei } { zhfs } { windows }

Modified: trunk/Master/texmf-dist/tex/latex/sjtutex/font/sjtu-cjk-font-windows.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/sjtutex/font/sjtu-cjk-font-windows.def	2024-04-05 21:21:27 UTC (rev 70866)
+++ trunk/Master/texmf-dist/tex/latex/sjtutex/font/sjtu-cjk-font-windows.def	2024-04-05 21:21:55 UTC (rev 70867)
@@ -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 ab42a74 2024-03-23 20:09:29 +0800 Alexara Wu <alexarawu at outlook.com> $
+\GetIdInfo$Id: sjtutex.dtx 6d52363 2024-04-05 19:40:30 +0800 Alexara Wu <alexarawu at outlook.com> $
   {Windows CJK fonts definition (SJTUTeX)}
 \ProvidesExplFile{sjtu-cjk-font-windows.def}
-  {\ExplFileDate}{2.1.1}{\ExplFileDescription}
+  {\ExplFileDate}{2.1.2}{\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 } }

Modified: trunk/Master/texmf-dist/tex/latex/sjtutex/font/sjtu-math-font-cambria.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/sjtutex/font/sjtu-math-font-cambria.def	2024-04-05 21:21:27 UTC (rev 70866)
+++ trunk/Master/texmf-dist/tex/latex/sjtutex/font/sjtu-math-font-cambria.def	2024-04-05 21:21:55 UTC (rev 70867)
@@ -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 ab42a74 2024-03-23 20:09:29 +0800 Alexara Wu <alexarawu at outlook.com> $
+\GetIdInfo$Id: sjtutex.dtx 6d52363 2024-04-05 19:40:30 +0800 Alexara Wu <alexarawu at outlook.com> $
   {Cambria math fonts definition (SJTUTeX)}
 \ProvidesExplFile{sjtu-math-font-cambria.def}
-  {\ExplFileDate}{2.1.1}{\ExplFileDescription}
+  {\ExplFileDate}{2.1.2}{\ExplFileDescription}
 \__sjtu_fontset_case:nn
   { \__sjtu_fontset_error:nn { math } { cambria } }
   {

Modified: trunk/Master/texmf-dist/tex/latex/sjtutex/font/sjtu-math-font-libertinus.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/sjtutex/font/sjtu-math-font-libertinus.def	2024-04-05 21:21:27 UTC (rev 70866)
+++ trunk/Master/texmf-dist/tex/latex/sjtutex/font/sjtu-math-font-libertinus.def	2024-04-05 21:21:55 UTC (rev 70867)
@@ -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 ab42a74 2024-03-23 20:09:29 +0800 Alexara Wu <alexarawu at outlook.com> $
+\GetIdInfo$Id: sjtutex.dtx 6d52363 2024-04-05 19:40:30 +0800 Alexara Wu <alexarawu at outlook.com> $
   {Libertinus math fonts definition (SJTUTeX)}
 \ProvidesExplFile{sjtu-math-font-libertinus.def}
-  {\ExplFileDate}{2.1.1}{\ExplFileDescription}
+  {\ExplFileDate}{2.1.2}{\ExplFileDescription}
 \__sjtu_fontset_case:nn
   {
     \exp_args:No \PassOptionsToPackage

Modified: trunk/Master/texmf-dist/tex/latex/sjtutex/font/sjtu-math-font-lm.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/sjtutex/font/sjtu-math-font-lm.def	2024-04-05 21:21:27 UTC (rev 70866)
+++ trunk/Master/texmf-dist/tex/latex/sjtutex/font/sjtu-math-font-lm.def	2024-04-05 21:21:55 UTC (rev 70867)
@@ -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 ab42a74 2024-03-23 20:09:29 +0800 Alexara Wu <alexarawu at outlook.com> $
+\GetIdInfo$Id: sjtutex.dtx 6d52363 2024-04-05 19:40:30 +0800 Alexara Wu <alexarawu at outlook.com> $
   {Latin Modern math fonts definition (SJTUTeX)}
 \ProvidesExplFile{sjtu-math-font-lm.def}
-  {\ExplFileDate}{2.1.1}{\ExplFileDescription}
+  {\ExplFileDate}{2.1.2}{\ExplFileDescription}
 \RequirePackage { amssymb, upgreek }
 \SetSymbolFont { operators    } { normal } { OT1 } { lmr  } { m  } { n  }
 \SetSymbolFont { letters      } { normal } { OML } { lmm  } { m  } { it }

Modified: trunk/Master/texmf-dist/tex/latex/sjtutex/font/sjtu-math-font-newcm.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/sjtutex/font/sjtu-math-font-newcm.def	2024-04-05 21:21:27 UTC (rev 70866)
+++ trunk/Master/texmf-dist/tex/latex/sjtutex/font/sjtu-math-font-newcm.def	2024-04-05 21:21:55 UTC (rev 70867)
@@ -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 ab42a74 2024-03-23 20:09:29 +0800 Alexara Wu <alexarawu at outlook.com> $
+\GetIdInfo$Id: sjtutex.dtx 6d52363 2024-04-05 19:40:30 +0800 Alexara Wu <alexarawu at outlook.com> $
   {New Computer Modern math fonts definition (SJTUTeX)}
 \ProvidesExplFile{sjtu-math-font-newcm.def}
-  {\ExplFileDate}{2.1.1}{\ExplFileDescription}
+  {\ExplFileDate}{2.1.2}{\ExplFileDescription}
 \__sjtu_fontset_case:nn
   { \__sjtu_fontset_error:nn { math } { newcm } }
   {
@@ -58,8 +58,8 @@
         ItalicFont          = *-BookItalic,
         BoldItalicFont      = *-BoldItalic,
         SlantedFont         = *-Book,
+        SlantedFeatures     = { FakeSlant = 0.25 },
         BoldSlantedFont     = *-Bold,
-        SlantedFeatures     = { FakeSlant = 0.25 },
         BoldSlantedFeatures = { FakeSlant = 0.25 }
       ]
     \setmathsf

Modified: trunk/Master/texmf-dist/tex/latex/sjtutex/font/sjtu-math-font-newpx.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/sjtutex/font/sjtu-math-font-newpx.def	2024-04-05 21:21:27 UTC (rev 70866)
+++ trunk/Master/texmf-dist/tex/latex/sjtutex/font/sjtu-math-font-newpx.def	2024-04-05 21:21:55 UTC (rev 70867)
@@ -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 ab42a74 2024-03-23 20:09:29 +0800 Alexara Wu <alexarawu at outlook.com> $
+\GetIdInfo$Id: sjtutex.dtx 6d52363 2024-04-05 19:40:30 +0800 Alexara Wu <alexarawu at outlook.com> $
   {New PX math fonts definition (SJTUTeX)}
 \ProvidesExplFile{sjtu-math-font-newpx.def}
-  {\ExplFileDate}{2.1.1}{\ExplFileDescription}
+  {\ExplFileDate}{2.1.2}{\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

Modified: trunk/Master/texmf-dist/tex/latex/sjtutex/font/sjtu-math-font-newtx.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/sjtutex/font/sjtu-math-font-newtx.def	2024-04-05 21:21:27 UTC (rev 70866)
+++ trunk/Master/texmf-dist/tex/latex/sjtutex/font/sjtu-math-font-newtx.def	2024-04-05 21:21:55 UTC (rev 70867)
@@ -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 ab42a74 2024-03-23 20:09:29 +0800 Alexara Wu <alexarawu at outlook.com> $
+\GetIdInfo$Id: sjtutex.dtx 6d52363 2024-04-05 19:40:30 +0800 Alexara Wu <alexarawu at outlook.com> $
   {New TX math fonts definition (SJTUTeX)}
 \ProvidesExplFile{sjtu-math-font-newtx.def}
-  {\ExplFileDate}{2.1.1}{\ExplFileDescription}
+  {\ExplFileDate}{2.1.2}{\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

Modified: trunk/Master/texmf-dist/tex/latex/sjtutex/font/sjtu-math-font-stixtwo.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/sjtutex/font/sjtu-math-font-stixtwo.def	2024-04-05 21:21:27 UTC (rev 70866)
+++ trunk/Master/texmf-dist/tex/latex/sjtutex/font/sjtu-math-font-stixtwo.def	2024-04-05 21:21:55 UTC (rev 70867)
@@ -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 ab42a74 2024-03-23 20:09:29 +0800 Alexara Wu <alexarawu at outlook.com> $
+\GetIdInfo$Id: sjtutex.dtx 6d52363 2024-04-05 19:40:30 +0800 Alexara Wu <alexarawu at outlook.com> $
   {STIX Two math fonts definition (SJTUTeX)}
 \ProvidesExplFile{sjtu-math-font-stixtwo.def}
-  {\ExplFileDate}{2.1.1}{\ExplFileDescription}
+  {\ExplFileDate}{2.1.2}{\ExplFileDescription}
 \__sjtu_fontset_case:nn
   {
     \DeclareSizeFunction { sub } { \sub at sfcnt \@font at info }

Modified: trunk/Master/texmf-dist/tex/latex/sjtutex/font/sjtu-math-font-times.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/sjtutex/font/sjtu-math-font-times.def	2024-04-05 21:21:27 UTC (rev 70866)
+++ trunk/Master/texmf-dist/tex/latex/sjtutex/font/sjtu-math-font-times.def	2024-04-05 21:21:55 UTC (rev 70867)
@@ -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 ab42a74 2024-03-23 20:09:29 +0800 Alexara Wu <alexarawu at outlook.com> $
+\GetIdInfo$Id: sjtutex.dtx 6d52363 2024-04-05 19:40:30 +0800 Alexara Wu <alexarawu at outlook.com> $
   {Times math fonts definition (SJTUTeX)}
 \ProvidesExplFile{sjtu-math-font-times.def}
-  {\ExplFileDate}{2.1.1}{\ExplFileDescription}
+  {\ExplFileDate}{2.1.2}{\ExplFileDescription}
 \PassOptionsToPackage { Symbol } { upgreek }
 \RequirePackage { amssymb, upgreek }
 \tl_set_eq:NN \l__sjtu_save_rmdefault_tl \rmdefault

Modified: trunk/Master/texmf-dist/tex/latex/sjtutex/font/sjtu-math-font-xits.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/sjtutex/font/sjtu-math-font-xits.def	2024-04-05 21:21:27 UTC (rev 70866)
+++ trunk/Master/texmf-dist/tex/latex/sjtutex/font/sjtu-math-font-xits.def	2024-04-05 21:21:55 UTC (rev 70867)
@@ -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 ab42a74 2024-03-23 20:09:29 +0800 Alexara Wu <alexarawu at outlook.com> $
+\GetIdInfo$Id: sjtutex.dtx 6d52363 2024-04-05 19:40:30 +0800 Alexara Wu <alexarawu at outlook.com> $
   {XITS math fonts definition (SJTUTeX)}
 \ProvidesExplFile{sjtu-math-font-xits.def}
-  {\ExplFileDate}{2.1.1}{\ExplFileDescription}
+  {\ExplFileDate}{2.1.2}{\ExplFileDescription}
 \__sjtu_fontset_case:nn
   { \__sjtu_fontset_error:nn { math } { xits } }
   {

Modified: trunk/Master/texmf-dist/tex/latex/sjtutex/font/sjtu-text-font-cambria.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/sjtutex/font/sjtu-text-font-cambria.def	2024-04-05 21:21:27 UTC (rev 70866)
+++ trunk/Master/texmf-dist/tex/latex/sjtutex/font/sjtu-text-font-cambria.def	2024-04-05 21:21:55 UTC (rev 70867)
@@ -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 ab42a74 2024-03-23 20:09:29 +0800 Alexara Wu <alexarawu at outlook.com> $
+\GetIdInfo$Id: sjtutex.dtx 6d52363 2024-04-05 19:40:30 +0800 Alexara Wu <alexarawu at outlook.com> $
   {Cambria text fonts definition (SJTUTeX)}
 \ProvidesExplFile{sjtu-text-font-cambria.def}
-  {\ExplFileDate}{2.1.1}{\ExplFileDescription}
+  {\ExplFileDate}{2.1.2}{\ExplFileDescription}
 \__sjtu_fontset_case:nn
   { \__sjtu_fontset_error:nn { text } { cambria } }
   {

Modified: trunk/Master/texmf-dist/tex/latex/sjtutex/font/sjtu-text-font-libertinus.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/sjtutex/font/sjtu-text-font-libertinus.def	2024-04-05 21:21:27 UTC (rev 70866)
+++ trunk/Master/texmf-dist/tex/latex/sjtutex/font/sjtu-text-font-libertinus.def	2024-04-05 21:21:55 UTC (rev 70867)
@@ -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 ab42a74 2024-03-23 20:09:29 +0800 Alexara Wu <alexarawu at outlook.com> $
+\GetIdInfo$Id: sjtutex.dtx 6d52363 2024-04-05 19:40:30 +0800 Alexara Wu <alexarawu at outlook.com> $
   {Libertinus text fonts definition (SJTUTeX)}
 \ProvidesExplFile{sjtu-text-font-libertinus.def}
-  {\ExplFileDate}{2.1.1}{\ExplFileDescription}
+  {\ExplFileDate}{2.1.2}{\ExplFileDescription}
 \__sjtu_fontset_case:nn
   {
     \tl_set:Nn \encodingdefault { T1 }

Modified: trunk/Master/texmf-dist/tex/latex/sjtutex/font/sjtu-text-font-lm.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/sjtutex/font/sjtu-text-font-lm.def	2024-04-05 21:21:27 UTC (rev 70866)
+++ trunk/Master/texmf-dist/tex/latex/sjtutex/font/sjtu-text-font-lm.def	2024-04-05 21:21:55 UTC (rev 70867)
@@ -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 ab42a74 2024-03-23 20:09:29 +0800 Alexara Wu <alexarawu at outlook.com> $
+\GetIdInfo$Id: sjtutex.dtx 6d52363 2024-04-05 19:40:30 +0800 Alexara Wu <alexarawu at outlook.com> $
   {Latin Modern text fonts definition (SJTUTeX)}
 \ProvidesExplFile{sjtu-text-font-lm.def}
-  {\ExplFileDate}{2.1.1}{\ExplFileDescription}
+  {\ExplFileDate}{2.1.2}{\ExplFileDescription}
 \__sjtu_fontset_case:nn
   {
     \tl_set:Nn \encodingdefault { T1 }

Modified: trunk/Master/texmf-dist/tex/latex/sjtutex/font/sjtu-text-font-newcm.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/sjtutex/font/sjtu-text-font-newcm.def	2024-04-05 21:21:27 UTC (rev 70866)
+++ trunk/Master/texmf-dist/tex/latex/sjtutex/font/sjtu-text-font-newcm.def	2024-04-05 21:21:55 UTC (rev 70867)
@@ -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 ab42a74 2024-03-23 20:09:29 +0800 Alexara Wu <alexarawu at outlook.com> $
+\GetIdInfo$Id: sjtutex.dtx 6d52363 2024-04-05 19:40:30 +0800 Alexara Wu <alexarawu at outlook.com> $
   {New Computer Modern text fonts definition (SJTUTeX)}
 \ProvidesExplFile{sjtu-text-font-newcm.def}
-  {\ExplFileDate}{2.1.1}{\ExplFileDescription}
+  {\ExplFileDate}{2.1.2}{\ExplFileDescription}
 \__sjtu_fontset_case:nn
   { \__sjtu_fontset_error:nn { text } { newcm } }
   {
@@ -46,8 +46,8 @@
         ItalicFont          = *-BookItalic,
         BoldItalicFont      = *-BoldItalic,
         SlantedFont         = *-Book,
+        SlantedFeatures     = { FakeSlant = 0.25 },
         BoldSlantedFont     = *-Bold,
-        SlantedFeatures     = { FakeSlant = 0.25 },
         BoldSlantedFeatures = { FakeSlant = 0.25 }
       ]
     \setsansfont

Modified: trunk/Master/texmf-dist/tex/latex/sjtutex/font/sjtu-text-font-newpx.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/sjtutex/font/sjtu-text-font-newpx.def	2024-04-05 21:21:27 UTC (rev 70866)
+++ trunk/Master/texmf-dist/tex/latex/sjtutex/font/sjtu-text-font-newpx.def	2024-04-05 21:21:55 UTC (rev 70867)
@@ -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 ab42a74 2024-03-23 20:09:29 +0800 Alexara Wu <alexarawu at outlook.com> $
+\GetIdInfo$Id: sjtutex.dtx 6d52363 2024-04-05 19:40:30 +0800 Alexara Wu <alexarawu at outlook.com> $
   {New PX text fonts definition (SJTUTeX)}
 \ProvidesExplFile{sjtu-text-font-newpx.def}
-  {\ExplFileDate}{2.1.1}{\ExplFileDescription}
+  {\ExplFileDate}{2.1.2}{\ExplFileDescription}
 \__sjtu_fontset_case:nn
   {
     \tl_set:Nn \encodingdefault { T1 }

Modified: trunk/Master/texmf-dist/tex/latex/sjtutex/font/sjtu-text-font-newtx.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/sjtutex/font/sjtu-text-font-newtx.def	2024-04-05 21:21:27 UTC (rev 70866)
+++ trunk/Master/texmf-dist/tex/latex/sjtutex/font/sjtu-text-font-newtx.def	2024-04-05 21:21:55 UTC (rev 70867)
@@ -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 ab42a74 2024-03-23 20:09:29 +0800 Alexara Wu <alexarawu at outlook.com> $
+\GetIdInfo$Id: sjtutex.dtx 6d52363 2024-04-05 19:40:30 +0800 Alexara Wu <alexarawu at outlook.com> $
   {New TX text fonts definition (SJTUTeX)}
 \ProvidesExplFile{sjtu-text-font-newtx.def}
-  {\ExplFileDate}{2.1.1}{\ExplFileDescription}
+  {\ExplFileDate}{2.1.2}{\ExplFileDescription}
 \__sjtu_fontset_case:nn
   {
     \tl_set:Nn \encodingdefault { T1 }

Modified: trunk/Master/texmf-dist/tex/latex/sjtutex/font/sjtu-text-font-stixtwo.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/sjtutex/font/sjtu-text-font-stixtwo.def	2024-04-05 21:21:27 UTC (rev 70866)
+++ trunk/Master/texmf-dist/tex/latex/sjtutex/font/sjtu-text-font-stixtwo.def	2024-04-05 21:21:55 UTC (rev 70867)
@@ -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 ab42a74 2024-03-23 20:09:29 +0800 Alexara Wu <alexarawu at outlook.com> $
+\GetIdInfo$Id: sjtutex.dtx 6d52363 2024-04-05 19:40:30 +0800 Alexara Wu <alexarawu at outlook.com> $
   {STIX Two text fonts definition (SJTUTeX)}
 \ProvidesExplFile{sjtu-text-font-stixtwo.def}
-  {\ExplFileDate}{2.1.1}{\ExplFileDescription}
+  {\ExplFileDate}{2.1.2}{\ExplFileDescription}
 \__sjtu_fontset_case:nn
   {
     \tl_set:Nn \encodingdefault { T1 }

Modified: trunk/Master/texmf-dist/tex/latex/sjtutex/font/sjtu-text-font-times.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/sjtutex/font/sjtu-text-font-times.def	2024-04-05 21:21:27 UTC (rev 70866)
+++ trunk/Master/texmf-dist/tex/latex/sjtutex/font/sjtu-text-font-times.def	2024-04-05 21:21:55 UTC (rev 70867)
@@ -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 ab42a74 2024-03-23 20:09:29 +0800 Alexara Wu <alexarawu at outlook.com> $
+\GetIdInfo$Id: sjtutex.dtx 6d52363 2024-04-05 19:40:30 +0800 Alexara Wu <alexarawu at outlook.com> $
   {Times text fonts definition (SJTUTeX)}
 \ProvidesExplFile{sjtu-text-font-times.def}
-  {\ExplFileDate}{2.1.1}{\ExplFileDescription}
+  {\ExplFileDate}{2.1.2}{\ExplFileDescription}
 \__sjtu_fontset_case:nn
   {
     \tl_set:Nn \encodingdefault { T1 }

Modified: trunk/Master/texmf-dist/tex/latex/sjtutex/font/sjtu-text-font-xits.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/sjtutex/font/sjtu-text-font-xits.def	2024-04-05 21:21:27 UTC (rev 70866)
+++ trunk/Master/texmf-dist/tex/latex/sjtutex/font/sjtu-text-font-xits.def	2024-04-05 21:21:55 UTC (rev 70867)
@@ -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 ab42a74 2024-03-23 20:09:29 +0800 Alexara Wu <alexarawu at outlook.com> $
+\GetIdInfo$Id: sjtutex.dtx 6d52363 2024-04-05 19:40:30 +0800 Alexara Wu <alexarawu at outlook.com> $
   {XITS text fonts definition (SJTUTeX)}
 \ProvidesExplFile{sjtu-text-font-xits.def}
-  {\ExplFileDate}{2.1.1}{\ExplFileDescription}
+  {\ExplFileDate}{2.1.2}{\ExplFileDescription}
 \__sjtu_fontset_case:nn
   { \__sjtu_fontset_error:nn { text } { xits } }
   {

Modified: trunk/Master/texmf-dist/tex/latex/sjtutex/lang/sjtu-lang-generic-de.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/sjtutex/lang/sjtu-lang-generic-de.def	2024-04-05 21:21:27 UTC (rev 70866)
+++ trunk/Master/texmf-dist/tex/latex/sjtutex/lang/sjtu-lang-generic-de.def	2024-04-05 21:21:55 UTC (rev 70867)
@@ -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 ab42a74 2024-03-23 20:09:29 +0800 Alexara Wu <alexarawu at outlook.com> $
+\GetIdInfo$Id: sjtutex.dtx 6d52363 2024-04-05 19:40:30 +0800 Alexara Wu <alexarawu at outlook.com> $
   {German specific definition for generic (SJTUTeX)}
 \ProvidesExplFile{sjtu-lang-generic-de.def}
-  {\ExplFileDate}{2.1.1}{\ExplFileDescription}
+  {\ExplFileDate}{2.1.2}{\ExplFileDescription}
 \cs_new:Npn \__sjtu_date_aux_de:nnn #1#2#3
   {
     \clist_item:Nn \c__sjtu_name_month_de_clist {#2} ~

Modified: trunk/Master/texmf-dist/tex/latex/sjtutex/lang/sjtu-lang-generic-en.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/sjtutex/lang/sjtu-lang-generic-en.def	2024-04-05 21:21:27 UTC (rev 70866)
+++ trunk/Master/texmf-dist/tex/latex/sjtutex/lang/sjtu-lang-generic-en.def	2024-04-05 21:21:55 UTC (rev 70867)
@@ -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 ab42a74 2024-03-23 20:09:29 +0800 Alexara Wu <alexarawu at outlook.com> $
+\GetIdInfo$Id: sjtutex.dtx 6d52363 2024-04-05 19:40:30 +0800 Alexara Wu <alexarawu at outlook.com> $
   {English specific definition for generic (SJTUTeX)}
 \ProvidesExplFile{sjtu-lang-generic-en.def}
-  {\ExplFileDate}{2.1.1}{\ExplFileDescription}
+  {\ExplFileDate}{2.1.2}{\ExplFileDescription}
 \cs_new:Npn \__sjtu_ordinal_en:n #1
   {
     \int_to_arabic:n {#1}

Modified: trunk/Master/texmf-dist/tex/latex/sjtutex/lang/sjtu-lang-generic-ja.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/sjtutex/lang/sjtu-lang-generic-ja.def	2024-04-05 21:21:27 UTC (rev 70866)
+++ trunk/Master/texmf-dist/tex/latex/sjtutex/lang/sjtu-lang-generic-ja.def	2024-04-05 21:21:55 UTC (rev 70867)
@@ -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 ab42a74 2024-03-23 20:09:29 +0800 Alexara Wu <alexarawu at outlook.com> $
+\GetIdInfo$Id: sjtutex.dtx 6d52363 2024-04-05 19:40:30 +0800 Alexara Wu <alexarawu at outlook.com> $
   {Japanese specific definition for generic (SJTUTeX)}
 \ProvidesExplFile{sjtu-lang-generic-ja.def}
-  {\ExplFileDate}{2.1.1}{\ExplFileDescription}
+  {\ExplFileDate}{2.1.2}{\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  } ~

Modified: trunk/Master/texmf-dist/tex/latex/sjtutex/lang/sjtu-lang-generic-zh.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/sjtutex/lang/sjtu-lang-generic-zh.def	2024-04-05 21:21:27 UTC (rev 70866)
+++ trunk/Master/texmf-dist/tex/latex/sjtutex/lang/sjtu-lang-generic-zh.def	2024-04-05 21:21:55 UTC (rev 70867)
@@ -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 ab42a74 2024-03-23 20:09:29 +0800 Alexara Wu <alexarawu at outlook.com> $
+\GetIdInfo$Id: sjtutex.dtx 6d52363 2024-04-05 19:40:30 +0800 Alexara Wu <alexarawu at outlook.com> $
   {Chinese specific definition for generic (SJTUTeX)}
 \ProvidesExplFile{sjtu-lang-generic-zh.def}
-  {\ExplFileDate}{2.1.1}{\ExplFileDescription}
+  {\ExplFileDate}{2.1.2}{\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  } ~

Modified: trunk/Master/texmf-dist/tex/latex/sjtutex/lang/sjtu-lang-thesis-de.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/sjtutex/lang/sjtu-lang-thesis-de.def	2024-04-05 21:21:27 UTC (rev 70866)
+++ trunk/Master/texmf-dist/tex/latex/sjtutex/lang/sjtu-lang-thesis-de.def	2024-04-05 21:21:55 UTC (rev 70867)
@@ -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 ab42a74 2024-03-23 20:09:29 +0800 Alexara Wu <alexarawu at outlook.com> $
+\GetIdInfo$Id: sjtutex.dtx 6d52363 2024-04-05 19:40:30 +0800 Alexara Wu <alexarawu at outlook.com> $
   {German specific definition for thesis (SJTUTeX)}
 \ProvidesExplFile{sjtu-lang-thesis-de.def}
-  {\ExplFileDate}{2.1.1}{\ExplFileDescription}
+  {\ExplFileDate}{2.1.2}{\ExplFileDescription}
 \__sjtu_info_keys_define:n { de }
 \keys_define:nn { sjtu / info / de }
   {

Modified: trunk/Master/texmf-dist/tex/latex/sjtutex/lang/sjtu-lang-thesis-en.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/sjtutex/lang/sjtu-lang-thesis-en.def	2024-04-05 21:21:27 UTC (rev 70866)
+++ trunk/Master/texmf-dist/tex/latex/sjtutex/lang/sjtu-lang-thesis-en.def	2024-04-05 21:21:55 UTC (rev 70867)
@@ -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 ab42a74 2024-03-23 20:09:29 +0800 Alexara Wu <alexarawu at outlook.com> $
+\GetIdInfo$Id: sjtutex.dtx 6d52363 2024-04-05 19:40:30 +0800 Alexara Wu <alexarawu at outlook.com> $
   {English specific definition for thesis (SJTUTeX)}
 \ProvidesExplFile{sjtu-lang-thesis-en.def}
-  {\ExplFileDate}{2.1.1}{\ExplFileDescription}
+  {\ExplFileDate}{2.1.2}{\ExplFileDescription}
 \__sjtu_info_keys_define:n { en }
 \keys_define:nn { sjtu / info / en }
   {

Modified: trunk/Master/texmf-dist/tex/latex/sjtutex/lang/sjtu-lang-thesis-ja.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/sjtutex/lang/sjtu-lang-thesis-ja.def	2024-04-05 21:21:27 UTC (rev 70866)
+++ trunk/Master/texmf-dist/tex/latex/sjtutex/lang/sjtu-lang-thesis-ja.def	2024-04-05 21:21:55 UTC (rev 70867)
@@ -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 ab42a74 2024-03-23 20:09:29 +0800 Alexara Wu <alexarawu at outlook.com> $
+\GetIdInfo$Id: sjtutex.dtx 6d52363 2024-04-05 19:40:30 +0800 Alexara Wu <alexarawu at outlook.com> $
   {Japanese specific definition for thesis (SJTUTeX)}
 \ProvidesExplFile{sjtu-lang-thesis-ja.def}
-  {\ExplFileDate}{2.1.1}{\ExplFileDescription}
+  {\ExplFileDate}{2.1.2}{\ExplFileDescription}
 \__sjtu_info_keys_define:n { ja }
 \keys_define:nn { sjtu / info / ja }
   {

Modified: trunk/Master/texmf-dist/tex/latex/sjtutex/lang/sjtu-lang-thesis-zh.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/sjtutex/lang/sjtu-lang-thesis-zh.def	2024-04-05 21:21:27 UTC (rev 70866)
+++ trunk/Master/texmf-dist/tex/latex/sjtutex/lang/sjtu-lang-thesis-zh.def	2024-04-05 21:21:55 UTC (rev 70867)
@@ -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 ab42a74 2024-03-23 20:09:29 +0800 Alexara Wu <alexarawu at outlook.com> $
+\GetIdInfo$Id: sjtutex.dtx 6d52363 2024-04-05 19:40:30 +0800 Alexara Wu <alexarawu at outlook.com> $
   {Chinese specific definition for thesis (SJTUTeX)}
 \ProvidesExplFile{sjtu-lang-thesis-zh.def}
-  {\ExplFileDate}{2.1.1}{\ExplFileDescription}
+  {\ExplFileDate}{2.1.2}{\ExplFileDescription}
 \__sjtu_info_keys_define:n { zh }
 \keys_define:nn { sjtu / info / zh }
   {

Modified: trunk/Master/texmf-dist/tex/latex/sjtutex/name/sjtu-name-generic-de.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/sjtutex/name/sjtu-name-generic-de.def	2024-04-05 21:21:27 UTC (rev 70866)
+++ trunk/Master/texmf-dist/tex/latex/sjtutex/name/sjtu-name-generic-de.def	2024-04-05 21:21:55 UTC (rev 70867)
@@ -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 ab42a74 2024-03-23 20:09:29 +0800 Alexara Wu <alexarawu at outlook.com> $
+\GetIdInfo$Id: sjtutex.dtx 6d52363 2024-04-05 19:40:30 +0800 Alexara Wu <alexarawu at outlook.com> $
   {German name config for generic (SJTUTeX)}
 \ProvidesExplFile{sjtu-name-generic-de.def}
-  {\ExplFileDate}{2.1.1}{\ExplFileDescription}
+  {\ExplFileDate}{2.1.2}{\ExplFileDescription}
 \clist_const:Nn \c__sjtu_name_month_de_clist
   {
     Januar, Februar, März, April, Mai, Juni,

Modified: trunk/Master/texmf-dist/tex/latex/sjtutex/name/sjtu-name-generic-en.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/sjtutex/name/sjtu-name-generic-en.def	2024-04-05 21:21:27 UTC (rev 70866)
+++ trunk/Master/texmf-dist/tex/latex/sjtutex/name/sjtu-name-generic-en.def	2024-04-05 21:21:55 UTC (rev 70867)
@@ -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 ab42a74 2024-03-23 20:09:29 +0800 Alexara Wu <alexarawu at outlook.com> $
+\GetIdInfo$Id: sjtutex.dtx 6d52363 2024-04-05 19:40:30 +0800 Alexara Wu <alexarawu at outlook.com> $
   {English name config for generic (SJTUTeX)}
 \ProvidesExplFile{sjtu-name-generic-en.def}
-  {\ExplFileDate}{2.1.1}{\ExplFileDescription}
+  {\ExplFileDate}{2.1.2}{\ExplFileDescription}
 \clist_const:Nn \c__sjtu_name_month_en_clist
   {
     January, February, March, April, May, June,

Modified: trunk/Master/texmf-dist/tex/latex/sjtutex/name/sjtu-name-generic-ja.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/sjtutex/name/sjtu-name-generic-ja.def	2024-04-05 21:21:27 UTC (rev 70866)
+++ trunk/Master/texmf-dist/tex/latex/sjtutex/name/sjtu-name-generic-ja.def	2024-04-05 21:21:55 UTC (rev 70867)
@@ -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 ab42a74 2024-03-23 20:09:29 +0800 Alexara Wu <alexarawu at outlook.com> $
+\GetIdInfo$Id: sjtutex.dtx 6d52363 2024-04-05 19:40:30 +0800 Alexara Wu <alexarawu at outlook.com> $
   {Japanese name config for generic (SJTUTeX)}
 \ProvidesExplFile{sjtu-name-generic-ja.def}
-  {\ExplFileDate}{2.1.1}{\ExplFileDescription}
+  {\ExplFileDate}{2.1.2}{\ExplFileDescription}
 \clist_map_inline:nn
   {
     { year  } { 年 } ,

Modified: trunk/Master/texmf-dist/tex/latex/sjtutex/name/sjtu-name-generic-zh.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/sjtutex/name/sjtu-name-generic-zh.def	2024-04-05 21:21:27 UTC (rev 70866)
+++ trunk/Master/texmf-dist/tex/latex/sjtutex/name/sjtu-name-generic-zh.def	2024-04-05 21:21:55 UTC (rev 70867)
@@ -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 ab42a74 2024-03-23 20:09:29 +0800 Alexara Wu <alexarawu at outlook.com> $
+\GetIdInfo$Id: sjtutex.dtx 6d52363 2024-04-05 19:40:30 +0800 Alexara Wu <alexarawu at outlook.com> $
   {Chinese name config for generic (SJTUTeX)}
 \ProvidesExplFile{sjtu-name-generic-zh.def}
-  {\ExplFileDate}{2.1.1}{\ExplFileDescription}
+  {\ExplFileDate}{2.1.2}{\ExplFileDescription}
 \clist_map_inline:nn
   {
     { year  } { 年 } ,

Modified: trunk/Master/texmf-dist/tex/latex/sjtutex/name/sjtu-name-thesis-de.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/sjtutex/name/sjtu-name-thesis-de.def	2024-04-05 21:21:27 UTC (rev 70866)
+++ trunk/Master/texmf-dist/tex/latex/sjtutex/name/sjtu-name-thesis-de.def	2024-04-05 21:21:55 UTC (rev 70867)
@@ -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 ab42a74 2024-03-23 20:09:29 +0800 Alexara Wu <alexarawu at outlook.com> $
+\GetIdInfo$Id: sjtutex.dtx 6d52363 2024-04-05 19:40:30 +0800 Alexara Wu <alexarawu at outlook.com> $
   {German name config for thesis (SJTUTeX)}
 \ProvidesExplFile{sjtu-name-thesis-de.def}
-  {\ExplFileDate}{2.1.1}{\ExplFileDescription}
+  {\ExplFileDate}{2.1.2}{\ExplFileDescription}
 \clist_const:Nn \c__sjtu_name_month_de_clist
   {
     Januar, Februar, März, April, Mai, Juni,

Modified: trunk/Master/texmf-dist/tex/latex/sjtutex/name/sjtu-name-thesis-en.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/sjtutex/name/sjtu-name-thesis-en.def	2024-04-05 21:21:27 UTC (rev 70866)
+++ trunk/Master/texmf-dist/tex/latex/sjtutex/name/sjtu-name-thesis-en.def	2024-04-05 21:21:55 UTC (rev 70867)
@@ -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 ab42a74 2024-03-23 20:09:29 +0800 Alexara Wu <alexarawu at outlook.com> $
+\GetIdInfo$Id: sjtutex.dtx 6d52363 2024-04-05 19:40:30 +0800 Alexara Wu <alexarawu at outlook.com> $
   {English name config for thesis (SJTUTeX)}
 \ProvidesExplFile{sjtu-name-thesis-en.def}
-  {\ExplFileDate}{2.1.1}{\ExplFileDescription}
+  {\ExplFileDate}{2.1.2}{\ExplFileDescription}
 \clist_const:Nn \c__sjtu_name_month_en_clist
   {
     January, February, March, April, May, June,

Modified: trunk/Master/texmf-dist/tex/latex/sjtutex/name/sjtu-name-thesis-ja.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/sjtutex/name/sjtu-name-thesis-ja.def	2024-04-05 21:21:27 UTC (rev 70866)
+++ trunk/Master/texmf-dist/tex/latex/sjtutex/name/sjtu-name-thesis-ja.def	2024-04-05 21:21:55 UTC (rev 70867)
@@ -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 ab42a74 2024-03-23 20:09:29 +0800 Alexara Wu <alexarawu at outlook.com> $
+\GetIdInfo$Id: sjtutex.dtx 6d52363 2024-04-05 19:40:30 +0800 Alexara Wu <alexarawu at outlook.com> $
   {Japanese name config for thesis (SJTUTeX)}
 \ProvidesExplFile{sjtu-name-thesis-ja.def}
-  {\ExplFileDate}{2.1.1}{\ExplFileDescription}
+  {\ExplFileDate}{2.1.2}{\ExplFileDescription}
 \clist_map_inline:nn
   {
     { year  } { 年 } ,

Modified: trunk/Master/texmf-dist/tex/latex/sjtutex/name/sjtu-name-thesis-zh.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/sjtutex/name/sjtu-name-thesis-zh.def	2024-04-05 21:21:27 UTC (rev 70866)
+++ trunk/Master/texmf-dist/tex/latex/sjtutex/name/sjtu-name-thesis-zh.def	2024-04-05 21:21:55 UTC (rev 70867)
@@ -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 ab42a74 2024-03-23 20:09:29 +0800 Alexara Wu <alexarawu at outlook.com> $
+\GetIdInfo$Id: sjtutex.dtx 6d52363 2024-04-05 19:40:30 +0800 Alexara Wu <alexarawu at outlook.com> $
   {Chinese name config for thesis (SJTUTeX)}
 \ProvidesExplFile{sjtu-name-thesis-zh.def}
-  {\ExplFileDate}{2.1.1}{\ExplFileDescription}
+  {\ExplFileDate}{2.1.2}{\ExplFileDescription}
 \clist_map_inline:nn
   {
     { year  } { 年 } ,

Modified: trunk/Master/texmf-dist/tex/latex/sjtutex/scheme/sjtu-scheme-de.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/sjtutex/scheme/sjtu-scheme-de.def	2024-04-05 21:21:27 UTC (rev 70866)
+++ trunk/Master/texmf-dist/tex/latex/sjtutex/scheme/sjtu-scheme-de.def	2024-04-05 21:21:55 UTC (rev 70867)
@@ -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 ab42a74 2024-03-23 20:09:29 +0800 Alexara Wu <alexarawu at outlook.com> $
+\GetIdInfo$Id: sjtutex.dtx 6d52363 2024-04-05 19:40:30 +0800 Alexara Wu <alexarawu at outlook.com> $
   {German scheme (SJTUTeX)}
 \ProvidesExplFile{sjtu-scheme-de.def}
-  {\ExplFileDate}{2.1.1}{\ExplFileDescription}
+  {\ExplFileDate}{2.1.2}{\ExplFileDescription}
 \keys_set_known:nn { sjtu / name }
   {
     contents      = { Inhaltsverzeichnis     } ,

Modified: trunk/Master/texmf-dist/tex/latex/sjtutex/scheme/sjtu-scheme-en.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/sjtutex/scheme/sjtu-scheme-en.def	2024-04-05 21:21:27 UTC (rev 70866)
+++ trunk/Master/texmf-dist/tex/latex/sjtutex/scheme/sjtu-scheme-en.def	2024-04-05 21:21:55 UTC (rev 70867)
@@ -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 ab42a74 2024-03-23 20:09:29 +0800 Alexara Wu <alexarawu at outlook.com> $
+\GetIdInfo$Id: sjtutex.dtx 6d52363 2024-04-05 19:40:30 +0800 Alexara Wu <alexarawu at outlook.com> $
   {English scheme (SJTUTeX)}
 \ProvidesExplFile{sjtu-scheme-en.def}
-  {\ExplFileDate}{2.1.1}{\ExplFileDescription}
+  {\ExplFileDate}{2.1.2}{\ExplFileDescription}
 \ctex_if_autoindent_touched:F
   { \ctex_set:n { autoindent = 1.5 em } }
 \ctex_patch_cmd:Nnn \quotation { 1.5em } { \parindent }

Modified: trunk/Master/texmf-dist/tex/latex/sjtutex/scheme/sjtu-scheme-ja.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/sjtutex/scheme/sjtu-scheme-ja.def	2024-04-05 21:21:27 UTC (rev 70866)
+++ trunk/Master/texmf-dist/tex/latex/sjtutex/scheme/sjtu-scheme-ja.def	2024-04-05 21:21:55 UTC (rev 70867)
@@ -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 ab42a74 2024-03-23 20:09:29 +0800 Alexara Wu <alexarawu at outlook.com> $
+\GetIdInfo$Id: sjtutex.dtx 6d52363 2024-04-05 19:40:30 +0800 Alexara Wu <alexarawu at outlook.com> $
   {Japanese scheme (SJTUTeX)}
 \ProvidesExplFile{sjtu-scheme-ja.def}
-  {\ExplFileDate}{2.1.1}{\ExplFileDescription}
+  {\ExplFileDate}{2.1.2}{\ExplFileDescription}
 \keys_set_known:nn { sjtu / name }
   {
     contents      = { 目 \protect \quad 次 } ,

Modified: trunk/Master/texmf-dist/tex/latex/sjtutex/scheme/sjtu-scheme-zh.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/sjtutex/scheme/sjtu-scheme-zh.def	2024-04-05 21:21:27 UTC (rev 70866)
+++ trunk/Master/texmf-dist/tex/latex/sjtutex/scheme/sjtu-scheme-zh.def	2024-04-05 21:21:55 UTC (rev 70867)
@@ -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 ab42a74 2024-03-23 20:09:29 +0800 Alexara Wu <alexarawu at outlook.com> $
+\GetIdInfo$Id: sjtutex.dtx 6d52363 2024-04-05 19:40:30 +0800 Alexara Wu <alexarawu at outlook.com> $
   {Chinese scheme (SJTUTeX)}
 \ProvidesExplFile{sjtu-scheme-zh.def}
-  {\ExplFileDate}{2.1.1}{\ExplFileDescription}
+  {\ExplFileDate}{2.1.2}{\ExplFileDescription}
 \keys_set_known:nn { sjtu / name }
   {
     contents      = { 目 \protect \quad 录   } ,

Modified: trunk/Master/texmf-dist/tex/latex/sjtutex/sjtuarticle.cls
===================================================================
--- trunk/Master/texmf-dist/tex/latex/sjtutex/sjtuarticle.cls	2024-04-05 21:21:27 UTC (rev 70866)
+++ trunk/Master/texmf-dist/tex/latex/sjtutex/sjtuarticle.cls	2024-04-05 21:21:55 UTC (rev 70867)
@@ -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 ab42a74 2024-03-23 20:09:29 +0800 Alexara Wu <alexarawu at outlook.com> $
+\GetIdInfo$Id: sjtutex.dtx 6d52363 2024-04-05 19:40:30 +0800 Alexara Wu <alexarawu at outlook.com> $
   {Article document class for Shanghai Jiao Tong University (SJTUTeX)}
 \ProvidesExplClass{sjtuarticle}
-  {\ExplFileDate}{2.1.1}{\ExplFileDescription}
+  {\ExplFileDate}{2.1.2}{\ExplFileDescription}
 \dim_new:N \l__sjtu_tmp_dim
 \skip_new:N \l__sjtu_tmp_skip
 \box_new:N \l__sjtu_tmp_box
@@ -211,7 +211,6 @@
 \clist_set:Nx \g__sjtu_options_to_packages_clist
   {
     { no-math           } { fontspec     } ,
-    { titles            } { tocloft      } ,
     { list = off        } { bicaption    } ,
     { warnings-off =
       {
@@ -233,7 +232,7 @@
     mathtools,
     geometry,
     fancyhdr,
-    tocloft,
+    titletoc,
     caption,
     bicaption,
     subcaption,
@@ -854,43 +853,43 @@
     \IfBooleanTF {#1}
       { \SJTU at head* { \contentsname } }
       { \SJTU at head  { \contentsname } }
-    \group_begin:
-      \cs_set:Npn \makebox [##1][##2]##3 { \, ##3 }
-      \@starttoc { toc }
-    \group_end:
+    \@starttoc { toc }
   }
+\tl_set:Nn \SJTU at leaders { \titlerule* [ 4bp ] { . } }
+\contentsmargin [ 2.55 em ] { 0 pt }
+\titlecontents { section }
+  [ 0 pt ] { \addvspace { 6 bp } \bfseries }
+  { \contentspush { \thecontentslabel \quad } } { }
+  { \SJTU at leaders \thecontentspage }
+\titlecontents { subsection }
+  [ 2 em ] { }
+  { \contentspush { \thecontentslabel \quad } } { }
+  { \SJTU at leaders \thecontentspage }
+\titlecontents { subsubsection }
+  [ 4 em ] { }
+  { \contentspush { \thecontentslabel \quad } } { }
+  { \SJTU at leaders \thecontentspage }
 \NewDocumentCommand \SJTU at listof { m m s }
   {
     \IfBooleanTF {#3}
       { \SJTU at head* {#1} }
       { \SJTU at head  {#1} }
-    \group_begin:
-      \cs_set:Npn \makebox [##1][##2]##3 { \, ##3 }
-      \exp_args:Nv \@starttoc { ext@ #2 }
-    \group_end:
+    \exp_args:Nv \@starttoc { ext@ #2 }
   }
-\DeclareDocumentCommand \listoffigures { }
-  { \SJTU at listof { \listfigurename } { figure } }
-\DeclareDocumentCommand \listoftables  { }
-  { \SJTU at listof { \listtablename  } { table  } }
-\tl_set:Nn \cftdotsep { 0.5 }
-\clist_set:Nn \l__sjtu_cft_presnum_clist
+\cs_new_protected:Npn \__sjtu_new_list_of:Nnnn #1#2#3#4
   {
-    { fig } { \figurename } ,
-    { tab } { \tablename  }
+    \DeclareDocumentCommand #1 { }
+      { \SJTU at listof {#4} {#2} }
+    \titlecontents {#2}
+      [ 0 pt ] { }
+      { \contentspush { #3 \space \thecontentslabel \quad } } { }
+      { \SJTU at leaders \thecontentspage }
+    \exp_args:Nnv \contentsuse {#2} { ext@ #2 }
   }
-\cs_new:Npn \__sjtu_update_cft_presnum:nn #1#2
-  {
-    \tl_set:cn { cft #1 presnum } { #2 \c_space_tl }
-    \skip_zero:c { cft #1 indent }
-    \skip_set:cn { cft #1 numwidth } { 1.8 em }
-    \__sjtu_skip_add_to_wd:cv { cft #1 numwidth } { cft #1 presnum }
-  }
-\ctex_at_end_preamble:n
-  {
-    \clist_map_inline:Nn \l__sjtu_cft_presnum_clist
-      { \__sjtu_update_cft_presnum:nn #1 }
-  }
+\__sjtu_new_list_of:Nnnn \listoffigures { figure }
+  { \figurename } { \listfigurename }
+\__sjtu_new_list_of:Nnnn \listoftables  { table  }
+  { \tablename  } { \listtablename  }
 \NewDocumentCommand \sjtusetup { } { \keys_set:nn { sjtu } }
 \keys_define:nn { sjtu }
   {
@@ -1021,14 +1020,15 @@
   }
 \ctex_at_end_package:nn { thmtools }
   {
-    \newlistentry { thm } { loe } { 0 }
-    \newcounter { loedepth }
-    \setcounter { loedepth } { 1 }
-    \skip_set:Nn \cftthmnumwidth { 2.3 em }
-    \define at key { thmt-listof } { numwidth }
-      { \skip_set:Nn \cftthmnumwidth {#1} }
     \cs_set:Npn \thmtlo at newentry
-      { \cs_set_eq:cN { l@ \thmt at envname } \l at thm }
+      {
+        \exp_args:NV \titlecontents \thmt at envname
+          [ \thmt at listnumwidth ] { }
+          { \contentslabel { \thmt at listnumwidth } }
+          { \hspace* { - \thmt at listnumwidth } }
+          { \SJTU at leaders \thecontentspage }
+        \exp_args:NV \contentsuse \thmt at envname { loe }
+      }
     \cs_set:Npn \thmtlo at chaptervspacehack { }
     \RenewDocumentCommand \listoftheorems { s O{ } }
       {
@@ -1055,26 +1055,15 @@
                   } { }
               \fi
             }
-          \cs_set:Npn \makebox [##1][##2]##3 { \, ##3 }
           \@starttoc { loe }
         \group_end:
       }
   }
-\cs_new_protected:Npn \__sjtu_newlistof:nnnnn #1#2#3#4#5
-  {
-    \exp_args:Nnv \newlistentry {#2} { ext@ #3 } { 0 }
-    \exp_args:Ne \newcounter { \tl_use:c { ext@ #3 } depth }
-    \exp_args:Ne \setcounter { \tl_use:c { ext@ #3 } depth } { 1 }
-    \clist_put_right:Nn \l__sjtu_cft_presnum_clist { {#2} {#4} }
-    \cs_set_eq:cc { l@ #3 } { l@ #2 }
-    \exp_args:Nc \DeclareDocumentCommand { listof #1 s } { }
-      { \SJTU at listof {#5} {#3} }
-  }
 \ctex_at_end_package:nn { algorithm }
   {
     \tl_set:Nn \fname at algorithm   { \SJTU at algorithmname     }
     \tl_set:Nn \listalgorithmname { \SJTU at listalgorithmname }
-    \__sjtu_newlistof:nnnnn { algorithm } { alg } { algorithm }
+    \__sjtu_new_list_of:Nnnn \listofalgorithms { algorithm }
       { \fname at algorithm } { \listalgorithmname }
   }
 \ctex_at_end_package:nn { algorithm2e }
@@ -1083,7 +1072,7 @@
                       { \SJTU at algorithmname     }
                       { \SJTU at listalgorithmname }
     \SetAlgoCaptionSeparator { \enskip }
-    \__sjtu_newlistof:nnnnn { algorithm } { alg } { algocf }
+    \__sjtu_new_list_of:Nnnn \listofalgorithms { algocf }
       { \algorithmcfname } { \listalgorithmcfname }
     \ctex_patch_cmd:Nnn \algocf at latexcaption
       { \addcontentsline }

Modified: trunk/Master/texmf-dist/tex/latex/sjtutex/sjtureport.cls
===================================================================
--- trunk/Master/texmf-dist/tex/latex/sjtutex/sjtureport.cls	2024-04-05 21:21:27 UTC (rev 70866)
+++ trunk/Master/texmf-dist/tex/latex/sjtutex/sjtureport.cls	2024-04-05 21:21:55 UTC (rev 70867)
@@ -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 ab42a74 2024-03-23 20:09:29 +0800 Alexara Wu <alexarawu at outlook.com> $
+\GetIdInfo$Id: sjtutex.dtx 6d52363 2024-04-05 19:40:30 +0800 Alexara Wu <alexarawu at outlook.com> $
   {Report document class for Shanghai Jiao Tong University (SJTUTeX)}
 \ProvidesExplClass{sjtureport}
-  {\ExplFileDate}{2.1.1}{\ExplFileDescription}
+  {\ExplFileDate}{2.1.2}{\ExplFileDescription}
 \dim_new:N \l__sjtu_tmp_dim
 \skip_new:N \l__sjtu_tmp_skip
 \box_new:N \l__sjtu_tmp_box
@@ -221,7 +221,6 @@
 \clist_set:Nx \g__sjtu_options_to_packages_clist
   {
     { no-math           } { fontspec     } ,
-    { titles            } { tocloft      } ,
     { list = off        } { bicaption    } ,
     { warnings-off =
       {
@@ -245,7 +244,7 @@
     mathtools,
     geometry,
     fancyhdr,
-    tocloft,
+    titletoc,
     caption,
     bicaption,
     subcaption,
@@ -884,44 +883,43 @@
     \IfBooleanTF {#1}
       { \SJTU at head* { \contentsname } }
       { \SJTU at head  { \contentsname } }
-    \group_begin:
-      \cs_set:Npn \makebox [##1][##2]##3 { \, ##3 }
-      \@starttoc { toc }
-    \group_end:
+    \@starttoc { toc }
   }
+\tl_set:Nn \SJTU at leaders { \titlerule* [ 4bp ] { . } }
+\contentsmargin [ 2.55 em ] { 0 pt }
+\titlecontents { chapter }
+  [ 0 pt ] { \addvspace { 6 bp } \bfseries }
+  { \contentspush { \thecontentslabel \quad } } { }
+  { \SJTU at leaders \thecontentspage }
+\titlecontents { section }
+  [ 2 em ] { }
+  { \contentspush { \thecontentslabel \quad } } { }
+  { \SJTU at leaders \thecontentspage }
+\titlecontents { subsection }
+  [ 4 em ] { }
+  { \contentspush { \thecontentslabel \quad } } { }
+  { \SJTU at leaders \thecontentspage }
 \NewDocumentCommand \SJTU at listof { m m s }
   {
     \IfBooleanTF {#3}
       { \SJTU at head* {#1} }
       { \SJTU at head  {#1} }
-    \group_begin:
-      \cs_set:Npn \makebox [##1][##2]##3 { \, ##3 }
-      \exp_args:Nv \@starttoc { ext@ #2 }
-    \group_end:
+    \exp_args:Nv \@starttoc { ext@ #2 }
   }
-\DeclareDocumentCommand \listoffigures { }
-  { \SJTU at listof { \listfigurename } { figure } }
-\DeclareDocumentCommand \listoftables  { }
-  { \SJTU at listof { \listtablename  } { table  } }
-\tl_set:Nn \cftdotsep { 0.5 }
-\tl_set:Nn \cftchapleader { \bfseries \cftdotfill { \cftdotsep } }
-\clist_set:Nn \l__sjtu_cft_presnum_clist
+\cs_new_protected:Npn \__sjtu_new_list_of:Nnnn #1#2#3#4
   {
-    { fig } { \figurename } ,
-    { tab } { \tablename  }
+    \DeclareDocumentCommand #1 { }
+      { \SJTU at listof {#4} {#2} }
+    \titlecontents {#2}
+      [ 0 pt ] { }
+      { \contentspush { #3 \space \thecontentslabel \quad } } { }
+      { \SJTU at leaders \thecontentspage }
+    \exp_args:Nnv \contentsuse {#2} { ext@ #2 }
   }
-\cs_new:Npn \__sjtu_update_cft_presnum:nn #1#2
-  {
-    \tl_set:cn { cft #1 presnum } { #2 \c_space_tl }
-    \skip_zero:c { cft #1 indent }
-    \skip_set:cn { cft #1 numwidth } { 2.8 em }
-    \__sjtu_skip_add_to_wd:cv { cft #1 numwidth } { cft #1 presnum }
-  }
-\ctex_at_end_preamble:n
-  {
-    \clist_map_inline:Nn \l__sjtu_cft_presnum_clist
-      { \__sjtu_update_cft_presnum:nn #1 }
-  }
+\__sjtu_new_list_of:Nnnn \listoffigures { figure }
+  { \figurename } { \listfigurename }
+\__sjtu_new_list_of:Nnnn \listoftables  { table  }
+  { \tablename  } { \listtablename  }
 \NewDocumentCommand \sjtusetup { } { \keys_set:nn { sjtu } }
 \keys_define:nn { sjtu }
   {
@@ -1055,14 +1053,15 @@
   }
 \ctex_at_end_package:nn { thmtools }
   {
-    \newlistentry { thm } { loe } { 0 }
-    \newcounter { loedepth }
-    \setcounter { loedepth } { 1 }
-    \skip_set:Nn \cftthmnumwidth { 2.3 em }
-    \define at key { thmt-listof } { numwidth }
-      { \skip_set:Nn \cftthmnumwidth {#1} }
     \cs_set:Npn \thmtlo at newentry
-      { \cs_set_eq:cN { l@ \thmt at envname } \l at thm }
+      {
+        \exp_args:NV \titlecontents \thmt at envname
+          [ \thmt at listnumwidth ] { }
+          { \contentslabel { \thmt at listnumwidth } }
+          { \hspace* { - \thmt at listnumwidth } }
+          { \SJTU at leaders \thecontentspage }
+        \exp_args:NV \contentsuse \thmt at envname { loe }
+      }
     \cs_set:Npn \thmtlo at chaptervspacehack { }
     \RenewDocumentCommand \listoftheorems { s O{ } }
       {
@@ -1089,27 +1088,16 @@
                   } { }
               \fi
             }
-          \cs_set:Npn \makebox [##1][##2]##3 { \, ##3 }
           \@starttoc { loe }
         \group_end:
       }
   }
-\cs_new_protected:Npn \__sjtu_newlistof:nnnnn #1#2#3#4#5
-  {
-    \exp_args:Nnv \newlistentry {#2} { ext@ #3 } { 0 }
-    \exp_args:Ne \newcounter { \tl_use:c { ext@ #3 } depth }
-    \exp_args:Ne \setcounter { \tl_use:c { ext@ #3 } depth } { 1 }
-    \clist_put_right:Nn \l__sjtu_cft_presnum_clist { {#2} {#4} }
-    \cs_set_eq:cc { l@ #3 } { l@ #2 }
-    \exp_args:Nc \DeclareDocumentCommand { listof #1 s } { }
-      { \SJTU at listof {#5} {#3} }
-    \SJTU at counterwithin { #3 } { chapter }
-  }
 \ctex_at_end_package:nn { algorithm }
   {
     \tl_set:Nn \fname at algorithm   { \SJTU at algorithmname     }
     \tl_set:Nn \listalgorithmname { \SJTU at listalgorithmname }
-    \__sjtu_newlistof:nnnnn { algorithm } { alg } { algorithm }
+    \SJTU at counterwithin { algorithm } { chapter }
+    \__sjtu_new_list_of:Nnnn \listofalgorithms { algorithm }
       { \fname at algorithm } { \listalgorithmname }
   }
 \ctex_at_begin_package:nn { algorithm2e }
@@ -1121,7 +1109,8 @@
                       { \SJTU at algorithmname     }
                       { \SJTU at listalgorithmname }
     \SetAlgoCaptionSeparator { \enskip }
-    \__sjtu_newlistof:nnnnn { algorithm } { alg } { algocf }
+    \SJTU at counterwithin { algocf } { chapter }
+    \__sjtu_new_list_of:Nnnn \listofalgorithms { algocf }
       { \algorithmcfname } { \listalgorithmcfname }
     \ctex_patch_cmd:Nnn \algocf at latexcaption
       { \addcontentsline }

Modified: trunk/Master/texmf-dist/tex/latex/sjtutex/sjtuthesis.cls
===================================================================
--- trunk/Master/texmf-dist/tex/latex/sjtutex/sjtuthesis.cls	2024-04-05 21:21:27 UTC (rev 70866)
+++ trunk/Master/texmf-dist/tex/latex/sjtutex/sjtuthesis.cls	2024-04-05 21:21:55 UTC (rev 70867)
@@ -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 ab42a74 2024-03-23 20:09:29 +0800 Alexara Wu <alexarawu at outlook.com> $
+\GetIdInfo$Id: sjtutex.dtx 6d52363 2024-04-05 19:40:30 +0800 Alexara Wu <alexarawu at outlook.com> $
   {Thesis document class for Shanghai Jiao Tong University (SJTUTeX)}
 \ProvidesExplClass{sjtuthesis}
-  {\ExplFileDate}{2.1.1}{\ExplFileDescription}
+  {\ExplFileDate}{2.1.2}{\ExplFileDescription}
 \bool_new:N \l__sjtu_tmp_bool
 \clist_new:N \l__sjtu_tmp_clist
 \dim_new:N \l__sjtu_tmp_dim
@@ -221,7 +221,6 @@
 \clist_set:Nx \g__sjtu_options_to_packages_clist
   {
     { no-math           } { fontspec     } ,
-    { titles            } { tocloft      } ,
     { list = off        } { bicaption    } ,
     { warnings-off =
       {
@@ -247,7 +246,7 @@
     mathtools,
     geometry,
     fancyhdr,
-    tocloft,
+    titletoc,
     caption,
     bicaption,
     subcaption,
@@ -1303,54 +1302,43 @@
     \IfBooleanTF {#1}
       { \SJTU at head* { \contentsname } }
       { \SJTU at head  { \contentsname } }
-    \group_begin:
-      \cs_set:Npn \makebox [##1][##2]##3 { \, ##3 }
-      \@starttoc { toc }
-    \group_end:
+    \@starttoc { toc }
   }
+\tl_set:Nn \SJTU at leaders { \titlerule* [ 4bp ] { . } }
+\contentsmargin [ 2.55 em ] { 0 pt }
+\titlecontents { chapter }
+  [ 0 pt ] { \addvspace { 6 bp } \bfseries }
+  { \contentspush { \thecontentslabel \quad } } { }
+  { \SJTU at leaders \thecontentspage }
+\titlecontents { section }
+  [ 2 em ] { }
+  { \contentspush { \thecontentslabel \quad } } { }
+  { \SJTU at leaders \thecontentspage }
+\titlecontents { subsection }
+  [ 4 em ] { }
+  { \contentspush { \thecontentslabel \quad } } { }
+  { \SJTU at leaders \thecontentspage }
 \NewDocumentCommand \SJTU at listof { m m s }
   {
     \IfBooleanTF {#3}
       { \SJTU at head* {#1} }
       { \SJTU at head  {#1} }
-    \group_begin:
-      \cs_set:Npn \makebox [##1][##2]##3 { \, ##3 }
-      \exp_args:Nv \@starttoc { ext@ #2 }
-    \group_end:
+    \exp_args:Nv \@starttoc { ext@ #2 }
   }
-\DeclareDocumentCommand \listoffigures { }
-  { \SJTU at listof { \listfigurename } { figure } }
-\DeclareDocumentCommand \listoftables  { }
-  { \SJTU at listof { \listtablename  } { table  } }
-\tl_set:Nn \cftdotsep { 0.5 }
-\tl_set:Nn \cftchapleader { \bfseries \cftdotfill { \cftdotsep } }
-\clist_map_inline:nn
+\cs_new_protected:Npn \__sjtu_new_list_of:Nnnn #1#2#3#4
   {
-    { cft before chap skip } { 10 bp plus 1 pt } ,
-    { cft chap   numwidth  } { 3.5 em } ,
-    { cft sec    indent    } { 2   em } ,
-    { cft sec    numwidth  } { 1.5 em } ,
-    { cft subsec indent    } { 4   em } ,
-    { cft subsec numwidth  } { 2.3 em }
+    \DeclareDocumentCommand #1 { }
+      { \SJTU at listof {#4} {#2} }
+    \titlecontents {#2}
+      [ 0 pt ] { }
+      { \contentspush { #3 \space \thecontentslabel \quad } } { }
+      { \SJTU at leaders \thecontentspage }
+    \exp_args:Nnv \contentsuse {#2} { ext@ #2 }
   }
-  { \skip_set:cn #1 }
-\clist_set:Nn \l__sjtu_cft_presnum_clist
-  {
-    { fig } { \figurename } ,
-    { tab } { \tablename  }
-  }
-\cs_new:Npn \__sjtu_update_cft_presnum:nn #1#2
-  {
-    \tl_set:cn { cft #1 presnum } { #2 \c_space_tl }
-    \skip_zero:c { cft #1 indent }
-    \skip_set:cn { cft #1 numwidth } { 2.8 em }
-    \__sjtu_skip_add_to_wd:cv { cft #1 numwidth } { cft #1 presnum }
-  }
-\ctex_at_end_preamble:n
-  {
-    \clist_map_inline:Nn \l__sjtu_cft_presnum_clist
-      { \__sjtu_update_cft_presnum:nn #1 }
-  }
+\__sjtu_new_list_of:Nnnn \listoffigures { figure }
+  { \figurename } { \listfigurename }
+\__sjtu_new_list_of:Nnnn \listoftables  { table  }
+  { \tablename  } { \listtablename  }
 \NewDocumentEnvironment { abbreviation  } { O{ \SJTU at abbrname } }
   {
     \chapter    {#1}
@@ -1673,14 +1661,15 @@
   }
 \ctex_at_end_package:nn { thmtools }
   {
-    \newlistentry { thm } { loe } { 0 }
-    \newcounter { loedepth }
-    \setcounter { loedepth } { 1 }
-    \skip_set:Nn \cftthmnumwidth { 2.3 em }
-    \define at key { thmt-listof } { numwidth }
-      { \skip_set:Nn \cftthmnumwidth {#1} }
     \cs_set:Npn \thmtlo at newentry
-      { \cs_set_eq:cN { l@ \thmt at envname } \l at thm }
+      {
+        \exp_args:NV \titlecontents \thmt at envname
+          [ \thmt at listnumwidth ] { }
+          { \contentslabel { \thmt at listnumwidth } }
+          { \hspace* { - \thmt at listnumwidth } }
+          { \SJTU at leaders \thecontentspage }
+        \exp_args:NV \contentsuse \thmt at envname { loe }
+      }
     \cs_set:Npn \thmtlo at chaptervspacehack { }
     \RenewDocumentCommand \listoftheorems { s O{ } }
       {
@@ -1707,28 +1696,17 @@
                   } { }
               \fi
             }
-          \cs_set:Npn \makebox [##1][##2]##3 { \, ##3 }
           \@starttoc { loe }
         \group_end:
       }
   }
-\cs_new_protected:Npn \__sjtu_newlistof:nnnnn #1#2#3#4#5
-  {
-    \exp_args:Nnv \newlistentry {#2} { ext@ #3 } { 0 }
-    \exp_args:Ne \newcounter { \tl_use:c { ext@ #3 } depth }
-    \exp_args:Ne \setcounter { \tl_use:c { ext@ #3 } depth } { 1 }
-    \clist_put_right:Nn \l__sjtu_cft_presnum_clist { {#2} {#4} }
-    \cs_set_eq:cc { l@ #3 } { l@ #2 }
-    \exp_args:Nc \DeclareDocumentCommand { listof #1 s } { }
-      { \SJTU at listof {#5} {#3} }
-    \SJTU at counterwithin { #3 } { chapter }
-    \clist_put_right:Nn \l__sjtu_counter_without_chapter_clist {#3}
-  }
 \ctex_at_end_package:nn { algorithm }
   {
     \tl_set:Nn \fname at algorithm   { \SJTU at algorithmname     }
     \tl_set:Nn \listalgorithmname { \SJTU at listalgorithmname }
-    \__sjtu_newlistof:nnnnn { algorithm } { alg } { algorithm }
+    \SJTU at counterwithin { algorithm } { chapter }
+    \clist_put_right:Nn \l__sjtu_counter_without_chapter_clist { algorithm }
+    \__sjtu_new_list_of:Nnnn \listofalgorithms { algorithm }
       { \fname at algorithm } { \listalgorithmname }
   }
 \ctex_at_begin_package:nn { algorithm2e }
@@ -1740,7 +1718,9 @@
                       { \SJTU at algorithmname     }
                       { \SJTU at listalgorithmname }
     \SetAlgoCaptionSeparator { \enskip }
-    \__sjtu_newlistof:nnnnn { algorithm } { alg } { algocf }
+    \SJTU at counterwithin { algocf } { chapter }
+    \clist_put_right:Nn \l__sjtu_counter_without_chapter_clist { algocf }
+    \__sjtu_new_list_of:Nnnn \listofalgorithms { algocf }
       { \algorithmcfname } { \listalgorithmcfname }
     \ctex_patch_cmd:Nnn \algocf at latexcaption
       { \addcontentsline }



More information about the tex-live-commits mailing list.