fontsetup (24jun20)

git-svn-id: svn://tug.org/texlive/trunk@55649 c570f23f-e606-0410-a88d-b1316a301751

4 files changed, 157 insertions, 3 deletions

diff --git a/Master/texmf-dist/tex/latex/fontsetup/fontsetup.sty b/Master/texmf-dist/tex/latex/fontsetup/fontsetup.sty
index 783c3f1d3da..32ed9bc0d4b 100644
--- a/Master/texmf-dist/tex/latex/fontsetup/fontsetup.sty
+++ b/Master/texmf-dist/tex/latex/fontsetup/fontsetup.sty
@@ -2,7 +2,7 @@
 \ProvidesPackage{fontsetup}[2019/12/20 Easy font setup by Antonis Tsolomitis]
 \typeout{fontsetup: Easy font setup by  Antonis Tsolomitis}
 
-\chardef\fontsetupdefault=0 % TODO fork cm-unicode or complete lm fonts
+\chardef\fontsetupdefault=0 %
 \chardef\fontsetupgfsartemisia=1
 \chardef\fontsetupgfsdidot=2
 \chardef\fontsetupgfsdidotclassic=3
@@ -20,6 +20,7 @@
 \chardef\fontsetupminion=15 % Install MinionPro and provided fspMinionGreekSmallCaps as a system font.
 \chardef\fontsetupneoeuler=16
 \chardef\fontsetuplibertinus=17
+\chardef\fontsetupolddefault=18 % old (thin) CMR
 
 \chardef\fontsetupfont\fontsetupdefault
 \DeclareOption{default}{\chardef\fontsetupfont\fontsetupdefault}
@@ -40,6 +41,7 @@
 \DeclareOption{minion}{\chardef\fontsetupfont\fontsetupminion}
 \DeclareOption{neoeuler}{\chardef\fontsetupfont\fontsetupneoeuler}
 \DeclareOption{libertinus}{\chardef\fontsetupfont\fontsetuplibertinus}
+\DeclareOption{olddefault}{\chardef\fontsetupfont\fontsetupolddefault}
 \DeclareOption*{\PackageWarning{fontsetup}{Unknown ‘\CurrentOption’}}
 \ProcessOptions
 
@@ -59,7 +61,7 @@
 \ifthenelse{\boolean{TeXUnicode}}{%
   %The user runs unicode engine
   \ifcase\fontsetupfont
-  \RequirePackage{fspdefaultfontsot}
+  \RequirePackage{fspdefault}
 \or
   \RequirePackage{fspgfsartemisiaot}
 \or
@@ -95,6 +97,8 @@
   \RequirePackage{fspneoeulerot}
 \or
   \RequirePackage{libertinus-otf}
+\or
+  \RequirePackage{fspolddefault}
   \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
new file mode 100644
index 00000000000..97b90822465
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/fontsetup/fspdefault.sty
@@ -0,0 +1,150 @@
+%% (C) Antonis Tsolomitis, GPL3.
+\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}
+
+\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}
+
+\setmonofont[%
+ItalicFont=NewCMMono10-BookItalic.otf,%
+BoldFont=NewCMMono10-Bold.otf,%
+BoldItalicFont=NewCMMono10-BoldOblique.otf,%
+SlantedFont=NewCMMono10-Book.otf,%
+SlantedFeatures={FakeSlant=0.25},
+BoldSlantedFont=NewCMMono10-Bold.otf,%
+BoldSlantedFeatures={FakeSlant=0.25},
+SmallCapsFeatures={Numbers=OldStyle}]{NewCMMono10-Book.otf}
+
+\setmathfont{NewCMMath-Book.otf}
+
+\newcommand{\tttextsc}[1]{{\ttscshape#1}}
+%
+\newcommand{\prosgegrammeni}{\addfontfeature{StylisticSet=1}}
+\newcommand{\textprosgegrammeni}[1]{{\prosgegrammeni#1}}
+%
+\newfontfamily{\ivbce}[StylisticSet=2]{NewCMSans10-Book.otf}
+\newcommand{\textivbce}[1]{{\ivbce#1}}
+%
+\newfontfamily{\ivbcealt}[StylisticSet=3]{NewCMSans10-Book.otf}
+\newcommand{\textivbcealt}[1]{{\ivbcealt#1}}
+%
+\newfontfamily{\vibce}[StylisticSet=4]{NewCMSans10-Book.otf}
+\newcommand{\textvibce}[1]{{\vibce#1}}
+%
+%% math (upright) sans Greek
+\newcommand{\msansAlpha}{\char"E000}
+\newcommand{\msansBeta}{\char"E001}
+\newcommand{\msansGamma}{\char"E002}
+\newcommand{\msansDelta}{\char"E003}
+\newcommand{\msansEpsilon}{\char"E004}
+\newcommand{\msansZeta}{\char"E005}
+\newcommand{\msansEta}{\char"E006}
+\newcommand{\msansTheta}{\char"E007}
+\newcommand{\msansIota}{\char"E008}
+\newcommand{\msansKappa}{\char"E009}
+\newcommand{\msansLambda}{\char"E00A}
+\newcommand{\msansMu}{\char"E00B}
+\newcommand{\msansNu}{\char"E00C}
+\newcommand{\msansXi}{\char"E00D}
+\newcommand{\msansOmicron}{\char"E00E}
+\newcommand{\msansPi}{\char"E00F}
+\newcommand{\msansRho}{\char"E010}
+\newcommand{\msansSigma}{\char"E011}
+\newcommand{\msansTau}{\char"E012}
+\newcommand{\msansUpsilon}{\char"E013}
+\newcommand{\msansPhi}{\char"E014}
+\newcommand{\msansChi}{\char"E015}
+\newcommand{\msansPsi}{\char"E016}
+\newcommand{\msansOmega}{\char"E017}
+\newcommand{\msansalpha}{\char"E018}
+\newcommand{\msansbeta}{\char"E019}
+\newcommand{\msansgamma}{\char"E01A}
+\newcommand{\msansdelta}{\char"E01B}
+\newcommand{\msansepsilon}{\char"E01C}
+\newcommand{\msanszeta}{\char"E01D}
+\newcommand{\msanseta}{\char"E01E}
+\newcommand{\msanstheta}{\char"E01F}
+\newcommand{\msansiota}{\char"E020}
+\newcommand{\msanskappa}{\char"E021}
+\newcommand{\msanslambda}{\char"E022}
+\newcommand{\msansmu}{\char"E023}
+\newcommand{\msansnu}{\char"E024}
+\newcommand{\msansxi}{\char"E025}
+\newcommand{\msansomicron}{\char"E026}
+\newcommand{\msanspi}{\char"E027}
+\newcommand{\msansrho}{\char"E028}
+\newcommand{\msansvarsigma}{\char"E029}
+\newcommand{\msanssigma}{\char"E02A}
+\newcommand{\msanstau}{\char"E02B}
+\newcommand{\msansupsilon}{\char"E02C}
+\newcommand{\msansphi}{\char"E02D}
+\newcommand{\msanschi}{\char"E02E}
+\newcommand{\msanspsi}{\char"E02F}
+\newcommand{\msansomega}{\char"E030}
+\newcommand{\msansvarepsilon}{\char"E031}
+% math italic sans Greek
+\newcommand{\mitsansAlpha}{\char"E041}
+\newcommand{\mitsansBeta}{\char"E042}
+\newcommand{\mitsansGamma}{\char"E043}
+\newcommand{\mitsansDelta}{\char"E044}
+\newcommand{\mitsansEpsilon}{\char"E045}
+\newcommand{\mitsansZeta}{\char"E046}
+\newcommand{\mitsansEta}{\char"E047}
+\newcommand{\mitsansTheta}{\char"E048}
+\newcommand{\mitsansIota}{\char"E049}
+\newcommand{\mitsansKappa}{\char"E04A}
+\newcommand{\mitsansLambda}{\char"E04B}
+\newcommand{\mitsansMu}{\char"E04C}
+\newcommand{\mitsansNu}{\char"E04D}
+\newcommand{\mitsansXi}{\char"E04E}
+\newcommand{\mitsansOmicron}{\char"E04F}
+\newcommand{\mitsansPi}{\char"E050}
+\newcommand{\mitsansRho}{\char"E051}
+\newcommand{\mitsansSigma}{\char"E052}
+\newcommand{\mitsansTau}{\char"E053}
+\newcommand{\mitsansUpsilon}{\char"E054}
+\newcommand{\mitsansPhi}{\char"E055}
+\newcommand{\mitsansChi}{\char"E056}
+\newcommand{\mitsansPsi}{\char"E057}
+\newcommand{\mitsansOmega}{\char"E058}
+\newcommand{\mitsansalpha}{\char"E059}
+\newcommand{\mitsansbeta}{\char"E05A}
+\newcommand{\mitsansgamma}{\char"E05B}
+\newcommand{\mitsansdelta}{\char"E05C}
+\newcommand{\mitsansepsilon}{\char"E05D}
+\newcommand{\mitsanszeta}{\char"E05E}
+\newcommand{\mitsanseta}{\char"E05F}
+\newcommand{\mitsanstheta}{\char"E060}
+\newcommand{\mitsansiota}{\char"E061}
+\newcommand{\mitsanskappa}{\char"E062}
+\newcommand{\mitsanslambda}{\char"E063}
+\newcommand{\mitsansmu}{\char"E064}
+\newcommand{\mitsansnu}{\char"E065}
+\newcommand{\mitsansxi}{\char"E066}
+\newcommand{\mitsansomicron}{\char"E067}
+\newcommand{\mitsanspi}{\char"E068}
+\newcommand{\mitsansrho}{\char"E069}
+\newcommand{\mitsansvarsigma}{\char"E06A}
+\newcommand{\mitsanssigma}{\char"E06B}
+\newcommand{\mitsanstau}{\char"E06C}
+\newcommand{\mitsansupsilon}{\char"E06D}
+\newcommand{\mitsansphi}{\char"E06E}
+\newcommand{\mitsanschi}{\char"E06F}
+\newcommand{\mitsanspsi}{\char"E070}
+\newcommand{\mitsansomega}{\char"E071}
+\newcommand{\mitsansvarepsilon}{\char"E072}
+
diff --git a/Master/texmf-dist/tex/latex/fontsetup/fspgfsdidotot.sty b/Master/texmf-dist/tex/latex/fontsetup/fspgfsdidotot.sty
index 6de2cfd7366..f8c312c02c2 100644
--- a/Master/texmf-dist/tex/latex/fontsetup/fspgfsdidotot.sty
+++ b/Master/texmf-dist/tex/latex/fontsetup/fspgfsdidotot.sty
@@ -14,7 +14,7 @@
 
 \RequirePackage{unicode-math}
 %\setmathfont{XITSMath-Regular.otf}
-\setmathfont{STIX2Math.otf}
+\setmathfont{NewCMMath-Book.otf}
 \setmathfont[range=\mathup/{num,latin,Latin,greek,Greek}]{GFSDidot.otf} 
 \setmathfont[range=\mathbfup/{num,latin,Latin,greek,Greek}]{GFSDidotBold.otf} 
 \setmathfont[range=\mathit/{greek,Greek}]{GFSOlga.otf}
diff --git a/Master/texmf-dist/tex/latex/fontsetup/fspdefaultfontsot.sty b/Master/texmf-dist/tex/latex/fontsetup/fspolddefault.sty
index 3b089942609..3b089942609 100644
--- a/Master/texmf-dist/tex/latex/fontsetup/fspdefaultfontsot.sty
+++ b/Master/texmf-dist/tex/latex/fontsetup/fspolddefault.sty