From ea55d28ebb1c0142549c51d9de0cd52745becc06 Mon Sep 17 00:00:00 2001 From: Norbert Preining Date: Thu, 25 Jun 2020 03:02:38 +0000 Subject: CTAN sync 202006250302 --- macros/latex/contrib/fontsetup/README | 2 +- .../latex/contrib/fontsetup/doc/fontsetup-doc.pdf | Bin 747596 -> 805088 bytes .../latex/contrib/fontsetup/doc/fontsetup-doc.tex | 20 ++- .../contrib/fontsetup/doc/fspsample-gfsdidot.pdf | Bin 38823 -> 31214 bytes .../contrib/fontsetup/doc/fspsample-newdefault.pdf | Bin 0 -> 44488 bytes macros/latex/contrib/fontsetup/doc/fspsample.pdf | Bin 0 -> 30402 bytes macros/latex/contrib/fontsetup/doc/fspsample.tex | 27 ++-- macros/latex/contrib/fontsetup/fontsetup.sty | 8 +- macros/latex/contrib/fontsetup/fspdefault.sty | 150 +++++++++++++++++++++ .../latex/contrib/fontsetup/fspdefaultfontsot.sty | 150 --------------------- macros/latex/contrib/fontsetup/fspgfsdidotot.sty | 2 +- macros/latex/contrib/fontsetup/fspolddefault.sty | 150 +++++++++++++++++++++ 12 files changed, 337 insertions(+), 172 deletions(-) create mode 100644 macros/latex/contrib/fontsetup/doc/fspsample-newdefault.pdf create mode 100644 macros/latex/contrib/fontsetup/doc/fspsample.pdf create mode 100644 macros/latex/contrib/fontsetup/fspdefault.sty delete mode 100644 macros/latex/contrib/fontsetup/fspdefaultfontsot.sty create mode 100644 macros/latex/contrib/fontsetup/fspolddefault.sty (limited to 'macros/latex/contrib/fontsetup') diff --git a/macros/latex/contrib/fontsetup/README b/macros/latex/contrib/fontsetup/README index 94e8c2ac2e..7688728890 100644 --- a/macros/latex/contrib/fontsetup/README +++ b/macros/latex/contrib/fontsetup/README @@ -1,5 +1,5 @@ The fontsetup package - (Version 1.003, GPL3) + (Version 1.004, GPL3) This simple package makes it trivial to switch quickly between different quality fonts supporting Mathematics. diff --git a/macros/latex/contrib/fontsetup/doc/fontsetup-doc.pdf b/macros/latex/contrib/fontsetup/doc/fontsetup-doc.pdf index 5526b3bbc9..b9ac41d8b6 100644 Binary files a/macros/latex/contrib/fontsetup/doc/fontsetup-doc.pdf and b/macros/latex/contrib/fontsetup/doc/fontsetup-doc.pdf differ diff --git a/macros/latex/contrib/fontsetup/doc/fontsetup-doc.tex b/macros/latex/contrib/fontsetup/doc/fontsetup-doc.tex index 285d2ee225..595db34e5e 100644 --- a/macros/latex/contrib/fontsetup/doc/fontsetup-doc.tex +++ b/macros/latex/contrib/fontsetup/doc/fontsetup-doc.tex @@ -9,8 +9,8 @@ \textit{by}\\[1ex] {\large Antonis Tsolomitis}\\ University of the Aegean\\ Department of Mathematics\\[1ex] - \textsc{24} May \textsc{2020}\\[1ex] - Version 1.003, \textsc{gpl3} + \textsc{24} June \textsc{2020}\\[1ex] + Version 1.004, \textsc{gpl3} \end{center} This package is a simple wrapper-type package that makes the setup of fonts easy and @@ -30,7 +30,8 @@ University of the Aegean\\ Department of Mathematics\\[1ex] \item[cambria] Loads the Cambria fonts of Microsoft. These must be already installed as a system font (in \verb|C:\Windows\Fonts| in MS-Windows, in \verb|/home/user/.fonts/| in Linux or elsewhere by the system administratior). - \item[default] Loads the NewComputerModern fonts, which is an assembly of cm fonts plus + \item[default] Loads the NewComputerModern fonts (in Book weight), + which is an assembly of cm fonts plus more fonts to support Greek (cbgreek) and Cyrillic languages. It also provides \begin{itemize} \item commands to access prosgegrammeni instead of ypogegrammeni for capitals and small @@ -42,7 +43,7 @@ University of the Aegean\\ Department of Mathematics\\[1ex] \item commands to access Sans Greek (upright and oblique) in math mode although these are not included in the unicode standard. The commands follow the unicode-math.sty notation, so to get $\msansLambda$ and $\mitsanspi$ you write \verb|$\msansLambda$| and \verb|$\mitsanspi$|. - \end{itemize} + \end{itemize} \item[ebgaramond] Loads the EB-Garamond fonts with Garamond-Math. \item[fira] Loads the Fira family, a sans-serif font. \item[gfsartemisia] Loads the GFSArtemisia, a font family designed to be used @@ -53,7 +54,7 @@ University of the Aegean\\ Department of Mathematics\\[1ex] letters are substituted from GFSDidotClassic to provide a better match. Notice that the Bold versions of the Greek fonts are faked using fontspec mechanism as the Greek part does not have bold versions. - \item[gfsdidot] Loads the GFSDidot fonts. Stix2 is the Mathematics font, but latin + \item[gfsdidot] Loads the GFSDidot fonts. NewCMMath-Book is the Mathematics font, but latin and greek letters are substituted from GFSdidot to provide a better match. \item[gfsneohellenic] Loads the GFSNeohellenic family with GFSNeohellenic-Math. \item[kerkis] Loads the kerkis font family and texgyrebonum-math. @@ -73,6 +74,7 @@ University of the Aegean\\ Department of Mathematics\\[1ex] from MS-Garamond. \item[neoeuler] Loads the Concrete fonts with the Euler for Mathematics. Needs euler.otf to be instaled in the TeX installation. + \item[olddefault] Loads the NewComputerModern fonts (in Regular weight), \item[palatino] Loads the Linotype Palatino Fonts available from some versions of Windows. Thefonts must be system installed (in \verb|C:\Windows\Fonts| in MS-Windows, in \verb|/home/user/.fonts/| in Linux or elsewhere by the system administratior). The supplied @@ -150,6 +152,12 @@ Cambria Fonts must be installed as system fonts\\[1cm] \begin{center} {\Large ComputerModern fonts: option \verb|default|}\\[1cm] +\includegraphics[scale=1.2]{fspsample-newdefault.pdf} +\end{center} +\newpage + +\begin{center} +{\Large ComputerModern fonts (Book weight): option \verb|olddefault|}\\[1cm] \includegraphics[scale=1.2]{fspsample-cmr.pdf} \end{center} @@ -184,7 +192,7 @@ Cambria Fonts must be installed as system fonts\\[1cm] \newpage \begin{center} -{\Large GFSDidot and Stix2Math: option \verb|gfsdidot|}\\[1cm] +{\Large GFSDidot and NewCMMath-Book: option \verb|gfsdidot|}\\[1cm] \includegraphics[scale=1.2]{fspsample-gfsdidot.pdf} \end{center} diff --git a/macros/latex/contrib/fontsetup/doc/fspsample-gfsdidot.pdf b/macros/latex/contrib/fontsetup/doc/fspsample-gfsdidot.pdf index 0a9f49edc2..852ae5eb95 100644 Binary files a/macros/latex/contrib/fontsetup/doc/fspsample-gfsdidot.pdf and b/macros/latex/contrib/fontsetup/doc/fspsample-gfsdidot.pdf differ diff --git a/macros/latex/contrib/fontsetup/doc/fspsample-newdefault.pdf b/macros/latex/contrib/fontsetup/doc/fspsample-newdefault.pdf new file mode 100644 index 0000000000..a856f5b7c4 Binary files /dev/null and b/macros/latex/contrib/fontsetup/doc/fspsample-newdefault.pdf differ diff --git a/macros/latex/contrib/fontsetup/doc/fspsample.pdf b/macros/latex/contrib/fontsetup/doc/fspsample.pdf new file mode 100644 index 0000000000..4fe1dc44ea Binary files /dev/null and b/macros/latex/contrib/fontsetup/doc/fspsample.pdf differ diff --git a/macros/latex/contrib/fontsetup/doc/fspsample.tex b/macros/latex/contrib/fontsetup/doc/fspsample.tex index b978369854..5a8f9f0463 100644 --- a/macros/latex/contrib/fontsetup/doc/fspsample.tex +++ b/macros/latex/contrib/fontsetup/doc/fspsample.tex @@ -1,3 +1,6 @@ +%% after xelatex run +%% pdfcrop fspsample.pdf output.pdf +%% to crop it \documentclass{article} \pagestyle{empty} \usepackage{xgreek,graphicx} @@ -24,7 +27,7 @@ %\usepackage[minion]{fontsetup} %\usepackage[neoeuler]{fontsetup} %\usepackage[libertinus]{fontsetup} - +%\usepackage[olddefault]{fontsetup} @@ -38,21 +41,21 @@ %Let $g$ be an Assume that $g$ is an in\-te\-grable func\-tion defined on the measurable set $E$ and hat - $(f_n)_{n\in\mathbb N}$ is a sequence of mea\-sur\-able function so that - $|f_n|\leq g$. If $f$ is a function so that $f_n\to f$ almost everywhere + $(\,f_n)_{n\in\mathbb N}$ is a sequence of mea\-sur\-able function so that + $|\,f_n|\leq g$. If $f$ is a function so that $f_n\to f$ almost everywhere then $$\lim_{n\to\infty}\int f_n=\int f.$$ \end{theorem} \textit{Proof}: The function $g-f_n$ is non-negative and thus from Fatou lemma -we have that $\int(g-f)\leq\liminf\int(g-f_n)$. Since $|f|\leq g$ and -$|f_n|\leq g$ the functions $f$ and $f_n$ are integrable and we have -$$\int g-\int f\leq \int g-\limsup\int f_n,$$ so -$$\int f\geq \limsup \int f_n.$$ +we have that $\int(g-f\,)\leq\liminf\int(g-f_n)$. Since $|\,f\,|\leq g$ and +$|\,f_n|\leq g$ the functions $f$ and $f_n$ are integrable and we have +$$\int g-\int f\,\leq \int g-\limsup\int f_n,$$ so +$$\int f\,\geq \limsup \int f_n.$$ \par \begin{theoremg}[Κυριαρχημένης σύγκλισης του Lebesgue] Έστω ότι η $g$ είναι μια ολοκληρώσιμη συνάρτηση ορισμένη στο μετρήσιμο σύνολο -$E$ και η $(f_n)_{n\in\mathbb N}$ είναι μια ακολουθία μετρήσιμων συναρτήσεων ώστε -$|f_n| ≤ g$. Υποθέτουμε ότι υπάρχει μια συνάρτηση $f$ +$E$ και η $(\,f_n)_{n\in\mathbb N}$ είναι μια ακολουθία μετρήσιμων συναρτήσεων ώστε +$|\,f_n| ≤ g$. Υποθέτουμε ότι υπάρχει μια συνάρτηση $f$ ώστε η $(f_n)_{n\in\mathbb N}$ να τείνει στην $f$ σχεδόν παντού. Τότε $$\lim \int f_n =\int f.$$ @@ -60,10 +63,10 @@ $$\lim \int f_n =\int f.$$ \textit{Απόδειξη}: Η συνάρτηση $g − f_n$ είναι μη αρνητική και άρα από το Λήμμα του Fatou ισχύει $\int (f-g) ≤ \liminf \int (g-f_n)$. Επειδή -$|f| ≤ g$ και $|f_n| ≤g$ οι $f$ και $f_n$ είναι ολοκληρώσιμες, έχουμε -$$\int g −\int f ≤ \int g − \limsup\int f_n,$$ +$|\,f\,| ≤ g$ και $|\,f_n| ≤g$ οι $f$ και $f_n$ είναι ολοκληρώσιμες, έχουμε +$$\int g −\int f\, ≤ \int g − \limsup\int f_n,$$ άρα -$$\int f\geq \limsup \int f_n.$$ +$$\int f\,\geq \limsup \int f_n.$$ diff --git a/macros/latex/contrib/fontsetup/fontsetup.sty b/macros/latex/contrib/fontsetup/fontsetup.sty index 783c3f1d3d..32ed9bc0d4 100644 --- a/macros/latex/contrib/fontsetup/fontsetup.sty +++ b/macros/latex/contrib/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/macros/latex/contrib/fontsetup/fspdefault.sty b/macros/latex/contrib/fontsetup/fspdefault.sty new file mode 100644 index 0000000000..97b9082246 --- /dev/null +++ b/macros/latex/contrib/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/macros/latex/contrib/fontsetup/fspdefaultfontsot.sty b/macros/latex/contrib/fontsetup/fspdefaultfontsot.sty deleted file mode 100644 index 3b08994260..0000000000 --- a/macros/latex/contrib/fontsetup/fspdefaultfontsot.sty +++ /dev/null @@ -1,150 +0,0 @@ -%% (C) Antonis Tsolomitis, GPL3. -\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} - -\setsansfont[% -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} - -\setmonofont[% -ItalicFont=NewCMMono10-Italic.otf,% -BoldFont=NewCMMono10-Bold.otf,% -BoldItalicFont=NewCMMono10-BoldOblique.otf,% -SlantedFont=NewCMMono10-Regular.otf,% -SlantedFeatures={FakeSlant=0.25}, -BoldSlantedFont=NewCMMono10-Bold.otf,% -BoldSlantedFeatures={FakeSlant=0.25}, -SmallCapsFeatures={Numbers=OldStyle}]{NewCMMono10-Regular.otf} - -\setmathfont{NewCMMath-Regular.otf} - -\newcommand{\tttextsc}[1]{{\ttscshape#1}} -% -\newcommand{\prosgegrammeni}{\addfontfeature{StylisticSet=1}} -\newcommand{\textprosgegrammeni}[1]{{\prosgegrammeni#1}} -% -\newfontfamily{\ivbce}[StylisticSet=2]{NewCMSans10-Regular.otf} -\newcommand{\textivbce}[1]{{\ivbce#1}} -% -\newfontfamily{\ivbcealt}[StylisticSet=3]{NewCMSans10-Regular.otf} -\newcommand{\textivbcealt}[1]{{\ivbcealt#1}} -% -\newfontfamily{\vibce}[StylisticSet=4]{NewCMSans10-Regular.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/macros/latex/contrib/fontsetup/fspgfsdidotot.sty b/macros/latex/contrib/fontsetup/fspgfsdidotot.sty index 6de2cfd736..f8c312c02c 100644 --- a/macros/latex/contrib/fontsetup/fspgfsdidotot.sty +++ b/macros/latex/contrib/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/macros/latex/contrib/fontsetup/fspolddefault.sty b/macros/latex/contrib/fontsetup/fspolddefault.sty new file mode 100644 index 0000000000..3b08994260 --- /dev/null +++ b/macros/latex/contrib/fontsetup/fspolddefault.sty @@ -0,0 +1,150 @@ +%% (C) Antonis Tsolomitis, GPL3. +\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} + +\setsansfont[% +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} + +\setmonofont[% +ItalicFont=NewCMMono10-Italic.otf,% +BoldFont=NewCMMono10-Bold.otf,% +BoldItalicFont=NewCMMono10-BoldOblique.otf,% +SlantedFont=NewCMMono10-Regular.otf,% +SlantedFeatures={FakeSlant=0.25}, +BoldSlantedFont=NewCMMono10-Bold.otf,% +BoldSlantedFeatures={FakeSlant=0.25}, +SmallCapsFeatures={Numbers=OldStyle}]{NewCMMono10-Regular.otf} + +\setmathfont{NewCMMath-Regular.otf} + +\newcommand{\tttextsc}[1]{{\ttscshape#1}} +% +\newcommand{\prosgegrammeni}{\addfontfeature{StylisticSet=1}} +\newcommand{\textprosgegrammeni}[1]{{\prosgegrammeni#1}} +% +\newfontfamily{\ivbce}[StylisticSet=2]{NewCMSans10-Regular.otf} +\newcommand{\textivbce}[1]{{\ivbce#1}} +% +\newfontfamily{\ivbcealt}[StylisticSet=3]{NewCMSans10-Regular.otf} +\newcommand{\textivbcealt}[1]{{\ivbcealt#1}} +% +\newfontfamily{\vibce}[StylisticSet=4]{NewCMSans10-Regular.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} + -- cgit v1.2.3