CTAN sync 202105040301

21 files changed, 105 insertions, 120 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
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}
diff --git a/macros/unicodetex/latex/fontsetup/README b/macros/unicodetex/latex/fontsetup/README
index 4a44a55be8..d6b9fbda54 100644
--- a/macros/unicodetex/latex/fontsetup/README
+++ b/macros/unicodetex/latex/fontsetup/README
@@ -1,5 +1,5 @@
                The fontsetup package
-               (Version 1.01, GPL3)
+               (Version 1.02, GPL3)
 
 This simple package makes it trivial to switch quickly between 
 different quality fonts supporting Mathematics. 
diff --git a/macros/unicodetex/latex/fontsetup/doc/fontsetup-doc.pdf b/macros/unicodetex/latex/fontsetup/doc/fontsetup-doc.pdf
index 88a39bf5cd..720e85cb92 100644
--- a/macros/unicodetex/latex/fontsetup/doc/fontsetup-doc.pdf
+++ b/macros/unicodetex/latex/fontsetup/doc/fontsetup-doc.pdf
diff --git a/macros/unicodetex/latex/fontsetup/doc/fontsetup-doc.tex b/macros/unicodetex/latex/fontsetup/doc/fontsetup-doc.tex
index f8b31a2b97..3618ae8d75 100644
--- a/macros/unicodetex/latex/fontsetup/doc/fontsetup-doc.tex
+++ b/macros/unicodetex/latex/fontsetup/doc/fontsetup-doc.tex
@@ -9,8 +9,8 @@
     \textit{by}\\[1ex]
     {\large Antonis Tsolomitis}\\
 University of the Aegean\\ Department of Mathematics\\[1ex]
-	  \textsc{29} January \textsc{2021}\\[1ex]
-	  Version 1.01, \textsc{gpl3}
+	  \textsc{3} May \textsc{2021}\\[1ex]
+	  Version 1.02, \textsc{gpl3}
   \end{center}
 
   This package is a simple wrapper-type package that makes the setup of fonts easy and
diff --git a/macros/unicodetex/latex/fontsetup/doc/fspsample-cambria.pdf b/macros/unicodetex/latex/fontsetup/doc/fspsample-cambria.pdf
deleted file mode 100644
index f003f22208..0000000000
--- a/macros/unicodetex/latex/fontsetup/doc/fspsample-cambria.pdf
+++ /dev/null
diff --git a/macros/unicodetex/latex/fontsetup/doc/fspsample-lucida.pdf b/macros/unicodetex/latex/fontsetup/doc/fspsample-lucida.pdf
deleted file mode 100644
index bebf3ceff9..0000000000
--- a/macros/unicodetex/latex/fontsetup/doc/fspsample-lucida.pdf
+++ /dev/null
diff --git a/macros/unicodetex/latex/fontsetup/doc/fspsample-minion.pdf b/macros/unicodetex/latex/fontsetup/doc/fspsample-minion.pdf
deleted file mode 100644
index ef26ae6481..0000000000
--- a/macros/unicodetex/latex/fontsetup/doc/fspsample-minion.pdf
+++ /dev/null
diff --git a/macros/unicodetex/latex/fontsetup/doc/fspsample-msgaramond.pdf b/macros/unicodetex/latex/fontsetup/doc/fspsample-msgaramond.pdf
deleted file mode 100644
index e411c077d6..0000000000
--- a/macros/unicodetex/latex/fontsetup/doc/fspsample-msgaramond.pdf
+++ /dev/null
diff --git a/macros/unicodetex/latex/fontsetup/doc/fspsample-palatino.pdf b/macros/unicodetex/latex/fontsetup/doc/fspsample-palatino.pdf
deleted file mode 100644
index 48644e576d..0000000000
--- a/macros/unicodetex/latex/fontsetup/doc/fspsample-palatino.pdf
+++ /dev/null
diff --git a/macros/unicodetex/latex/fontsetup/fspcambria.sty b/macros/unicodetex/latex/fontsetup/fspcambria.sty
deleted file mode 100644
index b2947bb3d6..0000000000
--- a/macros/unicodetex/latex/fontsetup/fspcambria.sty
+++ /dev/null
@@ -1,9 +0,0 @@
-%%
-%% Load Cambria fonts (C) A. Tsolomitis
-%%
-\RequirePackage{fontspec}
-\setmainfont[Contextuals=AlternateOff,BoldFont=Cambria-Bold,ItalicFont=Cambria-Italic,BoldItalicFont=Cambria-BoldItalic]{Cambria}
-\RequirePackage{unicode-math}
-\setmathfont{Cambria Math}
-
-\endinput
diff --git a/macros/unicodetex/latex/fontsetup/fsplucidaot.sty b/macros/unicodetex/latex/fontsetup/fsplucidaot.sty
deleted file mode 100644
index 2287f48685..0000000000
--- a/macros/unicodetex/latex/fontsetup/fsplucidaot.sty
+++ /dev/null
@@ -1,28 +0,0 @@
-\RequirePackage{fontspec}
-\setmainfont[% main font
-	 UprightFont=LucidaBrightOT,
-         ItalicFont=LucidaBrightOT-Italic,
-	 BoldFont=LucidaBrightOT-Demi,
-	 BoldItalicFont=LucidaBrightOT-DemiItalic,
-         SmallCapsFeatures={Numbers=OldStyle},	 
-         ]{LucidaBrightOT.otf}
-\setsansfont[%
- UprightFont=LucidaSansOT,
- ItalicFont=LucidaSansOT-Italic,
- BoldFont=LucidaSansOT-Demi,
- BoldItalicFont=LucidaSansOT-DemiItalic,
- SmallCapsFeatures={Numbers=OldStyle},	 
-]{LucidaSansOT.otf}
-% 
-\setmonofont[%
- UprightFont=LucidaSansTypewriterOT,
- ItalicFont=LucidaSansTypewriterOT-Oblique,
- BoldFont=LucidaSansTypewriterOT-Bold,
- BoldItalicFont=LucidaSansTypewriterOT-BoldOblique,
- SmallCapsFeatures={Numbers=OldStyle},	 
-	]{LucidaSansTypewriterOT.otf}
-% support for OpenType math fonts:
-\RequirePackage{unicode-math}
-\setmathfont{LucidaBrightMathOT.otf}
-\setmathfont[version=bold]{LucidaBrightMathOT-Demi.otf}
-
diff --git a/macros/unicodetex/latex/fontsetup/fspminion.sty b/macros/unicodetex/latex/fontsetup/fspminion.sty
deleted file mode 100644
index 47e5eab3fe..0000000000
--- a/macros/unicodetex/latex/fontsetup/fspminion.sty
+++ /dev/null
@@ -1,20 +0,0 @@
-
-
-
-\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}
-\RequirePackage[Latin, Greek]{ucharclasses}
-\setDefaultTransitions{\defaultfont}{}
-\setTransitionsForLatin{\defaultfont}{}
-\setTransitionsForGreek{\greekfont}{}
-
-\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}
diff --git a/macros/unicodetex/latex/fontsetup/fspmsgaramondot.sty b/macros/unicodetex/latex/fontsetup/fspmsgaramondot.sty
deleted file mode 100644
index 3d3907cb8b..0000000000
--- a/macros/unicodetex/latex/fontsetup/fspmsgaramondot.sty
+++ /dev/null
@@ -1,23 +0,0 @@
-%\RequirePackage[no-math]{fontspec}
-\RequirePackage{fontspec}
-\defaultfontfeatures{Ligatures=TeX}
-%\RequirePackage[garamond]{mathdesign}
-
-
-\newfontfamily{\defaultfont}{Garamond}
-\newfontfamily{\greekfont}{Garamond}
-
-\RequirePackage[Latin, Greek]{ucharclasses}
-\setDefaultTransitions{\defaultfont}{}
-\setTransitionsForLatin{\defaultfont}{}
-\setTransitionsForGreek{\greekfont}{}
-
-\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}
-
-
-\endinput
diff --git a/macros/unicodetex/latex/fontsetup/fsppalatinoot.sty b/macros/unicodetex/latex/fontsetup/fsppalatinoot.sty
deleted file mode 100644
index 3487754dde..0000000000
--- a/macros/unicodetex/latex/fontsetup/fsppalatinoot.sty
+++ /dev/null
@@ -1,17 +0,0 @@
-\RequirePackage{fontspec}
-\defaultfontfeatures{Ligatures=TeX}
-
-\newfontfamily{\defaultfont}[SmallCapsFeatures={Numbers=OldStyle}]{Palatino Linotype}
-
-\newfontfamily{\greekfont}[SmallCapsFont=fsplpscel]{Palatino Linotype}
-
-\RequirePackage[Latin, Greek]{ucharclasses}
-\setDefaultTransitions{\defaultfont}{}
-\setTransitionsForLatin{\defaultfont}{}
-\setTransitionsForGreek{\greekfont}{}
-
-\RequirePackage{unicode-math}
-\setmathfont{texgyrepagella-math.otf}
-
-
-\endinput
diff --git a/macros/unicodetex/latex/fontsetup/system-install-fonts/fsplpscel.otf b/macros/unicodetex/latex/fontsetup/system-install-fonts/fsplpscel.otf
deleted file mode 100644
index b505b6b96f..0000000000
--- a/macros/unicodetex/latex/fontsetup/system-install-fonts/fsplpscel.otf
+++ /dev/null
diff --git a/macros/unicodetex/latex/fontsetup/system-install-fonts/fspmnscel.otf b/macros/unicodetex/latex/fontsetup/system-install-fonts/fspmnscel.otf
deleted file mode 100644
index c0e233f43c..0000000000
--- a/macros/unicodetex/latex/fontsetup/system-install-fonts/fspmnscel.otf
+++ /dev/null