diff options
author | Norbert Preining <norbert@preining.info> | 2021-05-02 03:03:15 +0000 |
---|---|---|
committer | Norbert Preining <norbert@preining.info> | 2021-05-02 03:03:15 +0000 |
commit | db2a2e7b5c4ca1335618a0b5f5c574229bf459f6 (patch) | |
tree | d0f4c73e3a871ce1ff86e9e94ac3bcca055bf6e5 /macros/unicodetex/latex | |
parent | 33ca54806c387d16002fc16e31418d3a28c2dd63 (diff) |
CTAN sync 202105020303
Diffstat (limited to 'macros/unicodetex/latex')
21 files changed, 464 insertions, 127 deletions
diff --git a/macros/unicodetex/latex/fontsetup-nonfree/README b/macros/unicodetex/latex/fontsetup-nonfree/README new file mode 100644 index 0000000000..be697bf46e --- /dev/null +++ b/macros/unicodetex/latex/fontsetup-nonfree/README @@ -0,0 +1,14 @@ + The fontsetup-nonfree package + (Version 1.01, GPL3) + +This package accompanies fontsetup, and inludes support for nonfree fonts. + +For more information read the file fontsetup-nonfree-doc.pdf in +the doc subdirectory. + +Antonis Tsolomitis +Professor +University of the Aegean +Department of Mathematics +83200 Samos, Greece + diff --git a/macros/unicodetex/latex/fontsetup-nonfree/doc/fontsetup-nonfree-doc.pdf b/macros/unicodetex/latex/fontsetup-nonfree/doc/fontsetup-nonfree-doc.pdf Binary files differnew file mode 100644 index 0000000000..050161c789 --- /dev/null +++ b/macros/unicodetex/latex/fontsetup-nonfree/doc/fontsetup-nonfree-doc.pdf diff --git a/macros/unicodetex/latex/fontsetup-nonfree/doc/fontsetup-nonfree-doc.tex b/macros/unicodetex/latex/fontsetup-nonfree/doc/fontsetup-nonfree-doc.tex new file mode 100644 index 0000000000..17b83b6e1d --- /dev/null +++ b/macros/unicodetex/latex/fontsetup-nonfree/doc/fontsetup-nonfree-doc.tex @@ -0,0 +1,94 @@ +\documentclass{book} +\usepackage[default]{fontsetup} +\usepackage{graphicx,fullpage,supertabular} +\begin{document} + + + \begin{center} + {\LARGE The \texttt{fontsetup-nonfree} package}\\[1ex] + \textit{by}\\[1ex] + {\large Antonis Tsolomitis}\\ +University of the Aegean\\ Department of Mathematics\\[1ex] + \textsc{29} April \textsc{2021}\\[1ex] + Version 1.01, \textsc{gpl3} + \end{center} + + This package is part of the fontsetup package but for license issues it has been + separated from the rest. For general information about the use of fontsetup check + the file fontsetup-doc.pdf of the (free) fontsetup package. This package must + be installed to access the commercial fonts that supports. + +\bigskip + +\textbf{Summary of installation steps to support all commercial fonts supported} + +\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 + + + + +Samples of the supported commercial fonts 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 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 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 + + +\end{document} diff --git a/macros/unicodetex/latex/fontsetup-nonfree/doc/fspsample-cambria.pdf b/macros/unicodetex/latex/fontsetup-nonfree/doc/fspsample-cambria.pdf Binary files differnew file mode 100644 index 0000000000..f003f22208 --- /dev/null +++ b/macros/unicodetex/latex/fontsetup-nonfree/doc/fspsample-cambria.pdf diff --git a/macros/unicodetex/latex/fontsetup-nonfree/doc/fspsample-lucida.pdf b/macros/unicodetex/latex/fontsetup-nonfree/doc/fspsample-lucida.pdf Binary files differnew file mode 100644 index 0000000000..bebf3ceff9 --- /dev/null +++ b/macros/unicodetex/latex/fontsetup-nonfree/doc/fspsample-lucida.pdf diff --git a/macros/unicodetex/latex/fontsetup-nonfree/doc/fspsample-minion.pdf b/macros/unicodetex/latex/fontsetup-nonfree/doc/fspsample-minion.pdf Binary files differnew file mode 100644 index 0000000000..ef26ae6481 --- /dev/null +++ b/macros/unicodetex/latex/fontsetup-nonfree/doc/fspsample-minion.pdf diff --git a/macros/unicodetex/latex/fontsetup-nonfree/doc/fspsample-msgaramond.pdf b/macros/unicodetex/latex/fontsetup-nonfree/doc/fspsample-msgaramond.pdf Binary files differnew file mode 100644 index 0000000000..e411c077d6 --- /dev/null +++ b/macros/unicodetex/latex/fontsetup-nonfree/doc/fspsample-msgaramond.pdf diff --git a/macros/unicodetex/latex/fontsetup-nonfree/doc/fspsample-palatino.pdf b/macros/unicodetex/latex/fontsetup-nonfree/doc/fspsample-palatino.pdf Binary files differnew file mode 100644 index 0000000000..48644e576d --- /dev/null +++ b/macros/unicodetex/latex/fontsetup-nonfree/doc/fspsample-palatino.pdf diff --git a/macros/unicodetex/latex/fontsetup-nonfree/doc/fspsample.tex b/macros/unicodetex/latex/fontsetup-nonfree/doc/fspsample.tex new file mode 100644 index 0000000000..23ec736e02 --- /dev/null +++ b/macros/unicodetex/latex/fontsetup-nonfree/doc/fspsample.tex @@ -0,0 +1,75 @@ +%% 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} + + + +\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/macros/unicodetex/latex/fontsetup-nonfree/fspcambria.sty b/macros/unicodetex/latex/fontsetup-nonfree/fspcambria.sty new file mode 100644 index 0000000000..b2947bb3d6 --- /dev/null +++ b/macros/unicodetex/latex/fontsetup-nonfree/fspcambria.sty @@ -0,0 +1,9 @@ +%% +%% Load Cambria fonts (C) A. Tsolomitis +%% +\RequirePackage{fontspec} +\setmainfont[Contextuals=AlternateOff,BoldFont=Cambria-Bold,ItalicFont=Cambria-Italic,BoldItalicFont=Cambria-BoldItalic]{Cambria} +\RequirePackage{unicode-math} +\setmathfont{Cambria Math} + +\endinput diff --git a/macros/unicodetex/latex/fontsetup-nonfree/fsplucidaot.sty b/macros/unicodetex/latex/fontsetup-nonfree/fsplucidaot.sty new file mode 100644 index 0000000000..2287f48685 --- /dev/null +++ b/macros/unicodetex/latex/fontsetup-nonfree/fsplucidaot.sty @@ -0,0 +1,28 @@ +\RequirePackage{fontspec} +\setmainfont[% main font + UprightFont=LucidaBrightOT, + ItalicFont=LucidaBrightOT-Italic, + BoldFont=LucidaBrightOT-Demi, + BoldItalicFont=LucidaBrightOT-DemiItalic, + SmallCapsFeatures={Numbers=OldStyle}, + ]{LucidaBrightOT.otf} +\setsansfont[% + UprightFont=LucidaSansOT, + ItalicFont=LucidaSansOT-Italic, + BoldFont=LucidaSansOT-Demi, + BoldItalicFont=LucidaSansOT-DemiItalic, + SmallCapsFeatures={Numbers=OldStyle}, +]{LucidaSansOT.otf} +% +\setmonofont[% + UprightFont=LucidaSansTypewriterOT, + ItalicFont=LucidaSansTypewriterOT-Oblique, + BoldFont=LucidaSansTypewriterOT-Bold, + BoldItalicFont=LucidaSansTypewriterOT-BoldOblique, + SmallCapsFeatures={Numbers=OldStyle}, + ]{LucidaSansTypewriterOT.otf} +% support for OpenType math fonts: +\RequirePackage{unicode-math} +\setmathfont{LucidaBrightMathOT.otf} +\setmathfont[version=bold]{LucidaBrightMathOT-Demi.otf} + diff --git a/macros/unicodetex/latex/fontsetup-nonfree/fspminion.sty b/macros/unicodetex/latex/fontsetup-nonfree/fspminion.sty new file mode 100644 index 0000000000..47e5eab3fe --- /dev/null +++ b/macros/unicodetex/latex/fontsetup-nonfree/fspminion.sty @@ -0,0 +1,20 @@ + + + +\RequirePackage{fontspec} +\defaultfontfeatures{Ligatures=TeX} +\setmainfont[SmallCapsFeatures={Numbers=OldStyle}]{Minion Pro} +\setsansfont[SmallCapsFeatures={Numbers=OldStyle}]{Myriad Pro} +\newfontfamily{\defaultfont}[SmallCapsFeatures={Numbers=OldStyle}]{Minion Pro} +\newfontfamily{\greekfont}[SmallCapsFont=fspmnscel]{Minion Pro} +\RequirePackage[Latin, Greek]{ucharclasses} +\setDefaultTransitions{\defaultfont}{} +\setTransitionsForLatin{\defaultfont}{} +\setTransitionsForGreek{\greekfont}{} + +\RequirePackage{unicode-math} +\setmathfont{STIXTwoMath-Regular.otf} +\setmathfont[range=\mathup/{num,latin,Latin,greek,Greek}]{Minion Pro} +\setmathfont[range=\mathbfup/{num,latin,Latin,greek,Greek}]{Minion Pro Bold} +\setmathfont[range=\mathit/{num,latin,Latin,greek,Greek}]{Minion Pro Italic} +\setmathfont[range=\mathbfit/{num,latin,Latin,greek,Greek}]{Minion Pro Bold Italic} diff --git a/macros/unicodetex/latex/fontsetup-nonfree/fspmsgaramondot.sty b/macros/unicodetex/latex/fontsetup-nonfree/fspmsgaramondot.sty new file mode 100644 index 0000000000..3d3907cb8b --- /dev/null +++ b/macros/unicodetex/latex/fontsetup-nonfree/fspmsgaramondot.sty @@ -0,0 +1,23 @@ +%\RequirePackage[no-math]{fontspec} +\RequirePackage{fontspec} +\defaultfontfeatures{Ligatures=TeX} +%\RequirePackage[garamond]{mathdesign} + + +\newfontfamily{\defaultfont}{Garamond} +\newfontfamily{\greekfont}{Garamond} + +\RequirePackage[Latin, Greek]{ucharclasses} +\setDefaultTransitions{\defaultfont}{} +\setTransitionsForLatin{\defaultfont}{} +\setTransitionsForGreek{\greekfont}{} + +\RequirePackage{unicode-math} +\setmathfont{Garamond-Math.otf} +\setmathfont[range=\mathup/{num,latin,Latin,greek,Greek}]{Garamond} +\setmathfont[range=\mathbfup/{num,latin,Latin,greek,Greek}]{Garamond Bold} +\setmathfont[range=\mathit/{num,latin,Latin,greek,Greek}]{Garamond Italic} +\setmathfont[range=\mathbfit/{num,latin,Latin,greek,Greek}]{Garamond Bold} + + +\endinput diff --git a/macros/unicodetex/latex/fontsetup-nonfree/fsppalatinoot.sty b/macros/unicodetex/latex/fontsetup-nonfree/fsppalatinoot.sty new file mode 100644 index 0000000000..3487754dde --- /dev/null +++ b/macros/unicodetex/latex/fontsetup-nonfree/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/macros/unicodetex/latex/fontsetup-nonfree/system-install-fonts/fsplpscel.otf b/macros/unicodetex/latex/fontsetup-nonfree/system-install-fonts/fsplpscel.otf Binary files differnew file mode 100644 index 0000000000..b505b6b96f --- /dev/null +++ b/macros/unicodetex/latex/fontsetup-nonfree/system-install-fonts/fsplpscel.otf diff --git a/macros/unicodetex/latex/fontsetup-nonfree/system-install-fonts/fspmnscel.otf b/macros/unicodetex/latex/fontsetup-nonfree/system-install-fonts/fspmnscel.otf Binary files differnew file mode 100644 index 0000000000..c0e233f43c --- /dev/null +++ b/macros/unicodetex/latex/fontsetup-nonfree/system-install-fonts/fspmnscel.otf diff --git a/macros/unicodetex/latex/fontsetup/README b/macros/unicodetex/latex/fontsetup/README index 0dd9e72a3d..4a44a55be8 100644 --- a/macros/unicodetex/latex/fontsetup/README +++ b/macros/unicodetex/latex/fontsetup/README @@ -1,5 +1,5 @@ The fontsetup package - (Version 1.009, GPL3) + (Version 1.01, GPL3) This simple package makes it trivial to switch quickly between different quality fonts supporting Mathematics. diff --git a/macros/unicodetex/latex/fontsetup/doc/fontsetup-doc.pdf b/macros/unicodetex/latex/fontsetup/doc/fontsetup-doc.pdf Binary files differindex d06eddfc53..88a39bf5cd 100644 --- a/macros/unicodetex/latex/fontsetup/doc/fontsetup-doc.pdf +++ b/macros/unicodetex/latex/fontsetup/doc/fontsetup-doc.pdf diff --git a/macros/unicodetex/latex/fontsetup/doc/fontsetup-doc.tex b/macros/unicodetex/latex/fontsetup/doc/fontsetup-doc.tex index 62c5d1238a..f8b31a2b97 100644 --- a/macros/unicodetex/latex/fontsetup/doc/fontsetup-doc.tex +++ b/macros/unicodetex/latex/fontsetup/doc/fontsetup-doc.tex @@ -10,7 +10,7 @@ {\large Antonis Tsolomitis}\\ University of the Aegean\\ Department of Mathematics\\[1ex] \textsc{29} January \textsc{2021}\\[1ex] - Version 1.009, \textsc{gpl3} + Version 1.01, \textsc{gpl3} \end{center} This package is a simple wrapper-type package that makes the setup of fonts easy and @@ -23,6 +23,19 @@ University of the Aegean\\ Department of Mathematics\\[1ex] 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. + + Starting with version 1.01 the package is split in two; the main package called ``fontsetup'' + and the fontsetup-nonfree package that contains the support and sample files for the + non-free fonts. This facilitates the installation for users of texlive since the latter does not + install the support for non-free fonts. For a user who wants to install the support for + non-free fonts (Cambria, Lucida, Adobe-Minion, MS-Garamond, and Linotype-Palatino) it can be + easily done following the guide for the contrib repository here: + + https://contrib.texlive.info + + The main package will load the style files for the nonfree fonts if the fontsetup-nonfree + package is installed; that is, there is no other package that the user needs to + load in the TeX file. The options (in alphabetic order after the default option) are as follows: @@ -54,7 +67,8 @@ University of the Aegean\\ Department of Mathematics\\[1ex] similarly to the default option. \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). + or elsewhere by the system administratior). This option works only if + fontsetup-nonfree is installed. \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 @@ -70,19 +84,22 @@ University of the Aegean\\ Department of Mathematics\\[1ex] \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[lucida] Loads the Lucida font family if available (a commercial font). This option works only if + fontsetup-nonfree is installed. \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. + with letters replaced from MinionPro. Sans is MyriadPro. This option works only if + fontsetup-nonfree is installed. \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. + from MS-Garamond. This option works only if + 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[palatino] Loads the Linotype Palatino Fonts available from some versions of Windows. @@ -90,7 +107,8 @@ University of the Aegean\\ Department of Mathematics\\[1ex] 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. + Mathematics font is texgyrepagella-math. This option works only if + fontsetup-nonfree is installed. \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. @@ -116,50 +134,31 @@ to another among the supported ones. \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 +For accessing the free fonts there is nothing to install (provided +you have a full installation of TeX system) unless you want to access +the \verb|neoeuler| option. For this you have to install +\verb|euler.otf| in your TeX tree from here: \verb|https://github.com/khaledhosny/euler-otf| -\end{enumerate} -\bigskip +\medskip +To access commercial fonts supported by this package check the +documentation of the fontsetup-nonfree package. +\medskip 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 +Samples for the free fonts follow. Samples for the nonfree fonts can be found in -\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} +\noindent fontsetup-nonfree/doc/fontsetup-nonfree-doc.pdf \newpage + \begin{center} {\Large ComputerModern fonts (Book weight): option \verb|default|}\\[1cm] \includegraphics[scale=1.2]{fspsample-newdefault.pdf} @@ -233,29 +232,6 @@ Cambria Fonts must be installed as system fonts\\[1cm] \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|}\\ @@ -265,13 +241,6 @@ NeoEuler font must be installed in TeX tree\\[1cm] \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] diff --git a/macros/unicodetex/latex/fontsetup/fspdefault.sty b/macros/unicodetex/latex/fontsetup/fspdefault.sty index da0a494155..686a045394 100644 --- a/macros/unicodetex/latex/fontsetup/fspdefault.sty +++ b/macros/unicodetex/latex/fontsetup/fspdefault.sty @@ -2,22 +2,66 @@ \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} + SizeFeatures={% +{Size=-8, Font=NewCM08-Book.otf, + ItalicFont=NewCM08-BookItalic.otf,% + BoldFont=NewCM10-Bold.otf,% + BoldItalicFont=NewCM10-BoldItalic.otf,% + SlantedFont=NewCM08-Book.otf,% + BoldSlantedFont=NewCM10-Bold.otf,% + SmallCapsFeatures={Numbers=OldStyle}}, +{Size=8, Font=NewCM08-Book.otf, + ItalicFont=NewCM08-BookItalic.otf,% + BoldFont=NewCM10-Bold.otf,% + BoldItalicFont=NewCM10-BoldItalic.otf,% + SlantedFont=NewCM08-Book.otf,% + BoldSlantedFont=NewCM10-Bold.otf,% + SmallCapsFeatures={Numbers=OldStyle}}, +{Size= 9-, Font = NewCM10-Book.otf, + ItalicFont=NewCM10-BookItalic.otf,% + BoldFont=NewCM10-Bold.otf,% + BoldItalicFont=NewCM10-BoldItalic.otf,% + SlantedFont=NewCM10-Book.otf,% + BoldSlantedFont=NewCM10-Bold.otf,% + SmallCapsFeatures={Numbers=OldStyle}}% + },% + SmallCapsFeatures={Numbers=OldStyle},% + BoldSlantedFont=NewCM10-Bold.otf,% + SlantedFont=NewCM10-Book.otf,% + BoldItalicFont=NewCM10-BoldItalic.otf,% + BoldFont=NewCM10-Bold.otf,% + ItalicFont=NewCM10-BookItalic.otf,% + SlantedFeatures={FakeSlant=0.25},% + BoldSlantedFeatures={FakeSlant=0.25},% +]{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} + SizeFeatures={% +{Size= -8, Font=NewCMSans08-Book.otf,% + ItalicFont=NewCMSans08-BookOblique.otf,% + BoldFont=NewCMSans10-Bold.otf,% + BoldItalicFont=NewCMSans10-BoldOblique.otf,% + SmallCapsFeatures={Numbers=OldStyle},% +}, +{Size= 8, Font=NewCMSans08-Book.otf,% + ItalicFont=NewCMSans08-BookOblique.otf,% + BoldFont=NewCMSans10-Bold.otf,% + BoldItalicFont=NewCMSans10-BoldOblique.otf,% + SmallCapsFeatures={Numbers=OldStyle},% +}, +{Size= 9-, Font=NewCMSans10-Book.otf,% + ItalicFont=NewCMSans10-BookOblique.otf,% + BoldFont=NewCMSans10-Bold.otf,% + BoldItalicFont=NewCMSans10-BoldOblique.otf,% + SmallCapsFeatures={Numbers=OldStyle},% +}}, + ItalicFont=NewCMSans10-BookOblique.otf,% + BoldFont=NewCMSans10-Bold.otf,% + BoldItalicFont=NewCMSans10-BoldOblique.otf,% + SmallCapsFeatures={Numbers=OldStyle},% + SlantedFont=NewCMSans10-BookOblique.otf,% + BoldSlantedFont=NewCMSans10-BoldOblique.otf,% +]{NewCMSans10-Book.otf} \setmonofont[% ItalicFont=NewCMMono10-BookItalic.otf,% @@ -36,13 +80,16 @@ SmallCapsFeatures={Numbers=OldStyle}]{NewCMMono10-Book.otf} \newcommand{\prosgegrammeni}{\addfontfeature{StylisticSet=1}} \newcommand{\textprosgegrammeni}[1]{{\prosgegrammeni#1}} % -\newfontfamily{\ivbce}[StylisticSet=2]{NewCMSans10-Book.otf} +%\newfontfamily{\ivbce}[StylisticSet=2]{NewCMSans10-Book.otf} +\newcommand{\ivbce}{\sffamily\addfontfeature{StylisticSet=2}} \newcommand{\textivbce}[1]{{\ivbce#1}} % -\newfontfamily{\ivbcealt}[StylisticSet=3]{NewCMSans10-Book.otf} +%\newfontfamily{\ivbcealt}[StylisticSet=3]{NewCMSans10-Book.otf} +\newcommand{\ivbcealt}{\sffamily\addfontfeature{StylisticSet=3}} \newcommand{\textivbcealt}[1]{{\ivbcealt#1}} % -\newfontfamily{\vibce}[StylisticSet=4]{NewCMSans10-Book.otf} +%\newfontfamily{\vibce}[StylisticSet=4]{NewCMSans10-Book.otf} +\newcommand{\vibce}{\sffamily\addfontfeature{StylisticSet=4}} \newcommand{\textvibce}[1]{{\vibce#1}} % %% math (upright) sans Greek @@ -233,19 +280,21 @@ SmallCapsFeatures={Numbers=OldStyle}]{NewCMMono10-Book.otf} \DeclareRobustCommand\nleftleftarrows{\mathrel{\char"E032}} % % select ss02 lookup table for IPA symbols -\newfontfamily{\ipatext}[StylisticSet=5,% -BoldFont=NewCM10-Bold.otf,% -SlantedFont=NewCM10-Regular.otf,% -SlantedFeatures={FakeSlant=0.25}, -BoldSlantedFont=NewCM10-Bold.otf,% -BoldSlantedFeatures={FakeSlant=0.25}, -SmallCapsFeatures={Numbers=OldStyle}]{NewCM10-Book.otf} +%\newfontfamily{\ipatext}[StylisticSet=5,% +%BoldFont=NewCM10-Bold.otf,% +%SlantedFont=NewCM10-Regular.otf,% +%SlantedFeatures={FakeSlant=0.25}, +%BoldSlantedFont=NewCM10-Bold.otf,% +%BoldSlantedFeatures={FakeSlant=0.25}, +%SmallCapsFeatures={Numbers=OldStyle}]{NewCM10-Book.otf} +\newcommand{\ipatext}{\addfontfeature{StylisticSet=5}} \newcommand{\textipa}[1]{{\ipatext#1}} -\newfontfamily{\ipatextsans}[StylisticSet=5,% -ItalicFont=NewCMSans10-BookOblique.otf,% -BoldFont=NewCMSans10-Bold.otf,% -BoldItalicFont=NewCMSans10-BoldOblique.otf,% -SlantedFont=NewCMSans10-Oblique.otf,% -BoldSlantedFont=NewCMSans10-BoldOblique.otf,% -SmallCapsFeatures={Numbers=OldStyle}]{NewCMSans10-Book.otf} +%\newfontfamily{\ipatextsans}[StylisticSet=5,% +%ItalicFont=NewCMSans10-BookOblique.otf,% +%BoldFont=NewCMSans10-Bold.otf,% +%BoldItalicFont=NewCMSans10-BoldOblique.otf,% +%SlantedFont=NewCMSans10-Oblique.otf,% +%BoldSlantedFont=NewCMSans10-BoldOblique.otf,% +%SmallCapsFeatures={Numbers=OldStyle}]{NewCMSans10-Book.otf} +\newcommand{\ipatextsans}{\sffamily\addfontfeature{StylisticSet=5}} \newcommand{\textsansipa}[1]{{\ipatextsans#1}} diff --git a/macros/unicodetex/latex/fontsetup/fspolddefault.sty b/macros/unicodetex/latex/fontsetup/fspolddefault.sty index 1c52a8ff0c..3660ec706e 100644 --- a/macros/unicodetex/latex/fontsetup/fspolddefault.sty +++ b/macros/unicodetex/latex/fontsetup/fspolddefault.sty @@ -2,22 +2,56 @@ \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} + SizeFeatures={% +{Size=-8, Font=NewCM08-Regular.otf, + ItalicFont=NewCM08-Italic.otf,% + BoldFont=NewCM10-Bold.otf,% + BoldItalicFont=NewCM10-BoldItalic.otf,% + SlantedFont=NewCM08-Regular.otf,% + BoldSlantedFont=NewCM10-Bold.otf,% + SmallCapsFeatures={Numbers=OldStyle}}, +{Size=8, Font=NewCM08-Regular.otf, + ItalicFont=NewCM08-Italic.otf,% + BoldFont=NewCM10-Bold.otf,% + BoldItalicFont=NewCM10-BoldItalic.otf,% + SlantedFont=NewCM08-Regular.otf,% + BoldSlantedFont=NewCM10-Bold.otf,% + SmallCapsFeatures={Numbers=OldStyle}}, +{Size= 9-, Font = NewCM10-Regular.otf, + ItalicFont=NewCM10-Italic.otf,% + BoldFont=NewCM10-Bold.otf,% + BoldItalicFont=NewCM10-BoldItalic.otf,% + SlantedFont=NewCM10-Regular.otf,% + BoldSlantedFont=NewCM10-Bold.otf,% + SmallCapsFeatures={Numbers=OldStyle}}% + },% + SlantedFeatures={FakeSlant=0.25},% + BoldSlantedFeatures={FakeSlant=0.25},% +]{NewCM10-Regular.otf} \setsansfont[% -ItalicFont=NewCMSans10-Oblique.otf,% -BoldFont=NewCMSans10-Bold.otf,% -BoldItalicFont=NewCMSans10-BoldOblique.otf,% + SizeFeatures={% +{Size= -8, Font=NewCMSans08-Regular.otf,% + ItalicFont=NewCMSans08-Oblique.otf,% + BoldFont=NewCMSans10-Bold.otf,% + BoldItalicFont=NewCMSans10-BoldOblique.otf,% + SmallCapsFeatures={Numbers=OldStyle},% +}, +{Size= 8, Font=NewCMSans08-Regular.otf,% + ItalicFont=NewCMSans08-Oblique.otf,% + BoldFont=NewCMSans10-Bold.otf,% + BoldItalicFont=NewCMSans10-BoldOblique.otf,% + SmallCapsFeatures={Numbers=OldStyle},% +}, +{Size= 9-, Font=NewCMSans10-Regular.otf,% + ItalicFont=NewCMSans10-Oblique.otf,% + BoldFont=NewCMSans10-Bold.otf,% + BoldItalicFont=NewCMSans10-BoldOblique.otf,% + SmallCapsFeatures={Numbers=OldStyle},% +}}, SlantedFont=NewCMSans10-Oblique.otf,% BoldSlantedFont=NewCMSans10-BoldOblique.otf,% -SmallCapsFeatures={Numbers=OldStyle}]{NewCMSans10-Regular.otf} +]{NewCMSans10-Regular.otf} \setmonofont[% ItalicFont=NewCMMono10-Italic.otf,% @@ -36,13 +70,16 @@ SmallCapsFeatures={Numbers=OldStyle}]{NewCMMono10-Regular.otf} \newcommand{\prosgegrammeni}{\addfontfeature{StylisticSet=1}} \newcommand{\textprosgegrammeni}[1]{{\prosgegrammeni#1}} % -\newfontfamily{\ivbce}[StylisticSet=2]{NewCMSans10-Regular.otf} +%\newfontfamily{\ivbce}[StylisticSet=2]{NewCMSans10-Regular.otf} +\newcommand{\ivbce}{\sffamily\addfontfeature{StylisticSet=2}} \newcommand{\textivbce}[1]{{\ivbce#1}} % -\newfontfamily{\ivbcealt}[StylisticSet=3]{NewCMSans10-Regular.otf} +%\newfontfamily{\ivbcealt}[StylisticSet=3]{NewCMSans10-Regular.otf} +\newcommand{\ivbcealt}{\sffamily\addfontfeature{StylisticSet=3}} \newcommand{\textivbcealt}[1]{{\ivbcealt#1}} % -\newfontfamily{\vibce}[StylisticSet=4]{NewCMSans10-Regular.otf} +%\newfontfamily{\vibce}[StylisticSet=4]{NewCMSans10-Regular.otf} +\newcommand{\vibce}{\sffamily\addfontfeature{StylisticSet=4}} \newcommand{\textvibce}[1]{{\vibce#1}} % %% math (upright) sans Greek @@ -233,19 +270,21 @@ SmallCapsFeatures={Numbers=OldStyle}]{NewCMMono10-Regular.otf} \DeclareRobustCommand\nleftleftarrows{\mathrel{\char"E032}} % % select ss02 lookup table for IPA symbols -\newfontfamily{\ipatext}[StylisticSet=5,% -BoldFont=NewCM10-Bold.otf,% -SlantedFont=NewCM10-Regular.otf,% -SlantedFeatures={FakeSlant=0.25}, -BoldSlantedFont=NewCM10-Bold.otf,% -BoldSlantedFeatures={FakeSlant=0.25}, -SmallCapsFeatures={Numbers=OldStyle}]{NewCM10-Regular.otf} +%\newfontfamily{\ipatext}[StylisticSet=5,% +%BoldFont=NewCM10-Bold.otf,% +%SlantedFont=NewCM10-Regular.otf,% +%SlantedFeatures={FakeSlant=0.25}, +%BoldSlantedFont=NewCM10-Bold.otf,% +%BoldSlantedFeatures={FakeSlant=0.25}, +%SmallCapsFeatures={Numbers=OldStyle}]{NewCM10-Regular.otf} +\newcommand{\ipatext}{\addfontfeature{StylisticSet=5}} \newcommand{\textipa}[1]{{\ipatext#1}} -\newfontfamily{\ipatextsans}[StylisticSet=5,% -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} +%\newfontfamily{\ipatextsans}[StylisticSet=5,% +%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} +\newcommand{\ipatextsans}{\sffamily\addfontfeature{StylisticSet=5}} \newcommand{\textsansipa}[1]{{\ipatextsans#1}} |