fontsetup (6mar22)

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

10 files changed, 165 insertions, 5 deletions

diff --git a/Master/texmf-dist/doc/latex/fontsetup/README b/Master/texmf-dist/doc/latex/fontsetup/README
index bd550fab777..a6ec56e0904 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 1.2, GPL3)
+               (Version 1.3, 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 f98b8938b27..f94e4ab84d2 100644
--- a/Master/texmf-dist/doc/latex/fontsetup/fontsetup-doc.pdf
+++ b/Master/texmf-dist/doc/latex/fontsetup/fontsetup-doc.pdf
diff --git a/Master/texmf-dist/doc/latex/fontsetup/fontsetup-doc.tex b/Master/texmf-dist/doc/latex/fontsetup/fontsetup-doc.tex
index a8abebd2407..900a753df59 100644
--- a/Master/texmf-dist/doc/latex/fontsetup/fontsetup-doc.tex
+++ b/Master/texmf-dist/doc/latex/fontsetup/fontsetup-doc.tex
@@ -14,8 +14,8 @@
     \textit{by}\\[1ex]
     {\large Antonis Tsolomitis}\\
 University of the Aegean\\ Department of Mathematics\\[1ex]
-	  \textsc{31} Jan \textsc{2022}\\[1ex]
-	  Version 1.2, \textsc{gpl3}
+	  \textsc{6} Mar \textsc{2022}\\[1ex]
+	  Version 1.3, \textsc{gpl3}
   \end{center}
 
   This package is a simple wrapper-type package that makes the setup of fonts easy and
@@ -131,6 +131,9 @@ NewComputerModern font family.
     fontsetup-nonfree is installed.
     \item[neoeuler] Loads the Concrete fonts with the Euler for Mathematics. 
       Needs euler.otf to be instaled in the TeX installation.
+\item[oldstandard] Loads the OldStandard fonts. Mathematics is from
+      Garamond-Math with letters replaced
+      from OldStandard.
     \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
@@ -142,6 +145,8 @@ NewComputerModern font family.
     \item[talos] Loads the NewCM Book weight with the Greek cult font Talos.
     \item[times] Loads the FreeSerifb fonts, a Times font and stix2 for Mathematics
       with letters replaced from FreeSerifb.
+    \item[xcharter] Loads the XCharter fonts and the XCharter-Math font. The option \verb|upint| is provided for upright style integrals. The sans fonts are CabinCondensed and the mono fonts are
+      Inconsolatazi4.
   \end{description}
 
   You do not need to load \verb|fontspec|. This, as well as \verb|unicode-math|, are
@@ -276,6 +281,13 @@ NeoEuler font must be installed in TeX tree\\[1cm]
 
 \newpage
 
+\begin{center}
+{\Large OldStandard fonts with Garamond-Math: option \verb|oldstandard|}\\[1cm] 
+\includegraphics[scale=1.2]{fspsample-oldstandard.pdf}
+\end{center}
+
+\newpage
+
 
 \begin{center}
 {\Large Stix2 and Stix2Math: option \verb|stixtwo|}\\[1cm] 
@@ -297,6 +309,13 @@ NeoEuler font must be installed in TeX tree\\[1cm]
 \includegraphics[scale=1.2]{fspsample-times.pdf}
 \end{center}
 
+\newpage
+
+\begin{center}
+{\Large XCharter and XCharter-Math: option \verb|xcharter|}\\[1cm] 
+\includegraphics[scale=1.2]{fspsample-xcharter.pdf}
+\end{center}
+
 
 
 \appendix
diff --git a/Master/texmf-dist/doc/latex/fontsetup/fspsample-oldstandard.pdf b/Master/texmf-dist/doc/latex/fontsetup/fspsample-oldstandard.pdf
new file mode 100644
index 00000000000..b13da555430
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/fontsetup/fspsample-oldstandard.pdf
diff --git a/Master/texmf-dist/doc/latex/fontsetup/fspsample-oldstandard.tex b/Master/texmf-dist/doc/latex/fontsetup/fspsample-oldstandard.tex
new file mode 100644
index 00000000000..d082efd9ebc
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/fontsetup/fspsample-oldstandard.tex
@@ -0,0 +1,77 @@
+%% after xelatex run
+%% pdfcrop fspsample.pdf output.pdf
+%% to crop it
+\documentclass{article}
+\pagestyle{empty}
+\usepackage{xgreek,graphicx}
+\pagestyle{empty}
+%\usepackage[greek]{babel}
+%\usepackage[utf8x]{inputenc}
+%\usepackage{amsfonts}
+
+%\usepackage[default]{fontsetup}
+%\usepackage[gfsartemisia]{fontsetup}
+%\usepackage[gfsdidot]{fontsetup}
+%\usepackage[gfsdidotclassic]{fontsetup}
+%\usepackage[gfsneohellenic]{fontsetup}
+%\usepackage[cambria]{fontsetup}
+%\usepackage[lucida]{fontsetup}
+%\usepackage[kerkis]{fontsetup}
+%\usepackage[fira]{fontsetup}
+%\usepackage[times]{fontsetup}
+%\usepackage[palatino]{fontsetup}
+%\usepackage[stixtwo]{fontsetup}
+%\usepackage[neokadmus]{fontsetup}
+%\usepackage[msgaramond]{fontsetup}
+%\usepackage[ebgaramond]{fontsetup}
+%\usepackage[minion]{fontsetup}
+%\usepackage[neoeuler]{fontsetup}
+%\usepackage[libertinus]{fontsetup}
+%\usepackage[olddefault]{fontsetup}
+%\usepackage[concrete]{fontsetup}
+%\usepackage[talos]{fontsetup}
+\usepackage[oldstandard]{fontsetup}
+
+
+\newtheorem{theorem}{Theorem}
+\newtheorem{theoremg}[theorem]{Θεώρημα}
+
+
+\begin{document}
+
+\begin{theorem}[Dominated convergence of Lebesgue]
+%Let $g$ be an
+Assume that $g$ is an
+in\-te\-grable func\-tion defined on the measurable set $E$ and that
+  $(\,f_n)_{n\in\mathbb N}$ is a sequence of mea\-sur\-able functions 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.$$
+\par
+\begin{theoremg}[Κυριαρχημένης σύγκλισης του Lebesgue]
+  Έστω ότι
+η $g$ είναι μια ολοκληρώσιμη συνάρτηση ορισμένη στο μετρήσιμο σύνολο
+$E$ και η $(\,f_n)_{n\in\mathbb N}$ είναι μια ακολουθία μετρήσιμων συναρτήσεων ώστε
+$|\,f_n| ≤ g$. Υποθέτουμε ότι υπάρχει μια συνάρτηση $f$
+ώστε η  $(f_n)_{n\in\mathbb N}$ να
+τείνει στην $f$ σχεδόν παντού. Τότε
+$$\lim \int f_n =\int f.$$
+\end{theoremg}
+\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,$$
+άρα
+$$\int f\,\geq \limsup \int f_n.$$
+
+
+
+
+
+\end{document}
diff --git a/Master/texmf-dist/doc/latex/fontsetup/fspsample-xcharter.pdf b/Master/texmf-dist/doc/latex/fontsetup/fspsample-xcharter.pdf
new file mode 100644
index 00000000000..97b9e2c9f5d
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/fontsetup/fspsample-xcharter.pdf
diff --git a/Master/texmf-dist/doc/latex/fontsetup/fspsample.tex b/Master/texmf-dist/doc/latex/fontsetup/fspsample.tex
index 188ccf5a5e7..ec18b14d70a 100644
--- a/Master/texmf-dist/doc/latex/fontsetup/fspsample.tex
+++ b/Master/texmf-dist/doc/latex/fontsetup/fspsample.tex
@@ -9,7 +9,7 @@
 %\usepackage[utf8x]{inputenc}
 %\usepackage{amsfonts}
 
-\usepackage[default]{fontsetup}
+\usepackage[default,upint]{fontsetup}
 %\usepackage[gfsartemisia]{fontsetup}
 %\usepackage[gfsdidot]{fontsetup}
 %\usepackage[gfsdidotclassic]{fontsetup}
@@ -30,7 +30,8 @@
 %\usepackage[olddefault]{fontsetup}
 %\usepackage[concrete]{fontsetup}
 %\usepackage[talos]{fontsetup}
-
+%\usepackage[oldstandard]{fontsetup}
+%\usepackage[xcharter,upint]{fontsetup}
 
 
 \newtheorem{theorem}{Theorem}
diff --git a/Master/texmf-dist/tex/latex/fontsetup/fontsetup.sty b/Master/texmf-dist/tex/latex/fontsetup/fontsetup.sty
index 9fbafedcc96..603a0d8d3bf 100644
--- a/Master/texmf-dist/tex/latex/fontsetup/fontsetup.sty
+++ b/Master/texmf-dist/tex/latex/fontsetup/fontsetup.sty
@@ -32,6 +32,8 @@
 \chardef\fontsetupolddefault=18 % old (thin) CMR
 \chardef\fontsetupconcrete=19
 \chardef\fontsetuptalos=20
+\chardef\fontsetupoldstandard=21
+\chardef\fontsetupxcharter=22
 
 \chardef\fontsetupfont\fontsetupdefault
 \DeclareOption{default}{\chardef\fontsetupfont\fontsetupdefault}
@@ -55,6 +57,8 @@
 \DeclareOption{olddefault}{\chardef\fontsetupfont\fontsetupolddefault}
 \DeclareOption{concrete}{\chardef\fontsetupfont\fontsetupconcrete}
 \DeclareOption{talos}{\chardef\fontsetupfont\fontsetuptalos}
+\DeclareOption{oldstandard}{\chardef\fontsetupfont\fontsetupoldstandard}
+\DeclareOption{xcharter}{\chardef\fontsetupfont\fontsetupxcharter}
 \DeclareOption*{\PackageWarning{fontsetup}{Unknown ‘\CurrentOption’}}
 %
 \newif\if@upint
@@ -151,6 +155,15 @@
   \RequirePackage{fspconcrete}
 \or
   \RequirePackage{fsptalos}
+\or
+\RequirePackage{fspoldstandard}
+\or
+\RequirePackage{fspxcharter}
+\if@upint
+    \setmathfont[StylisticSet=3]{XCharter-Math.otf}
+\else
+   \relax
+\fi
 %%%
 %
 %%%
diff --git a/Master/texmf-dist/tex/latex/fontsetup/fspoldstandard.sty b/Master/texmf-dist/tex/latex/fontsetup/fspoldstandard.sty
new file mode 100644
index 00000000000..5d7347136e5
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/fontsetup/fspoldstandard.sty
@@ -0,0 +1,22 @@
+\RequirePackage{fontspec}
+\defaultfontfeatures{Ligatures=TeX}
+
+\setmainfont[%
+ExternalLocation=/home/atsol/texmf/fonts/sfd/ATsolomitis/OldStandard-Math/,
+ItalicFont=OldStandard-Italic.otf,
+BoldFont=OldStandard-Bold.otf,
+BoldItalicFont=OldStandard-BoldItalic.otf,
+SmallCapsFeatures={Numbers=OldStyle}]{OldStandard-Regular.otf}
+
+
+
+\RequirePackage{unicode-math}
+%\setmathfont{Garamond-Math.otf}
+\setmathfont[ExternalLocation=/home/atsol/texmf/fonts/sfd/ATsolomitis/OldStandard-Math/]{OldStandard-Math.otf}
+%\setmathfont[range=\mathup/{num,latin,Latin,greek,Greek}]{OldStandard-Regular.otf} 
+%\setmathfont[range=\mathbfup/{num,latin,Latin,greek,Greek}]{OldStandard-Bold.otf} 
+%\setmathfont[range=\mathit/{num,latin,Latin,greek,Greek}]{OldStandard-Italic.otf} 
+%\setmathfont[range=\mathbfit/{num,latin,Latin,greek,Greek}]{OldStandard-BoldItalic.otf}
+
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/fontsetup/fspxcharter.sty b/Master/texmf-dist/tex/latex/fontsetup/fspxcharter.sty
new file mode 100644
index 00000000000..9267191eab7
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/fontsetup/fspxcharter.sty
@@ -0,0 +1,28 @@
+\RequirePackage{fontspec}
+\defaultfontfeatures{Ligatures=TeX}
+
+\RequirePackage{xcharter-otf}
+
+\setsansfont[%
+ItalicFont=CabinCondensed-ItalicCondensed.otf,%
+BoldFont=CabinCondensed-SemiBoldCondensed.otf,%
+BoldItalicFont=CabinCondensed-SemiboldItalicCondensed.otf,%
+SmallCapsFeatures={Numbers=OldStyle},%
+SlantedFont=CabinCondensed-RegularCondensed.otf,%
+SlantedFeatures={FakeSlant=0.25},
+BoldSlantedFont=CabinCondensed-SemiBoldCondensed.otf,%
+BoldSlantedFeatures={FakeSlant=0.25},
+Scale=MatchLowercase
+]{CabinCondensed-RegularCondensed.otf}
+
+\setmonofont[%
+BoldFont=Inconsolatazi4-Bold.otf,%
+SlantedFont=Inconsolatazi4-Regular.otf,%
+SlantedFeatures={FakeSlant=0.25},
+BoldSlantedFont=,%
+BoldSlantedFeatures={FakeSlant=0.25},
+SmallCapsFeatures={Numbers=OldStyle},
+Scale=MatchLowercase]{Inconsolatazi4-Regular.otf}
+
+
+\endinput