diff --git a/texmf/tex/latex/sjtutex/fd/sjtu-cjk-font-adobe-ja.def b/texmf/tex/latex/sjtutex/fd/sjtu-cjk-font-adobe-ja.def index 8c6e529f..541d64c5 100644 --- a/texmf/tex/latex/sjtutex/fd/sjtu-cjk-font-adobe-ja.def +++ b/texmf/tex/latex/sjtutex/fd/sjtu-cjk-font-adobe-ja.def @@ -24,7 +24,7 @@ %% %% The Current Maintainers of this work are Alexara Wu and Log Creative. %% -\GetIdInfo $Id: sjtutex.dtx 2.0.2 2023-04-01 13:00:00Z Alexara Wu $ +\GetIdInfo $Id: sjtutex.dtx 2.0.3 2023-09-25 19:50:00Z Alexara Wu $ {Adobe CJK fonts definition for Japanese (SJTUTeX)} \ProvidesExplFile{sjtu-cjk-font-adobe-ja.def} {\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription} diff --git a/texmf/tex/latex/sjtutex/fd/sjtu-cjk-font-adobe-zh.def b/texmf/tex/latex/sjtutex/fd/sjtu-cjk-font-adobe-zh.def index 020d6b73..1b974e03 100644 --- a/texmf/tex/latex/sjtutex/fd/sjtu-cjk-font-adobe-zh.def +++ b/texmf/tex/latex/sjtutex/fd/sjtu-cjk-font-adobe-zh.def @@ -24,7 +24,7 @@ %% %% The Current Maintainers of this work are Alexara Wu and Log Creative. %% -\GetIdInfo $Id: sjtutex.dtx 2.0.2 2023-04-01 13:00:00Z Alexara Wu $ +\GetIdInfo $Id: sjtutex.dtx 2.0.3 2023-09-25 19:50:00Z Alexara Wu $ {Adobe CJK fonts definition for Chinese (SJTUTeX)} \ProvidesExplFile{sjtu-cjk-font-adobe-zh.def} {\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription} diff --git a/texmf/tex/latex/sjtutex/fd/sjtu-cjk-font-adobe.def b/texmf/tex/latex/sjtutex/fd/sjtu-cjk-font-adobe.def index 17c1f47b..c52f3e50 100644 --- a/texmf/tex/latex/sjtutex/fd/sjtu-cjk-font-adobe.def +++ b/texmf/tex/latex/sjtutex/fd/sjtu-cjk-font-adobe.def @@ -24,7 +24,7 @@ %% %% The Current Maintainers of this work are Alexara Wu and Log Creative. %% -\GetIdInfo $Id: sjtutex.dtx 2.0.2 2023-04-01 13:00:00Z Alexara Wu $ +\GetIdInfo $Id: sjtutex.dtx 2.0.3 2023-09-25 19:50:00Z Alexara Wu $ {Adobe CJK fonts definition (SJTUTeX)} \ProvidesExplFile{sjtu-cjk-font-adobe.def} {\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription} diff --git a/texmf/tex/latex/sjtutex/fd/sjtu-cjk-font-fandol-ja.def b/texmf/tex/latex/sjtutex/fd/sjtu-cjk-font-fandol-ja.def index af2e81cb..8c93acb4 100644 --- a/texmf/tex/latex/sjtutex/fd/sjtu-cjk-font-fandol-ja.def +++ b/texmf/tex/latex/sjtutex/fd/sjtu-cjk-font-fandol-ja.def @@ -24,7 +24,7 @@ %% %% The Current Maintainers of this work are Alexara Wu and Log Creative. %% -\GetIdInfo $Id: sjtutex.dtx 2.0.2 2023-04-01 13:00:00Z Alexara Wu $ +\GetIdInfo $Id: sjtutex.dtx 2.0.3 2023-09-25 19:50:00Z Alexara Wu $ {Fandol CJK fonts definition for Japanese (SJTUTeX)} \ProvidesExplFile{sjtu-cjk-font-fandol-ja.def} {\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription} diff --git a/texmf/tex/latex/sjtutex/fd/sjtu-cjk-font-fandol-zh.def b/texmf/tex/latex/sjtutex/fd/sjtu-cjk-font-fandol-zh.def index 3ebe116e..cb6f34b7 100644 --- a/texmf/tex/latex/sjtutex/fd/sjtu-cjk-font-fandol-zh.def +++ b/texmf/tex/latex/sjtutex/fd/sjtu-cjk-font-fandol-zh.def @@ -24,7 +24,7 @@ %% %% The Current Maintainers of this work are Alexara Wu and Log Creative. %% -\GetIdInfo $Id: sjtutex.dtx 2.0.2 2023-04-01 13:00:00Z Alexara Wu $ +\GetIdInfo $Id: sjtutex.dtx 2.0.3 2023-09-25 19:50:00Z Alexara Wu $ {Fandol CJK fonts definition for Chinese (SJTUTeX)} \ProvidesExplFile{sjtu-cjk-font-fandol-zh.def} {\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription} diff --git a/texmf/tex/latex/sjtutex/fd/sjtu-cjk-font-fandol.def b/texmf/tex/latex/sjtutex/fd/sjtu-cjk-font-fandol.def index 1dc5db5f..e1c72561 100644 --- a/texmf/tex/latex/sjtutex/fd/sjtu-cjk-font-fandol.def +++ b/texmf/tex/latex/sjtutex/fd/sjtu-cjk-font-fandol.def @@ -24,7 +24,7 @@ %% %% The Current Maintainers of this work are Alexara Wu and Log Creative. %% -\GetIdInfo $Id: sjtutex.dtx 2.0.2 2023-04-01 13:00:00Z Alexara Wu $ +\GetIdInfo $Id: sjtutex.dtx 2.0.3 2023-09-25 19:50:00Z Alexara Wu $ {Fandol CJK fonts definition (SJTUTeX)} \ProvidesExplFile{sjtu-cjk-font-fandol.def} {\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription} diff --git a/texmf/tex/latex/sjtutex/fd/sjtu-cjk-font-founder-ja.def b/texmf/tex/latex/sjtutex/fd/sjtu-cjk-font-founder-ja.def index 96399f43..5a3b7c96 100644 --- a/texmf/tex/latex/sjtutex/fd/sjtu-cjk-font-founder-ja.def +++ b/texmf/tex/latex/sjtutex/fd/sjtu-cjk-font-founder-ja.def @@ -24,7 +24,7 @@ %% %% The Current Maintainers of this work are Alexara Wu and Log Creative. %% -\GetIdInfo $Id: sjtutex.dtx 2.0.2 2023-04-01 13:00:00Z Alexara Wu $ +\GetIdInfo $Id: sjtutex.dtx 2.0.3 2023-09-25 19:50:00Z Alexara Wu $ {Founder CJK fonts definition for Japanese (SJTUTeX)} \ProvidesExplFile{sjtu-cjk-font-founder-ja.def} {\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription} diff --git a/texmf/tex/latex/sjtutex/fd/sjtu-cjk-font-founder-zh.def b/texmf/tex/latex/sjtutex/fd/sjtu-cjk-font-founder-zh.def index 6126c2b4..e832f35c 100644 --- a/texmf/tex/latex/sjtutex/fd/sjtu-cjk-font-founder-zh.def +++ b/texmf/tex/latex/sjtutex/fd/sjtu-cjk-font-founder-zh.def @@ -24,7 +24,7 @@ %% %% The Current Maintainers of this work are Alexara Wu and Log Creative. %% -\GetIdInfo $Id: sjtutex.dtx 2.0.2 2023-04-01 13:00:00Z Alexara Wu $ +\GetIdInfo $Id: sjtutex.dtx 2.0.3 2023-09-25 19:50:00Z Alexara Wu $ {Founder CJK fonts definition for Chinese (SJTUTeX)} \ProvidesExplFile{sjtu-cjk-font-founder-zh.def} {\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription} diff --git a/texmf/tex/latex/sjtutex/fd/sjtu-cjk-font-founder.def b/texmf/tex/latex/sjtutex/fd/sjtu-cjk-font-founder.def index f2af167e..a6448923 100644 --- a/texmf/tex/latex/sjtutex/fd/sjtu-cjk-font-founder.def +++ b/texmf/tex/latex/sjtutex/fd/sjtu-cjk-font-founder.def @@ -24,7 +24,7 @@ %% %% The Current Maintainers of this work are Alexara Wu and Log Creative. %% -\GetIdInfo $Id: sjtutex.dtx 2.0.2 2023-04-01 13:00:00Z Alexara Wu $ +\GetIdInfo $Id: sjtutex.dtx 2.0.3 2023-09-25 19:50:00Z Alexara Wu $ {Founder CJK fonts definition (SJTUTeX)} \ProvidesExplFile{sjtu-cjk-font-founder.def} {\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription} diff --git a/texmf/tex/latex/sjtutex/fd/sjtu-cjk-font-mac-ja.def b/texmf/tex/latex/sjtutex/fd/sjtu-cjk-font-mac-ja.def index 574acfc4..8385b613 100644 --- a/texmf/tex/latex/sjtutex/fd/sjtu-cjk-font-mac-ja.def +++ b/texmf/tex/latex/sjtutex/fd/sjtu-cjk-font-mac-ja.def @@ -24,7 +24,7 @@ %% %% The Current Maintainers of this work are Alexara Wu and Log Creative. %% -\GetIdInfo $Id: sjtutex.dtx 2.0.2 2023-04-01 13:00:00Z Alexara Wu $ +\GetIdInfo $Id: sjtutex.dtx 2.0.3 2023-09-25 19:50:00Z Alexara Wu $ {macOS CJK fonts definition for Japanese (SJTUTeX)} \ProvidesExplFile{sjtu-cjk-font-mac-ja.def} {\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription} diff --git a/texmf/tex/latex/sjtutex/fd/sjtu-cjk-font-mac-zh.def b/texmf/tex/latex/sjtutex/fd/sjtu-cjk-font-mac-zh.def index 80f0d315..21ee361f 100644 --- a/texmf/tex/latex/sjtutex/fd/sjtu-cjk-font-mac-zh.def +++ b/texmf/tex/latex/sjtutex/fd/sjtu-cjk-font-mac-zh.def @@ -24,7 +24,7 @@ %% %% The Current Maintainers of this work are Alexara Wu and Log Creative. %% -\GetIdInfo $Id: sjtutex.dtx 2.0.2 2023-04-01 13:00:00Z Alexara Wu $ +\GetIdInfo $Id: sjtutex.dtx 2.0.3 2023-09-25 19:50:00Z Alexara Wu $ {macOS CJK fonts definition for Chinese (SJTUTeX)} \ProvidesExplFile{sjtu-cjk-font-mac-zh.def} {\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription} diff --git a/texmf/tex/latex/sjtutex/fd/sjtu-cjk-font-mac.def b/texmf/tex/latex/sjtutex/fd/sjtu-cjk-font-mac.def index 22b5b382..52aa8f9b 100644 --- a/texmf/tex/latex/sjtutex/fd/sjtu-cjk-font-mac.def +++ b/texmf/tex/latex/sjtutex/fd/sjtu-cjk-font-mac.def @@ -24,7 +24,7 @@ %% %% The Current Maintainers of this work are Alexara Wu and Log Creative. %% -\GetIdInfo $Id: sjtutex.dtx 2.0.2 2023-04-01 13:00:00Z Alexara Wu $ +\GetIdInfo $Id: sjtutex.dtx 2.0.3 2023-09-25 19:50:00Z Alexara Wu $ {macOS CJK fonts definition (SJTUTeX)} \ProvidesExplFile{sjtu-cjk-font-mac.def} {\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription} diff --git a/texmf/tex/latex/sjtutex/fd/sjtu-cjk-font-ubuntu-ja.def b/texmf/tex/latex/sjtutex/fd/sjtu-cjk-font-ubuntu-ja.def index 0d9034d9..b3efbd98 100644 --- a/texmf/tex/latex/sjtutex/fd/sjtu-cjk-font-ubuntu-ja.def +++ b/texmf/tex/latex/sjtutex/fd/sjtu-cjk-font-ubuntu-ja.def @@ -24,7 +24,7 @@ %% %% The Current Maintainers of this work are Alexara Wu and Log Creative. %% -\GetIdInfo $Id: sjtutex.dtx 2.0.2 2023-04-01 13:00:00Z Alexara Wu $ +\GetIdInfo $Id: sjtutex.dtx 2.0.3 2023-09-25 19:50:00Z Alexara Wu $ {Ubuntu CJK fonts definition for Japanese (SJTUTeX)} \ProvidesExplFile{sjtu-cjk-font-ubuntu-ja.def} {\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription} diff --git a/texmf/tex/latex/sjtutex/fd/sjtu-cjk-font-ubuntu-zh.def b/texmf/tex/latex/sjtutex/fd/sjtu-cjk-font-ubuntu-zh.def index a6d1c62e..264140b6 100644 --- a/texmf/tex/latex/sjtutex/fd/sjtu-cjk-font-ubuntu-zh.def +++ b/texmf/tex/latex/sjtutex/fd/sjtu-cjk-font-ubuntu-zh.def @@ -24,7 +24,7 @@ %% %% The Current Maintainers of this work are Alexara Wu and Log Creative. %% -\GetIdInfo $Id: sjtutex.dtx 2.0.2 2023-04-01 13:00:00Z Alexara Wu $ +\GetIdInfo $Id: sjtutex.dtx 2.0.3 2023-09-25 19:50:00Z Alexara Wu $ {Ubuntu CJK fonts definition for Chinese (SJTUTeX)} \ProvidesExplFile{sjtu-cjk-font-ubuntu-zh.def} {\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription} diff --git a/texmf/tex/latex/sjtutex/fd/sjtu-cjk-font-ubuntu.def b/texmf/tex/latex/sjtutex/fd/sjtu-cjk-font-ubuntu.def index e40410ee..4e9935ed 100644 --- a/texmf/tex/latex/sjtutex/fd/sjtu-cjk-font-ubuntu.def +++ b/texmf/tex/latex/sjtutex/fd/sjtu-cjk-font-ubuntu.def @@ -24,7 +24,7 @@ %% %% The Current Maintainers of this work are Alexara Wu and Log Creative. %% -\GetIdInfo $Id: sjtutex.dtx 2.0.2 2023-04-01 13:00:00Z Alexara Wu $ +\GetIdInfo $Id: sjtutex.dtx 2.0.3 2023-09-25 19:50:00Z Alexara Wu $ {Ubuntu CJK fonts definition (SJTUTeX)} \ProvidesExplFile{sjtu-cjk-font-ubuntu.def} {\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription} diff --git a/texmf/tex/latex/sjtutex/fd/sjtu-cjk-font-windows-ja.def b/texmf/tex/latex/sjtutex/fd/sjtu-cjk-font-windows-ja.def index f62f6a18..b7c85f77 100644 --- a/texmf/tex/latex/sjtutex/fd/sjtu-cjk-font-windows-ja.def +++ b/texmf/tex/latex/sjtutex/fd/sjtu-cjk-font-windows-ja.def @@ -24,7 +24,7 @@ %% %% The Current Maintainers of this work are Alexara Wu and Log Creative. %% -\GetIdInfo $Id: sjtutex.dtx 2.0.2 2023-04-01 13:00:00Z Alexara Wu $ +\GetIdInfo $Id: sjtutex.dtx 2.0.3 2023-09-25 19:50:00Z Alexara Wu $ {Windows CJK fonts definition for Japanese (SJTUTeX)} \ProvidesExplFile{sjtu-cjk-font-windows-ja.def} {\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription} diff --git a/texmf/tex/latex/sjtutex/fd/sjtu-cjk-font-windows-zh.def b/texmf/tex/latex/sjtutex/fd/sjtu-cjk-font-windows-zh.def index 1cb00b01..80eaadc7 100644 --- a/texmf/tex/latex/sjtutex/fd/sjtu-cjk-font-windows-zh.def +++ b/texmf/tex/latex/sjtutex/fd/sjtu-cjk-font-windows-zh.def @@ -24,7 +24,7 @@ %% %% The Current Maintainers of this work are Alexara Wu and Log Creative. %% -\GetIdInfo $Id: sjtutex.dtx 2.0.2 2023-04-01 13:00:00Z Alexara Wu $ +\GetIdInfo $Id: sjtutex.dtx 2.0.3 2023-09-25 19:50:00Z Alexara Wu $ {Windows CJK fonts definition for Chinese (SJTUTeX)} \ProvidesExplFile{sjtu-cjk-font-windows-zh.def} {\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription} diff --git a/texmf/tex/latex/sjtutex/fd/sjtu-cjk-font-windows.def b/texmf/tex/latex/sjtutex/fd/sjtu-cjk-font-windows.def index 9754c189..4b32db0d 100644 --- a/texmf/tex/latex/sjtutex/fd/sjtu-cjk-font-windows.def +++ b/texmf/tex/latex/sjtutex/fd/sjtu-cjk-font-windows.def @@ -24,7 +24,7 @@ %% %% The Current Maintainers of this work are Alexara Wu and Log Creative. %% -\GetIdInfo $Id: sjtutex.dtx 2.0.2 2023-04-01 13:00:00Z Alexara Wu $ +\GetIdInfo $Id: sjtutex.dtx 2.0.3 2023-09-25 19:50:00Z Alexara Wu $ {Windows CJK fonts definition (SJTUTeX)} \ProvidesExplFile{sjtu-cjk-font-windows.def} {\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription} diff --git a/texmf/tex/latex/sjtutex/fd/sjtu-math-font-cambria.def b/texmf/tex/latex/sjtutex/fd/sjtu-math-font-cambria.def index d5b63ebc..5a53a289 100644 --- a/texmf/tex/latex/sjtutex/fd/sjtu-math-font-cambria.def +++ b/texmf/tex/latex/sjtutex/fd/sjtu-math-font-cambria.def @@ -24,7 +24,7 @@ %% %% The Current Maintainers of this work are Alexara Wu and Log Creative. %% -\GetIdInfo $Id: sjtutex.dtx 2.0.2 2023-04-01 13:00:00Z Alexara Wu $ +\GetIdInfo $Id: sjtutex.dtx 2.0.3 2023-09-25 19:50:00Z Alexara Wu $ {Cambria math fonts definition (SJTUTeX)} \ProvidesExplFile{sjtu-math-font-cambria.def} {\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription} diff --git a/texmf/tex/latex/sjtutex/fd/sjtu-math-font-libertinus.def b/texmf/tex/latex/sjtutex/fd/sjtu-math-font-libertinus.def new file mode 100644 index 00000000..b31b5b30 --- /dev/null +++ b/texmf/tex/latex/sjtutex/fd/sjtu-math-font-libertinus.def @@ -0,0 +1,76 @@ +%% +%% This is file `sjtu-math-font-libertinus.def', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% sjtutex.dtx (with options: `font,math,libertinus') +%% +%% Copyright (C) SJTUG +%% 2018--2023 Alexara Wu +%% 2022--2023 Log Creative +%% +%% This work may be distributed and/or modified under the +%% conditions of the LaTeX Project Public License, either +%% version 1.3c of this license or (at your option) any later +%% version. The latest version of this license is in: +%% +%% http://www.latex-project.org/lppl.txt +%% +%% and version 1.3 or later is part of all distributions of +%% LaTeX version 2005/12/01 or later. +%% +%% This work has the LPPL maintenance status `maintained'. +%% +%% The Current Maintainers of this work are Alexara Wu and Log Creative. +%% +\GetIdInfo $Id: sjtutex.dtx 2.0.3 2023-09-25 19:50:00Z Alexara Wu $ + {Libertinus math fonts definition (SJTUTeX)} +\ProvidesExplFile{sjtu-math-font-libertinus.def} + {\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription} +\__sjtu_fontset_case:nn + { + \exp_args:No \PassOptionsToPackage + { \g__sjtu_math_font_options_clist } { libertinust1math } + \RequirePackage { libertinust1math } + } + { + \RequirePackage { unicode-math } + \bool_if:NTF \g__sjtu_upright_integral_bool + { \setmathfont { LibertinusMath-Regular.otf } } + { + \setmathfont { LibertinusMath-Regular.otf } + [ StylisticSet = 8 ] + } + \setmathfont { latinmodern-math.otf } [ range = \checkmark ] + \setmathrm + { LibertinusSerif } + [ + Extension = .otf, + UprightFont = *-Regular, + BoldFont = *-Bold, + ItalicFont = *-Italic, + BoldItalicFont = *-BoldItalic, + SlantedFont = *-Regular, + BoldSlantedFont = *-Bold, + SlantedFeatures = { FakeSlant = 0.2 }, + BoldSlantedFeatures = { FakeSlant = 0.2 } + ] + \setmathsf + { LibertinusSans } + [ + Extension = .otf, + UprightFont = *-Regular, + BoldFont = *-Bold, + ItalicFont = *-Italic, + BoldItalicFont = *-Italic, + BoldItalicFeatures = { FakeBold = 3 }, + SlantedFont = *-Regular, + BoldSlantedFont = *-Bold, + SlantedFeatures = { FakeSlant = 0.2 }, + BoldSlantedFeatures = { FakeSlant = 0.2 } + ] + } +\endinput +%% +%% End of file `sjtu-math-font-libertinus.def'. diff --git a/texmf/tex/latex/sjtutex/fd/sjtu-math-font-lm.def b/texmf/tex/latex/sjtutex/fd/sjtu-math-font-lm.def index b8f2347f..8f946441 100644 --- a/texmf/tex/latex/sjtutex/fd/sjtu-math-font-lm.def +++ b/texmf/tex/latex/sjtutex/fd/sjtu-math-font-lm.def @@ -24,7 +24,7 @@ %% %% The Current Maintainers of this work are Alexara Wu and Log Creative. %% -\GetIdInfo $Id: sjtutex.dtx 2.0.2 2023-04-01 13:00:00Z Alexara Wu $ +\GetIdInfo $Id: sjtutex.dtx 2.0.3 2023-09-25 19:50:00Z Alexara Wu $ {Latin Modern math fonts definition (SJTUTeX)} \ProvidesExplFile{sjtu-math-font-lm.def} {\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription} @@ -47,7 +47,6 @@ \SetMathAlphabet { \mathtt } { bold } { OT1 } { lmtt } { m } { n } \bool_if:NT \g__sjtu_upright_integral_bool { \RequirePackage { cmupint } } -\RequirePackage { bm } \__sjtu_set_slanted_greek: \__sjtu_set_unimath_symbol: \endinput diff --git a/texmf/tex/latex/sjtutex/fd/sjtu-math-font-newcm.def b/texmf/tex/latex/sjtutex/fd/sjtu-math-font-newcm.def index 7fde6efd..431cb8b3 100644 --- a/texmf/tex/latex/sjtutex/fd/sjtu-math-font-newcm.def +++ b/texmf/tex/latex/sjtutex/fd/sjtu-math-font-newcm.def @@ -24,7 +24,7 @@ %% %% The Current Maintainers of this work are Alexara Wu and Log Creative. %% -\GetIdInfo $Id: sjtutex.dtx 2.0.2 2023-04-01 13:00:00Z Alexara Wu $ +\GetIdInfo $Id: sjtutex.dtx 2.0.3 2023-09-25 19:50:00Z Alexara Wu $ {New Computer Modern math fonts definition (SJTUTeX)} \ProvidesExplFile{sjtu-math-font-newcm.def} {\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription} diff --git a/texmf/tex/latex/sjtutex/fd/sjtu-math-font-newpx.def b/texmf/tex/latex/sjtutex/fd/sjtu-math-font-newpx.def index 715900f2..697bc6ed 100644 --- a/texmf/tex/latex/sjtutex/fd/sjtu-math-font-newpx.def +++ b/texmf/tex/latex/sjtutex/fd/sjtu-math-font-newpx.def @@ -24,7 +24,7 @@ %% %% The Current Maintainers of this work are Alexara Wu and Log Creative. %% -\GetIdInfo $Id: sjtutex.dtx 2.0.2 2023-04-01 13:00:00Z Alexara Wu $ +\GetIdInfo $Id: sjtutex.dtx 2.0.3 2023-09-25 19:50:00Z Alexara Wu $ {New PX math fonts definition (SJTUTeX)} \ProvidesExplFile{sjtu-math-font-newpx.def} {\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription} @@ -38,7 +38,6 @@ \tl_set:Nn \sfdefault { qhv } \tl_set:Nn \ttdefault { qcr } \RequirePackage { newpxmath } -\RequirePackage { bm } \tl_set_eq:NN \encodingdefault \g__sjtu_save_encodingdefault_tl \tl_set_eq:NN \rmdefault \g__sjtu_save_rmdefault_tl \tl_set_eq:NN \sfdefault \g__sjtu_save_sfdefault_tl diff --git a/texmf/tex/latex/sjtutex/fd/sjtu-math-font-newtx.def b/texmf/tex/latex/sjtutex/fd/sjtu-math-font-newtx.def index c875de06..d6975612 100644 --- a/texmf/tex/latex/sjtutex/fd/sjtu-math-font-newtx.def +++ b/texmf/tex/latex/sjtutex/fd/sjtu-math-font-newtx.def @@ -24,7 +24,7 @@ %% %% The Current Maintainers of this work are Alexara Wu and Log Creative. %% -\GetIdInfo $Id: sjtutex.dtx 2.0.2 2023-04-01 13:00:00Z Alexara Wu $ +\GetIdInfo $Id: sjtutex.dtx 2.0.3 2023-09-25 19:50:00Z Alexara Wu $ {New TX math fonts definition (SJTUTeX)} \ProvidesExplFile{sjtu-math-font-newtx.def} {\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription} @@ -38,7 +38,6 @@ \tl_set:Nn \sfdefault { qhv } \tl_set:Nn \ttdefault { qcr } \RequirePackage { newtxmath } -\RequirePackage { bm } \tl_set_eq:NN \encodingdefault \g__sjtu_save_encodingdefault_tl \tl_set_eq:NN \rmdefault \g__sjtu_save_rmdefault_tl \tl_set_eq:NN \sfdefault \g__sjtu_save_sfdefault_tl diff --git a/texmf/tex/latex/sjtutex/fd/sjtu-math-font-stixtwo.def b/texmf/tex/latex/sjtutex/fd/sjtu-math-font-stixtwo.def index 22e9fe8f..02496528 100644 --- a/texmf/tex/latex/sjtutex/fd/sjtu-math-font-stixtwo.def +++ b/texmf/tex/latex/sjtutex/fd/sjtu-math-font-stixtwo.def @@ -24,14 +24,14 @@ %% %% The Current Maintainers of this work are Alexara Wu and Log Creative. %% -\GetIdInfo $Id: sjtutex.dtx 2.0.2 2023-04-01 13:00:00Z Alexara Wu $ +\GetIdInfo $Id: sjtutex.dtx 2.0.3 2023-09-25 19:50:00Z Alexara Wu $ {STIX Two math fonts definition (SJTUTeX)} \ProvidesExplFile{sjtu-math-font-stixtwo.def} {\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription} \__sjtu_fontset_case:nn { \PassOptionsToPackage { notext } { stix2 } - \RequirePackage { upgreek, stix2, bm } + \RequirePackage { upgreek, stix2 } \__sjtu_set_slanted_greek: } { diff --git a/texmf/tex/latex/sjtutex/fd/sjtu-math-font-times.def b/texmf/tex/latex/sjtutex/fd/sjtu-math-font-times.def index a73ce61e..08b63914 100644 --- a/texmf/tex/latex/sjtutex/fd/sjtu-math-font-times.def +++ b/texmf/tex/latex/sjtutex/fd/sjtu-math-font-times.def @@ -24,7 +24,7 @@ %% %% The Current Maintainers of this work are Alexara Wu and Log Creative. %% -\GetIdInfo $Id: sjtutex.dtx 2.0.2 2023-04-01 13:00:00Z Alexara Wu $ +\GetIdInfo $Id: sjtutex.dtx 2.0.3 2023-09-25 19:50:00Z Alexara Wu $ {Times math fonts definition (SJTUTeX)} \ProvidesExplFile{sjtu-math-font-times.def} {\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription} @@ -39,7 +39,6 @@ \SetMathAlphabet { \mathtt } { bold } { OT1 } { pcr } { b } { n } \bool_if:NT \g__sjtu_upright_integral_bool { \RequirePackage { cmupint } } -\RequirePackage { bm } \__sjtu_set_unimath_symbol: \endinput %% diff --git a/texmf/tex/latex/sjtutex/fd/sjtu-math-font-xits.def b/texmf/tex/latex/sjtutex/fd/sjtu-math-font-xits.def index 0ee00163..bb6def4e 100644 --- a/texmf/tex/latex/sjtutex/fd/sjtu-math-font-xits.def +++ b/texmf/tex/latex/sjtutex/fd/sjtu-math-font-xits.def @@ -24,7 +24,7 @@ %% %% The Current Maintainers of this work are Alexara Wu and Log Creative. %% -\GetIdInfo $Id: sjtutex.dtx 2.0.2 2023-04-01 13:00:00Z Alexara Wu $ +\GetIdInfo $Id: sjtutex.dtx 2.0.3 2023-09-25 19:50:00Z Alexara Wu $ {XITS math fonts definition (SJTUTeX)} \ProvidesExplFile{sjtu-math-font-xits.def} {\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription} diff --git a/texmf/tex/latex/sjtutex/fd/sjtu-text-font-cambria.def b/texmf/tex/latex/sjtutex/fd/sjtu-text-font-cambria.def index 3b18f0e3..f32ecf6d 100644 --- a/texmf/tex/latex/sjtutex/fd/sjtu-text-font-cambria.def +++ b/texmf/tex/latex/sjtutex/fd/sjtu-text-font-cambria.def @@ -24,7 +24,7 @@ %% %% The Current Maintainers of this work are Alexara Wu and Log Creative. %% -\GetIdInfo $Id: sjtutex.dtx 2.0.2 2023-04-01 13:00:00Z Alexara Wu $ +\GetIdInfo $Id: sjtutex.dtx 2.0.3 2023-09-25 19:50:00Z Alexara Wu $ {Cambria text fonts definition (SJTUTeX)} \ProvidesExplFile{sjtu-text-font-cambria.def} {\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription} diff --git a/texmf/tex/latex/sjtutex/fd/sjtu-text-font-libertinus.def b/texmf/tex/latex/sjtutex/fd/sjtu-text-font-libertinus.def new file mode 100644 index 00000000..e60d6a8e --- /dev/null +++ b/texmf/tex/latex/sjtutex/fd/sjtu-text-font-libertinus.def @@ -0,0 +1,69 @@ +%% +%% This is file `sjtu-text-font-libertinus.def', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% sjtutex.dtx (with options: `font,text,libertinus') +%% +%% Copyright (C) SJTUG +%% 2018--2023 Alexara Wu +%% 2022--2023 Log Creative +%% +%% This work may be distributed and/or modified under the +%% conditions of the LaTeX Project Public License, either +%% version 1.3c of this license or (at your option) any later +%% version. The latest version of this license is in: +%% +%% http://www.latex-project.org/lppl.txt +%% +%% and version 1.3 or later is part of all distributions of +%% LaTeX version 2005/12/01 or later. +%% +%% This work has the LPPL maintenance status `maintained'. +%% +%% The Current Maintainers of this work are Alexara Wu and Log Creative. +%% +\GetIdInfo $Id: sjtutex.dtx 2.0.3 2023-09-25 19:50:00Z Alexara Wu $ + {Libertinus text fonts definition (SJTUTeX)} +\ProvidesExplFile{sjtu-text-font-libertinus.def} + {\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription} +\__sjtu_fontset_case:nn + { + \tl_set:Nn \encodingdefault { T1 } + \tl_set:Nn \rmdefault { LibertinusSerif-TLF } + \tl_set:Nn \sfdefault { LibertinusSans-TLF } + \tl_set:Nn \ttdefault { lmtt } + } + { + \setmainfont + { LibertinusSerif } + [ + Extension = .otf, + UprightFont = *-Regular, + BoldFont = *-Bold, + ItalicFont = *-Italic, + BoldItalicFont = *-BoldItalic, + SlantedFont = *-Regular, + BoldSlantedFont = *-Bold, + SlantedFeatures = { FakeSlant = 0.2 }, + BoldSlantedFeatures = { FakeSlant = 0.2 } + ] + \setsansfont + { LibertinusSans } + [ + Extension = .otf, + UprightFont = *-Regular, + BoldFont = *-Bold, + ItalicFont = *-Italic, + BoldItalicFont = *-Italic, + BoldItalicFeatures = { FakeBold = 3 }, + SlantedFont = *-Regular, + BoldSlantedFont = *-Bold, + SlantedFeatures = { FakeSlant = 0.2 }, + BoldSlantedFeatures = { FakeSlant = 0.2 } + ] + } +\endinput +%% +%% End of file `sjtu-text-font-libertinus.def'. diff --git a/texmf/tex/latex/sjtutex/fd/sjtu-text-font-lm.def b/texmf/tex/latex/sjtutex/fd/sjtu-text-font-lm.def index 8ba80261..38775bfc 100644 --- a/texmf/tex/latex/sjtutex/fd/sjtu-text-font-lm.def +++ b/texmf/tex/latex/sjtutex/fd/sjtu-text-font-lm.def @@ -24,7 +24,7 @@ %% %% The Current Maintainers of this work are Alexara Wu and Log Creative. %% -\GetIdInfo $Id: sjtutex.dtx 2.0.2 2023-04-01 13:00:00Z Alexara Wu $ +\GetIdInfo $Id: sjtutex.dtx 2.0.3 2023-09-25 19:50:00Z Alexara Wu $ {Latin Modern text fonts definition (SJTUTeX)} \ProvidesExplFile{sjtu-text-font-lm.def} {\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription} diff --git a/texmf/tex/latex/sjtutex/fd/sjtu-text-font-newcm.def b/texmf/tex/latex/sjtutex/fd/sjtu-text-font-newcm.def index fa42c80a..e09081aa 100644 --- a/texmf/tex/latex/sjtutex/fd/sjtu-text-font-newcm.def +++ b/texmf/tex/latex/sjtutex/fd/sjtu-text-font-newcm.def @@ -24,7 +24,7 @@ %% %% The Current Maintainers of this work are Alexara Wu and Log Creative. %% -\GetIdInfo $Id: sjtutex.dtx 2.0.2 2023-04-01 13:00:00Z Alexara Wu $ +\GetIdInfo $Id: sjtutex.dtx 2.0.3 2023-09-25 19:50:00Z Alexara Wu $ {New Computer Modern text fonts definition (SJTUTeX)} \ProvidesExplFile{sjtu-text-font-newcm.def} {\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription} diff --git a/texmf/tex/latex/sjtutex/fd/sjtu-text-font-newpx.def b/texmf/tex/latex/sjtutex/fd/sjtu-text-font-newpx.def index 4bf7ec37..775d4e3e 100644 --- a/texmf/tex/latex/sjtutex/fd/sjtu-text-font-newpx.def +++ b/texmf/tex/latex/sjtutex/fd/sjtu-text-font-newpx.def @@ -24,7 +24,7 @@ %% %% The Current Maintainers of this work are Alexara Wu and Log Creative. %% -\GetIdInfo $Id: sjtutex.dtx 2.0.2 2023-04-01 13:00:00Z Alexara Wu $ +\GetIdInfo $Id: sjtutex.dtx 2.0.3 2023-09-25 19:50:00Z Alexara Wu $ {New PX text fonts definition (SJTUTeX)} \ProvidesExplFile{sjtu-text-font-newpx.def} {\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription} diff --git a/texmf/tex/latex/sjtutex/fd/sjtu-text-font-newtx.def b/texmf/tex/latex/sjtutex/fd/sjtu-text-font-newtx.def index a89036d0..c04c3758 100644 --- a/texmf/tex/latex/sjtutex/fd/sjtu-text-font-newtx.def +++ b/texmf/tex/latex/sjtutex/fd/sjtu-text-font-newtx.def @@ -24,7 +24,7 @@ %% %% The Current Maintainers of this work are Alexara Wu and Log Creative. %% -\GetIdInfo $Id: sjtutex.dtx 2.0.2 2023-04-01 13:00:00Z Alexara Wu $ +\GetIdInfo $Id: sjtutex.dtx 2.0.3 2023-09-25 19:50:00Z Alexara Wu $ {New TX text fonts definition (SJTUTeX)} \ProvidesExplFile{sjtu-text-font-newtx.def} {\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription} diff --git a/texmf/tex/latex/sjtutex/fd/sjtu-text-font-stixtwo.def b/texmf/tex/latex/sjtutex/fd/sjtu-text-font-stixtwo.def index 534c43c3..d8064062 100644 --- a/texmf/tex/latex/sjtutex/fd/sjtu-text-font-stixtwo.def +++ b/texmf/tex/latex/sjtutex/fd/sjtu-text-font-stixtwo.def @@ -24,7 +24,7 @@ %% %% The Current Maintainers of this work are Alexara Wu and Log Creative. %% -\GetIdInfo $Id: sjtutex.dtx 2.0.2 2023-04-01 13:00:00Z Alexara Wu $ +\GetIdInfo $Id: sjtutex.dtx 2.0.3 2023-09-25 19:50:00Z Alexara Wu $ {STIX Two text fonts definition (SJTUTeX)} \ProvidesExplFile{sjtu-text-font-stixtwo.def} {\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription} diff --git a/texmf/tex/latex/sjtutex/fd/sjtu-text-font-times.def b/texmf/tex/latex/sjtutex/fd/sjtu-text-font-times.def index 5f8a978c..cad081e9 100644 --- a/texmf/tex/latex/sjtutex/fd/sjtu-text-font-times.def +++ b/texmf/tex/latex/sjtutex/fd/sjtu-text-font-times.def @@ -24,7 +24,7 @@ %% %% The Current Maintainers of this work are Alexara Wu and Log Creative. %% -\GetIdInfo $Id: sjtutex.dtx 2.0.2 2023-04-01 13:00:00Z Alexara Wu $ +\GetIdInfo $Id: sjtutex.dtx 2.0.3 2023-09-25 19:50:00Z Alexara Wu $ {Times text fonts definition (SJTUTeX)} \ProvidesExplFile{sjtu-text-font-times.def} {\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription} diff --git a/texmf/tex/latex/sjtutex/fd/sjtu-text-font-xits.def b/texmf/tex/latex/sjtutex/fd/sjtu-text-font-xits.def index 800c8a96..095ab3a9 100644 --- a/texmf/tex/latex/sjtutex/fd/sjtu-text-font-xits.def +++ b/texmf/tex/latex/sjtutex/fd/sjtu-text-font-xits.def @@ -24,7 +24,7 @@ %% %% The Current Maintainers of this work are Alexara Wu and Log Creative. %% -\GetIdInfo $Id: sjtutex.dtx 2.0.2 2023-04-01 13:00:00Z Alexara Wu $ +\GetIdInfo $Id: sjtutex.dtx 2.0.3 2023-09-25 19:50:00Z Alexara Wu $ {XITS text fonts definition (SJTUTeX)} \ProvidesExplFile{sjtu-text-font-xits.def} {\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription} diff --git a/texmf/tex/latex/sjtutex/sjtu-lang-generic-de.def b/texmf/tex/latex/sjtutex/sjtu-lang-generic-de.def index f1b1cacb..0a35b1d0 100644 --- a/texmf/tex/latex/sjtutex/sjtu-lang-generic-de.def +++ b/texmf/tex/latex/sjtutex/sjtu-lang-generic-de.def @@ -24,7 +24,7 @@ %% %% The Current Maintainers of this work are Alexara Wu and Log Creative. %% -\GetIdInfo $Id: sjtutex.dtx 2.0.2 2023-04-01 13:00:00Z Alexara Wu $ +\GetIdInfo $Id: sjtutex.dtx 2.0.3 2023-09-25 19:50:00Z Alexara Wu $ {German specific definition for generic (SJTUTeX)} \ProvidesExplFile{sjtu-lang-generic-de.def} {\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription} @@ -44,6 +44,7 @@ { \__sjtu_date_aux_short_de:nn {#1} {#2} } \cs_new_protected:Nn \__sjtu_set_language_de: { + \tl_set:Nn \languagename { ngerman } \ctex_set:n { autoindent = 1.5 em } \normalfont } diff --git a/texmf/tex/latex/sjtutex/sjtu-lang-generic-en.def b/texmf/tex/latex/sjtutex/sjtu-lang-generic-en.def index aa7d66a2..103d819c 100644 --- a/texmf/tex/latex/sjtutex/sjtu-lang-generic-en.def +++ b/texmf/tex/latex/sjtutex/sjtu-lang-generic-en.def @@ -24,7 +24,7 @@ %% %% The Current Maintainers of this work are Alexara Wu and Log Creative. %% -\GetIdInfo $Id: sjtutex.dtx 2.0.2 2023-04-01 13:00:00Z Alexara Wu $ +\GetIdInfo $Id: sjtutex.dtx 2.0.3 2023-09-25 19:50:00Z Alexara Wu $ {English specific definition for generic (SJTUTeX)} \ProvidesExplFile{sjtu-lang-generic-en.def} {\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription} @@ -67,6 +67,7 @@ { \__sjtu_date_aux_short_en:nn {#1} {#2} } \cs_new_protected:Nn \__sjtu_set_language_en: { + \tl_set:Nn \languagename { english } \ctex_set:n { autoindent = 1.5 em } \normalfont } diff --git a/texmf/tex/latex/sjtutex/sjtu-lang-generic-ja.def b/texmf/tex/latex/sjtutex/sjtu-lang-generic-ja.def index fb091307..7a34387c 100644 --- a/texmf/tex/latex/sjtutex/sjtu-lang-generic-ja.def +++ b/texmf/tex/latex/sjtutex/sjtu-lang-generic-ja.def @@ -24,7 +24,7 @@ %% %% The Current Maintainers of this work are Alexara Wu and Log Creative. %% -\GetIdInfo $Id: sjtutex.dtx 2.0.2 2023-04-01 13:00:00Z Alexara Wu $ +\GetIdInfo $Id: sjtutex.dtx 2.0.3 2023-09-25 19:50:00Z Alexara Wu $ {Japanese specific definition for generic (SJTUTeX)} \ProvidesExplFile{sjtu-lang-generic-ja.def} {\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription} @@ -51,6 +51,7 @@ } \cs_new_protected:Nn \__sjtu_set_language_ja: { + \tl_set:Nn \languagename { japanese } \ctex_set:n { autoindent = 1 } \__sjtu_set_cjk_default_ja: \normalfont diff --git a/texmf/tex/latex/sjtutex/sjtu-lang-generic-zh.def b/texmf/tex/latex/sjtutex/sjtu-lang-generic-zh.def index 98831456..8b4b6255 100644 --- a/texmf/tex/latex/sjtutex/sjtu-lang-generic-zh.def +++ b/texmf/tex/latex/sjtutex/sjtu-lang-generic-zh.def @@ -24,7 +24,7 @@ %% %% The Current Maintainers of this work are Alexara Wu and Log Creative. %% -\GetIdInfo $Id: sjtutex.dtx 2.0.2 2023-04-01 13:00:00Z Alexara Wu $ +\GetIdInfo $Id: sjtutex.dtx 2.0.3 2023-09-25 19:50:00Z Alexara Wu $ {Chinese specific definition for generic (SJTUTeX)} \ProvidesExplFile{sjtu-lang-generic-zh.def} {\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription} @@ -51,6 +51,7 @@ } \cs_new_protected:Nn \__sjtu_set_language_zh: { + \tl_set:Nn \languagename { chinese } \ctex_set:n { autoindent = true } \__sjtu_set_cjk_default_zh: \normalfont diff --git a/texmf/tex/latex/sjtutex/sjtu-lang-thesis-de.def b/texmf/tex/latex/sjtutex/sjtu-lang-thesis-de.def index df79551e..4d867713 100644 --- a/texmf/tex/latex/sjtutex/sjtu-lang-thesis-de.def +++ b/texmf/tex/latex/sjtutex/sjtu-lang-thesis-de.def @@ -24,7 +24,7 @@ %% %% The Current Maintainers of this work are Alexara Wu and Log Creative. %% -\GetIdInfo $Id: sjtutex.dtx 2.0.2 2023-04-01 13:00:00Z Alexara Wu $ +\GetIdInfo $Id: sjtutex.dtx 2.0.3 2023-09-25 19:50:00Z Alexara Wu $ {German specific definition for thesis (SJTUTeX)} \ProvidesExplFile{sjtu-lang-thesis-de.def} {\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription} @@ -54,6 +54,7 @@ { \__sjtu_date_aux_short_de:nn {#1} {#2} } \cs_new_protected:Nn \__sjtu_set_language_de: { + \tl_set:Nn \languagename { ngerman } \ctex_set:n { autoindent = 1.5 em } \normalfont } diff --git a/texmf/tex/latex/sjtutex/sjtu-lang-thesis-en.def b/texmf/tex/latex/sjtutex/sjtu-lang-thesis-en.def index f95dddfa..d3704b14 100644 --- a/texmf/tex/latex/sjtutex/sjtu-lang-thesis-en.def +++ b/texmf/tex/latex/sjtutex/sjtu-lang-thesis-en.def @@ -24,7 +24,7 @@ %% %% The Current Maintainers of this work are Alexara Wu and Log Creative. %% -\GetIdInfo $Id: sjtutex.dtx 2.0.2 2023-04-01 13:00:00Z Alexara Wu $ +\GetIdInfo $Id: sjtutex.dtx 2.0.3 2023-09-25 19:50:00Z Alexara Wu $ {English specific definition for thesis (SJTUTeX)} \ProvidesExplFile{sjtu-lang-thesis-en.def} {\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription} @@ -35,7 +35,7 @@ { A~ Dissertation~ Submitted~ to \exp_not:N \\ { \exp_not:V \c__sjtu_name_univ_en_tl }~ for~ - { \exp_not:V \c__sjtu_name_degree_level_en_tl }~ Degree + { \exp_not:V \c__sjtu_name_degree_level_possessive_en_tl }~ Degree } } \cs_new:Npn \__sjtu_ordinal_en:n #1 @@ -77,6 +77,7 @@ { \__sjtu_date_aux_short_en:nn {#1} {#2} } \cs_new_protected:Nn \__sjtu_set_language_en: { + \tl_set:Nn \languagename { english } \ctex_set:n { autoindent = 1.5 em } \normalfont } diff --git a/texmf/tex/latex/sjtutex/sjtu-lang-thesis-ja.def b/texmf/tex/latex/sjtutex/sjtu-lang-thesis-ja.def index befdb30e..31140a8b 100644 --- a/texmf/tex/latex/sjtutex/sjtu-lang-thesis-ja.def +++ b/texmf/tex/latex/sjtutex/sjtu-lang-thesis-ja.def @@ -24,7 +24,7 @@ %% %% The Current Maintainers of this work are Alexara Wu and Log Creative. %% -\GetIdInfo $Id: sjtutex.dtx 2.0.2 2023-04-01 13:00:00Z Alexara Wu $ +\GetIdInfo $Id: sjtutex.dtx 2.0.3 2023-09-25 19:50:00Z Alexara Wu $ {Japanese specific definition for thesis (SJTUTeX)} \ProvidesExplFile{sjtu-lang-thesis-ja.def} {\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription} @@ -61,6 +61,7 @@ } \cs_new_protected:Nn \__sjtu_set_language_ja: { + \tl_set:Nn \languagename { japanese } \ctex_set:n { autoindent = 1 } \__sjtu_set_cjk_default_ja: \normalfont diff --git a/texmf/tex/latex/sjtutex/sjtu-lang-thesis-zh.def b/texmf/tex/latex/sjtutex/sjtu-lang-thesis-zh.def index 4a7cb84a..c63f68df 100644 --- a/texmf/tex/latex/sjtutex/sjtu-lang-thesis-zh.def +++ b/texmf/tex/latex/sjtutex/sjtu-lang-thesis-zh.def @@ -24,7 +24,7 @@ %% %% The Current Maintainers of this work are Alexara Wu and Log Creative. %% -\GetIdInfo $Id: sjtutex.dtx 2.0.2 2023-04-01 13:00:00Z Alexara Wu $ +\GetIdInfo $Id: sjtutex.dtx 2.0.3 2023-09-25 19:50:00Z Alexara Wu $ {Chinese specific definition for thesis (SJTUTeX)} \ProvidesExplFile{sjtu-lang-thesis-zh.def} {\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription} @@ -61,6 +61,7 @@ } \cs_new_protected:Nn \__sjtu_set_language_zh: { + \tl_set:Nn \languagename { chinese } \ctex_set:n { autoindent = true } \__sjtu_set_cjk_default_zh: \normalfont diff --git a/texmf/tex/latex/sjtutex/sjtu-name-generic-de.def b/texmf/tex/latex/sjtutex/sjtu-name-generic-de.def index f1595762..cb397ceb 100644 --- a/texmf/tex/latex/sjtutex/sjtu-name-generic-de.def +++ b/texmf/tex/latex/sjtutex/sjtu-name-generic-de.def @@ -24,7 +24,7 @@ %% %% The Current Maintainers of this work are Alexara Wu and Log Creative. %% -\GetIdInfo $Id: sjtutex.dtx 2.0.2 2023-04-01 13:00:00Z Alexara Wu $ +\GetIdInfo $Id: sjtutex.dtx 2.0.3 2023-09-25 19:50:00Z Alexara Wu $ {German name config for generic (SJTUTeX)} \ProvidesExplFile{sjtu-name-generic-de.def} {\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription} diff --git a/texmf/tex/latex/sjtutex/sjtu-name-generic-en.def b/texmf/tex/latex/sjtutex/sjtu-name-generic-en.def index 45468df1..e1244289 100644 --- a/texmf/tex/latex/sjtutex/sjtu-name-generic-en.def +++ b/texmf/tex/latex/sjtutex/sjtu-name-generic-en.def @@ -24,7 +24,7 @@ %% %% The Current Maintainers of this work are Alexara Wu and Log Creative. %% -\GetIdInfo $Id: sjtutex.dtx 2.0.2 2023-04-01 13:00:00Z Alexara Wu $ +\GetIdInfo $Id: sjtutex.dtx 2.0.3 2023-09-25 19:50:00Z Alexara Wu $ {English name config for generic (SJTUTeX)} \ProvidesExplFile{sjtu-name-generic-en.def} {\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription} diff --git a/texmf/tex/latex/sjtutex/sjtu-name-generic-ja.def b/texmf/tex/latex/sjtutex/sjtu-name-generic-ja.def index 6e565351..657ade13 100644 --- a/texmf/tex/latex/sjtutex/sjtu-name-generic-ja.def +++ b/texmf/tex/latex/sjtutex/sjtu-name-generic-ja.def @@ -24,7 +24,7 @@ %% %% The Current Maintainers of this work are Alexara Wu and Log Creative. %% -\GetIdInfo $Id: sjtutex.dtx 2.0.2 2023-04-01 13:00:00Z Alexara Wu $ +\GetIdInfo $Id: sjtutex.dtx 2.0.3 2023-09-25 19:50:00Z Alexara Wu $ {Japanese name config for generic (SJTUTeX)} \ProvidesExplFile{sjtu-name-generic-ja.def} {\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription} diff --git a/texmf/tex/latex/sjtutex/sjtu-name-generic-zh.def b/texmf/tex/latex/sjtutex/sjtu-name-generic-zh.def index 783b6b4d..e62b11bd 100644 --- a/texmf/tex/latex/sjtutex/sjtu-name-generic-zh.def +++ b/texmf/tex/latex/sjtutex/sjtu-name-generic-zh.def @@ -24,7 +24,7 @@ %% %% The Current Maintainers of this work are Alexara Wu and Log Creative. %% -\GetIdInfo $Id: sjtutex.dtx 2.0.2 2023-04-01 13:00:00Z Alexara Wu $ +\GetIdInfo $Id: sjtutex.dtx 2.0.3 2023-09-25 19:50:00Z Alexara Wu $ {Chinese name config for generic (SJTUTeX)} \ProvidesExplFile{sjtu-name-generic-zh.def} {\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription} diff --git a/texmf/tex/latex/sjtutex/sjtu-name-thesis-de.def b/texmf/tex/latex/sjtutex/sjtu-name-thesis-de.def index ba5968c5..954a30c7 100644 --- a/texmf/tex/latex/sjtutex/sjtu-name-thesis-de.def +++ b/texmf/tex/latex/sjtutex/sjtu-name-thesis-de.def @@ -24,7 +24,7 @@ %% %% The Current Maintainers of this work are Alexara Wu and Log Creative. %% -\GetIdInfo $Id: sjtutex.dtx 2.0.2 2023-04-01 13:00:00Z Alexara Wu $ +\GetIdInfo $Id: sjtutex.dtx 2.0.3 2023-09-25 19:50:00Z Alexara Wu $ {German name config for thesis (SJTUTeX)} \ProvidesExplFile{sjtu-name-thesis-de.def} {\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription} diff --git a/texmf/tex/latex/sjtutex/sjtu-name-thesis-en.def b/texmf/tex/latex/sjtutex/sjtu-name-thesis-en.def index 724d266c..808200bd 100644 --- a/texmf/tex/latex/sjtutex/sjtu-name-thesis-en.def +++ b/texmf/tex/latex/sjtutex/sjtu-name-thesis-en.def @@ -24,7 +24,7 @@ %% %% The Current Maintainers of this work are Alexara Wu and Log Creative. %% -\GetIdInfo $Id: sjtutex.dtx 2.0.2 2023-04-01 13:00:00Z Alexara Wu $ +\GetIdInfo $Id: sjtutex.dtx 2.0.3 2023-09-25 19:50:00Z Alexara Wu $ {English name config for thesis (SJTUTeX)} \ProvidesExplFile{sjtu-name-thesis-en.def} {\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription} @@ -34,8 +34,8 @@ July, August, September, October, November, December } \__sjtu_define_name_from_clist:nnnn { en } - { degree_level } { \g__sjtu_thesis_type_int } - { Bachelor, Master, Doctor } + { degree_level_possessive } { \g__sjtu_thesis_type_int } + { Bachelor's, Master's, Doctoral } \clist_map_inline:nn { { univ } { Shanghai~ Jiao~ Tong~ University } , diff --git a/texmf/tex/latex/sjtutex/sjtu-name-thesis-ja.def b/texmf/tex/latex/sjtutex/sjtu-name-thesis-ja.def index 1b3efbad..826115e1 100644 --- a/texmf/tex/latex/sjtutex/sjtu-name-thesis-ja.def +++ b/texmf/tex/latex/sjtutex/sjtu-name-thesis-ja.def @@ -24,7 +24,7 @@ %% %% The Current Maintainers of this work are Alexara Wu and Log Creative. %% -\GetIdInfo $Id: sjtutex.dtx 2.0.2 2023-04-01 13:00:00Z Alexara Wu $ +\GetIdInfo $Id: sjtutex.dtx 2.0.3 2023-09-25 19:50:00Z Alexara Wu $ {Japanese name config for thesis (SJTUTeX)} \ProvidesExplFile{sjtu-name-thesis-ja.def} {\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription} diff --git a/texmf/tex/latex/sjtutex/sjtu-name-thesis-zh.def b/texmf/tex/latex/sjtutex/sjtu-name-thesis-zh.def index 2800d93c..833752ef 100644 --- a/texmf/tex/latex/sjtutex/sjtu-name-thesis-zh.def +++ b/texmf/tex/latex/sjtutex/sjtu-name-thesis-zh.def @@ -24,7 +24,7 @@ %% %% The Current Maintainers of this work are Alexara Wu and Log Creative. %% -\GetIdInfo $Id: sjtutex.dtx 2.0.2 2023-04-01 13:00:00Z Alexara Wu $ +\GetIdInfo $Id: sjtutex.dtx 2.0.3 2023-09-25 19:50:00Z Alexara Wu $ {Chinese name config for thesis (SJTUTeX)} \ProvidesExplFile{sjtu-name-thesis-zh.def} {\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription} diff --git a/texmf/tex/latex/sjtutex/sjtu-scheme-de.def b/texmf/tex/latex/sjtutex/sjtu-scheme-de.def index 731e97ab..f0b16d9d 100644 --- a/texmf/tex/latex/sjtutex/sjtu-scheme-de.def +++ b/texmf/tex/latex/sjtutex/sjtu-scheme-de.def @@ -24,7 +24,7 @@ %% %% The Current Maintainers of this work are Alexara Wu and Log Creative. %% -\GetIdInfo $Id: sjtutex.dtx 2.0.2 2023-04-01 13:00:00Z Alexara Wu $ +\GetIdInfo $Id: sjtutex.dtx 2.0.3 2023-09-25 19:50:00Z Alexara Wu $ {German scheme (SJTUTeX)} \ProvidesExplFile{sjtu-scheme-de.def} {\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription} @@ -58,6 +58,7 @@ \ctex_patch_cmd:Nnn \quotation { 1.5em } { \parindent } \keys_set:nn { sjtu / style } { fnmark-style = plain } +\tl_set:Nn \languagename { ngerman } \clist_map_inline:nn { { assumption } { Annahme } , diff --git a/texmf/tex/latex/sjtutex/sjtu-scheme-en.def b/texmf/tex/latex/sjtutex/sjtu-scheme-en.def index 2594b511..856556c9 100644 --- a/texmf/tex/latex/sjtutex/sjtu-scheme-en.def +++ b/texmf/tex/latex/sjtutex/sjtu-scheme-en.def @@ -24,7 +24,7 @@ %% %% The Current Maintainers of this work are Alexara Wu and Log Creative. %% -\GetIdInfo $Id: sjtutex.dtx 2.0.2 2023-04-01 13:00:00Z Alexara Wu $ +\GetIdInfo $Id: sjtutex.dtx 2.0.3 2023-09-25 19:50:00Z Alexara Wu $ {English scheme (SJTUTeX)} \ProvidesExplFile{sjtu-scheme-en.def} {\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription} @@ -33,6 +33,7 @@ \ctex_patch_cmd:Nnn \quotation { 1.5em } { \parindent } \keys_set:nn { sjtu / style } { fnmark-style = plain } +\tl_set:Nn \languagename { english } \clist_map_inline:nn { { assumption } { Assumption } , diff --git a/texmf/tex/latex/sjtutex/sjtu-scheme-ja.def b/texmf/tex/latex/sjtutex/sjtu-scheme-ja.def index c7ba167f..f83ef740 100644 --- a/texmf/tex/latex/sjtutex/sjtu-scheme-ja.def +++ b/texmf/tex/latex/sjtutex/sjtu-scheme-ja.def @@ -24,7 +24,7 @@ %% %% The Current Maintainers of this work are Alexara Wu and Log Creative. %% -\GetIdInfo $Id: sjtutex.dtx 2.0.2 2023-04-01 13:00:00Z Alexara Wu $ +\GetIdInfo $Id: sjtutex.dtx 2.0.3 2023-09-25 19:50:00Z Alexara Wu $ {Japanese scheme (SJTUTeX)} \ProvidesExplFile{sjtu-scheme-ja.def} {\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription} @@ -63,6 +63,7 @@ \ctex_patch_cmd:Nnn \quotation { 1.5em } { \parindent } \keys_set:nn { sjtu / style } { fnmark-style = circled } +\tl_set:Nn \languagename { japanese } \clist_map_inline:nn { { assumption } { 仮定 } , diff --git a/texmf/tex/latex/sjtutex/sjtu-scheme-zh.def b/texmf/tex/latex/sjtutex/sjtu-scheme-zh.def index a7e6da17..0c406757 100644 --- a/texmf/tex/latex/sjtutex/sjtu-scheme-zh.def +++ b/texmf/tex/latex/sjtutex/sjtu-scheme-zh.def @@ -24,7 +24,7 @@ %% %% The Current Maintainers of this work are Alexara Wu and Log Creative. %% -\GetIdInfo $Id: sjtutex.dtx 2.0.2 2023-04-01 13:00:00Z Alexara Wu $ +\GetIdInfo $Id: sjtutex.dtx 2.0.3 2023-09-25 19:50:00Z Alexara Wu $ {Chinese scheme (SJTUTeX)} \ProvidesExplFile{sjtu-scheme-zh.def} {\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription} @@ -63,6 +63,7 @@ \ctex_patch_cmd:Nnn \quotation { 1.5em } { \parindent } \keys_set:nn { sjtu / style } { fnmark-style = circled } +\tl_set:Nn \languagename { chinese } \clist_map_inline:nn { { assumption } { 假设 } , diff --git a/texmf/tex/latex/sjtutex/sjtuarticle.cls b/texmf/tex/latex/sjtutex/sjtuarticle.cls index 06293579..26e86d5b 100644 --- a/texmf/tex/latex/sjtutex/sjtuarticle.cls +++ b/texmf/tex/latex/sjtutex/sjtuarticle.cls @@ -26,7 +26,7 @@ %% \NeedsTeXFormat{LaTeX2e} \RequirePackage{expl3} -\GetIdInfo $Id: sjtutex.dtx 2.0.2 2023-04-01 13:00:00Z Alexara Wu $ +\GetIdInfo $Id: sjtutex.dtx 2.0.3 2023-09-25 19:50:00Z Alexara Wu $ {Article template for Shanghai Jiao Tong University} \ProvidesExplClass{sjtuarticle} {\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription} @@ -68,6 +68,7 @@ \bool_new:N \g__sjtu_slanted_uppercase_greek_bool \bool_new:N \g__sjtu_upright_integral_bool \bool_new:N \g__sjtu_integral_limits_bool +\clist_new:N \g__sjtu_math_font_options_clist \clist_set:Nn \g__sjtu_options_to_ctex_class_clist { a4paper, UTF8, scheme = plain, fontset = none } \clist_new:N \g__sjtu_options_to_packages_clist @@ -181,17 +182,21 @@ { \dim_set_eq:NN \g__sjtu_line_skip_dim \g__sjtu_default_line_skip_dim } \fp_set:Nn \g__sjtu_line_spread_fp { \dim_ratio:nn { \g__sjtu_line_skip_dim } { \g__sjtu_font_size_dim } / 1.2 } -\clist_put_right:Nx \@classoptionslist +\clist_set:Nx \g__sjtu_math_font_options_clist { - a4paper , \bool_if:NT \g__sjtu_slanted_uppercase_greek_bool { slantedGreek } , \bool_if:NT \g__sjtu_upright_integral_bool - { upint } , + { upint } + } +\clist_put_right:Nx \@classoptionslist + { + a4paper , + \tl_if_eq:NNT \g__sjtu_lang_tl \c__sjtu_lang_de_tl + { german, ngerman } , \bool_if:NT \g__sjtu_integral_limits_bool { intlimits } , - \tl_if_eq:NNT \g__sjtu_lang_tl \c__sjtu_lang_de_tl - { german, ngerman } + \g__sjtu_math_font_options_clist } \clist_put_right:Nx \g__sjtu_options_to_ctex_class_clist { @@ -211,7 +216,6 @@ { { no-math } { fontspec } , { titles } { tocloft } , - { perpage, bottom } { footmisc } , { list = off } { bicaption } , { warnings-off = { @@ -444,6 +448,11 @@ \intcap\intcup\upint\lowint } } +\ctex_at_end_preamble:n + { + \@ifpackageloaded { unicode-math } + { } { \RequirePackage { bm } } + } \NewDocumentCommand \CJKrmfamily { } { \CJKfamily { \CJKrmdefault } } \NewDocumentCommand \CJKsffamily { } { \CJKfamily { \CJKsfdefault } } \NewDocumentCommand \CJKttfamily { } { \CJKfamily { \CJKttdefault } } @@ -987,34 +996,23 @@ { \addcontentsline } { \caption@iflist { \addcontentsline } { \@gobblethree } } } -\ctex_at_end_package:nn { listings } - { - \lstdefinestyle { lstStyleCode } - { - aboveskip = \medskipamount , - belowskip = \medskipamount , - basicstyle = \ttfamily \zihao { 6 } , - commentstyle = \slshape \color { black!60 } , - stringstyle = \color { green!40!black!100 } , - keywordstyle = \bfseries \color { blue!50!black } , - extendedchars = false , - upquote = true , - tabsize = 2 , - showstringspaces = false , - xleftmargin = 1 em , - xrightmargin = 1 em , - breaklines = false , - framexleftmargin = 1 em , - framexrightmargin = 1 em , - backgroundcolor = \color { gray!10 } , - columns = flexible , - keepspaces = true , - texcl = true , - mathescape = true - } - } \ctex_at_end_package:nn { nomencl } { \tl_set:Nn \nomname { \SJTU@nomname } } +\ctex_at_end_package:nn { translations } + { + \DeclareLanguage { chinese } + \DeclareLanguageAlias { Chinese } { chinese } + } +\ctex_at_end_package:nn { siunitx } + { + \@ifpackageloaded { translations } + { + \DeclareTranslation { Chinese } { and } { 和 } + \DeclareTranslation { Japanese } { and } { と } + \DeclareTranslation { Chinese } { to~(numerical~range) } { \textasciitilde } + \DeclareTranslation { Japanese } { to~(numerical~range) } { \textasciitilde } + } { } + } \endinput %% %% End of file `sjtuarticle.cls'. diff --git a/texmf/tex/latex/sjtutex/sjtureport.cls b/texmf/tex/latex/sjtutex/sjtureport.cls index 42d72f57..213dcc53 100644 --- a/texmf/tex/latex/sjtutex/sjtureport.cls +++ b/texmf/tex/latex/sjtutex/sjtureport.cls @@ -26,7 +26,7 @@ %% \NeedsTeXFormat{LaTeX2e} \RequirePackage{expl3} -\GetIdInfo $Id: sjtutex.dtx 2.0.2 2023-04-01 13:00:00Z Alexara Wu $ +\GetIdInfo $Id: sjtutex.dtx 2.0.3 2023-09-25 19:50:00Z Alexara Wu $ {Report template for Shanghai Jiao Tong University} \ProvidesExplClass{sjtureport} {\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription} @@ -68,6 +68,7 @@ \bool_new:N \g__sjtu_slanted_uppercase_greek_bool \bool_new:N \g__sjtu_upright_integral_bool \bool_new:N \g__sjtu_integral_limits_bool +\clist_new:N \g__sjtu_math_font_options_clist \clist_set:Nn \g__sjtu_options_to_ctex_class_clist { a4paper, UTF8, scheme = plain, fontset = none } \clist_new:N \g__sjtu_options_to_packages_clist @@ -189,17 +190,21 @@ { \dim_set_eq:NN \g__sjtu_line_skip_dim \g__sjtu_default_line_skip_dim } \fp_set:Nn \g__sjtu_line_spread_fp { \dim_ratio:nn { \g__sjtu_line_skip_dim } { \g__sjtu_font_size_dim } / 1.2 } -\clist_put_right:Nx \@classoptionslist +\clist_set:Nx \g__sjtu_math_font_options_clist { - a4paper , \bool_if:NT \g__sjtu_slanted_uppercase_greek_bool { slantedGreek } , \bool_if:NT \g__sjtu_upright_integral_bool - { upint } , + { upint } + } +\clist_put_right:Nx \@classoptionslist + { + a4paper , + \tl_if_eq:NNT \g__sjtu_lang_tl \c__sjtu_lang_de_tl + { german, ngerman } , \bool_if:NT \g__sjtu_integral_limits_bool { intlimits } , - \tl_if_eq:NNT \g__sjtu_lang_tl \c__sjtu_lang_de_tl - { german, ngerman } + \g__sjtu_math_font_options_clist } \clist_put_right:Nx \g__sjtu_options_to_ctex_class_clist { @@ -221,7 +226,6 @@ { { no-math } { fontspec } , { titles } { tocloft } , - { perpage, bottom } { footmisc } , { list = off } { bicaption } , { warnings-off = { @@ -456,6 +460,11 @@ \intcap\intcup\upint\lowint } } +\ctex_at_end_preamble:n + { + \@ifpackageloaded { unicode-math } + { } { \RequirePackage { bm } } + } \NewDocumentCommand \CJKrmfamily { } { \CJKfamily { \CJKrmdefault } } \NewDocumentCommand \CJKsffamily { } { \CJKfamily { \CJKsfdefault } } \NewDocumentCommand \CJKttfamily { } { \CJKfamily { \CJKttdefault } } @@ -1023,34 +1032,23 @@ { \addcontentsline } { \caption@iflist { \addcontentsline } { \@gobblethree } } } -\ctex_at_end_package:nn { listings } +\ctex_at_end_package:nn { nomencl } + { \tl_set:Nn \nomname { \SJTU@nomname } } +\ctex_at_end_package:nn { translations } { - \lstdefinestyle { lstStyleCode } + \DeclareLanguage { chinese } + \DeclareLanguageAlias { Chinese } { chinese } + } +\ctex_at_end_package:nn { siunitx } + { + \@ifpackageloaded { translations } { - aboveskip = \medskipamount , - belowskip = \medskipamount , - basicstyle = \ttfamily \zihao { 6 } , - commentstyle = \slshape \color { black!60 } , - stringstyle = \color { green!40!black!100 } , - keywordstyle = \bfseries \color { blue!50!black } , - extendedchars = false , - upquote = true , - tabsize = 2 , - showstringspaces = false , - xleftmargin = 1 em , - xrightmargin = 1 em , - breaklines = false , - framexleftmargin = 1 em , - framexrightmargin = 1 em , - backgroundcolor = \color { gray!10 } , - columns = flexible , - keepspaces = true , - texcl = true , - mathescape = true - } + \DeclareTranslation { Chinese } { and } { 和 } + \DeclareTranslation { Japanese } { and } { と } + \DeclareTranslation { Chinese } { to~(numerical~range) } { \textasciitilde } + \DeclareTranslation { Japanese } { to~(numerical~range) } { \textasciitilde } + } { } } -\ctex_at_end_package:nn { nomencl } - { \tl_set:Nn \nomname { \SJTU@nomname } } \endinput %% %% End of file `sjtureport.cls'. diff --git a/texmf/tex/latex/sjtutex/sjtuthesis.cls b/texmf/tex/latex/sjtutex/sjtuthesis.cls index 1d4b9338..ffbc83e6 100644 --- a/texmf/tex/latex/sjtutex/sjtuthesis.cls +++ b/texmf/tex/latex/sjtutex/sjtuthesis.cls @@ -26,7 +26,7 @@ %% \NeedsTeXFormat{LaTeX2e} \RequirePackage{expl3} -\GetIdInfo $Id: sjtutex.dtx 2.0.2 2023-04-01 13:00:00Z Alexara Wu $ +\GetIdInfo $Id: sjtutex.dtx 2.0.3 2023-09-25 19:50:00Z Alexara Wu $ {Thesis template for Shanghai Jiao Tong University} \ProvidesExplClass{sjtuthesis} {\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription} @@ -70,6 +70,7 @@ \bool_new:N \g__sjtu_slanted_uppercase_greek_bool \bool_new:N \g__sjtu_upright_integral_bool \bool_new:N \g__sjtu_integral_limits_bool +\clist_new:N \g__sjtu_math_font_options_clist \bool_new:N \g__sjtu_review_bool \clist_set:Nn \g__sjtu_options_to_ctex_class_clist { a4paper, UTF8, scheme = plain, fontset = none } @@ -194,17 +195,21 @@ { \dim_set_eq:NN \g__sjtu_line_skip_dim \g__sjtu_default_line_skip_dim } \fp_set:Nn \g__sjtu_line_spread_fp { \dim_ratio:nn { \g__sjtu_line_skip_dim } { \g__sjtu_font_size_dim } / 1.2 } -\clist_put_right:Nx \@classoptionslist +\clist_set:Nx \g__sjtu_math_font_options_clist { - a4paper , \bool_if:NT \g__sjtu_slanted_uppercase_greek_bool { slantedGreek } , \bool_if:NT \g__sjtu_upright_integral_bool - { upint } , + { upint } + } +\clist_put_right:Nx \@classoptionslist + { + a4paper , + \tl_if_eq:NNT \g__sjtu_lang_tl \c__sjtu_lang_de_tl + { german, ngerman } , \bool_if:NT \g__sjtu_integral_limits_bool { intlimits } , - \tl_if_eq:NNT \g__sjtu_lang_tl \c__sjtu_lang_de_tl - { german, ngerman } + \g__sjtu_math_font_options_clist } \clist_put_right:Nx \g__sjtu_options_to_ctex_class_clist { @@ -224,7 +229,6 @@ { { no-math } { fontspec } , { titles } { tocloft } , - { perpage, bottom } { footmisc } , { list = off } { bicaption } , { warnings-off = { @@ -542,6 +546,11 @@ \intcap\intcup\upint\lowint } } +\ctex_at_end_preamble:n + { + \@ifpackageloaded { unicode-math } + { } { \RequirePackage { bm } } + } \NewDocumentCommand \CJKrmfamily { } { \CJKfamily { \CJKrmdefault } } \NewDocumentCommand \CJKsffamily { } { \CJKfamily { \CJKsfdefault } } \NewDocumentCommand \CJKttfamily { } { \CJKfamily { \CJKttdefault } } @@ -606,6 +615,7 @@ headsep = 0.5 cm, footskip = 1.0 cm } +\AtEndOfClass { \raggedbottom } \pagestyle { fancy } \fancyhf { } \keys_define:nn { sjtu / style } @@ -1601,34 +1611,23 @@ { \addcontentsline } { \caption@iflist { \addcontentsline } { \@gobblethree } } } -\ctex_at_end_package:nn { listings } +\ctex_at_end_package:nn { nomencl } + { \tl_set:Nn \nomname { \SJTU@nomname } } +\ctex_at_end_package:nn { translations } { - \lstdefinestyle { lstStyleCode } + \DeclareLanguage { chinese } + \DeclareLanguageAlias { Chinese } { chinese } + } +\ctex_at_end_package:nn { siunitx } + { + \@ifpackageloaded { translations } { - aboveskip = \medskipamount , - belowskip = \medskipamount , - basicstyle = \ttfamily \zihao { 6 } , - commentstyle = \slshape \color { black!60 } , - stringstyle = \color { green!40!black!100 } , - keywordstyle = \bfseries \color { blue!50!black } , - extendedchars = false , - upquote = true , - tabsize = 2 , - showstringspaces = false , - xleftmargin = 1 em , - xrightmargin = 1 em , - breaklines = false , - framexleftmargin = 1 em , - framexrightmargin = 1 em , - backgroundcolor = \color { gray!10 } , - columns = flexible , - keepspaces = true , - texcl = true , - mathescape = true - } + \DeclareTranslation { Chinese } { and } { 和 } + \DeclareTranslation { Japanese } { and } { と } + \DeclareTranslation { Chinese } { to~(numerical~range) } { \textasciitilde } + \DeclareTranslation { Japanese } { to~(numerical~range) } { \textasciitilde } + } { } } -\ctex_at_end_package:nn { nomencl } - { \tl_set:Nn \nomname { \SJTU@nomname } } \endinput %% %% End of file `sjtuthesis.cls'.