diff options
author | Karl Berry <karl@freefriends.org> | 2021-05-01 20:55:30 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2021-05-01 20:55:30 +0000 |
commit | 957ed4d9e1b52b52fd6dc62565d951e9b4143aaa (patch) | |
tree | 95e1b485fd39a20bcccb616022de1e3f34c38fe2 /Master/texmf-dist/tex | |
parent | 73598aeaa5e671b77a4d565db2eae53e59cb4752 (diff) |
fontsetup (1may21)
git-svn-id: svn://tug.org/texlive/trunk@59042 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex')
-rw-r--r-- | Master/texmf-dist/tex/latex/fontsetup/fspdefault.sty | 111 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/fontsetup/fspolddefault.sty | 97 |
2 files changed, 148 insertions, 60 deletions
diff --git a/Master/texmf-dist/tex/latex/fontsetup/fspdefault.sty b/Master/texmf-dist/tex/latex/fontsetup/fspdefault.sty index da0a494155c..686a0453947 100644 --- a/Master/texmf-dist/tex/latex/fontsetup/fspdefault.sty +++ b/Master/texmf-dist/tex/latex/fontsetup/fspdefault.sty @@ -2,22 +2,66 @@ \RequirePackage{fontspec} \RequirePackage{unicode-math} \setmainfont[% -ItalicFont=NewCM10-BookItalic.otf,% -BoldFont=NewCM10-Bold.otf,% -BoldItalicFont=NewCM10-BoldItalic.otf,% -SlantedFont=NewCM10-Book.otf,% -SlantedFeatures={FakeSlant=0.25}, -BoldSlantedFont=NewCM10-Bold.otf,% -BoldSlantedFeatures={FakeSlant=0.25}, -SmallCapsFeatures={Numbers=OldStyle}]{NewCM10-Book.otf} + SizeFeatures={% +{Size=-8, Font=NewCM08-Book.otf, + ItalicFont=NewCM08-BookItalic.otf,% + BoldFont=NewCM10-Bold.otf,% + BoldItalicFont=NewCM10-BoldItalic.otf,% + SlantedFont=NewCM08-Book.otf,% + BoldSlantedFont=NewCM10-Bold.otf,% + SmallCapsFeatures={Numbers=OldStyle}}, +{Size=8, Font=NewCM08-Book.otf, + ItalicFont=NewCM08-BookItalic.otf,% + BoldFont=NewCM10-Bold.otf,% + BoldItalicFont=NewCM10-BoldItalic.otf,% + SlantedFont=NewCM08-Book.otf,% + BoldSlantedFont=NewCM10-Bold.otf,% + SmallCapsFeatures={Numbers=OldStyle}}, +{Size= 9-, Font = NewCM10-Book.otf, + ItalicFont=NewCM10-BookItalic.otf,% + BoldFont=NewCM10-Bold.otf,% + BoldItalicFont=NewCM10-BoldItalic.otf,% + SlantedFont=NewCM10-Book.otf,% + BoldSlantedFont=NewCM10-Bold.otf,% + SmallCapsFeatures={Numbers=OldStyle}}% + },% + SmallCapsFeatures={Numbers=OldStyle},% + BoldSlantedFont=NewCM10-Bold.otf,% + SlantedFont=NewCM10-Book.otf,% + BoldItalicFont=NewCM10-BoldItalic.otf,% + BoldFont=NewCM10-Bold.otf,% + ItalicFont=NewCM10-BookItalic.otf,% + SlantedFeatures={FakeSlant=0.25},% + BoldSlantedFeatures={FakeSlant=0.25},% +]{NewCM10-Book.otf} \setsansfont[% -ItalicFont=NewCMSans10-BookOblique.otf,% -BoldFont=NewCMSans10-Bold.otf,% -BoldItalicFont=NewCMSans10-BoldOblique.otf,% -SlantedFont=NewCMSans10-BookOblique.otf,% -BoldSlantedFont=NewCMSans10-BoldOblique.otf,% -SmallCapsFeatures={Numbers=OldStyle}]{NewCMSans10-Book.otf} + SizeFeatures={% +{Size= -8, Font=NewCMSans08-Book.otf,% + ItalicFont=NewCMSans08-BookOblique.otf,% + BoldFont=NewCMSans10-Bold.otf,% + BoldItalicFont=NewCMSans10-BoldOblique.otf,% + SmallCapsFeatures={Numbers=OldStyle},% +}, +{Size= 8, Font=NewCMSans08-Book.otf,% + ItalicFont=NewCMSans08-BookOblique.otf,% + BoldFont=NewCMSans10-Bold.otf,% + BoldItalicFont=NewCMSans10-BoldOblique.otf,% + SmallCapsFeatures={Numbers=OldStyle},% +}, +{Size= 9-, Font=NewCMSans10-Book.otf,% + ItalicFont=NewCMSans10-BookOblique.otf,% + BoldFont=NewCMSans10-Bold.otf,% + BoldItalicFont=NewCMSans10-BoldOblique.otf,% + SmallCapsFeatures={Numbers=OldStyle},% +}}, + ItalicFont=NewCMSans10-BookOblique.otf,% + BoldFont=NewCMSans10-Bold.otf,% + BoldItalicFont=NewCMSans10-BoldOblique.otf,% + SmallCapsFeatures={Numbers=OldStyle},% + SlantedFont=NewCMSans10-BookOblique.otf,% + BoldSlantedFont=NewCMSans10-BoldOblique.otf,% +]{NewCMSans10-Book.otf} \setmonofont[% ItalicFont=NewCMMono10-BookItalic.otf,% @@ -36,13 +80,16 @@ SmallCapsFeatures={Numbers=OldStyle}]{NewCMMono10-Book.otf} \newcommand{\prosgegrammeni}{\addfontfeature{StylisticSet=1}} \newcommand{\textprosgegrammeni}[1]{{\prosgegrammeni#1}} % -\newfontfamily{\ivbce}[StylisticSet=2]{NewCMSans10-Book.otf} +%\newfontfamily{\ivbce}[StylisticSet=2]{NewCMSans10-Book.otf} +\newcommand{\ivbce}{\sffamily\addfontfeature{StylisticSet=2}} \newcommand{\textivbce}[1]{{\ivbce#1}} % -\newfontfamily{\ivbcealt}[StylisticSet=3]{NewCMSans10-Book.otf} +%\newfontfamily{\ivbcealt}[StylisticSet=3]{NewCMSans10-Book.otf} +\newcommand{\ivbcealt}{\sffamily\addfontfeature{StylisticSet=3}} \newcommand{\textivbcealt}[1]{{\ivbcealt#1}} % -\newfontfamily{\vibce}[StylisticSet=4]{NewCMSans10-Book.otf} +%\newfontfamily{\vibce}[StylisticSet=4]{NewCMSans10-Book.otf} +\newcommand{\vibce}{\sffamily\addfontfeature{StylisticSet=4}} \newcommand{\textvibce}[1]{{\vibce#1}} % %% math (upright) sans Greek @@ -233,19 +280,21 @@ SmallCapsFeatures={Numbers=OldStyle}]{NewCMMono10-Book.otf} \DeclareRobustCommand\nleftleftarrows{\mathrel{\char"E032}} % % select ss02 lookup table for IPA symbols -\newfontfamily{\ipatext}[StylisticSet=5,% -BoldFont=NewCM10-Bold.otf,% -SlantedFont=NewCM10-Regular.otf,% -SlantedFeatures={FakeSlant=0.25}, -BoldSlantedFont=NewCM10-Bold.otf,% -BoldSlantedFeatures={FakeSlant=0.25}, -SmallCapsFeatures={Numbers=OldStyle}]{NewCM10-Book.otf} +%\newfontfamily{\ipatext}[StylisticSet=5,% +%BoldFont=NewCM10-Bold.otf,% +%SlantedFont=NewCM10-Regular.otf,% +%SlantedFeatures={FakeSlant=0.25}, +%BoldSlantedFont=NewCM10-Bold.otf,% +%BoldSlantedFeatures={FakeSlant=0.25}, +%SmallCapsFeatures={Numbers=OldStyle}]{NewCM10-Book.otf} +\newcommand{\ipatext}{\addfontfeature{StylisticSet=5}} \newcommand{\textipa}[1]{{\ipatext#1}} -\newfontfamily{\ipatextsans}[StylisticSet=5,% -ItalicFont=NewCMSans10-BookOblique.otf,% -BoldFont=NewCMSans10-Bold.otf,% -BoldItalicFont=NewCMSans10-BoldOblique.otf,% -SlantedFont=NewCMSans10-Oblique.otf,% -BoldSlantedFont=NewCMSans10-BoldOblique.otf,% -SmallCapsFeatures={Numbers=OldStyle}]{NewCMSans10-Book.otf} +%\newfontfamily{\ipatextsans}[StylisticSet=5,% +%ItalicFont=NewCMSans10-BookOblique.otf,% +%BoldFont=NewCMSans10-Bold.otf,% +%BoldItalicFont=NewCMSans10-BoldOblique.otf,% +%SlantedFont=NewCMSans10-Oblique.otf,% +%BoldSlantedFont=NewCMSans10-BoldOblique.otf,% +%SmallCapsFeatures={Numbers=OldStyle}]{NewCMSans10-Book.otf} +\newcommand{\ipatextsans}{\sffamily\addfontfeature{StylisticSet=5}} \newcommand{\textsansipa}[1]{{\ipatextsans#1}} diff --git a/Master/texmf-dist/tex/latex/fontsetup/fspolddefault.sty b/Master/texmf-dist/tex/latex/fontsetup/fspolddefault.sty index 1c52a8ff0c0..3660ec706e1 100644 --- a/Master/texmf-dist/tex/latex/fontsetup/fspolddefault.sty +++ b/Master/texmf-dist/tex/latex/fontsetup/fspolddefault.sty @@ -2,22 +2,56 @@ \RequirePackage{fontspec} \RequirePackage{unicode-math} \setmainfont[% -ItalicFont=NewCM10-Italic.otf,% -BoldFont=NewCM10-Bold.otf,% -BoldItalicFont=NewCM10-BoldItalic.otf,% -SlantedFont=NewCM10-Regular.otf,% -SlantedFeatures={FakeSlant=0.25}, -BoldSlantedFont=NewCM10-Bold.otf,% -BoldSlantedFeatures={FakeSlant=0.25}, -SmallCapsFeatures={Numbers=OldStyle}]{NewCM10-Regular.otf} + SizeFeatures={% +{Size=-8, Font=NewCM08-Regular.otf, + ItalicFont=NewCM08-Italic.otf,% + BoldFont=NewCM10-Bold.otf,% + BoldItalicFont=NewCM10-BoldItalic.otf,% + SlantedFont=NewCM08-Regular.otf,% + BoldSlantedFont=NewCM10-Bold.otf,% + SmallCapsFeatures={Numbers=OldStyle}}, +{Size=8, Font=NewCM08-Regular.otf, + ItalicFont=NewCM08-Italic.otf,% + BoldFont=NewCM10-Bold.otf,% + BoldItalicFont=NewCM10-BoldItalic.otf,% + SlantedFont=NewCM08-Regular.otf,% + BoldSlantedFont=NewCM10-Bold.otf,% + SmallCapsFeatures={Numbers=OldStyle}}, +{Size= 9-, Font = NewCM10-Regular.otf, + ItalicFont=NewCM10-Italic.otf,% + BoldFont=NewCM10-Bold.otf,% + BoldItalicFont=NewCM10-BoldItalic.otf,% + SlantedFont=NewCM10-Regular.otf,% + BoldSlantedFont=NewCM10-Bold.otf,% + SmallCapsFeatures={Numbers=OldStyle}}% + },% + SlantedFeatures={FakeSlant=0.25},% + BoldSlantedFeatures={FakeSlant=0.25},% +]{NewCM10-Regular.otf} \setsansfont[% -ItalicFont=NewCMSans10-Oblique.otf,% -BoldFont=NewCMSans10-Bold.otf,% -BoldItalicFont=NewCMSans10-BoldOblique.otf,% + SizeFeatures={% +{Size= -8, Font=NewCMSans08-Regular.otf,% + ItalicFont=NewCMSans08-Oblique.otf,% + BoldFont=NewCMSans10-Bold.otf,% + BoldItalicFont=NewCMSans10-BoldOblique.otf,% + SmallCapsFeatures={Numbers=OldStyle},% +}, +{Size= 8, Font=NewCMSans08-Regular.otf,% + ItalicFont=NewCMSans08-Oblique.otf,% + BoldFont=NewCMSans10-Bold.otf,% + BoldItalicFont=NewCMSans10-BoldOblique.otf,% + SmallCapsFeatures={Numbers=OldStyle},% +}, +{Size= 9-, Font=NewCMSans10-Regular.otf,% + ItalicFont=NewCMSans10-Oblique.otf,% + BoldFont=NewCMSans10-Bold.otf,% + BoldItalicFont=NewCMSans10-BoldOblique.otf,% + SmallCapsFeatures={Numbers=OldStyle},% +}}, SlantedFont=NewCMSans10-Oblique.otf,% BoldSlantedFont=NewCMSans10-BoldOblique.otf,% -SmallCapsFeatures={Numbers=OldStyle}]{NewCMSans10-Regular.otf} +]{NewCMSans10-Regular.otf} \setmonofont[% ItalicFont=NewCMMono10-Italic.otf,% @@ -36,13 +70,16 @@ SmallCapsFeatures={Numbers=OldStyle}]{NewCMMono10-Regular.otf} \newcommand{\prosgegrammeni}{\addfontfeature{StylisticSet=1}} \newcommand{\textprosgegrammeni}[1]{{\prosgegrammeni#1}} % -\newfontfamily{\ivbce}[StylisticSet=2]{NewCMSans10-Regular.otf} +%\newfontfamily{\ivbce}[StylisticSet=2]{NewCMSans10-Regular.otf} +\newcommand{\ivbce}{\sffamily\addfontfeature{StylisticSet=2}} \newcommand{\textivbce}[1]{{\ivbce#1}} % -\newfontfamily{\ivbcealt}[StylisticSet=3]{NewCMSans10-Regular.otf} +%\newfontfamily{\ivbcealt}[StylisticSet=3]{NewCMSans10-Regular.otf} +\newcommand{\ivbcealt}{\sffamily\addfontfeature{StylisticSet=3}} \newcommand{\textivbcealt}[1]{{\ivbcealt#1}} % -\newfontfamily{\vibce}[StylisticSet=4]{NewCMSans10-Regular.otf} +%\newfontfamily{\vibce}[StylisticSet=4]{NewCMSans10-Regular.otf} +\newcommand{\vibce}{\sffamily\addfontfeature{StylisticSet=4}} \newcommand{\textvibce}[1]{{\vibce#1}} % %% math (upright) sans Greek @@ -233,19 +270,21 @@ SmallCapsFeatures={Numbers=OldStyle}]{NewCMMono10-Regular.otf} \DeclareRobustCommand\nleftleftarrows{\mathrel{\char"E032}} % % select ss02 lookup table for IPA symbols -\newfontfamily{\ipatext}[StylisticSet=5,% -BoldFont=NewCM10-Bold.otf,% -SlantedFont=NewCM10-Regular.otf,% -SlantedFeatures={FakeSlant=0.25}, -BoldSlantedFont=NewCM10-Bold.otf,% -BoldSlantedFeatures={FakeSlant=0.25}, -SmallCapsFeatures={Numbers=OldStyle}]{NewCM10-Regular.otf} +%\newfontfamily{\ipatext}[StylisticSet=5,% +%BoldFont=NewCM10-Bold.otf,% +%SlantedFont=NewCM10-Regular.otf,% +%SlantedFeatures={FakeSlant=0.25}, +%BoldSlantedFont=NewCM10-Bold.otf,% +%BoldSlantedFeatures={FakeSlant=0.25}, +%SmallCapsFeatures={Numbers=OldStyle}]{NewCM10-Regular.otf} +\newcommand{\ipatext}{\addfontfeature{StylisticSet=5}} \newcommand{\textipa}[1]{{\ipatext#1}} -\newfontfamily{\ipatextsans}[StylisticSet=5,% -ItalicFont=NewCMSans10-Oblique.otf,% -BoldFont=NewCMSans10-Bold.otf,% -BoldItalicFont=NewCMSans10-BoldOblique.otf,% -SlantedFont=NewCMSans10-Oblique.otf,% -BoldSlantedFont=NewCMSans10-BoldOblique.otf,% -SmallCapsFeatures={Numbers=OldStyle}]{NewCMSans10-Regular.otf} +%\newfontfamily{\ipatextsans}[StylisticSet=5,% +%ItalicFont=NewCMSans10-Oblique.otf,% +%BoldFont=NewCMSans10-Bold.otf,% +%BoldItalicFont=NewCMSans10-BoldOblique.otf,% +%SlantedFont=NewCMSans10-Oblique.otf,% +%BoldSlantedFont=NewCMSans10-BoldOblique.otf,% +%SmallCapsFeatures={Numbers=OldStyle}]{NewCMSans10-Regular.otf} +\newcommand{\ipatextsans}{\sffamily\addfontfeature{StylisticSet=5}} \newcommand{\textsansipa}[1]{{\ipatextsans#1}} |