From c853ff9c658499b16db581bcdbb2c5fa5ce9d0f4 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Wed, 20 Oct 2021 21:19:39 +0000 Subject: fontsetup (20oct21) git-svn-id: svn://tug.org/texlive/trunk@60816 c570f23f-e606-0410-a88d-b1316a301751 --- .../texmf-dist/tex/latex/fontsetup/fontsetup.sty | 31 +++++++++++++++++----- .../texmf-dist/tex/latex/fontsetup/fspdefault.sty | 2 ++ .../tex/latex/fontsetup/fspolddefault.sty | 2 ++ 3 files changed, 28 insertions(+), 7 deletions(-) (limited to 'Master/texmf-dist/tex/latex/fontsetup') diff --git a/Master/texmf-dist/tex/latex/fontsetup/fontsetup.sty b/Master/texmf-dist/tex/latex/fontsetup/fontsetup.sty index 5a0bb2b50b8..fd33a3ec47a 100644 --- a/Master/texmf-dist/tex/latex/fontsetup/fontsetup.sty +++ b/Master/texmf-dist/tex/latex/fontsetup/fontsetup.sty @@ -47,6 +47,9 @@ \newif\if@upint \DeclareOption{upint}{\@upinttrue} % +\newif\if@varnothing +\DeclareOption{varnothing}{\@varnothingtrue} +% \ProcessOptions %provide a test to know if a 16bits TeX is used. @@ -68,9 +71,17 @@ \RequirePackage{fspdefault} % \if@upint -\setmathfont[StylisticSet=2]{NewCMMath-Book.otf} + \if@varnothing + \setmathfont[StylisticSet=2,CharacterVariant=1]{NewCMMath-Book.otf} + \else + \setmathfont[StylisticSet=2]{NewCMMath-Book.otf} + \fi \else -\setmathfont{NewCMMath-Book.otf} + \if@varnothing + \setmathfont[CharacterVariant=1]{NewCMMath-Book.otf} + \else + \setmathfont{NewCMMath-Book.otf} + \fi \fi % \or @@ -109,14 +120,20 @@ \or \RequirePackage{libertinus-otf} \or -\RequirePackage{fspolddefault} -% + \RequirePackage{fspolddefault} \if@upint -\setmathfont[StylisticSet=2]{NewCMMath-Regular.otf} + \if@varnothing + \setmathfont[StylisticSet=2,CharacterVariant=1]{NewCMMath-Book.otf} + \else + \setmathfont[StylisticSet=2]{NewCMMath-Regular.otf} + \fi \else -\setmathfont{NewCMMath-Regular.otf} + \if@varnothing + \setmathfont[CharacterVariant=1]{NewCMMath-Book.otf} + \else + \setmathfont{NewCMMath-Regular.otf} + \fi \fi -% \fi }{%the user runs 8bit engine \relax} diff --git a/Master/texmf-dist/tex/latex/fontsetup/fspdefault.sty b/Master/texmf-dist/tex/latex/fontsetup/fspdefault.sty index 686a0453947..77148fe43a3 100644 --- a/Master/texmf-dist/tex/latex/fontsetup/fspdefault.sty +++ b/Master/texmf-dist/tex/latex/fontsetup/fspdefault.sty @@ -74,6 +74,8 @@ BoldSlantedFeatures={FakeSlant=0.25}, SmallCapsFeatures={Numbers=OldStyle}]{NewCMMono10-Book.otf} \setmathfont{NewCMMath-Book.otf} +\DeclareOption{varnothing}{\setmathfont[CharacterVariant=1]{NewCMMath-Book.otf}} +\ProcessOptions \newcommand{\tttextsc}[1]{{\ttscshape#1}} % diff --git a/Master/texmf-dist/tex/latex/fontsetup/fspolddefault.sty b/Master/texmf-dist/tex/latex/fontsetup/fspolddefault.sty index 3660ec706e1..ecea2a5026a 100644 --- a/Master/texmf-dist/tex/latex/fontsetup/fspolddefault.sty +++ b/Master/texmf-dist/tex/latex/fontsetup/fspolddefault.sty @@ -64,6 +64,8 @@ BoldSlantedFeatures={FakeSlant=0.25}, SmallCapsFeatures={Numbers=OldStyle}]{NewCMMono10-Regular.otf} \setmathfont{NewCMMath-Regular.otf} +\DeclareOption{varnothing}{\setmathfont[CharacterVariant=1]{NewCMMath-Regular.otf}} +\ProcessOptions \newcommand{\tttextsc}[1]{{\ttscshape#1}} % -- cgit v1.2.3