diff options
author | Karl Berry <karl@freefriends.org> | 2019-12-20 22:21:32 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2019-12-20 22:21:32 +0000 |
commit | f27cb1d537a34677b1291d5365c80cde1416417c (patch) | |
tree | 0e2d0e89e70b388b3f45fe8e81491a09cdca51e8 /Master | |
parent | 42fff9c15d299e41425b1aef482186e3cd2f4d9a (diff) |
fontsetup (20dec19)
git-svn-id: svn://tug.org/texlive/trunk@53195 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
36 files changed, 805 insertions, 0 deletions
diff --git a/Master/texmf-dist/doc/latex/fontsetup/README b/Master/texmf-dist/doc/latex/fontsetup/README new file mode 100644 index 00000000000..651488aef1e --- /dev/null +++ b/Master/texmf-dist/doc/latex/fontsetup/README @@ -0,0 +1,15 @@ + The fontsetup package + (Version 1.002, GPL3) + +This simple package makes it trivial to switch quickly between +different quality fonts supporting Mathematics. + +For more information read the file fontsetup-doc.pdf in +the doc subdirectory. + +Antonis Tsolomitis +Professor +University of the Aegean +Department of Mathematics +83200 Samos, Greece + diff --git a/Master/texmf-dist/doc/latex/fontsetup/README.TEXLIVE b/Master/texmf-dist/doc/latex/fontsetup/README.TEXLIVE new file mode 100644 index 00000000000..2eaf7dfab03 --- /dev/null +++ b/Master/texmf-dist/doc/latex/fontsetup/README.TEXLIVE @@ -0,0 +1,14 @@ +The following files have been removed in the TeX Live installation of +the current package, typically due to duplication, lack of space, or +missing source code. You can find these files on CTAN at + http://mirror.ctan.org/macros/latex/contrib/fontsetup +If questions or concerns, email tex-live@tug.org. + + fspsample-msgaramond.pdf + fspsample-cambria.pdf + fspmsgaramondot.sty + fspsample-minion.pdf + fspcambria.sty + fspsample-lucida.pdf + fspminion.sty + fsplucidaot.sty diff --git a/Master/texmf-dist/doc/latex/fontsetup/fontsetup-doc.pdf b/Master/texmf-dist/doc/latex/fontsetup/fontsetup-doc.pdf Binary files differnew file mode 100644 index 00000000000..3c7feb5474b --- /dev/null +++ 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 new file mode 100644 index 00000000000..d27ec9dbf88 --- /dev/null +++ b/Master/texmf-dist/doc/latex/fontsetup/fontsetup-doc.tex @@ -0,0 +1,263 @@ +\documentclass{article} +\usepackage[default]{fontsetup} +\usepackage{graphicx,fullpage} +\begin{document} + + + \begin{center} + {\LARGE The \texttt{fontsetup} package}\\[1ex] + \textit{by}\\[1ex] + {\large Antonis Tsolomitis}\\ +University of the Aegean\\ Department of Mathematics\\[1ex] + \textsc{20} December \textsc{2019}\\[1ex] + Version 1.002, \textsc{gpl3} + \end{center} + + 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. + + The target is to provide easy access to fonts with a matching Mathematics font available in + TeX distributions plus a few commercial if available. + + The package will include more font combinations in the future, however there are + some restrictions. The fonts must have some commercial-level quality and must support + Mathematics. + + The options (in alphabetic order) are as follows: + + \begin{description} + \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 + more fonts to support Greek (cbgreek) and Cyrillic languages. + \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 + as a Times replacement. The Mathematics is from stix2 but latin + and greek letters are substituted from GFSArtemisia to provide a better match. + \item[gfsdidotclassic] Uses the GFSDidotClassic for Greek with GFSPorson for italic. + The latin part is URW garamond. The Mathematics is from Garamond-Math but the greek + 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 + 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. + \item[libertinus] Loads the Libertinus and LibertinusMath fonts. + \item[lucida] Loads the Lucida font family if available (a commercial font). + \item[minion] Loads the MinionPro family. To install it, find the fonts MinionPro and + MyriadPro from the installation of Adobe PDF Reader and install the fonts to your system + (in \verb|C:\Windows\Fonts| in MS-Windows, in \verb|/home/user/.fonts/| in Linux + or elsewhere by the system administratior). Moreover, install the supplied + fspmnscel.otf as a system font to have access to Greek small caps. + Mathematics is from stix2 + with letters replaced from MinionPro. Sans is MyriadPro. + \item[msgaramond] Loads the MS-Garamond fonts. These 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). Mathematics is from + Garamond-Math with letters replaced + 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[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 + fsplpscel.otf must be also + system-installed to allow access to Greek small caps. + Mathematics font is texgyrepagella-math. + \item[stixtwo] Loads the stix2 fonts, a Times-type font. + \item[times] Loads the FreeSerifb fonts, a Times font and stix2 for Mathematics + with letters replaced from FreeSerifb. + \end{description} + + You do not need to load \verb|fontspec|. This, as well as \verb|unicode-math|, are + automatically loaded. A minimal file is +\begin{verbatim} + \documentclass{article} + \usepackage[default]{fontsetup} + \begin{document} + ... + \end{document} +\end{verbatim} + +The switch to another font is trivial. You just change the option of \verb|fontsetup| +to another among the supported ones. + + +\bigskip + +\textbf{Summary of installation steps to support all fonts} + +\medskip + +You do not have to do any of these steps if you rely on free fonts +(except step 6 if you want to use the \verb|neoeuler| option) and do not want +to use the commercial ones. + +\medskip + +\begin{enumerate} +\item Install as system fonts the supplied \verb|fspmnscel.otf| + and \verb|fsplpscel.otf| (in \verb|C:\Windows\Fonts\| on MS-Windows or in + \verb|/home/user/.fonts/| in Linux or system-wide install as administrator) +\item Repeat the previous step for all MinionPro and MyriadPro fonts from the + installation of the free Adobe Acrobat Reader. +\item Repeat the above for the MS-Garamond fonts (\verb|Gara.ttf|, \verb|Garabd.ttf| + and \verb|Garait.ttf|) as well as for the Linotype Palatino fonts + found in some versions of Microsoft Windows (\verb|palabi.ttf|, \verb|palab.ttf|, + \verb|palai.ttf|, and \verb|pala.ttf|). +\item Repeat the above for the Cambria fonts (\verb|cambria.ttc|, \verb|cambriab.ttf|, + \verb|cambriai.ttf|, \verb|cambriaz.ttf|). +\item Install the commercial Lucida fonts (if available) in your TeX tree. +\item Install \verb|euler.otf| in your TeX tree from + here: \verb|https://github.com/khaledhosny/euler-otf| +\end{enumerate} + +\bigskip + + + + +You can indeed suggest a new combination of fonts and I will add them. However, I do +reserve the right to reject them if the font quality is bad or if Mathematics is not supported +with a matching font. + +Samples follow. + +\newpage + +\begin{center} +{\Large Cambria and CambriaMath: option \verb|cambria|}\\ +Cambria Fonts must be installed as system fonts\\[1cm] +\includegraphics[scale=1.2]{fspsample-cambria.pdf} +\end{center} + +\newpage + +\begin{center} +{\Large ComputerModern fonts: option \verb|default|}\\[1cm] +\includegraphics[scale=1.2]{fspsample-cmr.pdf} +\end{center} + +\newpage + +\begin{center} +{\Large EB-Garamond and Garamond-Math fonts: option \verb|ebgaramond|}\\[1cm] +\includegraphics[scale=1.2]{fspsample-ebgaramond.pdf} +\end{center} + +\newpage + +\begin{center} +{\Large Fira fonts: option \verb|fira|}\\[1cm] +\includegraphics[scale=1.2]{fspsample-fira.pdf} +\end{center} + +\newpage + +\begin{center} +{\Large GFSArtemisia and Stix2Math fonts: option \verb|gfsartemisia|}\\[1cm] +\includegraphics[scale=1.2]{fspsample-gfsartemisia.pdf} +\end{center} + +\newpage + +\begin{center} +{\Large GFSDidotClassic, GFSPorson Italic, and Garamond-Math fonts: option \verb|gfsdidotclassic|}\\[1cm] +\includegraphics[scale=1.2]{fspsample-gfsdidotclassic.pdf} +\end{center} + +\newpage + +\begin{center} +{\Large GFSDidot and Stix2Math: option \verb|gfsdidot|}\\[1cm] +\includegraphics[scale=1.2]{fspsample-gfsdidot.pdf} +\end{center} + +\newpage + +\begin{center} +{\Large GFSNeohellenic and GFSNeohellenic-Math: option \verb|gfsneohellenic|}\\[1cm] +\includegraphics[scale=1.2]{fspsample-gfsneohellenic.pdf} +\end{center} + +\newpage + +\begin{center} +{\Large Kerkis and texgyrebonum-math: option \verb|kerkis|}\\[1cm] +\includegraphics[scale=1.2]{fspsample-kerkis.pdf} +\end{center} + + + +\newpage + +\begin{center} +{\Large Libertinus and LibertinusMath: option \verb|libertinus|}\\[1cm] +\includegraphics[scale=1.2]{fspsample-libertinus.pdf} +\end{center} + + + +\newpage + +\begin{center} +{\Large Lucida and Lucida-Math (commercial): option \verb|lucida|}\\[1cm] +\includegraphics[scale=1.2]{fspsample-lucida.pdf} +\end{center} + +\newpage + +\begin{center} +{\Large MinionPro (commercial) and Stix2Math: option \verb|minion|}\\ +MinionPro Fonts and the supplied fspmnscel.otf must +be installed as system fonts\\[1cm] +\includegraphics[scale=1.2]{fspsample-minion.pdf} +\end{center} + +\newpage + +\begin{center} +{\Large MS-Garamond (commercial) and Garamond-Math: option \verb|msgaramond|}\\ +MS-Garamond Fonts must be installed as system fonts\\[1cm] +\includegraphics[scale=1.2]{fspsample-msgaramond.pdf} +\end{center} + +\newpage + +\begin{center} +{\Large Concrete fonts and NeoEuler Math: option \verb|neoeuler|}\\ +NeoEuler font must be installed in TeX tree\\[1cm] +\includegraphics[scale=1.2]{fspsample-neoeuler.pdf} +\end{center} + +\newpage + +\begin{center} +{\Large Linotype Palatino (commercial) and texgyrepagella-math: option \verb|palatino|}\\ +Linotype Palatino Fonts and the supplied fsplpscel.otf must be installed as system fonts\\[1cm] +\includegraphics[scale=1.2]{fspsample-palatino.pdf} +\end{center} + +\newpage + +\begin{center} +{\Large Stix2 and Stix2Math: option \verb|stixtwo|}\\[1cm] +\includegraphics[scale=1.2]{fspsample-stixtwo.pdf} +\end{center} + +\newpage + +\begin{center} +{\Large FreeSerifb and Stix2Math: option \verb|times|}\\[1cm] +\includegraphics[scale=1.2]{fspsample-times.pdf} +\end{center} + + + + + +\end{document} diff --git a/Master/texmf-dist/doc/latex/fontsetup/fspsample-cmr.pdf b/Master/texmf-dist/doc/latex/fontsetup/fspsample-cmr.pdf Binary files differnew file mode 100644 index 00000000000..14a66ed61d7 --- /dev/null +++ b/Master/texmf-dist/doc/latex/fontsetup/fspsample-cmr.pdf diff --git a/Master/texmf-dist/doc/latex/fontsetup/fspsample-ebgaramond.pdf b/Master/texmf-dist/doc/latex/fontsetup/fspsample-ebgaramond.pdf Binary files differnew file mode 100644 index 00000000000..ebc2cbb5bea --- /dev/null +++ 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 Binary files differnew file mode 100644 index 00000000000..1c5215cce90 --- /dev/null +++ b/Master/texmf-dist/doc/latex/fontsetup/fspsample-fira.pdf diff --git a/Master/texmf-dist/doc/latex/fontsetup/fspsample-gfsartemisia.pdf b/Master/texmf-dist/doc/latex/fontsetup/fspsample-gfsartemisia.pdf Binary files differnew file mode 100644 index 00000000000..d4af57e51fd --- /dev/null +++ b/Master/texmf-dist/doc/latex/fontsetup/fspsample-gfsartemisia.pdf diff --git a/Master/texmf-dist/doc/latex/fontsetup/fspsample-gfsdidot.pdf b/Master/texmf-dist/doc/latex/fontsetup/fspsample-gfsdidot.pdf Binary files differnew file mode 100644 index 00000000000..0a9f49edc20 --- /dev/null +++ b/Master/texmf-dist/doc/latex/fontsetup/fspsample-gfsdidot.pdf diff --git a/Master/texmf-dist/doc/latex/fontsetup/fspsample-gfsdidotclassic.pdf b/Master/texmf-dist/doc/latex/fontsetup/fspsample-gfsdidotclassic.pdf Binary files differnew file mode 100644 index 00000000000..68bc005ced8 --- /dev/null +++ b/Master/texmf-dist/doc/latex/fontsetup/fspsample-gfsdidotclassic.pdf diff --git a/Master/texmf-dist/doc/latex/fontsetup/fspsample-gfsneohellenic.pdf b/Master/texmf-dist/doc/latex/fontsetup/fspsample-gfsneohellenic.pdf Binary files differnew file mode 100644 index 00000000000..b155b14810d --- /dev/null +++ b/Master/texmf-dist/doc/latex/fontsetup/fspsample-gfsneohellenic.pdf diff --git a/Master/texmf-dist/doc/latex/fontsetup/fspsample-kerkis.pdf b/Master/texmf-dist/doc/latex/fontsetup/fspsample-kerkis.pdf Binary files differnew file mode 100644 index 00000000000..ce4caf1121b --- /dev/null +++ b/Master/texmf-dist/doc/latex/fontsetup/fspsample-kerkis.pdf diff --git a/Master/texmf-dist/doc/latex/fontsetup/fspsample-libertinus.pdf b/Master/texmf-dist/doc/latex/fontsetup/fspsample-libertinus.pdf Binary files differnew file mode 100644 index 00000000000..da4f818429c --- /dev/null +++ b/Master/texmf-dist/doc/latex/fontsetup/fspsample-libertinus.pdf diff --git a/Master/texmf-dist/doc/latex/fontsetup/fspsample-neoeuler.pdf b/Master/texmf-dist/doc/latex/fontsetup/fspsample-neoeuler.pdf Binary files differnew file mode 100644 index 00000000000..7611ed11f9c --- /dev/null +++ b/Master/texmf-dist/doc/latex/fontsetup/fspsample-neoeuler.pdf diff --git a/Master/texmf-dist/doc/latex/fontsetup/fspsample-palatino.pdf b/Master/texmf-dist/doc/latex/fontsetup/fspsample-palatino.pdf Binary files differnew file mode 100644 index 00000000000..c5231ab0abf --- /dev/null +++ b/Master/texmf-dist/doc/latex/fontsetup/fspsample-palatino.pdf diff --git a/Master/texmf-dist/doc/latex/fontsetup/fspsample-stixtwo.pdf b/Master/texmf-dist/doc/latex/fontsetup/fspsample-stixtwo.pdf Binary files differnew file mode 100644 index 00000000000..79e5f55cd6d --- /dev/null +++ b/Master/texmf-dist/doc/latex/fontsetup/fspsample-stixtwo.pdf diff --git a/Master/texmf-dist/doc/latex/fontsetup/fspsample-times.pdf b/Master/texmf-dist/doc/latex/fontsetup/fspsample-times.pdf Binary files differnew file mode 100644 index 00000000000..57413898c19 --- /dev/null +++ b/Master/texmf-dist/doc/latex/fontsetup/fspsample-times.pdf diff --git a/Master/texmf-dist/doc/latex/fontsetup/fspsample.tex b/Master/texmf-dist/doc/latex/fontsetup/fspsample.tex new file mode 100644 index 00000000000..b9783698540 --- /dev/null +++ b/Master/texmf-dist/doc/latex/fontsetup/fspsample.tex @@ -0,0 +1,72 @@ +\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} + + + + +\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 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 + 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/system-install-fonts/fsplpscel.otf b/Master/texmf-dist/doc/latex/fontsetup/system-install-fonts/fsplpscel.otf Binary files differnew file mode 100644 index 00000000000..b505b6b96fe --- /dev/null +++ b/Master/texmf-dist/doc/latex/fontsetup/system-install-fonts/fsplpscel.otf diff --git a/Master/texmf-dist/doc/latex/fontsetup/system-install-fonts/fspmnscel.otf b/Master/texmf-dist/doc/latex/fontsetup/system-install-fonts/fspmnscel.otf Binary files differnew file mode 100644 index 00000000000..c0e233f43c9 --- /dev/null +++ b/Master/texmf-dist/doc/latex/fontsetup/system-install-fonts/fspmnscel.otf diff --git a/Master/texmf-dist/tex/latex/fontsetup/fontsetup.sty b/Master/texmf-dist/tex/latex/fontsetup/fontsetup.sty new file mode 100644 index 00000000000..783c3f1d3da --- /dev/null +++ b/Master/texmf-dist/tex/latex/fontsetup/fontsetup.sty @@ -0,0 +1,106 @@ +%\NeedsTeXFormat{LaTeX2e} +\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\fontsetupgfsartemisia=1 +\chardef\fontsetupgfsdidot=2 +\chardef\fontsetupgfsdidotclassic=3 +\chardef\fontsetupgfsneohellenic=4 +\chardef\fontsetupcambria=5 %install cambria as a system font. cambria.ttc, cambriai.ttf, cambriab.ttf, cambriaz.ttf +\chardef\fontsetuplucida=6 %install in TeX tree +\chardef\fontsetupkerkis=7 +\chardef\fontsetupfira=8 +\chardef\fontsetuptimes=9 +\chardef\fontsetuppalatino=10 %install Linotype Palatino as a System font. Files pala.ttf palai, palab, palabi. Install fspPalatinoGreekSmallCaps as a System font. +\chardef\fontsetupstixtwo=11 +\chardef\fontsetupneokadmus=12 +\chardef\fontsetupmsgaramond=13 %install Microsoft Garamond as a System font. Gara.TTF, Garai, Garabd +\chardef\fontsetupebgaramond=14 +\chardef\fontsetupminion=15 % Install MinionPro and provided fspMinionGreekSmallCaps as a system font. +\chardef\fontsetupneoeuler=16 +\chardef\fontsetuplibertinus=17 + +\chardef\fontsetupfont\fontsetupdefault +\DeclareOption{default}{\chardef\fontsetupfont\fontsetupdefault} +\DeclareOption{gfsartemisia}{\chardef\fontsetupfont\fontsetupgfsartemisia} +\DeclareOption{gfsdidot}{\chardef\fontsetupfont\fontsetupgfsdidot} +\DeclareOption{gfsdidotclassic}{\chardef\fontsetupfont\fontsetupgfsdidotclassic} +\DeclareOption{gfsneohellenic}{\chardef\fontsetupfont\fontsetupgfsneohellenic} +\DeclareOption{cambria}{\chardef\fontsetupfont\fontsetupcambria} +\DeclareOption{lucida}{\chardef\fontsetupfont\fontsetuplucida} +\DeclareOption{kerkis}{\chardef\fontsetupfont\fontsetupkerkis} +\DeclareOption{fira}{\chardef\fontsetupfont\fontsetupfira} +\DeclareOption{times}{\chardef\fontsetupfont\fontsetuptimes} +\DeclareOption{palatino}{\chardef\fontsetupfont\fontsetuppalatino} +\DeclareOption{stixtwo}{\chardef\fontsetupfont\fontsetupstixtwo} +\DeclareOption{neokadmus}{\chardef\fontsetupfont\fontsetupneokadmus} +\DeclareOption{msgaramond}{\chardef\fontsetupfont\fontsetupmsgaramond} +\DeclareOption{ebgaramond}{\chardef\fontsetupfont\fontsetupebgaramond} +\DeclareOption{minion}{\chardef\fontsetupfont\fontsetupminion} +\DeclareOption{neoeuler}{\chardef\fontsetupfont\fontsetupneoeuler} +\DeclareOption{libertinus}{\chardef\fontsetupfont\fontsetuplibertinus} +\DeclareOption*{\PackageWarning{fontsetup}{Unknown ‘\CurrentOption’}} +\ProcessOptions + +%provide a test to know if a 16bits TeX is used. +\RequirePackage{ifthen} +\RequirePackage{iftex} +\newboolean{TeXUnicode} +\ifXeTeX + \setboolean{TeXUnicode}{true} +\fi +\ifLuaTeX + \setboolean{TeXUnicode}{true} +\fi + + + +\ifthenelse{\boolean{TeXUnicode}}{% + %The user runs unicode engine + \ifcase\fontsetupfont + \RequirePackage{fspdefaultfontsot} +\or + \RequirePackage{fspgfsartemisiaot} +\or + \RequirePackage{fspgfsdidotot} +\or + \RequirePackage{fspgfsdidotclassicot} +\or + \RequirePackage{fspgfsneohellenicot} +\or + \RequirePackage{fspcambria} +\or + \RequirePackage{fsplucidaot} +% \RequirePackage[usefilenames]{lucida-otf} %for some reason it fails +\or + \RequirePackage{fspkerkisot} +\or + \RequirePackage{fspfiraot} +\or + \RequirePackage{fsptimesot} +\or + \RequirePackage{fsppalatinoot} +\or + \RequirePackage{fspstixtwoot} +\or + \RequirePackage{neokadmus} +\or + \RequirePackage{fspmsgaramondot} +\or + \RequirePackage{fspebgaramondot} +\or + \RequirePackage{fspminion} +\or + \RequirePackage{fspneoeulerot} +\or + \RequirePackage{libertinus-otf} + \fi +}{%the user runs 8bit engine +\relax} + + + + +\endinput + diff --git a/Master/texmf-dist/tex/latex/fontsetup/fspdefaultfontsot.sty b/Master/texmf-dist/tex/latex/fontsetup/fspdefaultfontsot.sty new file mode 100644 index 00000000000..2192c0c32d3 --- /dev/null +++ b/Master/texmf-dist/tex/latex/fontsetup/fspdefaultfontsot.sty @@ -0,0 +1,38 @@ +%% (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}} + + + + diff --git a/Master/texmf-dist/tex/latex/fontsetup/fspebgaramondot.sty b/Master/texmf-dist/tex/latex/fontsetup/fspebgaramondot.sty new file mode 100644 index 00000000000..a819513535f --- /dev/null +++ b/Master/texmf-dist/tex/latex/fontsetup/fspebgaramondot.sty @@ -0,0 +1,12 @@ +\RequirePackage{fontspec} +\defaultfontfeatures{Ligatures=TeX} + +\setmainfont[ItalicFont=EBGaramond-Italic.otf, +BoldFont=EBGaramond-Bold.otf, +BoldItalicFont=EBGaramond-BoldItalic.otf,SmallCapsFeatures={Numbers=OldStyle}]{EBGaramond-Regular.otf} + +\RequirePackage{unicode-math} +\setmathfont{Garamond-Math.otf} + + +\endinput diff --git a/Master/texmf-dist/tex/latex/fontsetup/fspfiraot.sty b/Master/texmf-dist/tex/latex/fontsetup/fspfiraot.sty new file mode 100644 index 00000000000..172bf45dab9 --- /dev/null +++ b/Master/texmf-dist/tex/latex/fontsetup/fspfiraot.sty @@ -0,0 +1,26 @@ +\RequirePackage{fontspec} +\defaultfontfeatures{Ligatures=TeX} + +\setmainfont[% +ItalicFont=FiraSans-Italic.otf,% +BoldFont=FiraSans-Bold.otf, +BoldItalicFont=FiraSans-BookItalic.otf,% +SmallCapsFeatures={Numbers=OldStyle}% +]{FiraSans-Regular.otf} + +\setsansfont[% +ItalicFont=FiraSans-Italic.otf,% +BoldFont=FiraSans-Bold.otf,% +BoldItalicFont=FiraSans-BookItalic.otf,% +SmallCapsFeatures={Numbers=OldStyle}% +]{FiraSans-Regular.otf} + +\setmonofont[ItalicFont=FiraMono-Regular.otf,ItalicFeatures={FakeSlant=0.2},% +BoldFont=FiraMono-Bold.otf,% +BoldItalicFont=FiraMono-Bold.otf,BoldItalicFeatures={FakeSlant=0.2}% +]{FiraMono-Regular.otf} + +\RequirePackage{unicode-math} +\setmathfont{FiraMath-Regular.otf} + +\endinput
\ No newline at end of file diff --git a/Master/texmf-dist/tex/latex/fontsetup/fspgfsartemisiaot.sty b/Master/texmf-dist/tex/latex/fontsetup/fspgfsartemisiaot.sty new file mode 100644 index 00000000000..c4dc761f878 --- /dev/null +++ b/Master/texmf-dist/tex/latex/fontsetup/fspgfsartemisiaot.sty @@ -0,0 +1,16 @@ +\RequirePackage{fontspec} +\defaultfontfeatures{Ligatures=TeX} + +\setmainfont[ItalicFont=GFSArtemisiaIt.otf, +BoldFont=GFSArtemisiaBold.otf, +BoldItalicFont=GFSArtemisiaBoldIt.otf,SmallCapsFeatures={Numbers=OldStyle}]{GFSArtemisia.otf} + +\RequirePackage{unicode-math} +%\setmathfont{XITSMath-Regular.otf} +\setmathfont{STIX2Math.otf} +\setmathfont[range=\mathup/{num,latin,Latin,greek,Greek}]{GFSArtemisia.otf} +\setmathfont[range=\mathbfup/{num,latin,Latin,greek,Greek}]{GFSArtemisiaBold.otf} +\setmathfont[range=\mathit/{num,latin,Latin,greek,Greek}]{GFSArtemisiaIt.otf} +\setmathfont[range=\mathbfit/{num,latin,Latin,greek,Greek}]{GFSArtemisiaBoldIt.otf} + +\endinput diff --git a/Master/texmf-dist/tex/latex/fontsetup/fspgfsdidotclassicot.sty b/Master/texmf-dist/tex/latex/fontsetup/fspgfsdidotclassicot.sty new file mode 100644 index 00000000000..d1f26d14c75 --- /dev/null +++ b/Master/texmf-dist/tex/latex/fontsetup/fspgfsdidotclassicot.sty @@ -0,0 +1,24 @@ +%\RequirePackage[no-math]{fontspec} +\RequirePackage{fontspec} +\defaultfontfeatures{Ligatures=TeX} + +%\RequirePackage[garamond]{mathdesign} + + +%\newfontfamily{\defaultfont}[Scale=1.087,ItalicFont=GFSDidot_Classic,ItalicFeatures={FakeSlant=0.2},BoldFont=GFSDidot_Classic,BoldFeatures={FakeBold=2},BoldItalicFont=GFSDidot_Classic,BoldItalicFeatures={FakeSlant=0.2,FakeBold=2}]{GFSDidot_Classic.otf} + +\newfontfamily{\defaultfont}[Scale=1.05, + ItalicFont=GFSPorson,ItalicFeatures={FakeSlant=0.1,FakeStretch=.92},BoldFont=GFSDidot_Classic,BoldFeatures={FakeBold=1.4,LetterSpace=2},BoldItalicFont=GFSPorson,BoldItalicFeatures={FakeBold=1.4,FakeStretch=.92,FakeSlant=0.1,LetterSpace=2}]{GFSDidot_Classic.otf} + +\newfontfamily{\latinfont}[ItalicFont=ugmri8a,BoldFont=ugmm8a,BoldItalicFont=ugmmi8a]{ugmr8a.otf} +\RequirePackage[Latin, Greek]{ucharclasses} +\setDefaultTransitions{\defaultfont}{} + +\setTransitionsForLatin{\latinfont}{} +\setTransitionsForGreek{\defaultfont}{} + +\RequirePackage{unicode-math} +\setmathfont{Garamond-Math.otf} + + +\endinput diff --git a/Master/texmf-dist/tex/latex/fontsetup/fspgfsdidotot.sty b/Master/texmf-dist/tex/latex/fontsetup/fspgfsdidotot.sty new file mode 100644 index 00000000000..6de2cfd7366 --- /dev/null +++ b/Master/texmf-dist/tex/latex/fontsetup/fspgfsdidotot.sty @@ -0,0 +1,49 @@ + +\RequirePackage{fontspec} + +\setmainfont[ItalicFont=GFSOlga, + BoldFont=GFSDidotBold, + BoldItalicFont=GFSDidotBoldItalic,SlantedFont=GFSDidotItalic, + SmallCapsFeatures={Numbers=OldStyle}]{GFSDidot.otf} +\newfontfamily{\GFSDidotoSubstFont}[% + ItalicFont=GFSDidotItalic, + BoldFont=GFSDidotBold, + BoldItalicFont=GFSDidotBoldItalic, + SmallCapsFeatures={Numbers=OldStyle}]{GFSDidot.otf} + + +\RequirePackage{unicode-math} +%\setmathfont{XITSMath-Regular.otf} +\setmathfont{STIX2Math.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} +\setmathfont[range=\mathit/{num,latin,Latin}]{GFSDidotItalic.otf} +\setmathfont[range=\mathbfit/{num,latin,Latin,greek,Greek}]{GFSDidotBoldItalic.otf} + +%% the next code replaces non-existent Olga Latin with GFSDidotItalic Latin +\XeTeXinterchartokenstate=1% +\newXeTeXintercharclass\GFSDidotoSubst% +\count255="0021% +\loop\ifnum\count255<"0341% + \XeTeXcharclass\count255=\GFSDidotoSubst% + \advance\count255 by 1% +\repeat% +\XeTeXinterchartoks 0 \GFSDidotoSubst = {\begingroup\GFSDidotoSubstFont}% +\XeTeXinterchartoks 4095 \GFSDidotoSubst = {\begingroup\GFSDidotoSubstFont}% +\XeTeXinterchartoks \GFSDidotoSubst 0 = {\endgroup}% +\XeTeXinterchartoks \GFSDidotoSubst 4095 = {\endgroup}% +%%%%%%%%%%%%%%%%%%%%%%%%% + +%%%%%%%%%% Fix epsilons %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +\AtBeginDocument{\renewcommand{\epsilon}{\textit{ε}} +\renewcommand{\varepsilon}{\textsl{ε}}} +%%%%%%%%% Fix phi %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +\newfontfamily\phifix[Scale=1.2]{GFSDidotItalic.otf} +\AtBeginDocument{\renewcommand{\phi}{\textrm{\phifix\char"03D5}}} +%%%%%%%%% Fix theta %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +\AtBeginDocument{\renewcommand{\theta}{\textsl{θ}} +\renewcommand{\vartheta}{\textit{θ}}} +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +\endinput diff --git a/Master/texmf-dist/tex/latex/fontsetup/fspgfsneohellenicot.sty b/Master/texmf-dist/tex/latex/fontsetup/fspgfsneohellenicot.sty new file mode 100644 index 00000000000..76e0d0a6537 --- /dev/null +++ b/Master/texmf-dist/tex/latex/fontsetup/fspgfsneohellenicot.sty @@ -0,0 +1,53 @@ +\RequirePackage{fontspec} +\defaultfontfeatures{Ligatures=TeX} +\RequirePackage{fontspec} + +\setmainfont[% main font + UprightFont=GFSNeohellenic, + ItalicFont=GFSNeohellenicIt, + BoldFont=GFSNeohellenicBold, + BoldItalicFont=GFSNeohellenicBoldIt, + RawFeature=+pnum,% variable width numbers + WordSpace={0.75,0.75,1},% + Scale=1.2,%use instead of 12pt +SmallCapsFeatures={Numbers=OldStyle,WordSpace={0.75,0.75,1},LetterSpace=0.06}]{GFSNeohellenic.otf} +%\renewfontfamily\scshape[% +% RawFeature=+smcp,RawFeature=+onum,WordSpace={0.75,0.75,1},LetterSpace=0.06,% +% Scale=1.2%use instead of 12pt +%]{GFSNeohellenic.otf} + + +\RequirePackage{unicode-math} +\setmathfont[% + Scale=1.2%use instead of 12pt +]{GFSNeohellenicMath.otf} + +\renewcommand{\baselinestretch}{1.086} %~1/0.92, use when at 10pt scaled by 1.2 + +%%%%%%%%% special symbols %%%%%%%%%%%%%%%%%%%%% +%fixes the delimiters so that all big sizes appear. TeX default is 5pt. +% run texdoc mathmode and check the "problems with parentheses" section +%\delimitershortfall=1pt +%\newcommand{\myvarnothing}{\symbol{"E000}} +\let\varnothing\undefined +\let\emptyset\undefined +\AtBeginDocument{ +\def\varnothing{\symbol{"E000}}% +\def\emptyset{\symbol{"2205}}} +\DeclareRobustCommand\nrightrightarrows{\mathrel{\char"2B5A}} +\DeclareRobustCommand\nleftleftarrows{\mathrel{\char"2B5B}} +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +%\let\bigint\undefined +\DeclareRobustCommand\smallprod{\mathop{\char"2B5E}\nolimits} +\DeclareRobustCommand\smallcoprod{\mathop{\char"2B5F}\nolimits} +\DeclareRobustCommand\smallsum{\mathop{\char"2B60}\nolimits} +\DeclareRobustCommand\smallint{\mathop{\char"2B61}\nolimits} +\DeclareRobustCommand\Bigint{\mathop{\char"2B62}\nolimits} +\DeclareRobustCommand\biggint{\mathop{\char"2B63}\nolimits} +\DeclareRobustCommand\Biggint{\mathop{\char"2B64}\nolimits} +\DeclareRobustCommand\bigggint{\mathop{\char"2B65}\nolimits} + + +\renewcommand{\LaTeX}{L\kern-.75ex\raisebox{.7ex}{\textsc{a}}\kern-.1ex\hbox{T}\kern-.4ex\raisebox{-.5ex}{E}\kern-.3exX} + +\endinput
\ No newline at end of file diff --git a/Master/texmf-dist/tex/latex/fontsetup/fspkerkisot.sty b/Master/texmf-dist/tex/latex/fontsetup/fspkerkisot.sty new file mode 100644 index 00000000000..8315fa6f9e2 --- /dev/null +++ b/Master/texmf-dist/tex/latex/fontsetup/fspkerkisot.sty @@ -0,0 +1,15 @@ +\RequirePackage{fontspec} +\defaultfontfeatures{Ligatures=TeX} + +\setmainfont[ItalicFont=Kerkis-Italic.otf, +BoldFont=Kerkis-Bold.otf, +BoldItalicFont=Kerkis-BoldItalic.otf,SmallCapsFont=Kerkis-SmallCaps.otf]{Kerkis.otf} + +\setsansfont[ItalicFont=KerkisSans-Italic.otf, +BoldFont=KerkisSans-Bold.otf, +BoldItalicFont=KerkisSans-BoldItalic.otf,SmallCapsFont=KerkisSans-SmallCaps.otf]{KerkisSans.otf} + +\RequirePackage{unicode-math} +\setmathfont{texgyrebonum-math.otf} + +\endinput
\ No newline at end of file diff --git a/Master/texmf-dist/tex/latex/fontsetup/fspneoeulerot.sty b/Master/texmf-dist/tex/latex/fontsetup/fspneoeulerot.sty new file mode 100644 index 00000000000..725686c3a86 --- /dev/null +++ b/Master/texmf-dist/tex/latex/fontsetup/fspneoeulerot.sty @@ -0,0 +1,41 @@ +\RequirePackage{fontspec} +\RequirePackage{unicode-math} +%\unimathsetup{math-style=upright} +\setmainfont[ItalicFont=cmunoti.otf, + BoldFont=cmunobx.otf, + BoldItalicFont=cmunobi.otf, + % RawFeature=+pnum,% variable width numbers +SmallCapsFeatures={Numbers=OldStyle}]{cmunorm.otf} +\defaultfontfeatures{Scale=MatchLowercase} +\setmathfont{LibertinusMath-Regular.otf} +\setmathfont[range={"0000-"0001,"0020-"007E, + "00A0,"00A7-"00A8,"00AC,"00AF,"00B1,"00B4-"00B5,"00B7, + "00D7,"00F7, + "0131, + "0237,"02C6-"02C7,"02D8-"02DA,"02DC, + "0300-"030C,"030F,"0311,"0323-"0325,"032E-"0332,"0338, + "0391-"0393,"0395-"03A1,"03A3-"03A8,"03B1-"03BB, + "03BD-"03C1,"03C3-"03C9,"03D1,"03D5-"03D6,"03F5, + "2016,"2018-"2019,"2021,"2026-"202C,"2032-"2037,"2044, + "2057,"20D6-"20D7,"20DB-"20DD,"20E1,"20EE-"20EF, + "210B-"210C,"210E-"2113,"2118,"211B-"211C,"2126-"2128, + "212C-"212D,"2130-"2131,"2133,"2135,"2190-"2199, + "21A4,"21A6,"21A9-"21AA,"21BC-"21CC,"21D0-"21D5, + "2200,"2202-"2209,"220B-"220C,"220F-"2213,"2215-"221E, + "2223,"2225,"2227-"222E,"2234-"2235,"2237-"223D, + "2240-"224C,"2260-"2269,"226E-"2279,"2282-"228B,"228E, + "2291-"2292,"2295-"2299,"22A2-"22A5,"22C0-"22C5, + "22DC-"22DD,"22EF,"22F0-"22F1, + "2308-"230B,"2320-"2321,"2329-"232A,"239B-"23AE, + "23DC-"23DF, + "27E8-"27E9,"27F5-"27FE,"2A0C,"2B1A, + "1D400-"1D433,"1D49C,"1D49E-"1D49F,"1D4A2,"1D4A5-"1D4A6, + "1D4A9-"1D4AC,"1D4AE-"1D4B5,"1D4D0-"1D4E9,"1D504-"1D505, + "1D507-"1D50A,"1D50D-"1D514,"1D516-"1D51C,"1D51E-"1D537, + "1D56C-"1D59F,"1D6A8-"1D6B8,"1D6BA-"1D6D2,"1D6D4-"1D6DD, + "1D6DF,"1D6E1,"1D7CE-"1D7D7 + }]{euler.otf} +\setmathfont[range=up/{greek,Greek}, script-features={}, sscript-features={} + ]{euler.otf} +\setmathfont[range=up/{latin,Latin,num}, script-features={}, sscript-features={} + ]{euler.otf} diff --git a/Master/texmf-dist/tex/latex/fontsetup/fsppalatinoot.sty b/Master/texmf-dist/tex/latex/fontsetup/fsppalatinoot.sty new file mode 100644 index 00000000000..3487754dded --- /dev/null +++ b/Master/texmf-dist/tex/latex/fontsetup/fsppalatinoot.sty @@ -0,0 +1,17 @@ +\RequirePackage{fontspec} +\defaultfontfeatures{Ligatures=TeX} + +\newfontfamily{\defaultfont}[SmallCapsFeatures={Numbers=OldStyle}]{Palatino Linotype} + +\newfontfamily{\greekfont}[SmallCapsFont=fsplpscel]{Palatino Linotype} + +\RequirePackage[Latin, Greek]{ucharclasses} +\setDefaultTransitions{\defaultfont}{} +\setTransitionsForLatin{\defaultfont}{} +\setTransitionsForGreek{\greekfont}{} + +\RequirePackage{unicode-math} +\setmathfont{texgyrepagella-math.otf} + + +\endinput diff --git a/Master/texmf-dist/tex/latex/fontsetup/fspstixtwoot.sty b/Master/texmf-dist/tex/latex/fontsetup/fspstixtwoot.sty new file mode 100644 index 00000000000..f38c44654d4 --- /dev/null +++ b/Master/texmf-dist/tex/latex/fontsetup/fspstixtwoot.sty @@ -0,0 +1,17 @@ +\RequirePackage{fontspec} +\defaultfontfeatures{Ligatures=TeX} + + +\setmainfont[% + Script=Default,% make small caps work for both latn and grek + ItalicFont=STIX2Text-Italic.otf, + BoldFont=STIX2Text-Bold.otf, + BoldItalicFont=STIX2Text-BoldItalic.otf, + % RawFeature=+pnum,% variable width numbers +SmallCapsFeatures={Numbers=OldStyle}]{STIX2Text-Regular.otf} + +\RequirePackage{unicode-math} +\setmathfont{STIX2Math.otf} + + +\endinput diff --git a/Master/texmf-dist/tex/latex/fontsetup/fsptimesot.sty b/Master/texmf-dist/tex/latex/fontsetup/fsptimesot.sty new file mode 100644 index 00000000000..772be2b6334 --- /dev/null +++ b/Master/texmf-dist/tex/latex/fontsetup/fsptimesot.sty @@ -0,0 +1,16 @@ +\RequirePackage{fontspec} +\defaultfontfeatures{Ligatures=TeX} + +\setmainfont[ItalicFont=FreeSerifbItalic.otf, +BoldFont=FreeSerifbBold.otf, +BoldItalicFont=FreeSerifbBoldItalic.otf,SmallCapsFont=FreeSerifb-SmallCapsAlt.otf]{FreeSerifb.otf} + +\RequirePackage{unicode-math} +%\setmathfont{XITSMath-Regular.otf} +\setmathfont{STIX2Math.otf} +\setmathfont[range=\mathup/{num,latin,Latin,greek,Greek}]{FreeSerifb.otf} +\setmathfont[range=\mathbfup/{num,latin,Latin,greek,Greek}]{FreeSerifbBold.otf} +\setmathfont[range=\mathit/{num,latin,Latin,greek,Greek}]{FreeSerifbItalic.otf} +\setmathfont[range=\mathbfit/{num,latin,Latin,greek,Greek}]{FreeSerifbBoldItalic.otf} + +\endinput diff --git a/Master/tlpkg/libexec/ctan2tds b/Master/tlpkg/libexec/ctan2tds index bc171c75b63..e607fc52147 100755 --- a/Master/tlpkg/libexec/ctan2tds +++ b/Master/tlpkg/libexec/ctan2tds @@ -488,6 +488,7 @@ chomp (my $ctan_root = `tlpkginfo --ctan-root`); 'fontinstallationguide', "die 'skipping, use Type1fonts'", 'fontloader-luaotfload', "die 'skipping, obsolete 29sep18'", 'fontname', "die 'skipping, done through tl-update-auto'", + 'fontsetup', "&MAKEflatten", 'fontools', "&MAKEflatten", 'fonts-arundina', "die 'skipping, depends on uninstalled thailatex'", 'fonts-churchslavonic',"&MAKEflatten", @@ -1476,6 +1477,7 @@ chomp (my $ctan_root = `tlpkginfo --ctan-root`); 'epspdf' => '&POSTepspdf', 'fixme' => '&POSTfixme', 'font-change-xetex' => '&POSTfont_change_xetex', + 'fontsetup' => '&POSTfontsetup', 'formation-latex-ul' => '&POSTformation_latex_ul', 'fpl' => '&POSTfpl', 'frenchle' => '&POST_rmsymlink', @@ -3002,6 +3004,7 @@ $standardofm='\.ofm'; $standardotf='\.(otf|woff2?)$'; %specialotf = ( 'cm-unicode' => '^[^.]*\.otf', # not Fontmap.CMU.otf + 'fontsetup' => 'NULL', # intended for system installation ); $standardotp='\.otp'; @@ -3309,6 +3312,7 @@ $standardclean = '\.head|\.tmp|\.dvi|\.log|\.out|\.aux|\.toc|\.lof|\.lot' 'exceltex' => 'manpage.pdf', # no source 'facture' => 'issue7.pdf', # no source 'flacards' => 'flacards.pdf', # no source + 'fontsetup' => 'cambria|lucida|minion|msgaramond', # nonfree 'gfsartemisia' => 'A*Specimen.pdf', # no source 'gfsbaskerville'=> 'B*Specimen.pdf', # no source 'gfsbodoni' => 'B*Specimen.pdf', # no source @@ -6207,6 +6211,12 @@ sub POSTfont_change_xetex { &mv_with_mkdir ("macros/*", "$DEST/tex/xetex/$package/"); } +sub POSTfontsetup { + print "POST$package - restore system-install-fonts dir\n"; + # because we flattened it to get the doc files. Six of one ... + &mv_with_mkdir ("*.otf", "system-install-fonts"); +} + sub POSTformation_latex_ul { print "POST$package - move source subdir, doc/* files\n"; &SYSTEM ("$MV source $DEST/source/latex/$package"); diff --git a/Master/tlpkg/tlpsrc/collection-latexextra.tlpsrc b/Master/tlpkg/tlpsrc/collection-latexextra.tlpsrc index 42c092d696b..2ab5c93f0c7 100644 --- a/Master/tlpkg/tlpsrc/collection-latexextra.tlpsrc +++ b/Master/tlpkg/tlpsrc/collection-latexextra.tlpsrc @@ -471,6 +471,7 @@ depend fnpct depend fnumprint depend foilhtml depend fontaxes +depend fontsetup depend fonttable depend footmisc depend footmisx diff --git a/Master/tlpkg/tlpsrc/fontsetup.tlpsrc b/Master/tlpkg/tlpsrc/fontsetup.tlpsrc new file mode 100644 index 00000000000..e69de29bb2d --- /dev/null +++ b/Master/tlpkg/tlpsrc/fontsetup.tlpsrc |