summaryrefslogtreecommitdiff
path: root/Master
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2021-05-01 20:55:30 +0000
committerKarl Berry <karl@freefriends.org>2021-05-01 20:55:30 +0000
commit957ed4d9e1b52b52fd6dc62565d951e9b4143aaa (patch)
tree95e1b485fd39a20bcccb616022de1e3f34c38fe2 /Master
parent73598aeaa5e671b77a4d565db2eae53e59cb4752 (diff)
fontsetup (1may21)
git-svn-id: svn://tug.org/texlive/trunk@59042 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
-rw-r--r--Master/texmf-dist/doc/latex/fontsetup/README2
-rw-r--r--Master/texmf-dist/doc/latex/fontsetup/README.TEXLIVE19
-rw-r--r--Master/texmf-dist/doc/latex/fontsetup/fontsetup-doc.pdfbin709057 -> 445568 bytes
-rw-r--r--Master/texmf-dist/doc/latex/fontsetup/fontsetup-doc.tex101
-rw-r--r--Master/texmf-dist/tex/latex/fontsetup/fspdefault.sty111
-rw-r--r--Master/texmf-dist/tex/latex/fontsetup/fspolddefault.sty97
-rwxr-xr-xMaster/tlpkg/libexec/ctan2tds2
7 files changed, 185 insertions, 147 deletions
diff --git a/Master/texmf-dist/doc/latex/fontsetup/README b/Master/texmf-dist/doc/latex/fontsetup/README
index 0dd9e72a3d3..4a44a55be8a 100644
--- a/Master/texmf-dist/doc/latex/fontsetup/README
+++ b/Master/texmf-dist/doc/latex/fontsetup/README
@@ -1,5 +1,5 @@
The fontsetup package
- (Version 1.009, GPL3)
+ (Version 1.01, 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/README.TEXLIVE b/Master/texmf-dist/doc/latex/fontsetup/README.TEXLIVE
deleted file mode 100644
index 6f3d602143c..00000000000
--- a/Master/texmf-dist/doc/latex/fontsetup/README.TEXLIVE
+++ /dev/null
@@ -1,19 +0,0 @@
-The files below have been removed in the TeX Live installation of
-the current package, possibly because of missing source (e.g., a
-PDF with no source), possibly because their only purpose is to support
-nonfree fonts or other software, possibly for other reasons.
-More info: https://tug.org/texlive/pkgcontrib.html#requirements
-
-If this is a concern, please contact the package maintainer.
-
-You can find these files on CTAN at
- http://mirror.ctan.org/macros/unicodetex/latex/fontsetup.
-
- fspcambria.sty
- fsplucidaot.sty
- fspminion.sty
- fspmsgaramondot.sty
- fspsample-cambria.pdf
- fspsample-lucida.pdf
- fspsample-minion.pdf
- fspsample-msgaramond.pdf
diff --git a/Master/texmf-dist/doc/latex/fontsetup/fontsetup-doc.pdf b/Master/texmf-dist/doc/latex/fontsetup/fontsetup-doc.pdf
index d06eddfc530..88a39bf5cd9 100644
--- a/Master/texmf-dist/doc/latex/fontsetup/fontsetup-doc.pdf
+++ b/Master/texmf-dist/doc/latex/fontsetup/fontsetup-doc.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/fontsetup/fontsetup-doc.tex b/Master/texmf-dist/doc/latex/fontsetup/fontsetup-doc.tex
index 62c5d1238a4..f8b31a2b976 100644
--- a/Master/texmf-dist/doc/latex/fontsetup/fontsetup-doc.tex
+++ b/Master/texmf-dist/doc/latex/fontsetup/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/Master/texmf-dist/tex/latex/fontsetup/fspdefault.sty b/Master/texmf-dist/tex/latex/fontsetup/fspdefault.sty
index da0a494155c..686a0453947 100644
--- a/Master/texmf-dist/tex/latex/fontsetup/fspdefault.sty
+++ b/Master/texmf-dist/tex/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/Master/texmf-dist/tex/latex/fontsetup/fspolddefault.sty b/Master/texmf-dist/tex/latex/fontsetup/fspolddefault.sty
index 1c52a8ff0c0..3660ec706e1 100644
--- a/Master/texmf-dist/tex/latex/fontsetup/fspolddefault.sty
+++ b/Master/texmf-dist/tex/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}}
diff --git a/Master/tlpkg/libexec/ctan2tds b/Master/tlpkg/libexec/ctan2tds
index ec00d793896..4085517a719 100755
--- a/Master/tlpkg/libexec/ctan2tds
+++ b/Master/tlpkg/libexec/ctan2tds
@@ -3538,6 +3538,7 @@ $standardclean = '\.head|\.tmp|\.dvi|\.log|\.out|\.aux|\.toc|\.lof|\.lot'
'emisa' => $standardclean . '|\.brf$',
'enctex' => '\.ch|\.patch', # binary-related
'findhyph' => 'findhyph.pdf', # we generate
+ 'fontsetup' => 'cambria|lucida|minion|msgaramond', # nonfree
'fundus' => $standardclean . '|outline.sty', # in own package
'gentle' => 'gentle.ps.gz', # pdf is enough
'hycolor' => 'hycolor\.(drv|ins|log)',
@@ -3584,7 +3585,6 @@ $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