fontsetup (8sep24)

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

19 files changed, 218 insertions, 46 deletions

diff --git a/Master/texmf-dist/doc/latex/fontsetup/README b/Master/texmf-dist/doc/latex/fontsetup/README
index 3c2ec51ef05..45e8f753a53 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 2.1.1, GPL3)
+               (Version 2.2.0, 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 68d519c607d..ad64f41ff07 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 d8ec1bd3378..efa98fd530e 100644
--- a/Master/texmf-dist/doc/latex/fontsetup/fontsetup-doc.tex
+++ b/Master/texmf-dist/doc/latex/fontsetup/fontsetup-doc.tex
@@ -1,8 +1,6 @@
 \documentclass{book}
 \synctex=1
 \usepackage[default]{fontsetup}
-%\usepackage[fira]{fontsetup}
-%\usepackage{fontsetup}
 \newfontfamily\newcmgreekguillemots[CharacterVariant=4]{NewCM10-Book.otf}
 \newfontfamily\devfont[Script=Devanagari,Language=Marathi]{NewCM10Devanagari-Book.otf}
 \newcommand\leftgrquotes{\char"201C}
@@ -17,11 +15,11 @@
     \textit{by}\\[1ex]
     {\large Antonis Tsolomitis}\\
 University of the Aegean\\ Department of Mathematics\\[1ex]
-	  \textsc{24} February \textsc{2024}\\[1ex]
-	  Version 2.1.1, \textsc{gpl3}
+	  \textsc{8} September \textsc{2024}\\[1ex]
+	  Version 2.2.0, \textsc{gpl3}
   \end{center}
 
-  This package is a simple wrapper-type package that makes the setup of fonts easy and
+This package is a simple wrapper-type package that makes the setup of fonts easy and
   quick for XeLaTeX and LuaLaTeX. You just load the package using one of the supported
   fonts as an option.
 
@@ -74,7 +72,11 @@ University of the Aegean\\ Department of Mathematics\\[1ex]
       \item commands to access the Ancient Greek Numbers (Unicode u10140--u1018E)
         documented in the Appendix
       \item commands to access the negation of uniform convergence symbols \verb|\nrightrightarrows|
-        for $\nrightrightarrows$ and \verb|\nleftleftarrows| for $\nleftleftarrows$.
+        for $\nrightrightarrows$ and \verb|\nleftleftarrows| for $\nleftleftarrows$, and
+        1-1 and onto functions: \verb|\twoheadhookrightarrow| for $\twoheadhookrightarrow$ and
+        \verb|\twoheadhookleftarrow| for $\twoheadhookleftarrow$.
+      \item command \verb|\convolution| to access the new convolution operator $\convolution$
+        (check the documentation of NewCM fonts).
       \item commands to access the IPA symbols. These are \verb|\ipatext| and
         \verb|\textipa{...}| to select the fonts
         for IPA symbols locally. Compare \textipa{ðŋβθχ}
@@ -112,7 +114,8 @@ NewComputerModern font family.
     fontsetup-nonfree is installed.
   \item[concrete] Loads the Concrete fonts from the \texttt{cmu} package with Concrete-Math
     font for mathematics.
-  \item[ebgaramond] Loads the EB-Garamond fonts with Garamond-Math.
+  \item[ebgaramond] Loads the EB-Garamond fonts with Garamond-Math and complements them with
+    Ysabeau for Sans.
     \item[erewhon] Loads the Erewhon fonts with Erewhon-Math.
     \item[euler] Loads the Concrete fonts with the Euler-Math for Mathematics. This option replaces
       the older option \texttt{neoeuler} which was using the neoeuler font. This font has continued
diff --git a/Master/texmf-dist/doc/latex/fontsetup/fspsample-cmr.pdf b/Master/texmf-dist/doc/latex/fontsetup/fspsample-cmr.pdf
index 8423318316b..69a5fbd0c89 100644
--- a/Master/texmf-dist/doc/latex/fontsetup/fspsample-cmr.pdf
+++ b/Master/texmf-dist/doc/latex/fontsetup/fspsample-cmr.pdf
diff --git a/Master/texmf-dist/doc/latex/fontsetup/fspsample-concrete.pdf b/Master/texmf-dist/doc/latex/fontsetup/fspsample-concrete.pdf
index 577d069a552..a412389f090 100644
--- a/Master/texmf-dist/doc/latex/fontsetup/fspsample-concrete.pdf
+++ b/Master/texmf-dist/doc/latex/fontsetup/fspsample-concrete.pdf
diff --git a/Master/texmf-dist/doc/latex/fontsetup/fspsample-ebgaramond.pdf b/Master/texmf-dist/doc/latex/fontsetup/fspsample-ebgaramond.pdf
index 6084e0e3bf3..7cc1c3faa0a 100644
--- a/Master/texmf-dist/doc/latex/fontsetup/fspsample-ebgaramond.pdf
+++ b/Master/texmf-dist/doc/latex/fontsetup/fspsample-ebgaramond.pdf
diff --git a/Master/texmf-dist/doc/latex/fontsetup/fspsample-fira.pdf b/Master/texmf-dist/doc/latex/fontsetup/fspsample-fira.pdf
index 479fecca543..e9e5538d93b 100644
--- a/Master/texmf-dist/doc/latex/fontsetup/fspsample-fira.pdf
+++ b/Master/texmf-dist/doc/latex/fontsetup/fspsample-fira.pdf
diff --git a/Master/texmf-dist/doc/latex/fontsetup/fspsample-kerkis.pdf b/Master/texmf-dist/doc/latex/fontsetup/fspsample-kerkis.pdf
index 5161451c9f5..e94e972ce57 100644
--- a/Master/texmf-dist/doc/latex/fontsetup/fspsample-kerkis.pdf
+++ b/Master/texmf-dist/doc/latex/fontsetup/fspsample-kerkis.pdf
diff --git a/Master/texmf-dist/doc/latex/fontsetup/fspsample-newdefault.pdf b/Master/texmf-dist/doc/latex/fontsetup/fspsample-newdefault.pdf
index 736690886c2..11d7c8fceee 100644
--- a/Master/texmf-dist/doc/latex/fontsetup/fspsample-newdefault.pdf
+++ b/Master/texmf-dist/doc/latex/fontsetup/fspsample-newdefault.pdf
diff --git a/Master/texmf-dist/doc/latex/fontsetup/fspsample-talos.pdf b/Master/texmf-dist/doc/latex/fontsetup/fspsample-talos.pdf
index 384b5ee71e0..c3fc62698c5 100644
--- a/Master/texmf-dist/doc/latex/fontsetup/fspsample-talos.pdf
+++ b/Master/texmf-dist/doc/latex/fontsetup/fspsample-talos.pdf
diff --git a/Master/texmf-dist/doc/latex/fontsetup/fspsample-withsans.pdf b/Master/texmf-dist/doc/latex/fontsetup/fspsample-withsans.pdf
new file mode 100644
index 00000000000..505a53ae76f
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/fontsetup/fspsample-withsans.pdf
diff --git a/Master/texmf-dist/doc/latex/fontsetup/fspsample-withsans.tex b/Master/texmf-dist/doc/latex/fontsetup/fspsample-withsans.tex
new file mode 100644
index 00000000000..5eea2f65d51
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/fontsetup/fspsample-withsans.tex
@@ -0,0 +1,120 @@
+%% after xelatex run
+%% pdfcrop fspsample.pdf output.pdf
+%% to crop it
+\documentclass{article}
+\pagestyle{empty}
+\usepackage{graphicx,wrapfig,xcolor}
+\pagestyle{empty}
+%\usepackage[greek]{babel}
+%\usepackage[utf8x]{inputenc}
+%\usepackage{amsfonts}
+
+\usepackage{polyglossia}
+\setdefaultlanguage{english}
+\setotherlanguage{greek}
+
+\usepackage[default]{fontsetup}%upint, newcmbb
+%\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[euler]{fontsetup}
+%\usepackage[neoeuler]{fontsetup}
+%\usepackage[libertinus]{fontsetup}
+%\usepackage[olddefault]{fontsetup}%upint, newcmbb
+%\usepackage[concrete]{fontsetup}
+%\usepackage[talos]{fontsetup}
+%\usepackage[oldstandard]{fontsetup}
+%\usepackage[xcharter]{fontsetup}% upint
+%\usepackage[erewhon]{fontsetup}
+
+\newtheorem{theorem}{Theorem}
+\newtheorem{theoremg}[theorem]{Θεώρημα}
+
+\makeatletter
+\long\def\@makecaption#1#2{%
+  \vskip\abovecaptionskip
+  \sbox\@tempboxa{\sffamily #1: #2}%
+  \ifdim \wd\@tempboxa >\hsize
+   {\sffamily #1: #2}\par
+  \else
+    \global \@minipagefalse
+    \hb@xt@\hsize{\hfil\box\@tempboxa\hfil}%
+  \fi
+  \vskip\belowcaptionskip}
+\makeatother
+
+
+
+
+\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}
+
+\begin{wrapfigure}[4]{o}{0.22\textwidth}\vspace*{-1.8\baselineskip}
+\begin{center}
+  {\Huge\textsf{\color{lightgray}ABC}}
+\end{center}
+\caption{Caption in Sans fonts}
+\end{wrapfigure}
+\textit{Proof}: The function $g-f_n$ is \textit{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
+
+\selectlanguage{greek}
+
+
+\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}
+
+%% Comment for xcharter %%%
+\begin{wrapfigure}[4]{o}{0.22\textwidth}\vspace*{-1.8\baselineskip}
+\begin{center}
+  {\Huge\textsf{\color{lightgray}ΓΨΩ}}
+\end{center}
+\caption{Λεζάντα σε γραμματοσειρά Sans}
+\end{wrapfigure}
+%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+
+\textit{Απόδειξη}: Η συνάρτηση $g − f_n$ είναι \textit{μη αρνητική} και άρα από
+το Λήμμα του 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
index 97b9e2c9f5d..954c4004d60 100644
--- a/Master/texmf-dist/doc/latex/fontsetup/fspsample-xcharter.pdf
+++ b/Master/texmf-dist/doc/latex/fontsetup/fspsample-xcharter.pdf
diff --git a/Master/texmf-dist/doc/latex/fontsetup/fspsample.pdf b/Master/texmf-dist/doc/latex/fontsetup/fspsample.pdf
index 89bee7ffc6b..c297af6b90d 100644
--- a/Master/texmf-dist/doc/latex/fontsetup/fspsample.pdf
+++ b/Master/texmf-dist/doc/latex/fontsetup/fspsample.pdf
diff --git a/Master/texmf-dist/doc/latex/fontsetup/fspsample.tex b/Master/texmf-dist/doc/latex/fontsetup/fspsample.tex
index ac293097252..c012dad2990 100644
--- a/Master/texmf-dist/doc/latex/fontsetup/fspsample.tex
+++ b/Master/texmf-dist/doc/latex/fontsetup/fspsample.tex
@@ -3,14 +3,18 @@
 %% to crop it
 \documentclass{article}
 \pagestyle{empty}
-\usepackage{xgreek,graphicx}
+\usepackage{graphicx,wrapfig,xcolor}
 \pagestyle{empty}
 %\usepackage[greek]{babel}
 %\usepackage[utf8x]{inputenc}
 %\usepackage{amsfonts}
 
+\usepackage{polyglossia}
+\setdefaultlanguage{english}
+\setotherlanguage{greek}
+
 %\usepackage[default]{fontsetup}%upint, newcmbb
-%\usepackage[gfsartemisia]{fontsetup}
+\usepackage[gfsartemisia]{fontsetup}
 %\usepackage[gfsdidot]{fontsetup}
 %\usepackage[gfsdidotclassic]{fontsetup}
 %\usepackage[gfsneohellenic]{fontsetup}
@@ -25,7 +29,7 @@
 %\usepackage[msgaramond]{fontsetup}
 %\usepackage[ebgaramond]{fontsetup}
 %\usepackage[minion]{fontsetup}
-\usepackage[euler]{fontsetup}
+%\usepackage[euler]{fontsetup}
 %\usepackage[neoeuler]{fontsetup}
 %\usepackage[libertinus]{fontsetup}
 %\usepackage[olddefault]{fontsetup}%upint, newcmbb
@@ -38,6 +42,21 @@
 \newtheorem{theorem}{Theorem}
 \newtheorem{theoremg}[theorem]{Θεώρημα}
 
+\makeatletter
+\long\def\@makecaption#1#2{%
+  \vskip\abovecaptionskip
+  \sbox\@tempboxa{\sffamily #1: #2}%
+  \ifdim \wd\@tempboxa >\hsize
+   {\sffamily #1: #2}\par
+  \else
+    \global \@minipagefalse
+    \hb@xt@\hsize{\hfil\box\@tempboxa\hfil}%
+  \fi
+  \vskip\belowcaptionskip}
+\makeatother
+
+
+
 
 \begin{document}
 
@@ -49,12 +68,23 @@ in\-te\-grable func\-tion defined on the measurable set $E$ and 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}
+
+\begin{wrapfigure}[4]{o}{0.22\textwidth}\vspace*{-1.8\baselineskip}
+\begin{center}
+  {\Huge\textsf{\color{lightgray}ABC}}
+\end{center}
+\caption{Caption in Sans fonts}
+\end{wrapfigure}
 \textit{Proof}: The function $g-f_n$ is \textit{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
+
+\selectlanguage{greek}
+
+
 \begin{theoremg}[Κυριαρχημένης σύγκλισης του Lebesgue]
   Έστω ότι
 η $g$ είναι μια ολοκληρώσιμη συνάρτηση ορισμένη στο μετρήσιμο σύνολο
@@ -64,6 +94,15 @@ $|\,f_n| ≤ g$. Υποθέτουμε ότι υπάρχει μια συνάρτ�
 τείνει στην $f$ σχεδόν παντού. Τότε
 $$\lim \int f_n =\int f.$$
 \end{theoremg}
+
+
+\begin{wrapfigure}[4]{o}{0.22\textwidth}\vspace*{-1.8\baselineskip}
+\begin{center}
+  {\Huge\textsf{\color{lightgray}ΓΨΩ}}
+\end{center}
+\caption{Λεζάντα σε γραμματοσειρά Sans}
+\end{wrapfigure}
+
 \textit{Απόδειξη}: Η συνάρτηση $g − f_n$ είναι \textit{μη αρνητική} και άρα από
 το Λήμμα του Fatou ισχύει
 $\int (f-g) ≤ \liminf \int (g-f_n)$. Επειδή
diff --git a/Master/texmf-dist/tex/latex/fontsetup/fontsetup.sty b/Master/texmf-dist/tex/latex/fontsetup/fontsetup.sty
index 6656d2a95ff..42cc65f7793 100644
--- a/Master/texmf-dist/tex/latex/fontsetup/fontsetup.sty
+++ b/Master/texmf-dist/tex/latex/fontsetup/fontsetup.sty
@@ -1,4 +1,4 @@
-\ProvidesPackage{fontsetup}[2024/2/24 v2.1.1 For easily using font families with mathematics]
+\ProvidesPackage{fontsetup}[2024/9/08 v2.2.0 For easily using font families with mathematics]
 \RequirePackage{iflang}
 \RequirePackage{iftex}
 % Provide a test to know if a 16bits TeX is used.
@@ -27,7 +27,6 @@
 \newif\if@palatino
 \newif\if@msgaramond
 \newif\if@minion
-\newif\if@packagewithoptions
 \newcommand*\greeksetup{%
   \newcommand*\leftgrquotes{\char"201C}%
   \newcommand*\rightgrquotes{\char"201E}%
@@ -81,7 +80,6 @@
   \newcommand*{\regularorbook}{Book}%
   \ncmsetup
   \endgroup
-  \@packagewithoptionstrue
 }
 \DeclareOption{olddefault}{%
   \input{fspolddefault}%
@@ -89,60 +87,49 @@
   \newcommand*{\regularorbook}{Regular}%
   \ncmsetup
   \endgroup
-  \@packagewithoptionstrue
 }
 % Install Cambria as a system font.
 % cambria.ttc, cambriai.ttf, cambriab.ttf, cambriaz.ttf
-\DeclareOption{cambria}{\input{fspcambria}\@packagewithoptionstrue}
-\DeclareOption{concrete}{\input{fspconcrete}\@packagewithoptionstrue}
-\DeclareOption{ebgaramond}{\input{fspebgaramondot}\@packagewithoptionstrue}
-\DeclareOption{erewhon}{\input{fsperewhon}\@erewhontrue\@packagewithoptionstrue}
-\DeclareOption{euler}{\input{fspeulerot}\@packagewithoptionstrue}
-\DeclareOption{fira}{\input{fspfiraot}\@packagewithoptionstrue}
-\DeclareOption{gfsartemisia}{\input{fspgfsartemisiaot}\@packagewithoptionstrue}
-\DeclareOption{gfsdidot}{\input{fspgfsdidotot}\@packagewithoptionstrue}
-\DeclareOption{gfsdidotclassic}{\input{fspgfsdidotclassicot}\@gfstrue\@packagewithoptionstrue}
-\DeclareOption{gfsneohellenic}{\input{fspgfsneohellenicot}\@packagewithoptionstrue}
-\DeclareOption{kerkis}{\input{fspkerkisot}\@packagewithoptionstrue}
-\DeclareOption{libertinus}{\@libertinustrue\@packagewithoptionstrue}
+\DeclareOption{cambria}{\input{fspcambria}}
+\DeclareOption{concrete}{\input{fspconcrete}}
+\DeclareOption{ebgaramond}{\input{fspebgaramondot}}
+\DeclareOption{erewhon}{\input{fsperewhon}\@erewhontrue}
+\DeclareOption{euler}{\input{fspeulerot}}
+\DeclareOption{fira}{\input{fspfiraot}}
+\DeclareOption{gfsartemisia}{\input{fspgfsartemisiaot}}
+\DeclareOption{gfsdidot}{\input{fspgfsdidotot}}
+\DeclareOption{gfsdidotclassic}{\input{fspgfsdidotclassicot}\@gfstrue}
+\DeclareOption{gfsneohellenic}{\input{fspgfsneohellenicot}}
+\DeclareOption{kerkis}{\input{fspkerkisot}}
+\DeclareOption{libertinus}{\@libertinustrue}
 % Install Lucida in TeX tree
-\DeclareOption{lucida}{\input{fsplucidaot}\@packagewithoptionstrue}
+\DeclareOption{lucida}{\input{fsplucidaot}}
 % Install MinionPro and provided fspMinionGreekSmallCaps as system fonts.
-\DeclareOption{minion}{\input{fspminion}\@miniontrue\@packagewithoptionstrue}
+\DeclareOption{minion}{\input{fspminion}\@miniontrue}
 % Install Microsoft Garamond as a system font.
 % Gara.ttf, Garai, Garabd
-\DeclareOption{msgaramond}{\input{fspmsgaramondot}\@msgaramondtrue\@packagewithoptionstrue}
-\DeclareOption{neoeuler}{\input{fspeulerot}\@packagewithoptionstrue}% compatibility
+\DeclareOption{msgaramond}{\input{fspmsgaramondot}\@msgaramondtrue}
+\DeclareOption{neoeuler}{\input{fspeulerot}}% compatibility
 % Not released yet
 % \DeclareOption{neokadmus}{\input{neokadmus}}
 \DeclareOption{oldstandard}{\input{fspoldstandard}%
   \if@upint
     \setmathfont[StylisticSet=2]{OldStandard-Math.otf}%
   \fi
-  \@packagewithoptionstrue
 }
 % Install Linotype Palatino as a system font.
 % pala.ttf palai, palab, palabi.
 % Install fspPalatinoGreekSmallCaps as a System font.
-\DeclareOption{palatino}{\input{fsppalatinoot}\@palatinotrue\@packagewithoptionstrue}
-\DeclareOption{stixtwo}{\input{fspstixtwoot}\@packagewithoptionstrue}
-\DeclareOption{talos}{\input{fsptalos}\@packagewithoptionstrue}
-\DeclareOption{times}{\input{fsptimesot}\@packagewithoptionstrue}
+\DeclareOption{palatino}{\input{fsppalatinoot}\@palatinotrue}
+\DeclareOption{stixtwo}{\input{fspstixtwoot}}
+\DeclareOption{talos}{\input{fsptalos}}
+\DeclareOption{times}{\input{fsptimesot}}
 \DeclareOption{xcharter}{%
   \input{fspxcharter}%
   \@xchartertrue
-  \@packagewithoptionstrue
 }
 \DeclareOption*{\PackageWarning{fontsetup}{Unknown ‘\CurrentOption’}}
 \ProcessOptions
-\if@packagewithoptions
-\else
-  \input{fspdefault}%
-  \begingroup
-  \newcommand*{\regularorbook}{Book}%
-  \ncmsetup
-  \endgroup
-\fi
 \AtBeginDocument{%
   \if@erewhon
     \RequirePackage{fourier-otf}
diff --git a/Master/texmf-dist/tex/latex/fontsetup/fspdefault.tex b/Master/texmf-dist/tex/latex/fontsetup/fspdefault.tex
index 05a40a7f019..6453568639f 100644
--- a/Master/texmf-dist/tex/latex/fontsetup/fspdefault.tex
+++ b/Master/texmf-dist/tex/latex/fontsetup/fspdefault.tex
@@ -94,6 +94,7 @@ SmallCapsFeatures={Numbers=OldStyle}]{NewCMMono10-Book.otf}
   ]{NewCMUncial10-Book.otf}
 \newcommand{\textuncial}[1]{{\uncial #1}}
 \setmathfont{NewCMMath-Book.otf}
+\setmathfont{NewCMMath-Bold.otf}[version=bold]
 \setmathfont[range={\mathscr,\mathbfscr},StylisticSet=1]{NewCMMath-Book.otf}
 \newcommand{\tttextsc}[1]{{\ttscshape#1}}
 %
@@ -299,6 +300,12 @@ SmallCapsFeatures={Numbers=OldStyle}]{NewCMMono10-Book.otf}
 % some math symbols
 \DeclareRobustCommand*\nrightrightarrows{\mathrel{\char"E033}}
 \DeclareRobustCommand*\nleftleftarrows{\mathrel{\char"E032}}
+\DeclareRobustCommand*\twoheadhookrightarrow{\mathrel{\char"E034}}
+\DeclareRobustCommand*\twoheadhookleftarrow{\mathrel{\char"E035}}
+%
+%%% declare the convolution operator %%%%%%%%%%%%%%%
+\DeclareMathOperator*{\convolution}{\mathchoice{\char"E037}{\char"E036}{\char"E038}{\char"E039}}
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
 % select ss02 lookup table for IPA symbols
 %\newfontfamily{\ipatext}[StylisticSet=5,%
diff --git a/Master/texmf-dist/tex/latex/fontsetup/fspebgaramondot.tex b/Master/texmf-dist/tex/latex/fontsetup/fspebgaramondot.tex
index 8d8802fbd66..7961849540b 100644
--- a/Master/texmf-dist/tex/latex/fontsetup/fspebgaramondot.tex
+++ b/Master/texmf-dist/tex/latex/fontsetup/fspebgaramondot.tex
@@ -2,4 +2,13 @@
 \setmainfont[ItalicFont=EBGaramond-Italic.otf,
 BoldFont=EBGaramond-Bold.otf,
 BoldItalicFont=EBGaramond-BoldItalic.otf,SmallCapsFeatures={Numbers=OldStyle}]{EBGaramond-Regular.otf}
-\setmathfont{Garamond-Math.otf}
\ No newline at end of file
+\setsansfont[ItalicFont=Ysabeau-Italic.otf,
+BoldFont=Ysabeau-Bold.otf,BoldItalicFont=Ysabeau-BoldItalic.otf,Scale=MatchLowercase,
+SmallCapsFeatures={Numbers=OldStyle}]{Ysabeau-Regular.otf}
+
+%\newfontfamily{\greekfont}[ItalicFont=EBGaramond-Italic.otf,
+%BoldFont=EBGaramond-Bold.otf,
+%BoldItalicFont=EBGaramond-BoldItalic.otf,SmallCapsFeatures={Numbers=OldStyle}]{EBGaramond-Regular.otf}
+%
+\setmathfont{Garamond-Math.otf}
+
diff --git a/Master/texmf-dist/tex/latex/fontsetup/fspolddefault.tex b/Master/texmf-dist/tex/latex/fontsetup/fspolddefault.tex
index 48f3bd948a7..796f3c21330 100644
--- a/Master/texmf-dist/tex/latex/fontsetup/fspolddefault.tex
+++ b/Master/texmf-dist/tex/latex/fontsetup/fspolddefault.tex
@@ -98,6 +98,7 @@ SmallCapsFeatures={Numbers=OldStyle}]{NewCMMono10-Regular.otf}
 
 \newcommand{\textuncial}[1]{{\uncial #1}}
 \setmathfont{NewCMMath-Regular.otf}
+\setmathfont{NewCMMath-Bold.otf}[version=bold]
 \setmathfont[range={\mathscr,\mathbfscr},StylisticSet=1]{NewCMMath-Regular.otf}
 
 \newcommand{\tttextsc}[1]{{\ttscshape#1}}
@@ -304,6 +305,12 @@ SmallCapsFeatures={Numbers=OldStyle}]{NewCMMono10-Regular.otf}
 % some math symbols
 \DeclareRobustCommand*\nrightrightarrows{\mathrel{\char"E033}}
 \DeclareRobustCommand*\nleftleftarrows{\mathrel{\char"E032}}
+\DeclareRobustCommand*\twoheadhookrightarrow{\mathrel{\char"E034}}
+\DeclareRobustCommand*\twoheadhookleftarrow{\mathrel{\char"E035}}
+%
+%%% declare the convolution operator %%%%%%%%%%%%%%%
+\DeclareMathOperator*{\convolution}{\mathchoice{\char"E037}{\char"E036}{\char"E038}{\char"E039}}
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
 % select ss02 lookup table for IPA symbols
 %\newfontfamily{\ipatext}[StylisticSet=5,%