8 files changed, 3 insertions, 40 deletions
diff --git a/texmf-dist/doc/latex/fontsetup-nonfree/README b/texmf-dist/doc/latex/fontsetup-nonfree/README
index 5a68a220..e31a6808 100644
--- a/texmf-dist/doc/latex/fontsetup-nonfree/README
+++ b/texmf-dist/doc/latex/fontsetup-nonfree/README
@@ -1,5 +1,5 @@
                The fontsetup-nonfree package
-               (Version 1.02, GPL3)
+               (Version 2.0, GPL3)
 
 This package accompanies fontsetup, and inludes support for nonfree fonts. 
 
diff --git a/texmf-dist/doc/latex/fontsetup-nonfree/fontsetup-nonfree-doc.pdf b/texmf-dist/doc/latex/fontsetup-nonfree/fontsetup-nonfree-doc.pdf
index 071b8771..89828d7b 100644
--- a/texmf-dist/doc/latex/fontsetup-nonfree/fontsetup-nonfree-doc.pdf
+++ b/texmf-dist/doc/latex/fontsetup-nonfree/fontsetup-nonfree-doc.pdf
diff --git a/texmf-dist/doc/latex/fontsetup-nonfree/fontsetup-nonfree-doc.tex b/texmf-dist/doc/latex/fontsetup-nonfree/fontsetup-nonfree-doc.tex
index 5711b01a..8ba3e055 100644
--- a/texmf-dist/doc/latex/fontsetup-nonfree/fontsetup-nonfree-doc.tex
+++ b/texmf-dist/doc/latex/fontsetup-nonfree/fontsetup-nonfree-doc.tex
@@ -9,8 +9,8 @@
     \textit{by}\\[1ex]
     {\large Antonis Tsolomitis}\\
 University of the Aegean\\ Department of Mathematics\\[1ex]
-	  \textsc{3} May \textsc{2021}\\[1ex]
-	  Version 1.02, \textsc{gpl3}
+	  \textsc{14} December \textsc{2023}\\[1ex]
+	  Version 2.0, \textsc{gpl3}
   \end{center}
 
   This package is part of the fontsetup package but for license issues it has been
diff --git a/texmf-dist/tex/latex/fontsetup-nonfree/fspcambria.sty b/texmf-dist/tex/latex/fontsetup-nonfree/fspcambria.tex
index b2947bb3..8d1d5572 100644
--- a/texmf-dist/tex/latex/fontsetup-nonfree/fspcambria.sty
+++ b/texmf-dist/tex/latex/fontsetup-nonfree/fspcambria.tex
@@ -1,9 +1,7 @@
 %%
 %% 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/texmf-dist/tex/latex/fontsetup-nonfree/fsplucidaot.sty b/texmf-dist/tex/latex/fontsetup-nonfree/fsplucidaot.tex
index 2287f486..b0707c79 100644
--- a/texmf-dist/tex/latex/fontsetup-nonfree/fsplucidaot.sty
+++ b/texmf-dist/tex/latex/fontsetup-nonfree/fsplucidaot.tex
@@ -1,4 +1,3 @@
-\RequirePackage{fontspec}
 \setmainfont[% main font
 	 UprightFont=LucidaBrightOT,
          ItalicFont=LucidaBrightOT-Italic,
@@ -22,7 +21,6 @@
  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/texmf-dist/tex/latex/fontsetup-nonfree/fspminion.sty b/texmf-dist/tex/latex/fontsetup-nonfree/fspminion.tex
index 292f3dd7..1821bf3a 100644
--- a/texmf-dist/tex/latex/fontsetup-nonfree/fspminion.sty
+++ b/texmf-dist/tex/latex/fontsetup-nonfree/fspminion.tex
@@ -1,7 +1,6 @@
 
 
 
-\RequirePackage{fontspec}
 \defaultfontfeatures{Ligatures=TeX}
 \setmainfont[SmallCapsFeatures={Numbers=OldStyle},%
   NFSSFamily=MinionPro,%
@@ -27,18 +26,8 @@
   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}]{MinionPro-Regular} 
 \setmathfont[range=\mathbfup/{num,latin,Latin,greek,Greek}]{MinionPro-Bold} 
diff --git a/texmf-dist/tex/latex/fontsetup-nonfree/fspmsgaramondot.sty b/texmf-dist/tex/latex/fontsetup-nonfree/fspmsgaramondot.tex
index 5f50b8bf..1479678e 100644
--- a/texmf-dist/tex/latex/fontsetup-nonfree/fspmsgaramondot.sty
+++ b/texmf-dist/tex/latex/fontsetup-nonfree/fspmsgaramondot.tex
@@ -1,5 +1,4 @@
 %\RequirePackage[no-math]{fontspec}
-\RequirePackage{fontspec}
 \defaultfontfeatures{Ligatures=TeX}
 %\RequirePackage[garamond]{mathdesign}
 
@@ -34,17 +33,7 @@
 ]{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} 
diff --git a/texmf-dist/tex/latex/fontsetup-nonfree/fsppalatinoot.sty b/texmf-dist/tex/latex/fontsetup-nonfree/fsppalatinoot.tex
index 48528a88..6f3b4e07 100644
--- a/texmf-dist/tex/latex/fontsetup-nonfree/fsppalatinoot.sty
+++ b/texmf-dist/tex/latex/fontsetup-nonfree/fsppalatinoot.tex
@@ -1,4 +1,3 @@
-\RequirePackage{fontspec}
 \defaultfontfeatures{Ligatures=TeX}
 \setmainfont[SmallCapsFeatures={Numbers=OldStyle},%
   NFSSFamily=Palatino Linotype,%
@@ -18,17 +17,7 @@
   BoldItalicFont=PalatinoLinotype-BoldItalic,%
 ]{PalatinoLinotype-Roman}
 
-\RequirePackage{iftex}
-\ifxetex
-\RequirePackage[Latin, Greek]{ucharclasses}
-\setDefaultTransitions{\defaultfont}{}
-\setTransitionsForLatin{\defaultfont}{}
-\setTransitionsForGreek{\greekfont}{}
-\else
-\relax
-\fi
 
-\RequirePackage{unicode-math}
 \setmathfont{texgyrepagella-math.otf}