summaryrefslogtreecommitdiff
path: root/macros/unicodetex/latex/fontsetup/tex/fontsetup.sty
diff options
context:
space:
mode:
Diffstat (limited to 'macros/unicodetex/latex/fontsetup/tex/fontsetup.sty')
-rw-r--r--macros/unicodetex/latex/fontsetup/tex/fontsetup.sty55
1 files changed, 34 insertions, 21 deletions
diff --git a/macros/unicodetex/latex/fontsetup/tex/fontsetup.sty b/macros/unicodetex/latex/fontsetup/tex/fontsetup.sty
index 84b374b795..6656d2a95f 100644
--- a/macros/unicodetex/latex/fontsetup/tex/fontsetup.sty
+++ b/macros/unicodetex/latex/fontsetup/tex/fontsetup.sty
@@ -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@palatino
\newif\if@msgaramond
\newif\if@minion
+\newif\if@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,49 +89,60 @@
\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}%
\if@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@packagewithoptions
+\else
+ \input{fspdefault}%
+ \begingroup
+ \newcommand*{\regularorbook}{Book}%
+ \ncmsetup
+ \endgroup
+\fi
\AtBeginDocument{%
\if@erewhon
\RequirePackage{fourier-otf}