summaryrefslogtreecommitdiff
path: root/macros/unicodetex/latex/fontsetup-nonfree
diff options
context:
space:
mode:
authorNorbert Preining <norbert@preining.info>2021-05-04 03:01:16 +0000
committerNorbert Preining <norbert@preining.info>2021-05-04 03:01:16 +0000
commit342f2e1be699f5ec70b5b1c35d9cd59798d37304 (patch)
treeb0e2ca800047194391139c36c6f3e3dc3b3d2094 /macros/unicodetex/latex/fontsetup-nonfree
parentbf393e635d1fb55b009da7ade3001c104c7deb48 (diff)
CTAN sync 202105040301
Diffstat (limited to 'macros/unicodetex/latex/fontsetup-nonfree')
-rw-r--r--macros/unicodetex/latex/fontsetup-nonfree/README2
-rw-r--r--macros/unicodetex/latex/fontsetup-nonfree/doc/fontsetup-nonfree-doc.pdfbin294480 -> 300630 bytes
-rw-r--r--macros/unicodetex/latex/fontsetup-nonfree/doc/fontsetup-nonfree-doc.tex10
-rw-r--r--macros/unicodetex/latex/fontsetup-nonfree/fspminion.sty42
-rw-r--r--macros/unicodetex/latex/fontsetup-nonfree/fspmsgaramondot.sty42
-rw-r--r--macros/unicodetex/latex/fontsetup-nonfree/fsppalatinoot.sty26
6 files changed, 102 insertions, 20 deletions
diff --git a/macros/unicodetex/latex/fontsetup-nonfree/README b/macros/unicodetex/latex/fontsetup-nonfree/README
index be697bf46e..5a68a22041 100644
--- a/macros/unicodetex/latex/fontsetup-nonfree/README
+++ b/macros/unicodetex/latex/fontsetup-nonfree/README
@@ -1,5 +1,5 @@
The fontsetup-nonfree package
- (Version 1.01, GPL3)
+ (Version 1.02, GPL3)
This package accompanies fontsetup, and inludes support for nonfree fonts.
diff --git a/macros/unicodetex/latex/fontsetup-nonfree/doc/fontsetup-nonfree-doc.pdf b/macros/unicodetex/latex/fontsetup-nonfree/doc/fontsetup-nonfree-doc.pdf
index 050161c789..071b87711f 100644
--- a/macros/unicodetex/latex/fontsetup-nonfree/doc/fontsetup-nonfree-doc.pdf
+++ b/macros/unicodetex/latex/fontsetup-nonfree/doc/fontsetup-nonfree-doc.pdf
Binary files differ
diff --git a/macros/unicodetex/latex/fontsetup-nonfree/doc/fontsetup-nonfree-doc.tex b/macros/unicodetex/latex/fontsetup-nonfree/doc/fontsetup-nonfree-doc.tex
index 17b83b6e1d..5711b01afc 100644
--- a/macros/unicodetex/latex/fontsetup-nonfree/doc/fontsetup-nonfree-doc.tex
+++ b/macros/unicodetex/latex/fontsetup-nonfree/doc/fontsetup-nonfree-doc.tex
@@ -9,8 +9,8 @@
\textit{by}\\[1ex]
{\large Antonis Tsolomitis}\\
University of the Aegean\\ Department of Mathematics\\[1ex]
- \textsc{29} April \textsc{2021}\\[1ex]
- Version 1.01, \textsc{gpl3}
+ \textsc{3} May \textsc{2021}\\[1ex]
+ Version 1.02, \textsc{gpl3}
\end{center}
This package is part of the fontsetup package but for license issues it has been
@@ -24,6 +24,12 @@ University of the Aegean\\ Department of Mathematics\\[1ex]
\medskip
+\textit{Please note that Greek Small Caps for Linotype Palatino and MinionPro
+ are supported only for} \verb|xelatex|.
+ Users of \verb|lualatex| have to use custom commands as lua does not work with
+ the \verb|ucharclasses| package.
+\medskip
+
\begin{enumerate}
\item Install as system fonts the supplied \verb|fspmnscel.otf|
and \verb|fsplpscel.otf| (in \verb|C:\Windows\Fonts\| on MS-Windows or in
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}
diff --git a/macros/unicodetex/latex/fontsetup-nonfree/fspmsgaramondot.sty b/macros/unicodetex/latex/fontsetup-nonfree/fspmsgaramondot.sty
index 3d3907cb8b..5f50b8bf02 100644
--- a/macros/unicodetex/latex/fontsetup-nonfree/fspmsgaramondot.sty
+++ b/macros/unicodetex/latex/fontsetup-nonfree/fspmsgaramondot.sty
@@ -3,21 +3,53 @@
\defaultfontfeatures{Ligatures=TeX}
%\RequirePackage[garamond]{mathdesign}
+\setmainfont[%
+ NFSSFamily=Garamond,%
+ ItalicFont=Garamond-Italic,%
+ BoldFont=Garamond-Bold,%
+ BoldItalicFont=Garamond-Bold,%
+ SlantedFont=Garamond,%
+ BoldSlantedFont=Garamond-Bold,%
+ SlantedFeatures={FakeSlant=0.25},%
+ BoldSlantedFeatures={FakeSlant=0.25},%
+]{Garamond}
+\newfontfamily{\greekfont}[%
+ ItalicFont=Garamond-Italic,%
+ BoldFont=Garamond-Bold,%
+ BoldItalicFont=Garamond-Bold,%
+ SlantedFont=Garamond,%
+ BoldSlantedFont=Garamond-Bold,%
+ SlantedFeatures={FakeSlant=0.25},%
+ BoldSlantedFeatures={FakeSlant=0.25},%
+]{Garamond}
+\newfontfamily{\defaultfont}[%
+ NFSSFamily=Garamond,%
+ ItalicFont=Garamond-Italic,%
+ BoldFont=Garamond-Bold,%
+ BoldItalicFont=Garamond-Bold,%
+ SlantedFont=Garamond,%
+ BoldSlantedFont=Garamond-Bold,%
+ SlantedFeatures={FakeSlant=0.25},%
+ BoldSlantedFeatures={FakeSlant=0.25},%
+]{Garamond}
-\newfontfamily{\defaultfont}{Garamond}
-\newfontfamily{\greekfont}{Garamond}
+\RequirePackage{iftex}
+\ifxetex
\RequirePackage[Latin, Greek]{ucharclasses}
\setDefaultTransitions{\defaultfont}{}
\setTransitionsForLatin{\defaultfont}{}
\setTransitionsForGreek{\greekfont}{}
+\else
+\relax
+\fi
\RequirePackage{unicode-math}
\setmathfont{Garamond-Math.otf}
\setmathfont[range=\mathup/{num,latin,Latin,greek,Greek}]{Garamond}
-\setmathfont[range=\mathbfup/{num,latin,Latin,greek,Greek}]{Garamond Bold}
-\setmathfont[range=\mathit/{num,latin,Latin,greek,Greek}]{Garamond Italic}
-\setmathfont[range=\mathbfit/{num,latin,Latin,greek,Greek}]{Garamond Bold}
+\setmathfont[range=\mathbfup/{num,latin,Latin,greek,Greek}]{Garamond-Bold}
+\setmathfont[range=\mathit/{num,latin,Latin,greek,Greek}]{Garamond-Italic}
+\setmathfont[range=\mathbfit/{num,latin,Latin,greek,Greek}]{Garamond-Bold}
\endinput
diff --git a/macros/unicodetex/latex/fontsetup-nonfree/fsppalatinoot.sty b/macros/unicodetex/latex/fontsetup-nonfree/fsppalatinoot.sty
index 3487754dde..48528a8880 100644
--- a/macros/unicodetex/latex/fontsetup-nonfree/fsppalatinoot.sty
+++ b/macros/unicodetex/latex/fontsetup-nonfree/fsppalatinoot.sty
@@ -1,14 +1,32 @@
\RequirePackage{fontspec}
\defaultfontfeatures{Ligatures=TeX}
+\setmainfont[SmallCapsFeatures={Numbers=OldStyle},%
+ NFSSFamily=Palatino Linotype,%
+ ItalicFont=PalatinoLinotype-Italic,%
+ BoldFont=PalatinoLinotype-Bold,%
+ BoldItalicFont=PalatinoLinotype-BoldItalic,%
+]{PalatinoLinotype-Roman}
+\newfontfamily{\greekfont}[SmallCapsFont=fsplpscel,
+ ItalicFont=PalatinoLinotype-Italic,%
+ BoldFont=PalatinoLinotype-Bold,%
+ BoldItalicFont=PalatinoLinotype-BoldItalic,%
+]{PalatinoLinotype-Roman}
+\newfontfamily{\defaultfont}[SmallCapsFeatures={Numbers=OldStyle},%
+ NFSSFamily=Palatino Linotype,%
+ ItalicFont=PalatinoLinotype-Italic,%
+ BoldFont=PalatinoLinotype-Bold,%
+ BoldItalicFont=PalatinoLinotype-BoldItalic,%
+]{PalatinoLinotype-Roman}
-\newfontfamily{\defaultfont}[SmallCapsFeatures={Numbers=OldStyle}]{Palatino Linotype}
-
-\newfontfamily{\greekfont}[SmallCapsFont=fsplpscel]{Palatino Linotype}
-
+\RequirePackage{iftex}
+\ifxetex
\RequirePackage[Latin, Greek]{ucharclasses}
\setDefaultTransitions{\defaultfont}{}
\setTransitionsForLatin{\defaultfont}{}
\setTransitionsForGreek{\greekfont}{}
+\else
+\relax
+\fi
\RequirePackage{unicode-math}
\setmathfont{texgyrepagella-math.otf}