summaryrefslogtreecommitdiff
path: root/macros/unicodetex/latex/fontsetup-nonfree/fspminion.sty
diff options
context:
space:
mode:
Diffstat (limited to 'macros/unicodetex/latex/fontsetup-nonfree/fspminion.sty')
-rw-r--r--macros/unicodetex/latex/fontsetup-nonfree/fspminion.sty42
1 files changed, 34 insertions, 8 deletions
diff --git a/macros/unicodetex/latex/fontsetup-nonfree/fspminion.sty b/macros/unicodetex/latex/fontsetup-nonfree/fspminion.sty
index 47e5eab3fe..292f3dd7a2 100644
--- a/macros/unicodetex/latex/fontsetup-nonfree/fspminion.sty
+++ b/macros/unicodetex/latex/fontsetup-nonfree/fspminion.sty
@@ -3,18 +3,44 @@
\RequirePackage{fontspec}
\defaultfontfeatures{Ligatures=TeX}
-\setmainfont[SmallCapsFeatures={Numbers=OldStyle}]{Minion Pro}
-\setsansfont[SmallCapsFeatures={Numbers=OldStyle}]{Myriad Pro}
-\newfontfamily{\defaultfont}[SmallCapsFeatures={Numbers=OldStyle}]{Minion Pro}
-\newfontfamily{\greekfont}[SmallCapsFont=fspmnscel]{Minion Pro}
+\setmainfont[SmallCapsFeatures={Numbers=OldStyle},%
+ NFSSFamily=MinionPro,%
+ ItalicFont=MinionPro-It,%
+ BoldFont=MinionPro-Bold,%
+ BoldItalicFont=MinionPro-BoldIt,%
+]{MinionPro-Regular}
+\setsansfont[SmallCapsFeatures={Numbers=OldStyle},%
+ NFSSFamily=MyriadPro,%
+ ItalicFont=MyriadPro-It,%
+ BoldFont=MyriadPro-Bold,%
+ BoldItalicFont=MyriadPro-BoldIt,%
+]{MyriadPro-Regular}
+\newfontfamily{\greekfont}[SmallCapsFont=fspmnscel,%
+ ItalicFont=MinionPro-It,%
+ BoldFont=MinionPro-Bold,%
+ BoldItalicFont=MinionPro-BoldIt,%
+]{MinionPro-Regular}
+
+\newfontfamily{\defaultfont}[SmallCapsFeatures={Numbers=OldStyle},%
+ NFSSFamily=MinionPro,%
+ ItalicFont=MinionPro-It,%
+ BoldFont=MinionPro-Bold,%
+ BoldItalicFont=MinionPro-BoldIt,%
+]{MinionPro-Regular}
+\RequirePackage{iftex}
+\ifxetex
\RequirePackage[Latin, Greek]{ucharclasses}
\setDefaultTransitions{\defaultfont}{}
\setTransitionsForLatin{\defaultfont}{}
\setTransitionsForGreek{\greekfont}{}
+\else
+\relax
+\fi
+
\RequirePackage{unicode-math}
\setmathfont{STIXTwoMath-Regular.otf}
-\setmathfont[range=\mathup/{num,latin,Latin,greek,Greek}]{Minion Pro}
-\setmathfont[range=\mathbfup/{num,latin,Latin,greek,Greek}]{Minion Pro Bold}
-\setmathfont[range=\mathit/{num,latin,Latin,greek,Greek}]{Minion Pro Italic}
-\setmathfont[range=\mathbfit/{num,latin,Latin,greek,Greek}]{Minion Pro Bold Italic}
+\setmathfont[range=\mathup/{num,latin,Latin,greek,Greek}]{MinionPro-Regular}
+\setmathfont[range=\mathbfup/{num,latin,Latin,greek,Greek}]{MinionPro-Bold}
+\setmathfont[range=\mathit/{num,latin,Latin,greek,Greek}]{MinionPro-It}
+\setmathfont[range=\mathbfit/{num,latin,Latin,greek,Greek}]{MinionPro-BoldIt}