From 6b445d147422cd1e537709110c0a67971464a514 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sat, 24 Feb 2024 20:39:34 +0000 Subject: fontsetup (24feb24) git-svn-id: svn://tug.org/texlive/trunk@70134 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/fontsetup/README | 2 +- .../doc/latex/fontsetup/fontsetup-doc.pdf | Bin 565890 -> 566412 bytes .../doc/latex/fontsetup/fontsetup-doc.tex | 6 ++- .../texmf-dist/tex/latex/fontsetup/fontsetup.sty | 55 +++++++++++++-------- 4 files changed, 39 insertions(+), 24 deletions(-) diff --git a/Master/texmf-dist/doc/latex/fontsetup/README b/Master/texmf-dist/doc/latex/fontsetup/README index 1c180e21c18..3c2ec51ef05 100644 --- a/Master/texmf-dist/doc/latex/fontsetup/README +++ b/Master/texmf-dist/doc/latex/fontsetup/README @@ -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. diff --git a/Master/texmf-dist/doc/latex/fontsetup/fontsetup-doc.pdf b/Master/texmf-dist/doc/latex/fontsetup/fontsetup-doc.pdf index 5cedc1ae3b5..68d519c607d 100644 Binary files a/Master/texmf-dist/doc/latex/fontsetup/fontsetup-doc.pdf and b/Master/texmf-dist/doc/latex/fontsetup/fontsetup-doc.pdf differ diff --git a/Master/texmf-dist/doc/latex/fontsetup/fontsetup-doc.tex b/Master/texmf-dist/doc/latex/fontsetup/fontsetup-doc.tex index d33b8d0084f..d8ec1bd3378 100644 --- a/Master/texmf-dist/doc/latex/fontsetup/fontsetup-doc.tex +++ b/Master/texmf-dist/doc/latex/fontsetup/fontsetup-doc.tex @@ -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 diff --git a/Master/texmf-dist/tex/latex/fontsetup/fontsetup.sty b/Master/texmf-dist/tex/latex/fontsetup/fontsetup.sty index 84b374b795a..6656d2a95ff 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/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} -- cgit v1.2.3