texlive[70134] Master/texmf-dist: fontsetup (24feb24)

[commits+karl at tug.org]

Revision: 70134
          https://tug.org/svn/texlive?view=revision&revision=70134
Author:   karl
Date:     2024-02-24 21:39:34 +0100 (Sat, 24 Feb 2024)
Log Message:
-----------
fontsetup (24feb24)

Modified Paths:
--------------
    trunk/Master/texmf-dist/doc/latex/fontsetup/README
    trunk/Master/texmf-dist/doc/latex/fontsetup/fontsetup-doc.pdf
    trunk/Master/texmf-dist/doc/latex/fontsetup/fontsetup-doc.tex
    trunk/Master/texmf-dist/tex/latex/fontsetup/fontsetup.sty

Modified: trunk/Master/texmf-dist/doc/latex/fontsetup/README
===================================================================
--- trunk/Master/texmf-dist/doc/latex/fontsetup/README	2024-02-24 20:39:21 UTC (rev 70133)
+++ trunk/Master/texmf-dist/doc/latex/fontsetup/README	2024-02-24 20:39:34 UTC (rev 70134)
@@ -1,5 +1,5 @@
                The fontsetup package
-               (Version 2.1.0, GPL3)
+               (Version 2.1.1, GPL3)
 
 This simple package makes it trivial to switch quickly between 
 different quality fonts supporting Mathematics. 

Modified: trunk/Master/texmf-dist/doc/latex/fontsetup/fontsetup-doc.pdf
===================================================================
(Binary files differ)

Modified: trunk/Master/texmf-dist/doc/latex/fontsetup/fontsetup-doc.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/fontsetup/fontsetup-doc.tex	2024-02-24 20:39:21 UTC (rev 70133)
+++ trunk/Master/texmf-dist/doc/latex/fontsetup/fontsetup-doc.tex	2024-02-24 20:39:34 UTC (rev 70134)
@@ -1,6 +1,8 @@
 \documentclass{book}
 \synctex=1
 \usepackage[default]{fontsetup}
+%\usepackage[fira]{fontsetup}
+%\usepackage{fontsetup}
 \newfontfamily\newcmgreekguillemots[CharacterVariant=4]{NewCM10-Book.otf}
 \newfontfamily\devfont[Script=Devanagari,Language=Marathi]{NewCM10Devanagari-Book.otf}
 \newcommand\leftgrquotes{\char"201C}
@@ -15,8 +17,8 @@
     \textit{by}\\[1ex]
     {\large Antonis Tsolomitis}\\
 University of the Aegean\\ Department of Mathematics\\[1ex]
-	  \textsc{26} December \textsc{2023}\\[1ex]
-	  Version 2.1.0, \textsc{gpl3}
+	  \textsc{24} February \textsc{2024}\\[1ex]
+	  Version 2.1.1, \textsc{gpl3}
   \end{center}
 
   This package is a simple wrapper-type package that makes the setup of fonts easy and

Modified: trunk/Master/texmf-dist/tex/latex/fontsetup/fontsetup.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/fontsetup/fontsetup.sty	2024-02-24 20:39:21 UTC (rev 70133)
+++ trunk/Master/texmf-dist/tex/latex/fontsetup/fontsetup.sty	2024-02-24 20:39:34 UTC (rev 70134)
@@ -1,4 +1,4 @@
-\ProvidesPackage{fontsetup}[2024/1/11 v2.1.0 For easily using font families with mathematics]
+\ProvidesPackage{fontsetup}[2024/2/24 v2.1.1 For easily using font families with mathematics]
 \RequirePackage{iflang}
 \RequirePackage{iftex}
 % Provide a test to know if a 16bits TeX is used.
@@ -27,6 +27,7 @@
 \newif\if at palatino
 \newif\if at msgaramond
 \newif\if at minion
+\newif\if at packagewithoptions
 \newcommand*\greeksetup{%
   \newcommand*\leftgrquotes{\char"201C}%
   \newcommand*\rightgrquotes{\char"201E}%
@@ -80,6 +81,7 @@
   \newcommand*{\regularorbook}{Book}%
   \ncmsetup
   \endgroup
+  \@packagewithoptionstrue
 }
 \DeclareOption{olddefault}{%
   \input{fspolddefault}%
@@ -87,29 +89,30 @@
   \newcommand*{\regularorbook}{Regular}%
   \ncmsetup
   \endgroup
+  \@packagewithoptionstrue
 }
 % Install Cambria as a system font.
 % cambria.ttc, cambriai.ttf, cambriab.ttf, cambriaz.ttf
-\DeclareOption{cambria}{\input{fspcambria}}
-\DeclareOption{concrete}{\input{fspconcrete}}
-\DeclareOption{ebgaramond}{\input{fspebgaramondot}}
-\DeclareOption{erewhon}{\input{fsperewhon}\@erewhontrue}
-\DeclareOption{euler}{\input{fspeulerot}}
-\DeclareOption{fira}{\input{fspfiraot}}
-\DeclareOption{gfsartemisia}{\input{fspgfsartemisiaot}}
-\DeclareOption{gfsdidot}{\input{fspgfsdidotot}}
-\DeclareOption{gfsdidotclassic}{\input{fspgfsdidotclassicot}\@gfstrue}
-\DeclareOption{gfsneohellenic}{\input{fspgfsneohellenicot}}
-\DeclareOption{kerkis}{\input{fspkerkisot}}
-\DeclareOption{libertinus}{\@libertinustrue}
+\DeclareOption{cambria}{\input{fspcambria}\@packagewithoptionstrue}
+\DeclareOption{concrete}{\input{fspconcrete}\@packagewithoptionstrue}
+\DeclareOption{ebgaramond}{\input{fspebgaramondot}\@packagewithoptionstrue}
+\DeclareOption{erewhon}{\input{fsperewhon}\@erewhontrue\@packagewithoptionstrue}
+\DeclareOption{euler}{\input{fspeulerot}\@packagewithoptionstrue}
+\DeclareOption{fira}{\input{fspfiraot}\@packagewithoptionstrue}
+\DeclareOption{gfsartemisia}{\input{fspgfsartemisiaot}\@packagewithoptionstrue}
+\DeclareOption{gfsdidot}{\input{fspgfsdidotot}\@packagewithoptionstrue}
+\DeclareOption{gfsdidotclassic}{\input{fspgfsdidotclassicot}\@gfstrue\@packagewithoptionstrue}
+\DeclareOption{gfsneohellenic}{\input{fspgfsneohellenicot}\@packagewithoptionstrue}
+\DeclareOption{kerkis}{\input{fspkerkisot}\@packagewithoptionstrue}
+\DeclareOption{libertinus}{\@libertinustrue\@packagewithoptionstrue}
 % Install Lucida in TeX tree
-\DeclareOption{lucida}{\input{fsplucidaot}}
+\DeclareOption{lucida}{\input{fsplucidaot}\@packagewithoptionstrue}
 % Install MinionPro and provided fspMinionGreekSmallCaps as system fonts.
-\DeclareOption{minion}{\input{fspminion}\@miniontrue}
+\DeclareOption{minion}{\input{fspminion}\@miniontrue\@packagewithoptionstrue}
 % Install Microsoft Garamond as a system font.
 % Gara.ttf, Garai, Garabd
-\DeclareOption{msgaramond}{\input{fspmsgaramondot}\@msgaramondtrue}
-\DeclareOption{neoeuler}{\input{fspeulerot}}% compatibility
+\DeclareOption{msgaramond}{\input{fspmsgaramondot}\@msgaramondtrue\@packagewithoptionstrue}
+\DeclareOption{neoeuler}{\input{fspeulerot}\@packagewithoptionstrue}% compatibility
 % Not released yet
 % \DeclareOption{neokadmus}{\input{neokadmus}}
 \DeclareOption{oldstandard}{\input{fspoldstandard}%
@@ -116,20 +119,30 @@
   \if at upint
     \setmathfont[StylisticSet=2]{OldStandard-Math.otf}%
   \fi
+  \@packagewithoptionstrue
 }
 % Install Linotype Palatino as a system font.
 % pala.ttf palai, palab, palabi.
 % Install fspPalatinoGreekSmallCaps as a System font.
-\DeclareOption{palatino}{\input{fsppalatinoot}\@palatinotrue}
-\DeclareOption{stixtwo}{\input{fspstixtwoot}}
-\DeclareOption{talos}{\input{fsptalos}}
-\DeclareOption{times}{\input{fsptimesot}}
+\DeclareOption{palatino}{\input{fsppalatinoot}\@palatinotrue\@packagewithoptionstrue}
+\DeclareOption{stixtwo}{\input{fspstixtwoot}\@packagewithoptionstrue}
+\DeclareOption{talos}{\input{fsptalos}\@packagewithoptionstrue}
+\DeclareOption{times}{\input{fsptimesot}\@packagewithoptionstrue}
 \DeclareOption{xcharter}{%
   \input{fspxcharter}%
   \@xchartertrue
+  \@packagewithoptionstrue
 }
 \DeclareOption*{\PackageWarning{fontsetup}{Unknown ‘\CurrentOption’}}
 \ProcessOptions
+\if at packagewithoptions
+\else
+  \input{fspdefault}%
+  \begingroup
+  \newcommand*{\regularorbook}{Book}%
+  \ncmsetup
+  \endgroup
+\fi
 \AtBeginDocument{%
   \if at erewhon
     \RequirePackage{fourier-otf}