diff options
Diffstat (limited to 'Master/texmf-dist/tex')
-rw-r--r-- | Master/texmf-dist/tex/latex/fontsetup/fontsetup.sty | 63 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/fontsetup/fspdefault.tex | 2 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/fontsetup/fspolddefault.tex | 2 |
3 files changed, 44 insertions, 23 deletions
diff --git a/Master/texmf-dist/tex/latex/fontsetup/fontsetup.sty b/Master/texmf-dist/tex/latex/fontsetup/fontsetup.sty index 42cc65f7793..659263a5291 100644 --- a/Master/texmf-dist/tex/latex/fontsetup/fontsetup.sty +++ b/Master/texmf-dist/tex/latex/fontsetup/fontsetup.sty @@ -1,4 +1,4 @@ -\ProvidesPackage{fontsetup}[2024/9/08 v2.2.0 For easily using font families with mathematics] +\ProvidesPackage{fontsetup}[2024/9/11 v2.2.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}% @@ -45,28 +46,36 @@ \if@varnothing \if@newcmbb \setmathfont[StylisticSet=2,StylisticSet=3,CharacterVariant=1]{NewCMMath-\regularorbook.otf}% + \setmathfont[version=bold,StylisticSet=2,StylisticSet=3,CharacterVariant=1]{NewCMMath-Bold.otf}% \else \setmathfont[StylisticSet=2,CharacterVariant=1]{NewCMMath-\regularorbook.otf}% + \setmathfont[version=bold,StylisticSet=2,CharacterVariant=1]{NewCMMath-Bold.otf}% \fi \else \if@newcmbb \setmathfont[StylisticSet=2,StylisticSet=3]{NewCMMath-\regularorbook.otf}% + \setmathfont[version=bold,StylisticSet=2,StylisticSet=3]{NewCMMath-Bold.otf}% \else \setmathfont[StylisticSet=2]{NewCMMath-\regularorbook.otf}% + \setmathfont[version=bold,StylisticSet=2]{NewCMMath-Bold.otf}% \fi \fi \else \if@varnothing \if@newcmbb \setmathfont[StylisticSet=3,CharacterVariant=1]{NewCMMath-\regularorbook.otf}% + \setmathfont[version=bold,StylisticSet=3,CharacterVariant=1]{NewCMMath-Bold.otf}% \else \setmathfont[CharacterVariant=1]{NewCMMath-\regularorbook.otf}% + \setmathfont[version=bold,CharacterVariant=1]{NewCMMath-Bold.otf}% \fi \else \if@newcmbb \setmathfont[StylisticSet=3]{NewCMMath-\regularorbook.otf}% + \setmathfont[version=bold,StylisticSet=3]{NewCMMath-Bold.otf}% \else \setmathfont{NewCMMath-\regularorbook.otf}% + \setmathfont[version=bold]{NewCMMath-Bold.otf}% \fi \fi \fi @@ -80,6 +89,7 @@ \newcommand*{\regularorbook}{Book}% \ncmsetup \endgroup + \@packagewithoptionstrue } \DeclareOption{olddefault}{% \input{fspolddefault}% @@ -87,49 +97,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} diff --git a/Master/texmf-dist/tex/latex/fontsetup/fspdefault.tex b/Master/texmf-dist/tex/latex/fontsetup/fspdefault.tex index 6453568639f..7b72ba65e4a 100644 --- a/Master/texmf-dist/tex/latex/fontsetup/fspdefault.tex +++ b/Master/texmf-dist/tex/latex/fontsetup/fspdefault.tex @@ -94,8 +94,8 @@ SmallCapsFeatures={Numbers=OldStyle}]{NewCMMono10-Book.otf} ]{NewCMUncial10-Book.otf} \newcommand{\textuncial}[1]{{\uncial #1}} \setmathfont{NewCMMath-Book.otf} -\setmathfont{NewCMMath-Bold.otf}[version=bold] \setmathfont[range={\mathscr,\mathbfscr},StylisticSet=1]{NewCMMath-Book.otf} +\setmathfont{NewCMMath-Bold.otf}[version=bold] \newcommand{\tttextsc}[1]{{\ttscshape#1}} % \let\prosgegrammeni=\undefined diff --git a/Master/texmf-dist/tex/latex/fontsetup/fspolddefault.tex b/Master/texmf-dist/tex/latex/fontsetup/fspolddefault.tex index 796f3c21330..4b27d42e45a 100644 --- a/Master/texmf-dist/tex/latex/fontsetup/fspolddefault.tex +++ b/Master/texmf-dist/tex/latex/fontsetup/fspolddefault.tex @@ -98,8 +98,8 @@ SmallCapsFeatures={Numbers=OldStyle}]{NewCMMono10-Regular.otf} \newcommand{\textuncial}[1]{{\uncial #1}} \setmathfont{NewCMMath-Regular.otf} -\setmathfont{NewCMMath-Bold.otf}[version=bold] \setmathfont[range={\mathscr,\mathbfscr},StylisticSet=1]{NewCMMath-Regular.otf} +\setmathfont{NewCMMath-Bold.otf}[version=bold] \newcommand{\tttextsc}[1]{{\ttscshape#1}} % |