Update 20210228195018

stawary · Jun 3, 2021 · ea4e49d · ea4e49d
1 parent 99e7de4
commit ea4e49d
Show file tree

Hide file tree

Showing 10 changed files with 96 additions and 101 deletions.
diff --git a/texmf/tex/latex/sjtuthesis/fd/sjtu-math-font-cambria.def b/texmf/tex/latex/sjtuthesis/fd/sjtu-math-font-cambria.def
@@ -28,7 +28,7 @@
 \setmathfont{Cambria Math}
 \setmathrm{Cambria}
 \setmathsf{Calibri}
-\setmathtt[Scale = MatchLowercase]{Consolas}
+\setmathtt[Scale=MatchLowercase]{Consolas}
 \endinput
 %%
 %% End of file `sjtu-math-font-cambria.def'.
diff --git a/texmf/tex/latex/sjtuthesis/fd/sjtu-math-font-pagella.def b/texmf/tex/latex/sjtuthesis/fd/sjtu-math-font-pagella.def
@@ -48,8 +48,6 @@
     Ligatures      = CommonOff,
   ]{texgyrecursor}
 \else
-  \RequirePackage{amssymb}
-  \RequirePackage{upgreek}
   \let\oldencodingdefault\encodingdefault
   \let\oldrmdefault\rmdefault
   \let\oldsfdefault\sfdefault

diff --git a/texmf/tex/latex/sjtuthesis/fd/sjtu-math-font-stix2.def b/texmf/tex/latex/sjtuthesis/fd/sjtu-math-font-stix2.def
@@ -23,53 +23,47 @@
 %% 
 \ProvidesFile{sjtu-math-font-stix2.def}
   [2020/07/31 1.0.0rc7 STIX Two math fonts definition (SJTUThesis)]
-\ifsjtu@unimath
-  \setmathfont{STIX2Math}[
-    Extension    = .otf,
-    StylisticSet = 8,
-  ]
-  \setmathfont{STIX2Math}[
-    Extension    = .otf,
-    StylisticSet = 1,
-    range        = {scr,bfscr},
-  ]
+\sjtu@unimathtrue
+\RequirePackage{unicode-math}
+\IfFontExistsTF{STIXTwoMath-Regular.otf}{
+  \setmathfont[StylisticSet=8]{STIXTwoMath-Regular.otf}
+  \setmathfont[range={scr,bfscr},StylisticSet=1]{STIXTwoMath-Regular.otf}
+}{
+  \setmathfont[StylisticSet=8]{STIX2Math.otf}
+  \setmathfont[range={scr,bfscr},StylisticSet=1]{STIX2Math.otf}
+}
+\IfFontExistsTF{STIXTwoText-Regular.otf}{
   \setmathrm[
     Extension      = .otf,
     UprightFont    = *-Regular,
     BoldFont       = *-Bold,
     ItalicFont     = *-Italic,
     BoldItalicFont = *-BoldItalic,
-  ]{STIX2Text}
-  \setmathsf[
-    Extension      = .otf,
-    UprightFont    = *-Regular ,
-    ItalicFont     = *-RegularIt ,
-    BoldFont       = *-Bold ,
-    BoldItalicFont = *-BoldIt,
-  ]{SourceSansPro}
-  \setmathtt[
+  ]{STIXTwoText}
+}{
+  \setmathrm[
     Extension      = .otf,
-    UprightFont    = *-Regular ,
-    ItalicFont     = *-RegularIt ,
-    BoldFont       = *-Bold ,
-    BoldItalicFont = *-BoldIt,
-    Scale          = MatchLowercase,
-  ]{SourceCodePro}
-\else
-  \RequirePackage{amssymb}
-  \RequirePackage{upgreek}
-  \let\oldencodingdefault\encodingdefault
-  \let\oldrmdefault\rmdefault
-  \let\oldsfdefault\sfdefault
-  \let\oldttdefault\ttdefault
-  \RequirePackage[T1]{fontenc}
-  \RequirePackage[notext,notextcomp,upint]{stix2}
-  \let\encodingdefault\oldencodingdefault
-  \let\rmdefault\oldrmdefault
-  \let\sfdefault\oldsfdefault
-  \let\ttdefault\oldttdefault
-  \RequirePackage{bm}
-\fi
+    UprightFont    = *-Regular,
+    BoldFont       = *-Bold,
+    ItalicFont     = *-Italic,
+    BoldItalicFont = *-BoldItalic,
+  ]{STIX2Text}
+}
+\setmathsf[
+  Extension      = .otf,
+  UprightFont    = *-Regular ,
+  ItalicFont     = *-RegularIt ,
+  BoldFont       = *-Bold ,
+  BoldItalicFont = *-BoldIt,
+]{SourceSansPro}
+\setmathtt[
+  Extension      = .otf,
+  UprightFont    = *-Regular ,
+  ItalicFont     = *-RegularIt ,
+  BoldFont       = *-Bold ,
+  BoldItalicFont = *-BoldIt,
+  Scale          = MatchLowercase,
+]{SourceCodePro}
 \endinput
 %%
 %% End of file `sjtu-math-font-stix2.def'.
diff --git a/texmf/tex/latex/sjtuthesis/fd/sjtu-math-font-termes.def b/texmf/tex/latex/sjtuthesis/fd/sjtu-math-font-termes.def
@@ -48,8 +48,6 @@
     Ligatures      = CommonOff,
   ]{texgyrecursor}
 \else
-  \RequirePackage{amssymb}
-  \RequirePackage{upgreek}
   \let\oldencodingdefault\encodingdefault
   \let\oldrmdefault\rmdefault
   \let\oldsfdefault\sfdefault

diff --git a/texmf/tex/latex/sjtuthesis/fd/sjtu-math-font-xits.def b/texmf/tex/latex/sjtuthesis/fd/sjtu-math-font-xits.def
@@ -31,20 +31,14 @@
     BoldFont     = XITSMath-Bold,
     StylisticSet = 8,
   ]{XITSMath-Regular}
-  \setmathfont[
-    range        = {cal,bfcal},
-    StylisticSet = 1,
-  ]{XITSMath-Regular.otf}
+  \setmathfont[range={cal,bfcal},StylisticSet=1]{XITSMath-Regular.otf}
 }{
   \setmathfont[
     Extension    = .otf,
     BoldFont     = *bold,
     StylisticSet = 8,
   ]{xits-math}
-  \setmathfont[
-    range        = {cal,bfcal},
-    StylisticSet = 1,
-  ]{xits-math.otf}
+  \setmathfont[range={cal,bfcal},StylisticSet=1]{xits-math.otf}
 }
 \IfFontExistsTF{XITS-Regular.otf}{
   \setmathrm[
@@ -63,21 +57,21 @@
     BoldItalicFont = *-bolditalic,
   ]{xits}
 }
-  \setmathsf[
-    Extension      = .otf,
-    UprightFont    = *-Regular ,
-    ItalicFont     = *-RegularIt ,
-    BoldFont       = *-Bold ,
-    BoldItalicFont = *-BoldIt,
-  ]{SourceSansPro}
-  \setmathtt[
-    Extension      = .otf,
-    UprightFont    = *-Regular ,
-    ItalicFont     = *-RegularIt ,
-    BoldFont       = *-Bold ,
-    BoldItalicFont = *-BoldIt,
-    Scale          = MatchLowercase,
-  ]{SourceCodePro}
+\setmathsf[
+  Extension      = .otf,
+  UprightFont    = *-Regular ,
+  ItalicFont     = *-RegularIt ,
+  BoldFont       = *-Bold ,
+  BoldItalicFont = *-BoldIt,
+]{SourceSansPro}
+\setmathtt[
+  Extension      = .otf,
+  UprightFont    = *-Regular ,
+  ItalicFont     = *-RegularIt ,
+  BoldFont       = *-Bold ,
+  BoldItalicFont = *-BoldIt,
+  Scale          = MatchLowercase,
+]{SourceCodePro}
 \endinput
 %%
 %% End of file `sjtu-math-font-xits.def'.
diff --git a/texmf/tex/latex/sjtuthesis/fd/sjtu-text-font-cambria.def b/texmf/tex/latex/sjtuthesis/fd/sjtu-text-font-cambria.def
@@ -25,7 +25,7 @@
   [2020/07/31 1.0.0rc7 Cambria text fonts definition (SJTUThesis)]
 \setmainfont{Cambria}
 \setsansfont{Calibri}
-\setmonofont[Scale = MatchLowercase]{Consolas}
+\setmonofont[Scale=MatchLowercase]{Consolas}
 \endinput
 %%
 %% End of file `sjtu-text-font-cambria.def'.
diff --git a/texmf/tex/latex/sjtuthesis/fd/sjtu-text-font-stix2.def b/texmf/tex/latex/sjtuthesis/fd/sjtu-text-font-stix2.def
@@ -23,28 +23,38 @@
 %% 
 \ProvidesFile{sjtu-text-font-stix2.def}
   [2020/07/31 1.0.0rc7 STIX Two text fonts definition (SJTUThesis)]
+\IfFontExistsTF{STIXTwoText-Regular.otf}{
   \setmainfont[
     Extension      = .otf,
     UprightFont    = *-Regular,
     BoldFont       = *-Bold,
     ItalicFont     = *-Italic,
     BoldItalicFont = *-BoldItalic,
-  ]{STIX2Text}
-  \setsansfont[
-    Extension      = .otf,
-    UprightFont    = *-Regular ,
-    ItalicFont     = *-RegularIt ,
-    BoldFont       = *-Bold ,
-    BoldItalicFont = *-BoldIt,
-  ]{SourceSansPro}
-  \setmonofont[
+  ]{STIXTwoText}
+}{
+  \setmainfont[
     Extension      = .otf,
-    UprightFont    = *-Regular ,
-    ItalicFont     = *-RegularIt ,
-    BoldFont       = *-Bold ,
-    BoldItalicFont = *-BoldIt,
-    Scale          = MatchLowercase,
-  ]{SourceCodePro}
+    UprightFont    = *-Regular,
+    BoldFont       = *-Bold,
+    ItalicFont     = *-Italic,
+    BoldItalicFont = *-BoldItalic,
+  ]{STIX2Text}
+}
+\setsansfont[
+  Extension      = .otf,
+  UprightFont    = *-Regular ,
+  ItalicFont     = *-RegularIt ,
+  BoldFont       = *-Bold ,
+  BoldItalicFont = *-BoldIt,
+]{SourceSansPro}
+\setmonofont[
+  Extension      = .otf,
+  UprightFont    = *-Regular ,
+  ItalicFont     = *-RegularIt ,
+  BoldFont       = *-Bold ,
+  BoldItalicFont = *-BoldIt,
+  Scale          = MatchLowercase,
+]{SourceCodePro}
 \endinput
 %%
 %% End of file `sjtu-text-font-stix2.def'.
diff --git a/texmf/tex/latex/sjtuthesis/fd/sjtu-text-font-times.def b/texmf/tex/latex/sjtuthesis/fd/sjtu-text-font-times.def
@@ -23,9 +23,9 @@
 %% 
 \ProvidesFile{sjtu-text-font-times.def}
   [2020/07/31 1.0.0rc7 Times text fonts definition (SJTUThesis)]
-\setmainfont[Ligatures = Rare]{Times New Roman}
+\setmainfont[Ligatures=Rare]{Times New Roman}
 \setsansfont{Arial}
-\setmonofont[Scale = MatchLowercase]{Courier New}
+\setmonofont[Scale=MatchLowercase]{Courier New}
 \endinput
 %%
 %% End of file `sjtu-text-font-times.def'.
diff --git a/texmf/tex/latex/sjtuthesis/fd/sjtu-text-font-xits.def b/texmf/tex/latex/sjtuthesis/fd/sjtu-text-font-xits.def
@@ -40,21 +40,21 @@
     BoldItalicFont = *-bolditalic,
   ]{xits}
 }
-  \setsansfont[
-    Extension      = .otf,
-    UprightFont    = *-Regular ,
-    ItalicFont     = *-RegularIt ,
-    BoldFont       = *-Bold ,
-    BoldItalicFont = *-BoldIt,
-  ]{SourceSansPro}
-  \setmonofont[
-    Extension      = .otf,
-    UprightFont    = *-Regular ,
-    ItalicFont     = *-RegularIt ,
-    BoldFont       = *-Bold ,
-    BoldItalicFont = *-BoldIt,
-    Scale          = MatchLowercase,
-  ]{SourceCodePro}
+\setsansfont[
+  Extension      = .otf,
+  UprightFont    = *-Regular ,
+  ItalicFont     = *-RegularIt ,
+  BoldFont       = *-Bold ,
+  BoldItalicFont = *-BoldIt,
+]{SourceSansPro}
+\setmonofont[
+  Extension      = .otf,
+  UprightFont    = *-Regular ,
+  ItalicFont     = *-RegularIt ,
+  BoldFont       = *-Bold ,
+  BoldItalicFont = *-BoldIt,
+  Scale          = MatchLowercase,
+]{SourceCodePro}
 \endinput
 %%
 %% End of file `sjtu-text-font-xits.def'.
diff --git a/texmf/tex/latex/sjtuthesis/sjtuthesis.cls b/texmf/tex/latex/sjtuthesis/sjtuthesis.cls
@@ -1051,6 +1051,7 @@
   \sjtu@package@conflict{unicode-math}{eucal}
   \sjtu@package@conflict{unicode-math}{eufrak}
   \sjtu@package@conflict{unicode-math}{mathrsfs}
+  \sjtu@package@conflict{unicode-math}{upgreek}
 }
 \AtEndOfPackageFile*{siunitx}{
   \sisetup{