diff options
Diffstat (limited to 'fonts')
54 files changed, 418 insertions, 600 deletions
diff --git a/fonts/newcomputermodern/README b/fonts/newcomputermodern/README index 9486da5450..4a99ea9c8d 100644 --- a/fonts/newcomputermodern/README +++ b/fonts/newcomputermodern/README @@ -1,10 +1,10 @@ New Computer Modern Fonts - (Package version 5.02, GustFLv1 or later) + (Package version 5.1, GustFLv1 or later) Antonis Tsolomitis - Samos, Greece, 2019--2023 + Samos, Greece, 2019--2024 This is a release of a new assembly of ComputerModern fonts that extents the family with more shapes and more mathematical glyphs @@ -50,8 +50,71 @@ of Mathematics providing the widest possible Mathematical coverage. The fonts have their own protrusion settings through the microtype package which are distributed with microtype. +====================================================================== + +How to build the package from source +------------------------------------ + +(a) convert the sfd files to otf using the script +with contents the next three lines: + +#!/usr/bin/fontforge +Open($1) +Generate($1:r + ".otf") + +Assume the above script is called sfd2otf +After making it executable cd in the sfd folder +and execute + +for i in *.sfd; do sfd2otf $i; done + +(b) copy/move the otf files either in + +$HOME/texmf/tex/fonts/opentype/newcomputermodern/ + +or + +in your TeX installation + +or + +in the folder that contains newcm-doc.tex + +In any case, the command + +kpsewhich NewCM10-Regular.otf + +must return the newly installed font. + +(c) cd in the folder that contains newcm-doc.tex +and run + +xelatex-unsafe newcm-doc.tex + +or (in newer installations) + +xelatex newcm-doc.tex + +(the xelatex-unsafe if for using gs properly) +==================================================== + + Latest additions/improvements: +------------------------------ + +Version 5.1 + +Added Aegean Numbers in the Sans font + +Added one.oldstyle.alt and one.taboldstyle.alt in cv06 + +Added missing ligatures in dlig for ch, ck, and il + +Added right kerning for the sequence uni026D slash + +Replaced fspdefault.sty and fspolddefault.sty with +fspdefault.tex and fspolddefault.tex in newcomputermodern.sty Version 5.01 diff --git a/fonts/newcomputermodern/doc/newcm-doc.pdf b/fonts/newcomputermodern/doc/newcm-doc.pdf Binary files differindex 7c0ca343fc..953e01a753 100644 --- a/fonts/newcomputermodern/doc/newcm-doc.pdf +++ b/fonts/newcomputermodern/doc/newcm-doc.pdf diff --git a/fonts/newcomputermodern/doc/newcm-doc.tex b/fonts/newcomputermodern/doc/newcm-doc.tex index ca152c25ef..7e20605e67 100644 --- a/fonts/newcomputermodern/doc/newcm-doc.tex +++ b/fonts/newcomputermodern/doc/newcm-doc.tex @@ -95,7 +95,7 @@ Language=Nepali, \renewcommand{\arraystretch}{1.4} -\title{The New Computer Modern FontFamily\\ version 5.02} +\title{The New Computer Modern FontFamily\\ version 5.1} \author{Antonis Tsolomitis} %\address{Department of Mathematics\\ University of the Aegean\\ Karlovassi, 832\,00 Samos\\ Greece} %\netaddress{atsol (at) aegean dot gr} @@ -237,7 +237,7 @@ The Serif font includes additional ligatures fb ffb ffh ffj ffk fft fh fj ft fk and the same with longs instead of f in the \textit{default} liga table (in addition to the default fi fl ffi ffl ff). It also includes an alternative k (in the cv01 table) and -{\newcmdlig sp ch ck ct st} +{\newcmdlig sp ch ck ct st il} in the dlig table. Finally it also inludes} ``end'' {\newcmaltk versions for the letters a, e, m, n and r in the cv02 table. } @@ -256,17 +256,58 @@ and to load the font with endings variations use Of course the above can be mixed separating the optional arguments with comma, or one can define a custom font say by using -\verb|\newfontfamily\myfont[<options to enable>]{NewCM10-Regular.otf}| +\verb|\newfontfamily\myfont[<options to enable>]{NewCM10-Book.otf}| \begin{center} \begin{tabular}{c|c|c|c} - Regular & k & a e m n r & sp ch ck ct st\\ \hline + Book & k & a e m n r & sp ch ck ct st il\\ \hline cv01 & {\newcmaltk k} & & \\ \hline cv02 & & {\newcmaltendings a e m n r} & \\ \hline - dlig & & & {\newcmdlig sp ch ck ct st} + dlig & & & {\newcmdlig sp ch ck ct st il} \end{tabular} \end{center} +\subsection{Oldstyle numbers} + +Typically oldstyle numbers are available in \verb|onum| Lookup +and with the \verb|\textsc| if \verb|fontsetup| is loaded. +Also available they are with \verb|\oldstylenums|. +There are two series, one is with variable widths and one with +fixed width for use in tables. The code + +\begin{verbatim} +\oldstylenums{0123456789}\addfontfeatures{Numbers=Tabular} +\textsc{0123456789} +\end{verbatim} +gives + +\oldstylenums{0123456789}\addfontfeatures{Numbers=Tabular} + +\textsc{0123456789}\addfontfeatures{Numbers=Proportional} + +\medskip + +\noindent An alternative design is also provided for the number 1 in cv06. +The code + +\begin{verbatim} +\oldstylenums{0123456789}\addfontfeatures{CharacterVariant=6} +\oldstylenums{0\textcolor{red}{1}23456789} + \addfontfeatures{CharacterVariant=6,Numbers=Tabular} +\oldstylenums{0\textcolor{red}{1}23456789} +\end{verbatim} +gives + + +\oldstylenums{0123456789}\addfontfeatures{CharacterVariant=6} + +\oldstylenums{0\textcolor{red}{1}23456789}\addfontfeatures{CharacterVariant=6,Numbers=Tabular} + +\oldstylenums{0\textcolor{red}{1}23456789} + + + + \subsection{Old Italic} The fonts also fully support the Old Italic Unicode block @@ -510,6 +551,33 @@ with the command \verb|\atticfivestaters| and it gives \atticfivestaters; and th slot u10182 named ``Greek Kyathos Base Sign'' can be accessed with the command \verb|\greekkyathosbasesign| and it gives \greekkyathosbasesign. + +\subsection{Aegean Numbers} +Aegean numbers are supported in the Sans fonts and their slots are defined in \verb|fontsetup| +package using commands of the form \verb|\aegeanXXXX| where \verb|XXXX| is the Unicode name +of the character (without spaces). +A few examples are: +\begin{center} +\aegeanseven\quad +\aegeanfivehundred\quad +\aegeanfourthousand\quad +\aegeanfiftythousand\quad +\aegeanweightbaseunit\quad +\aegeanweightfirstsubunit\quad +\aegeanweightsecondsubunit\quad +\aegeanweightthirdsubunit\quad +\aegeanweightfourthsubunit\quad +\aegeandrymeasurefirstsubunit\quad +\aegeanliquidmeasurefirstsubunit\quad +\aegeansecondsubunit\quad +\aegeanthirdsubunit +\end{center} +and the whole table of Aegean Numbers with the commands to access the glyphs +is shown on page \pageref{AegeanNumbers}. + + + + \subsection{Support for Papyrology} Papyrology needs to declare that a glyph is missing from the papyrus or the papyrus is worn at this point and the papyrologist adds the missing glyph @@ -1105,6 +1173,45 @@ Private Area of the fonts. \displayfonttable[hex-digits=head+foot, range-end=03CE]{NewCMUncial10-Book.otf} +\section{The Aegean Numbers glyph complement} +\label{AegeanNumbers} + +\begin{tabular}{|c|c||c|c|}\hline +\verb|\aegeanseparator| &\aegeanseparator& \verb|\aegeaneighthundred| &\aegeaneighthundred\\ \hline +\verb|\aegeanseparatordot| &\aegeanseparatordot& \verb|\aegeanninehundred| &\aegeanninehundred\\ \hline +\verb|\aegeancheckmark| &\aegeancheckmark& \verb|\aegeanonethousand| &\aegeanonethousand\\ \hline +\verb|\aegeanone| &\aegeanone& \verb|\aegeantwothousand| &\aegeantwothousand\\ \hline +\verb|\aegeantwo| &\aegeantwo& \verb|\aegeanthreethousand| &\aegeanthreethousand\\ \hline +\verb|\aegeanthree| &\aegeanthree& \verb|\aegeanfourthousand| &\aegeanfourthousand\\ \hline +\verb|\aegeanfour| &\aegeanfour& \verb|\aegeanfivethousand| &\aegeanfivethousand\\ \hline +\verb|\aegeanfive| &\aegeanfive& \verb|\aegeansixthousand| &\aegeansixthousand\\ \hline +\verb|\aegeansix| &\aegeansix& \verb|\aegeanseventhousand| &\aegeanseventhousand\\ \hline +\verb|\aegeanseven| &\aegeanseven& \verb|\aegeaneightthousand| &\aegeaneightthousand\\ \hline +\verb|\aegeaneight| &\aegeaneight& \verb|\aegeanninethousand| &\aegeanninethousand\\ \hline +\verb|\aegeanine| &\aegeanine& \verb|\aegeantenthousand| &\aegeantenthousand\\ \hline +\verb|\aegeanten| &\aegeanten& \verb|\aegeantwentythousand| &\aegeantwentythousand\\ \hline +\verb|\aegeantwenty| &\aegeantwenty& \verb|\aegeanthirtythousand| &\aegeanthirtythousand\\ \hline +\verb|\aegeanthirty| &\aegeanthirty& \verb|\aegeanfourtythousand| &\aegeanfourtythousand\\ \hline +\verb|\aegeanfourty| &\aegeanfourty& \verb|\aegeanfiftythousand| &\aegeanfiftythousand\\ \hline +\verb|\aegeanfifty| &\aegeanfifty& \verb|\aegeansixtythousand| &\aegeansixtythousand\\ \hline +\verb|\aegeansixty| &\aegeansixty& \verb|\aegeanseventythousand| &\aegeanseventythousand\\ \hline +\verb|\aegeanseventy| &\aegeanseventy& \verb|\aegeaneightythousand| &\aegeaneightythousand\\ \hline +\verb|\aegeaneighty| &\aegeaneighty& \verb|\aegeanninetythousand| &\aegeanninetythousand\\ \hline +\verb|\aegeanninety| &\aegeanninety& \verb|\aegeanweightbaseunit| &\aegeanweightbaseunit\\ \hline +\verb|\aegeanonehundred| &\aegeanonehundred& \verb|\aegeanweightfirstsubunit| &\aegeanweightfirstsubunit\\ \hline +\verb|\aegeantwohundred| &\aegeantwohundred& \verb|\aegeanweightsecondsubunit| &\aegeanweightsecondsubunit\\ \hline +\verb|\aegeanthreehundred| &\aegeanthreehundred& \verb|\aegeanweightthirdsubunit| &\aegeanweightthirdsubunit\\ \hline +\verb|\aegeanfourhundred| &\aegeanfourhundred& \verb|\aegeanweightfourthsubunit| &\aegeanweightfourthsubunit\\ \hline +\verb|\aegeanfivehundred| &\aegeanfivehundred& \verb|\aegeandrymeasurefirstsubunit| &\aegeandrymeasurefirstsubunit\\ \hline +\verb|\aegeansixhundred| &\aegeansixhundred& \verb|\aegeanliquidmeasurefirstsubunit| &\aegeanliquidmeasurefirstsubunit\\ \hline +\verb|\aegeansevenhundred| &\aegeansevenhundred& \verb|\aegeansecondsubunit| &\aegeansecondsubunit\\ \hline + & & \verb|\aegeanthirdsubunit| &\aegeanthirdsubunit\\ \hline +\end{tabular} + + + + + \begin{thebibliography}{9} \bibitem[\textsc{at}]{1} Antonis Tsolomitis, \textit{The NewComputerModern font family}, \textsc{tug}boat Vol.~\textsc{42}, No.~\textsc{1}, \textsc{2021}. \bibitem[\textsc{ipa}rev]{2} Council actions on revisions of the \textsc{ipa}, Phonetic Representation: b) Revision of the \textsc{ipa}, Journal of the International Phonetic Association, Volume \textsc{23}, Issue \textsc{1}, diff --git a/fonts/newcomputermodern/otf/NewCM08-Book.otf b/fonts/newcomputermodern/otf/NewCM08-Book.otf Binary files differindex 313f06d1d5..7ed4116f3d 100644 --- a/fonts/newcomputermodern/otf/NewCM08-Book.otf +++ b/fonts/newcomputermodern/otf/NewCM08-Book.otf diff --git a/fonts/newcomputermodern/otf/NewCM08-BookItalic.otf b/fonts/newcomputermodern/otf/NewCM08-BookItalic.otf Binary files differindex 9e4a15c7d2..473e3c3468 100644 --- a/fonts/newcomputermodern/otf/NewCM08-BookItalic.otf +++ b/fonts/newcomputermodern/otf/NewCM08-BookItalic.otf diff --git a/fonts/newcomputermodern/otf/NewCM08-Italic.otf b/fonts/newcomputermodern/otf/NewCM08-Italic.otf Binary files differindex 09f65f123d..5cf41ce959 100644 --- a/fonts/newcomputermodern/otf/NewCM08-Italic.otf +++ b/fonts/newcomputermodern/otf/NewCM08-Italic.otf diff --git a/fonts/newcomputermodern/otf/NewCM08-Regular.otf b/fonts/newcomputermodern/otf/NewCM08-Regular.otf Binary files differindex cc4bb8b719..c7d99ad897 100644 --- a/fonts/newcomputermodern/otf/NewCM08-Regular.otf +++ b/fonts/newcomputermodern/otf/NewCM08-Regular.otf diff --git a/fonts/newcomputermodern/otf/NewCM10-Bold.otf b/fonts/newcomputermodern/otf/NewCM10-Bold.otf Binary files differindex cfd2859459..4ce44956d2 100644 --- a/fonts/newcomputermodern/otf/NewCM10-Bold.otf +++ b/fonts/newcomputermodern/otf/NewCM10-Bold.otf diff --git a/fonts/newcomputermodern/otf/NewCM10-BoldItalic.otf b/fonts/newcomputermodern/otf/NewCM10-BoldItalic.otf Binary files differindex ae87120fb7..4960299320 100644 --- a/fonts/newcomputermodern/otf/NewCM10-BoldItalic.otf +++ b/fonts/newcomputermodern/otf/NewCM10-BoldItalic.otf diff --git a/fonts/newcomputermodern/otf/NewCM10-Book.otf b/fonts/newcomputermodern/otf/NewCM10-Book.otf Binary files differindex 8dc9d53cbe..01cd69a60a 100644 --- a/fonts/newcomputermodern/otf/NewCM10-Book.otf +++ b/fonts/newcomputermodern/otf/NewCM10-Book.otf diff --git a/fonts/newcomputermodern/otf/NewCM10-BookItalic.otf b/fonts/newcomputermodern/otf/NewCM10-BookItalic.otf Binary files differindex d6ca61ce2f..e6f3f86e8a 100644 --- a/fonts/newcomputermodern/otf/NewCM10-BookItalic.otf +++ b/fonts/newcomputermodern/otf/NewCM10-BookItalic.otf diff --git a/fonts/newcomputermodern/otf/NewCM10-Italic.otf b/fonts/newcomputermodern/otf/NewCM10-Italic.otf Binary files differindex 3706d147c2..4d1ca0cae5 100644 --- a/fonts/newcomputermodern/otf/NewCM10-Italic.otf +++ b/fonts/newcomputermodern/otf/NewCM10-Italic.otf diff --git a/fonts/newcomputermodern/otf/NewCM10-Regular.otf b/fonts/newcomputermodern/otf/NewCM10-Regular.otf Binary files differindex a2a6f9a97b..84c08a3bf5 100644 --- a/fonts/newcomputermodern/otf/NewCM10-Regular.otf +++ b/fonts/newcomputermodern/otf/NewCM10-Regular.otf diff --git a/fonts/newcomputermodern/otf/NewCMMath-Book.otf b/fonts/newcomputermodern/otf/NewCMMath-Book.otf Binary files differindex 45e4da3418..e27c8b7831 100644 --- a/fonts/newcomputermodern/otf/NewCMMath-Book.otf +++ b/fonts/newcomputermodern/otf/NewCMMath-Book.otf diff --git a/fonts/newcomputermodern/otf/NewCMMath-Regular.otf b/fonts/newcomputermodern/otf/NewCMMath-Regular.otf Binary files differindex ef6623c9f8..fa03029f51 100644 --- a/fonts/newcomputermodern/otf/NewCMMath-Regular.otf +++ b/fonts/newcomputermodern/otf/NewCMMath-Regular.otf diff --git a/fonts/newcomputermodern/otf/NewCMMono10-Bold.otf b/fonts/newcomputermodern/otf/NewCMMono10-Bold.otf Binary files differindex 52d186f26c..50ba877119 100644 --- a/fonts/newcomputermodern/otf/NewCMMono10-Bold.otf +++ b/fonts/newcomputermodern/otf/NewCMMono10-Bold.otf diff --git a/fonts/newcomputermodern/otf/NewCMMono10-BoldOblique.otf b/fonts/newcomputermodern/otf/NewCMMono10-BoldOblique.otf Binary files differindex 926fe9d81c..5c4ba9e86a 100644 --- a/fonts/newcomputermodern/otf/NewCMMono10-BoldOblique.otf +++ b/fonts/newcomputermodern/otf/NewCMMono10-BoldOblique.otf diff --git a/fonts/newcomputermodern/otf/NewCMMono10-Book.otf b/fonts/newcomputermodern/otf/NewCMMono10-Book.otf Binary files differindex 809e79fd50..ebd8ad581f 100644 --- a/fonts/newcomputermodern/otf/NewCMMono10-Book.otf +++ b/fonts/newcomputermodern/otf/NewCMMono10-Book.otf diff --git a/fonts/newcomputermodern/otf/NewCMMono10-BookItalic.otf b/fonts/newcomputermodern/otf/NewCMMono10-BookItalic.otf Binary files differindex 3daf4b2e3f..a04b75a355 100644 --- a/fonts/newcomputermodern/otf/NewCMMono10-BookItalic.otf +++ b/fonts/newcomputermodern/otf/NewCMMono10-BookItalic.otf diff --git a/fonts/newcomputermodern/otf/NewCMMono10-Italic.otf b/fonts/newcomputermodern/otf/NewCMMono10-Italic.otf Binary files differindex 0ea097d190..99eda8c986 100644 --- a/fonts/newcomputermodern/otf/NewCMMono10-Italic.otf +++ b/fonts/newcomputermodern/otf/NewCMMono10-Italic.otf diff --git a/fonts/newcomputermodern/otf/NewCMMono10-Regular.otf b/fonts/newcomputermodern/otf/NewCMMono10-Regular.otf Binary files differindex 98a69ec4ff..ac4bf3aa9f 100644 --- a/fonts/newcomputermodern/otf/NewCMMono10-Regular.otf +++ b/fonts/newcomputermodern/otf/NewCMMono10-Regular.otf diff --git a/fonts/newcomputermodern/otf/NewCMSans08-Book.otf b/fonts/newcomputermodern/otf/NewCMSans08-Book.otf Binary files differindex f5b0d20168..c79936eb80 100644 --- a/fonts/newcomputermodern/otf/NewCMSans08-Book.otf +++ b/fonts/newcomputermodern/otf/NewCMSans08-Book.otf diff --git a/fonts/newcomputermodern/otf/NewCMSans08-BookOblique.otf b/fonts/newcomputermodern/otf/NewCMSans08-BookOblique.otf Binary files differindex b6e1fcc91b..e4178cd80c 100644 --- a/fonts/newcomputermodern/otf/NewCMSans08-BookOblique.otf +++ b/fonts/newcomputermodern/otf/NewCMSans08-BookOblique.otf diff --git a/fonts/newcomputermodern/otf/NewCMSans08-Oblique.otf b/fonts/newcomputermodern/otf/NewCMSans08-Oblique.otf Binary files differindex 69a1f8f1fb..cf707402e1 100644 --- a/fonts/newcomputermodern/otf/NewCMSans08-Oblique.otf +++ b/fonts/newcomputermodern/otf/NewCMSans08-Oblique.otf diff --git a/fonts/newcomputermodern/otf/NewCMSans08-Regular.otf b/fonts/newcomputermodern/otf/NewCMSans08-Regular.otf Binary files differindex bd6314c5a6..120b73717e 100644 --- a/fonts/newcomputermodern/otf/NewCMSans08-Regular.otf +++ b/fonts/newcomputermodern/otf/NewCMSans08-Regular.otf diff --git a/fonts/newcomputermodern/otf/NewCMSans10-Bold.otf b/fonts/newcomputermodern/otf/NewCMSans10-Bold.otf Binary files differindex 2af90d2ef9..ca2bcdfebc 100644 --- a/fonts/newcomputermodern/otf/NewCMSans10-Bold.otf +++ b/fonts/newcomputermodern/otf/NewCMSans10-Bold.otf diff --git a/fonts/newcomputermodern/otf/NewCMSans10-BoldOblique.otf b/fonts/newcomputermodern/otf/NewCMSans10-BoldOblique.otf Binary files differindex ce41d72a28..62ab987327 100644 --- a/fonts/newcomputermodern/otf/NewCMSans10-BoldOblique.otf +++ b/fonts/newcomputermodern/otf/NewCMSans10-BoldOblique.otf diff --git a/fonts/newcomputermodern/otf/NewCMSans10-Book.otf b/fonts/newcomputermodern/otf/NewCMSans10-Book.otf Binary files differindex a44c6086cc..43ddfb93b3 100644 --- a/fonts/newcomputermodern/otf/NewCMSans10-Book.otf +++ b/fonts/newcomputermodern/otf/NewCMSans10-Book.otf diff --git a/fonts/newcomputermodern/otf/NewCMSans10-BookOblique.otf b/fonts/newcomputermodern/otf/NewCMSans10-BookOblique.otf Binary files differindex 44a2c63897..056d616445 100644 --- a/fonts/newcomputermodern/otf/NewCMSans10-BookOblique.otf +++ b/fonts/newcomputermodern/otf/NewCMSans10-BookOblique.otf diff --git a/fonts/newcomputermodern/otf/NewCMSans10-Oblique.otf b/fonts/newcomputermodern/otf/NewCMSans10-Oblique.otf Binary files differindex acb58b0709..e8d4baad44 100644 --- a/fonts/newcomputermodern/otf/NewCMSans10-Oblique.otf +++ b/fonts/newcomputermodern/otf/NewCMSans10-Oblique.otf diff --git a/fonts/newcomputermodern/otf/NewCMSans10-Regular.otf b/fonts/newcomputermodern/otf/NewCMSans10-Regular.otf Binary files differindex b45a9c4f6a..96da57f58f 100644 --- a/fonts/newcomputermodern/otf/NewCMSans10-Regular.otf +++ b/fonts/newcomputermodern/otf/NewCMSans10-Regular.otf diff --git a/fonts/newcomputermodern/source.txz b/fonts/newcomputermodern/source.txz Binary files differindex 9462ee3ac4..c631bc4687 100644 --- a/fonts/newcomputermodern/source.txz +++ b/fonts/newcomputermodern/source.txz diff --git a/fonts/newcomputermodern/tex/newcomputermodern.sty b/fonts/newcomputermodern/tex/newcomputermodern.sty index 27e4575d8b..22e39e68a1 100644 --- a/fonts/newcomputermodern/tex/newcomputermodern.sty +++ b/fonts/newcomputermodern/tex/newcomputermodern.sty @@ -1,15 +1,21 @@ %\NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{newcomputermodern}[v5.02 NewCM fonts by Antonis Tsolomitis] +\ProvidesPackage{newcomputermodern}[v5.1 NewCM fonts by Antonis Tsolomitis] \typeout{Loading NewCM fonts by Antonis Tsolomitis} +\RequirePackage{fontspec} +\RequirePackage{unicode-math} \newif\if@olddefault \DeclareOption{regular}{\@olddefaulttrue} \ProcessOptions\relax +%Next command has been moved to fspolddefault.tex and +% fspdefault.tex +%\let\prosgegrammeni=\undefined %Babel compatibility + \if@olddefault - \RequirePackage{fspolddefault} + \input{fspolddefault.tex} \else - \RequirePackage{fspdefault} + \input{fspdefault.tex} \fi \endinput diff --git a/fonts/newpx/README b/fonts/newpx/README index 5e96afad90..c3322dea06 100644 --- a/fonts/newpx/README +++ b/fonts/newpx/README @@ -1,16 +1,22 @@ This package, based initially on pxfonts, provides many fixes and enhancements to that package, splitting it in two parts---newpxtext and newpxmath---which may be run independently of one another. It provides scaling, improved metrics, and other options. For proper operation, the packages require that the packages newtxmath, pxfonts and TeXGyrePagella be installed and their map files enabled. The text package now relies on an extension of the TeXGyrePagella Type1 fonts that is provided with this package. The accompanying MANIFEST-newpx.txt provides details of the extension as requested by GUST-FONT-LICENSE.txt -Current version: 1.534 2023-11-13 +Current version: 1.535 2024-01-10 This material is subject to the LaTeX Project Public License. See http://www.ctan.org/license/lppl1.3 for the details of that license. +Changes in version 1.535 +Moved all sups code from newpxtext.sty to superiors.sty, version 2, +leaving a stub in place to warn users of the associated newpxtext options +about the changes. + Changes in version 1.534 1. Made changes to a number of fd files to rework some incorrect \providefile entries. (Thanks Martin Münch.) 2. Added four declarations to newpxtext.sty of the form \DeclareFontFamilySubstitution{\encodingdefault}{zplLF}{zpllf} so that the old names for font families would work as well as the new -lowercase forms. +lowercase forms. + Changes in version 1.533 1. Introduced a sequence of curly braces to replace standard braces if you specify the option curlybraces to newtxmath. diff --git a/fonts/newpx/doc/newpxdoc.pdf b/fonts/newpx/doc/newpxdoc.pdf Binary files differindex 401e6e3781..9925313328 100644 --- a/fonts/newpx/doc/newpxdoc.pdf +++ b/fonts/newpx/doc/newpxdoc.pdf diff --git a/fonts/newpx/doc/newpxdoc.tex b/fonts/newpx/doc/newpxdoc.tex index 92a3f76241..bb61b9199a 100644 --- a/fonts/newpx/doc/newpxdoc.tex +++ b/fonts/newpx/doc/newpxdoc.tex @@ -118,7 +118,7 @@ This package is meant to be a replacement for Young Ryu's {\tt pxfonts}---a com \textsc{Changes as of version 1.53} \begin{itemize} \item -Superior letters and figures distinct from numerators have been added along with some special features. The text switch \verb|\sustyle| (or \verb|\sufigures|) or the commands \verb|\textsu|, \verb|\textsup|, \verb|\textsups| may be used to invoke ordinary superiors. The command \verb|\textsuperior| is reserved for a form of superiors that respond to adjustments you may specify in the package options, and which are used for footnote marker placement: \verb|supscale| rescales them, \verb|supsraised| specifies an amount to move them vertically, and \verb|supLspaced|, \verb|supRspaced| specify additional kerning to be applied at the left and right. These changes are applied in the order: scaling, raising, kerning. All except \verb|supscale| should be dimensions with units like {\tt em} which will scale properly. Their relative vertical positions stack up like this: X\textinf{12}X\textde{345}X\textnu{678}X\textsu{90}. +Superior letters and figures distinct from numerators have been added along with some special features. The text switch \verb|\sustyle| (or \verb|\sufigures|) or the commands \verb|\textsu|, \verb|\textsup|, \verb|\textsups| may be used to invoke ordinary superiors. The command \verb|\textsuperior| is reserved for a form of superiors that respond to adjustments you may specify in the package options, and which are used for footnote marker placement: \verb|supscale| rescales them, \verb|supsraised| specifies an amount to move them vertically, and \verb|supLspaced|, \verb|supRspaced| specify additional kerning to be applied at the left and right. These changes are applied in the order: scaling, raising, kerning. All except \verb|supscale| should be dimensions with units like {\tt em} which will scale properly. Their relative vertical positions stack up like this: X\textinf{12}X\textde{345}X\textnu{678}X\textsu{90}. \textbf{IMPORTANT: As of version 1.535, the options and code described in this paragraph have been moved to the new {\tt superiors} package.} \item Unless you specify the option {\tt defaultsups}, the package will use the superior letters and numbers for footnote markers. These will work in all LaTeX engines, and with all standard LaTeX classes, as well a the KOMA classes. With {\tt defaultsups}, you get scaled-down glyphs which may not match the color of other text and may be more difficult to find on a page. \item @@ -1002,8 +1002,8 @@ and pasting it into the top of your document before the \verb|\documentclass...| \end{filecontents*} \end{verbatim} -\section{Footnote markers} -The following page displays some of the ways that footnote markers may be modified. -\newpage -\includegraphics{footsnippet-crop} +%\section{Footnote markers} +%The following page displays some of the ways that footnote markers may be modified. +%\newpage +%\includegraphics{footsnippet-crop} \end{document} diff --git a/fonts/newpx/tex/newpxtext.sty b/fonts/newpx/tex/newpxtext.sty index 9d1686273d..937112b88c 100644 --- a/fonts/newpx/tex/newpxtext.sty +++ b/fonts/newpx/tex/newpxtext.sty @@ -8,8 +8,8 @@ % Text is now directed to an extension of TeXGyrePagella rather than ppl. % 1.5 is first version of newpxtext to support both [pdf]latex and unicode latex. -\def\fileversion{1.534} -\def\filedate{2023/11/13} +\def\fileversion{1.535} +\def\filedate{2024/01/10} \ProvidesPackage{newpxtext}[% \filedate\space v\fileversion (Michael Sharpe) latex and unicode latex support for TeXGyrePagellaX] @@ -126,20 +126,21 @@ \newif\ifzpl@thrm \newif\ifzpl@sl % new sups options -\newdimen\zplsups@scale -\newdimen\zplsups@raise -\def\zplsups@raised{\z@} -\def\zplsups@Lspaced{.04em} -\def\zplsups@Rspaced{.04em} -\def\zplsups@scaledval{1.0} -\def\zplsups@scalefactor{1} -\newcommand*{\zplsups@color}{black} -\DeclareOptionX{supscaled}{\renewcommand*{\zplsups@scaledval}{#1}} -\DeclareOptionX{supscale}{\renewcommand*{\zplsups@scaledval}{#1}} -\DeclareOptionX{supsraised}{\renewcommand*{\zplsups@raised}{#1}} -\DeclareOptionX{supLspaced}{\renewcommand*{\zplsups@Lspaced}{#1}} -\DeclareOptionX{supRspaced}{\renewcommand*{\zplsups@Rspaced}{#1}} -\DeclareOptionX{supscolor}{\renewcommand*{\zplsups@color}{#1}} +%\newdimen\zplsups@scale +%\newdimen\zplsups@raise +%\def\zplsups@raised{\z@} +%\def\zplsups@Lspaced{.04em} +%\def\zplsups@Rspaced{.04em} +%\def\zplsups@scaledval{1.0} +%\def\zplsups@scalefactor{1} +%\newcommand*{\zplsups@color}{black} +\newif\ifzpl@supsflag +\DeclareOptionX{supscaled}{\zpl@supsflagtrue}%{\renewcommand*{\zplsups@scaledval}{#1}} +\DeclareOptionX{supscale}{\zpl@supsflagtrue}%{\renewcommand*{\zplsups@scaledval}{#1}} +\DeclareOptionX{supsraised}{\zpl@supsflagtrue}%{\renewcommand*{\zplsups@raised}{#1}} +\DeclareOptionX{supLspaced}{\zpl@supsflagtrue}%{\renewcommand*{\zplsups@Lspaced}{#1}} +\DeclareOptionX{supRspaced}{\zpl@supsflagtrue}%{\renewcommand*{\zplsups@Rspaced}{#1}} +\DeclareOptionX{supspaced}{\zpl@supsflagtrue}%\DeclareOptionX{supscolor}{\zpl@supsflagtrue}%{\renewcommand*{\zplsups@color}{#1}} % Other options \DeclareOptionX{defaultsups}[true]{% @@ -205,12 +206,13 @@ \def\zpl@sfrSC{#1}} \ProcessOptionsX\relax - -\setlength{\zplsups@raise}{\zplsups@raised} -\setlength{\zplsups@scale}{\zplsups@scaledval\p@} -\zplsups@scale=\zpl@scale\zplsups@scale % -\def\zplsups@scalefactor{\strip@pt\zplsups@scale} -\def\zplsups@scaled{s*[\strip@pt\zplsups@scale]} +\ifzpl@supsflag% +\PackageWarningNoLine{newpxtext}{sups options no longer handled---use superiors package (v2) instead.}\fi +%\setlength{\zplsups@raise}{\zplsups@raised} +%\setlength{\zplsups@scale}{\zplsups@scaledval\p@} +%\zplsups@scale=\zpl@scale\zplsups@scale % +%\def\zplsups@scalefactor{\strip@pt\zplsups@scale} +%\def\zplsups@scaled{s*[\strip@pt\zplsups@scale]} % for stacked fractions \@ifundefined{zpl@xht}{\def\zpl@xht{460}}{} % lowercase letters \@ifundefined{zpl@deht}{\def\zpl@deht{412}}{} % denominator figures ht @@ -268,12 +270,12 @@ \fontfamily{zplsups}\selectfont} \let\supstyle\sustyle -\ifdim\zplsups@raise=\z@ +%\ifdim\zplsups@raise=\z@ \DeclareRobustCommand{\textsups}[1]{{\supstyle#1}} -\else - \DeclareRobustCommand{\textsups}[1]{% - \raisebox{\zplsups@raise}{\hbox{{\supstyle#1}}}} -\fi +%\else +% \DeclareRobustCommand{\textsups}[1]{% +% \raisebox{\zplsups@raise}{\hbox{{\supstyle#1}}}} +%\fi \RequirePackage{fontaxes} \fa@naming@exception{figures}{{superior}{proportional}}{sups} @@ -435,44 +437,44 @@ \fontfamily{zpltosf}\selectfont % } \ifzpl@defaultsups % - \else - \ExplSyntaxOn - \DeclareDocumentCommand \fakesuperscript {m} { - \@textsuperscript{\selectfont#1} - } - \RenewDocumentCommand \textsuperscript {s} { - \IfBooleanTF #1 \fakesuperscript \realsuperscript - } - \DeclareDocumentCommand \realsuperscript {m} { - \hbox_set:Nn \l_tmpa_box {{\sustyle#1}} - \box_scale:Nnn \l_tmpa_box { \zplsups@scalefactor } { \zplsups@scalefactor } - \hbox_set:Nn \l_tmpa_box - { \box_move_up:nn \zplsups@raised {\box_use:N \l_tmpa_box} } - \hspace*{\zplsups@Lspaced}{\color{\zplsups@color}% - \box_use:N \l_tmpa_box} \hspace*{\zplsups@Rspaced}}% - - - \cs_set:Npn \@makefnmark { - \mbox{% - \footnotemarkfont\textsuperscript{\@thefnmark}} - } - \cs_if_exist:NTF \ftntm@font % will exist only for KOMA - { - \cs_new:Npn \footnotemarkfont {\normalfont \ftntm@font} - } - { - \cs_new:Npn \footnotemarkfont {\normalfont} - } - \ExplSyntaxOff - \patchcmd{\maketitle}{\@textsuperscript{\normalfont\@thefnmark}}{\normalfont{\textsuperscript\@thefnmark}}{}{} - \patchcmd{\maketitle}{\@textsuperscript{\normalfont\@thefnmark}}{\normalfont{\textsuperscript\@thefnmark}}{}{} - \patchcmd{\maketitle} -{\hb@xt@1.8em}{\hb@xt@2.18em}{}{} - \ifzpl@KOMA - \setkomafont{footnotereference}{\normalfont\sustyle} - \setkomafont{footnotelabel}{\normalfont\sustyle} - \fi - \fi + \else\fi +% \ExplSyntaxOn +% \DeclareDocumentCommand \fakesuperscript {m} { +% \@textsuperscript{\selectfont#1} +% } +% \RenewDocumentCommand \textsuperscript {s} { +% \IfBooleanTF #1 \fakesuperscript \realsuperscript +% } +% \DeclareDocumentCommand \realsuperscript {m} { +% \hbox_set:Nn \l_tmpa_box {{\sustyle#1}} +% \box_scale:Nnn \l_tmpa_box { \zplsups@scalefactor } { \zplsups@scalefactor } +% \hbox_set:Nn \l_tmpa_box +% { \box_move_up:nn \zplsups@raised {\box_use:N \l_tmpa_box} } +% \hspace*{\zplsups@Lspaced}{\color{\zplsups@color}% +% \box_use:N \l_tmpa_box} \hspace*{\zplsups@Rspaced}}% +% +% +% \cs_set:Npn \@makefnmark { +% \mbox{% +% \footnotemarkfont\textsuperscript{\@thefnmark}} +% } +% \cs_if_exist:NTF \ftntm@font % will exist only for KOMA +% { +% \cs_new:Npn \footnotemarkfont {\normalfont \ftntm@font} +% } +% { +% \cs_new:Npn \footnotemarkfont {\normalfont} +% } +% \ExplSyntaxOff +% \patchcmd{\maketitle}{\@textsuperscript{\normalfont\@thefnmark}}{\normalfont{\textsuperscript\@thefnmark}}{}{} +% \patchcmd{\maketitle}{\@textsuperscript{\normalfont\@thefnmark}}{\normalfont{\textsuperscript\@thefnmark}}{}{} +%% \patchcmd{\maketitle} +%%{\hb@xt@1.8em}{\hb@xt@2.18em}{}{} +% \ifzpl@KOMA +% \setkomafont{footnotereference}{\normalfont\sustyle} +% \setkomafont{footnotelabel}{\normalfont\sustyle} +% \fi +% \fi % \ifzpl@KOMA % \let\textsuperscript\sustyle % \setkomafont{footnotelabel}{\textsuperscript} @@ -556,46 +558,46 @@ \let\defigures\destyle \ifzpl@defaultsups % - \else - \RequirePackage{realscripts} - \ExplSyntaxOn - \DeclareDocumentCommand \imagsuperscript {m} { - \fontspec_if_fontspec_font:TF - { - \fontspec_if_opentype:TF - { \fontspec_if_feature:nTF {+sups} - { {\addfontfeature{VerticalPosition=Superior}#1} } - { \fakesuperscript{#1} } - } - { \fontspec_if_aat_feature:nnTF {10} {1} - { {\addfontfeature{VerticalPosition=Superior}#1} } - { \fakesuperscript{#1} } - } - } - { \fakesuperscript{#1} } -} - - \RenewDocumentCommand \realsuperscript {m} { - \hbox_set:Nn \l_tmpa_box {\imagsuperscript{#1}} - \box_scale:Nnn \l_tmpa_box { \zplsups@scalefactor } { \zplsups@scalefactor } - \hbox_set:Nn \l_tmpa_box - { \box_move_up:nn \zplsups@raised {\box_use:N \l_tmpa_box} } - \hspace*{\zplsups@Lspaced} - {\color{\zplsups@color}% - \box_use:N \l_tmpa_box }% - \hspace*{\zplsups@Rspaced}} - - \ExplSyntaxOff - - \patchcmd{\maketitle}{\@textsuperscript{\normalfont\@thefnmark}}{\normalfont{\textsuperscript\@thefnmark}}{}{} - \patchcmd{\maketitle}{\@textsuperscript{\normalfont\@thefnmark}}{\normalfont{\textsuperscript\@thefnmark}}{}{} - \patchcmd{\maketitle} -{\hb@xt@1.8em}{\hb@xt@2.18em}{}{} - \ifzpl@KOMA - \setkomafont{footnotereference}{\normalfont\sustyle} - \setkomafont{footnotelabel}{\normalfont\sustyle} - \fi - \fi + \else\fi +% \RequirePackage{realscripts} +% \ExplSyntaxOn +% \DeclareDocumentCommand \imagsuperscript {m} { +% \fontspec_if_fontspec_font:TF +% { +% \fontspec_if_opentype:TF +% { \fontspec_if_feature:nTF {+sups} +% { {\addfontfeature{VerticalPosition=Superior}#1} } +% { \fakesuperscript{#1} } +% } +% { \fontspec_if_aat_feature:nnTF {10} {1} +% { {\addfontfeature{VerticalPosition=Superior}#1} } +% { \fakesuperscript{#1} } +% } +% } +% { \fakesuperscript{#1} } +%} +% +% \RenewDocumentCommand \realsuperscript {m} { +% \hbox_set:Nn \l_tmpa_box {\imagsuperscript{#1}} +% \box_scale:Nnn \l_tmpa_box { \zplsups@scalefactor } { \zplsups@scalefactor } +% \hbox_set:Nn \l_tmpa_box +% { \box_move_up:nn \zplsups@raised {\box_use:N \l_tmpa_box} } +% \hspace*{\zplsups@Lspaced} +% {\color{\zplsups@color}% +% \box_use:N \l_tmpa_box }% +% \hspace*{\zplsups@Rspaced}} +% +% \ExplSyntaxOff +% +% \patchcmd{\maketitle}{\@textsuperscript{\normalfont\@thefnmark}}{\normalfont{\textsuperscript\@thefnmark}}{}{} +% \patchcmd{\maketitle}{\@textsuperscript{\normalfont\@thefnmark}}{\normalfont{\textsuperscript\@thefnmark}}{}{} +%% \patchcmd{\maketitle} +%%{\hb@xt@1.8em}{\hb@xt@2.18em}{}{} +% \ifzpl@KOMA +% \setkomafont{footnotereference}{\normalfont\sustyle} +% \setkomafont{footnotelabel}{\normalfont\sustyle} +% \fi +% \fi \renewcommand*{\textcircled}[1]{\hmode@bgroup\ooalign{% \hfil \raise -.255ex\hbox{{% diff --git a/fonts/newpx/tex/t1zpllf.fd b/fonts/newpx/tex/t1zpllf.fd index ae3c5ea7be..bfbacfb71d 100644 --- a/fonts/newpx/tex/t1zpllf.fd +++ b/fonts/newpx/tex/t1zpllf.fd @@ -1,4 +1,4 @@ -\ProvidesFile{t1zpl.fd}[2021/05/25 v1.0 font definition file for T1/zpl/lf] +\ProvidesFile{t1zpllf.fd}[2021/05/25 v1.0 font definition file for T1/zpl/lf] \@ifundefined{ifzpl@sl}{\global\let\ifzpl@sl\iftrue}{} diff --git a/fonts/newtx/README b/fonts/newtx/README index 8ef7e7dfa1..433b51bb16 100644 --- a/fonts/newtx/README +++ b/fonts/newtx/README @@ -1,10 +1,14 @@ This package, initially based on txfonts, provides many fixes and enhancements to the txfonts package, splitting it into two separate packages---newtxtext and newtxmath, which may be run independently of one another. It provides scaling, improved metrics, and other options. In particular, newtxmath offers a libertine option which substitutes Linux Libertine (provided with TeXLive and MikTeX) italic and Greek letters for the default Times letters, providing a good match for the Libertine text font, which is heavier than Computer Modern but lighter than Times, and in my experience, looks very sharp and clear on the screen. -Current version: 1.736 2023-12-20 +Current version: 1.737 2024-01-11 This material is subject to the LaTeX Project Public License. See http://www.ctan.org/license/lppl1.3 for the details of that license. +Changes in version 1.737 +Moved all sups code from newtxtext.sty to superiors.sty, version 2, leaving a stub +in place to warn users of the associated newtxtext options about the changes. + Changes in version 1.736 A typo in newtxmath.sty made subscriptcorrection inoperative. Fixed. diff --git a/fonts/newtx/doc/newtxdoc.pdf b/fonts/newtx/doc/newtxdoc.pdf Binary files differindex 0d8c08b21b..f3d8916ce2 100644 --- a/fonts/newtx/doc/newtxdoc.pdf +++ b/fonts/newtx/doc/newtxdoc.pdf diff --git a/fonts/newtx/doc/newtxdoc.tex b/fonts/newtx/doc/newtxdoc.tex index 735a929122..a412dd6dba 100644 --- a/fonts/newtx/doc/newtxdoc.tex +++ b/fonts/newtx/doc/newtxdoc.tex @@ -28,7 +28,7 @@ \usepackage[type1,sfdefault,scale=1]{sourcesanspro}% used by \mathsf, optional \usepackage[scaled=.98,varqu,varl]{zi4} %\usepackage[nohelv,nott,amsthm,largesc,theoremfont,trueslanted,scosf]{newtx}% Use newtxmath, not a unicode math package -\usepackage[textscale=1,amsthm,theoremfont,newsu]{newtx}% Use newtxmath, not a unicode math package +\usepackage[textscale=1,amsthm,theoremfont,newsu,scosf]{newtx}% Use newtxmath, not a unicode math package %\usepackage{amsthm} %\usepackage{newtxmath} %\usepackage[largesc,theoremfont,scosf]{newtxtext} @@ -82,10 +82,11 @@ % \section{Introduction} This package is meant to be a replacement for Young Ryu's {\tt txfonts}. It is a complete text ({\tt newtxtext}) and math ({\tt newtxmath}) package with roman text font provided by a Times clone, sans serif based on a \textsf{Helvetica} clone, typewriter faces, plus math symbol fonts whose math italic letters are from a Times Italic clone. As of version 1.4, {\tt newtxtext} no longer depends on {\tt txfonts} but is based on the richer source \textsf{TeXGyre Termes}, but {\tt newtxmath} continues to use the {\tt txfonts} math glyphs with many metric adjustments and some wholesale modifications. + \textsc{Changes as of version 1.735} \begin{itemize} \item -If {\tt newtx} or {\tt newtxtext} detects that a prior package loaded {\tt fontspec}, then it avoids trying to reload it. While this reduces the risk of an {\tt option clash error}, it means that the prior package will have complete reposibility for loading {\tt fontspec} with an option to control its math handling, specifically {\tt no-math}. For example, if using the {\tt xeCJK} package together with {\tt newtxtext.sty} and {\tt newtxmath.sty}, a minimal preamble could be something like: +If {\tt newtx} or {\tt newtxtext} detects that a prior package loaded {\tt fontspec}, then it avoids trying to reload it. While this reduces the risk of an {\tt option clash error}, it means that the prior package will have complete resposibility for loading {\tt fontspec} with an option to control its math handling, specifically {\tt no-math}. For example, if using the {\tt xeCJK} package together with {\tt newtxtext.sty} and {\tt newtxmath.sty}, a minimal preamble could be something like: \begin{verbatim} \PassOptionsToPackage{no-math}{xeCJK} \documentclass{ctexart} @@ -105,8 +106,9 @@ or \textsc{Changes as of version 1.73} \begin{itemize} \item -Superior letters and figures distinct from numerators have been added along with some special features. The text switch \verb|\sustyle| (or \verb|\sufigures|) or the commands \verb|\textsu|, \verb|\textsup|, \verb|\textsups| may be used to invoke ordinary superiors. The command \verb|\textsuperscript| is reserved for a form of superiors that respond to adjustments you may specify in the package options, and which are used for footnote marker typesetting: \verb|supscale| rescales them, \verb|supsraised| specifies an amount to move them vertically, and \verb|supLspaced|, \verb|supRspaced| specify additional kerning to be applied at the left and right. These changes are applied in the order: scaling, raising, kerning. All except \verb|supscale| should be dimensions with units like {\tt em} which will scale properly. Their relative vertical positions stack up like this: X\textinf{12}X\textde{345}X\textnu{678}X\textsu{90}. - There is also a {\tt supscolor} option that will apply a color specified in a form understood by {\tt xcolor}, like {\tt red!70!black}. +Superior letters and figures distinct from numerators have been added along with some special features. The text switch \verb|\sustyle| (or \verb|\sufigures|) or the commands \verb|\textsu|, \verb|\textsup|, \verb|\textsups| may be used to invoke ordinary superiors. +The command \verb|\textsuperscript| is reserved for a form of superiors that respond to adjustments you may specify in the package options, and which are used for footnote marker typesetting: \verb|supscale| rescales them, \verb|supsraised| specifies an amount to move them vertically, and \verb|supLspaced|, \verb|supRspaced| specify additional kerning to be applied at the left and right. These changes are applied in the order: scaling, raising, kerning. All except \verb|supscale| should be dimensions with units like {\tt em} which will scale properly. Their relative vertical positions stack up like this: X\textinf{12}X\textde{345}X\textnu{678}X\textsu{90}. + There is also a {\tt supscolor} option that will apply a color specified in a form understood by {\tt xcolor}, like {\tt red!70!black}. \textbf{IMPORTANT: As of version 1.737, the options and code described in this paragraph has been moved to the new {\tt superiors} package.} \item Version 1.732 introduces some new mathematical glyphs. First, there are new curly braces invoked by the option {\tt curlybraces} with {\tt height+depth} of 940, 1200, 1800, 2400, 3000 and 3600 em units. Second, there are three new math symbols: \begin{itemize} @@ -266,7 +268,7 @@ Aside from options that are passed along to the text and math packages, {\tt new \begin{itemize} \item You may set the scale for both text and math by setting {\tt scale} or, equivalently, {\tt scaled}. Alternatively, you may scale text and math separately by means of the options {\tt textscale[d]}, {\tt mathscale[d]}. -\item Option {otfmath} is acted upon only under a unicode engine, and specifies unicode math rather than the default---type1 math using {\tt newtxmath}. The effect is the exact opposite to {\tt no-math}, which would specify math no controlled by {\tt fontspec}. +\item Option {otfmath} is acted upon only under a unicode engine, and specifies unicode math rather than the default---type1 math using {\tt newtxmath}. The effect is the exact opposite to {\tt no-math}, which would specify math not controlled by {\tt fontspec}. \item Option {\tt subscriptcorrectionfile} allows you to set your own file specifying subscript corrections. \item You may specify as an option to {\tt newtx} the name of any supported text package and any options other than scale[d] that are understood by that package. The default text package is {\tt newtxtext}, which need not be specified explicitly. Other valid options as of early May, 2022, are: \begin{verbatim} @@ -628,17 +630,17 @@ As of version 1.4, there are four normal figure styles: tabular lining, tabular Option {\tt defaultsups} (same effect as {\tt defaultsups=true}) forces the package to use default footnote markers (or, at least, those in force when the package is loaded) instead of those preferred by the package---Times Roman superior figures instead of spindly ordinary Times lining figures reduced to about 70\%. (Footnote markers in minipages use the default lowercase italic alphabetic characters, unless otherwise specified by redefining \verb|\thempfootnote|.) For better control over position and size of footnote markers, use the {\tt superiors} package after loading {\tt newtxtext}. The \verb|\sustyle| font switch and its related \verb|\textsu| macro know not only about figures, but also the upper and lower case letters, including \texttt{egrave}, so that traditional French expressions like \textlf{1}\textsup{i\`ere} may be typeset correctly. The Times superiors now contain the symbols often required for footnote marker symbols: \textsu{\textasteriskcentered\textdagger\textdaggerdbl\textsection\textparagraph\textbardbl}. -The footnote marker macros in this package work with all LaTeX engines, and with the KOMA classes in all engines. -Their position and spacing may be modified with the following options: -\begin{itemize} -\item -{\tt supscaled} (or {\tt supscale}): a scale factor to apply to the marker. -\item {\tt supsraised}:amount to raise the superiors baseline---should be in units like {\tt ex} so that they scale properly. -\item -{\tt supLspaced}: kerning to apply to the left of the superscript. -\item -{\tt supRspaced}: kerning to apply to the right of the superscript. -\end{itemize} +%The footnote marker macros in this package work with all LaTeX engines, and with the KOMA classes in all engines. +%Their position and spacing may be modified with the following options: +%\begin{itemize} +%\item +%{\tt supscaled} (or {\tt supscale}): a scale factor to apply to the marker. +%\item {\tt supsraised}:amount to raise the superiors baseline---should be in units like {\tt ex} so that they scale properly. +%\item +%{\tt supLspaced}: kerning to apply to the left of the superscript. +%\item +%{\tt supRspaced}: kerning to apply to the right of the superscript. +%\end{itemize} As of version 1.7, there are two additional figure forms having the same sizes as the superior figures: denominator figures aligned to the text baseline and inferior figures whose baseline lies below the text baseline. The latter may be called either with \verb|{\infigures 12345}| {\infigures 12345} or \verb|\textinf{6789}| \textinf{6789}, while denominator figures may be called with the font switches \verb|\defigures|, \verb|\destyle| or by the macro \verb|\textde|. Prior to version 1.7, these were arranged a little differently in LaTeX, and only for upright regular text. With version 1.7, these are available under all \LaTeX\ engines. There is also a much improved (at least in unicode latex) \verb|\textfrac| macro that builds a fraction from numerator and denominator figures: e.g., \verb|\textlf{5}\,\textfrac{7}{80}| renders as \textlf{5}\,\textfrac{7}{80}. The macro was changed starting in version 1.630 to add an optional argument for the integer part, and to allow adjustments to the space before and after the fraction solidus by means of the package options {\tt foresolidus} and {\tt aftsolidus}, which have no effect in unicode latex because they are not needed. Now, for example, \verb|\textfrac[5]{7}{80}| renders as \textfrac[5]{7}{80}. In version 1.724 this arrangement has been modified (with option {\tt newsu}, an abbreviation for \emph{new superiors}) whose effect is to leave numerator and denominator figures at the same sizes and positions as in 1.7, but adding larger (by 20\%) superiors and inferiors at revised vertical positions. I think the new superior size and position is more suitable for footnote markers than the old values. For a comparison of the two possibilities:\\ \verb|\textsup{1}\textnum{2}\textde{3}\textinf{4}| renders as \textsup{1}\textnum{2}\textde{3}\textinf{4} under option {\tt newsu} and as {\addfontfeature{VerticalPosition=Numerator}12}% @@ -845,7 +847,7 @@ Upper and lower case letters in English alphabet: \textcircled{A}\dots\textcircl \item all double figures from 10 to 20: \textcircled{10}\dots\textcircled{20} \end{itemize} -\item {\tt sups}: the package treats this differently in unicode LaTeX and pdflatex, with handling in the unicode case passed off to the {\tt realscripts} package where the footnote marker font is set to \verb|\normalfont|, meaning that superiors from the current (TeXGyreTermesX) text font are employed. +%\item {\tt sups}: the package treats this differently in unicode LaTeX and pdflatex, with handling in the unicode case passed off to the {\tt realscripts} package where the footnote marker font is set to \verb|\normalfont|, meaning that superiors from the current (TeXGyreTermesX) text font are employed. \item {\tt theoremfont}, {\tt thmtabular}, {\tt thmlining} all function in a manner similar to that in {\tt pdflatex}. \item {\tt foresolidus, aftsolidus} are not used in unicode tex. \item {\tt scosf} operates more effectively than in [pdf]latex---in the latter, it seems now very difficult to modify the definition of \verb|\scshape|, and this option works only for \verb|\textsc|. diff --git a/fonts/newtx/tex/newtxtext.sty b/fonts/newtx/tex/newtxtext.sty index b487cbc6de..ac7033051d 100644 --- a/fonts/newtx/tex/newtxtext.sty +++ b/fonts/newtx/tex/newtxtext.sty @@ -11,8 +11,8 @@ %\def\ntx@state{0} % 0 for both, 1 for tutex only, 2 for legacy only \def\setstate#1{\if 1\ntx@showstate\typeout{State=#1}\fi} -\def\fileversion{1.735} -\def\filedate{2023/12/18} +\def\fileversion{1.737} +\def\filedate{2024/01/11} \ProvidesPackage{newtxtext}[% \filedate\space v\fileversion (Michael Sharpe) latex and unicode latex support for TeXGyreTermesX] @@ -130,20 +130,22 @@ \newcommand*{\ntx@scale}{1} % actual scaled command in \ntx@scaled \DeclareOptionX{scale}{\renewcommand*{\ntx@scale}{#1}} \DeclareOptionX{scaled}{\renewcommand*{\ntx@scale}{#1}} -\newdimen\ntxsups@scale -\newdimen\ntxsups@raise -\def\ntxsups@raised{\z@} -\def\ntxsups@Lspaced{.03em} -\def\ntxsups@Rspaced{.03em} -\def\ntxsups@scaledval{1} -\def\ntxsups@scalefactor{1} -\newcommand*{\ntxsups@color}{black} -\DeclareOptionX{supscaled}{\renewcommand*{\ntxsups@scaledval}{#1}}%added 2023/09/16 -\DeclareOptionX{supscale}{\renewcommand*{\ntxsups@scaledval}{#1}}%added 2023/09/16 -\DeclareOptionX{supsraised}{\renewcommand*{\ntxsups@raised}{#1}}%added 2023/09/16 -\DeclareOptionX{supLspaced}{\renewcommand*{\ntxsups@Lspaced}{#1}}%added 2023/09/16 -\DeclareOptionX{supRspaced}{\renewcommand*{\ntxsups@Rspaced}{#1}}%added 2023/09/16 -\DeclareOptionX{supscolor}{\renewcommand*{\ntxsups@color}{#1}} %added 2023/09/16 +%\newdimen\ntxsups@scale +%\newdimen\ntxsups@raise +%\def\ntxsups@raised{\z@} +%\def\ntxsups@Lspaced{.03em} +%\def\ntxsups@Rspaced{.03em} +%\def\ntxsups@scaledval{1} +%\def\ntxsups@scalefactor{1} +%\newcommand*{\ntxsups@color}{black} +\newif\ifntx@supsflag +\DeclareOptionX{supscaled}{\ntx@supsflagtrue}%{\renewcommand*{\ntxsups@scaledval}{#1}}%added 2023/09/16 +\DeclareOptionX{supscale}{\ntx@supsflagtrue}%{\renewcommand*{\ntxsups@scaledval}{#1}}%added 2023/09/16 +\DeclareOptionX{supsraised}{\ntx@supsflagtrue}%{\renewcommand*{\ntxsups@raised}{#1}}%added 2023/09/16 +\DeclareOptionX{supLspaced}{\ntx@supsflagtrue}%{\renewcommand*{\ntxsups@Lspaced}{#1}}%added 2023/09/16 +\DeclareOptionX{supRspaced}{\ntx@supsflagtrue}%{\renewcommand*{\ntxsups@Rspaced}{#1}}%added 2023/09/16 +\DeclareOptionX{supspaced}{\ntx@supsflagtrue}% +\DeclareOptionX{supscolor}{\ntx@supsflagtrue}%{\renewcommand*{\ntxsups@color}{#1}} %added 2023/09/16 \newif\ifntx@defaultsups %\newif\ifntx@adobesc % we don't use this exc. in fd, but may in future @@ -224,13 +226,16 @@ %\def\ntx@sfrSC{#1}} \ProcessOptionsX\relax +\ifntx@supsflag% +\PackageWarningNoLine{newpxtext}{sups options no longer handled---use superiors package (v2) instead.}\fi + % otfmath beats no-math \ifntx@otfmath\ntx@nomathfalse\fi -\setlength{\ntxsups@raise}{\ntxsups@raised} -\setlength{\ntxsups@scale}{\ntxsups@scaledval\p@} -\ntxsups@scale=\ntx@scale\ntxsups@scale % -\def\ntxsups@scalefactor{\strip@pt\ntxsups@scale} -\def\ntxsups@scaled{s*[\ntxsups@scalefactor]} +%\setlength{\ntxsups@raise}{\ntxsups@raised} +%\setlength{\ntxsups@scale}{\ntxsups@scaledval\p@} +%\ntxsups@scale=\ntx@scale\ntxsups@scale % +%\def\ntxsups@scalefactor{\strip@pt\ntxsups@scale} +%\def\ntxsups@scaled{s*[\ntxsups@scalefactor]} %\ifntx@otftext \typeout{ntx@otftexttrue}\else\typeout{ntx@otftextfalse}\fi \ifntx@newtx\let\ntx@scale=\ntxtext@scale\fi @@ -499,38 +504,38 @@ \fontfamily{ntxtosf}\selectfont % } \ifntx@defaultsups % - \else - \ExplSyntaxOn - %\@textsuperscript is defined in latex.ltx to render text at about 70% size, at math superscript position - \DeclareDocumentCommand \textsuperscript {m} { - \hbox_set:Nn \l_tmpa_box {{\sustyle #1}} - \box_scale:Nnn \l_tmpa_box { \ntxsups@scalefactor } { \ntxsups@scalefactor } - \hbox_set:Nn \l_tmpa_box - { \box_move_up:nn \ntxsups@raised {\box_use:N \l_tmpa_box} } - \hspace*{\ntxsups@Lspaced}{\color{\ntxsups@color}\box_use:N \l_tmpa_box} \hspace*{\ntxsups@Rspaced}}% - - - \cs_set:Npn \@makefnmark { - \mbox{% - \footnotemarkfont\textsuperscript{\@thefnmark}} - } - \cs_if_exist:NTF \ftntm@font % will exist only for KOMA - { - \cs_new:Npn \footnotemarkfont {\normalfont \ftntm@font} - } - { - \cs_new:Npn \footnotemarkfont {\normalfont} - } - \ExplSyntaxOff - \patchcmd{\maketitle}{\@textsuperscript{\normalfont\@thefnmark}}{\normalfont{\textsuperscript\@thefnmark}}{}{} - \patchcmd{\maketitle}{\@textsuperscript{\normalfont\@thefnmark}}{\normalfont{\textsuperscript\@thefnmark}}{}{} -% \patchcmd{\maketitle} -%{\hb@xt@1.8em}{\hb@xt@1.8em}{}{} %2.18? - \ifntx@KOMA - \setkomafont{footnotereference}{\normalfont\sustyle} - \setkomafont{footnotelabel}{\normalfont\sustyle} - \fi - \fi + \else\fi +% \ExplSyntaxOn +% %\@textsuperscript is defined in latex.ltx to render text at about 70% size, at math superscript position +% \DeclareDocumentCommand \textsuperscript {m} { +% \hbox_set:Nn \l_tmpa_box {{\sustyle #1}} +% \box_scale:Nnn \l_tmpa_box { \ntxsups@scalefactor } { \ntxsups@scalefactor } +% \hbox_set:Nn \l_tmpa_box +% { \box_move_up:nn \ntxsups@raised {\box_use:N \l_tmpa_box} } +% \hspace*{\ntxsups@Lspaced}{\color{\ntxsups@color}\box_use:N \l_tmpa_box} \hspace*{\ntxsups@Rspaced}}% +% +% +% \cs_set:Npn \@makefnmark { +% \mbox{% +% \footnotemarkfont\textsuperscript{\@thefnmark}} +% } +% \cs_if_exist:NTF \ftntm@font % will exist only for KOMA +% { +% \cs_new:Npn \footnotemarkfont {\normalfont \ftntm@font} +% } +% { +% \cs_new:Npn \footnotemarkfont {\normalfont} +% } +% \ExplSyntaxOff +% \patchcmd{\maketitle}{\@textsuperscript{\normalfont\@thefnmark}}{\normalfont{\textsuperscript\@thefnmark}}{}{} +% \patchcmd{\maketitle}{\@textsuperscript{\normalfont\@thefnmark}}{\normalfont{\textsuperscript\@thefnmark}}{}{} +%% \patchcmd{\maketitle} +%%{\hb@xt@1.8em}{\hb@xt@1.8em}{}{} %2.18? +% \ifntx@KOMA +% \setkomafont{footnotereference}{\normalfont\sustyle} +% \setkomafont{footnotelabel}{\normalfont\sustyle} +% \fi +% \fi % \ifntx@KOMA % %\let\textsuperscript\sustyle % \else % NOT KOMA @@ -641,35 +646,35 @@ \ifntx@defaultsups % \else - %\RequirePackage{realscripts} - \ExplSyntaxOn - \RenewDocumentCommand \textsuperscript {m} { - \hbox_set:Nn \l_tmpa_box {\textsu{\tlfstyle #1}} - \box_scale:Nnn \l_tmpa_box { \ntxsups@scalefactor } { \ntxsups@scalefactor } - \hbox_set:Nn \l_tmpa_box - { \box_move_up:nn \ntxsups@raised {\box_use:N \l_tmpa_box} } - \hspace*{\ntxsups@Lspaced}{\color{\ntxsups@color}\box_use:N \l_tmpa_box} \hspace*{\ntxsups@Rspaced}} - -\cs_set:Npn \@makefnmark { - \mbox{\footnotemarkfont\textsuperscript{\@thefnmark}} -} -\cs_if_exist:NTF \ftntm@font % KOMA only -{ - \cs_new:Npn \footnotemarkfont {\ftntm@font} -} -{ - \cs_new:Npn \footnotemarkfont {\normalfont} -} - \patchcmd{\maketitle}{\@textsuperscript{\normalfont\@thefnmark}}{\normalfont{\textsuperscript\@thefnmark}}{}{} - \patchcmd{\maketitle}{\@textsuperscript{\normalfont\@thefnmark}}{\normalfont{\textsuperscript\@thefnmark}}{}{} -% \patchcmd{\maketitle} -%{\hb@xt@1.8em}{\hb@xt@1.8em}{}{} % 2.18? - \ExplSyntaxOff - \ifntx@KOMA - \setkomafont{footnotereference}{\normalfont\sustyle} - \setkomafont{footnotelabel}{\normalfont\sustyle} - \fi - \fi% end of tutex footnote handling + \fi +% \ExplSyntaxOn +% \RenewDocumentCommand \textsuperscript {m} { +% \hbox_set:Nn \l_tmpa_box {\textsu{\tlfstyle #1}} +% \box_scale:Nnn \l_tmpa_box { \ntxsups@scalefactor } { \ntxsups@scalefactor } +% \hbox_set:Nn \l_tmpa_box +% { \box_move_up:nn \ntxsups@raised {\box_use:N \l_tmpa_box} } +% \hspace*{\ntxsups@Lspaced}{\color{\ntxsups@color}\box_use:N \l_tmpa_box} \hspace*{\ntxsups@Rspaced}} +% +%\cs_set:Npn \@makefnmark { +% \mbox{\footnotemarkfont\textsuperscript{\@thefnmark}} +%} +%\cs_if_exist:NTF \ftntm@font % KOMA only +%{ +% \cs_new:Npn \footnotemarkfont {\ftntm@font} +%} +%{ +% \cs_new:Npn \footnotemarkfont {\normalfont} +%} +% \patchcmd{\maketitle}{\@textsuperscript{\normalfont\@thefnmark}}{\normalfont{\textsuperscript\@thefnmark}}{}{} +% \patchcmd{\maketitle}{\@textsuperscript{\normalfont\@thefnmark}}{\normalfont{\textsuperscript\@thefnmark}}{}{} +%% \patchcmd{\maketitle} +%%{\hb@xt@1.8em}{\hb@xt@1.8em}{}{} % 2.18? +% \ExplSyntaxOff +% \ifntx@KOMA +% \setkomafont{footnotereference}{\normalfont\sustyle} +% \setkomafont{footnotelabel}{\normalfont\sustyle} +% \fi +% \fi% end of tutex footnote handling % \else % tutex+LTX (article,book,report) % \patchcmd[]{\maketitle}{\normalfont\@thefnmark}{\@thefnmark}{\message{Successfully patched maketitle command}}{\message{Unable to patch maketitle command}} % \patchcmd[]{\maketitle}{\normalfont\@thefnmark}{\@thefnmark}{\message{Successfully patched maketitle command}}{\message{Unable to patch maketitle command}} diff --git a/fonts/superiors/README b/fonts/superiors/README deleted file mode 100644 index cdf43ffbff..0000000000 --- a/fonts/superiors/README +++ /dev/null @@ -1,31 +0,0 @@ -This small package provides a means of adding to or modifying the superior figures used for footnote and endnote markers in any font collection. - -Current version: 1.06 - -This material is subject to the LaTeX Project Public License. See -http://www.ctan.org/license/lppl1.3 -for the details of that license. - -Changes in 1.06 -Added more abbreviations and added a check for KOMA, with which it is incompatibe. - -Changes in 1.05 -1. Added option to allow the tfm containing the superior figures to be specified by an abbreviation. -2. Modified code so that options supspaced and raised actually do what they are claimed to do. - -Changes in 1.04 -1. Corrected the code to eliminate an unwanted space following the footnote mark. - -Changes in 1.03: -1. Changed code so that footnotes within minipages are not handled using superior figures, but use whatever was determined by \thempfootnote and the existing \@makefnmark. - -Changes in 1.02: -1. libertinesups now points to a snapshot taken from LinLibertineO, and no longer depends on any other Libertine package. - -The package provides one superior figures font drawn from the Linux Libertine collection---installation requires enabling superiors.map. The default superior figures font is distributed with newtx, and provides figures based on STIX superior figures, compatible with Times and other heavy fonts. - -Any existing fonts collection, such as might be constructed by otfinst, may be used provided it has a complete set of superior digits. - -Please send comments and bug reports or suggestions for improvement to - -msharpe at ucsd dot edu
\ No newline at end of file diff --git a/fonts/superiors/doc/libfoot0-crop.pdf b/fonts/superiors/doc/libfoot0-crop.pdf Binary files differdeleted file mode 100644 index d241a9fbc4..0000000000 --- a/fonts/superiors/doc/libfoot0-crop.pdf +++ /dev/null diff --git a/fonts/superiors/doc/libfoot1-crop.pdf b/fonts/superiors/doc/libfoot1-crop.pdf Binary files differdeleted file mode 100644 index 7468771f3d..0000000000 --- a/fonts/superiors/doc/libfoot1-crop.pdf +++ /dev/null diff --git a/fonts/superiors/doc/stempelfoot0-crop.pdf b/fonts/superiors/doc/stempelfoot0-crop.pdf Binary files differdeleted file mode 100644 index 3ae5d3ec1b..0000000000 --- a/fonts/superiors/doc/stempelfoot0-crop.pdf +++ /dev/null diff --git a/fonts/superiors/doc/stempelfoot1-crop.pdf b/fonts/superiors/doc/stempelfoot1-crop.pdf Binary files differdeleted file mode 100644 index e39fe5ca90..0000000000 --- a/fonts/superiors/doc/stempelfoot1-crop.pdf +++ /dev/null diff --git a/fonts/superiors/doc/superiors-doc.pdf b/fonts/superiors/doc/superiors-doc.pdf Binary files differdeleted file mode 100644 index f7ec72312d..0000000000 --- a/fonts/superiors/doc/superiors-doc.pdf +++ /dev/null diff --git a/fonts/superiors/doc/superiors-doc.tex b/fonts/superiors/doc/superiors-doc.tex deleted file mode 100644 index 1ad8d27fd3..0000000000 --- a/fonts/superiors/doc/superiors-doc.tex +++ /dev/null @@ -1,161 +0,0 @@ -% !TEX TS-program = pdflatexmk -\documentclass[11pt]{amsart} -\usepackage[margin=.75in]{geometry} -\usepackage[parfill]{parskip}%\usepackage{graphicx} -\usepackage{graphicx} -%SetFonts -% libertine text and newtxmath -\usepackage{libertine} -\usepackage[TS1,T1]{fontenc} -\usepackage{textcomp} -\usepackage[scaled=.85]{beramono} -\usepackage[libertine]{newtxmath} -\makeatletter -\def\libertine@figurestyle{OsF} -\makeatother -%\def\libertine{\fontfamily{fxlj}\selectfont} -%SetFonts -\usepackage[supstfm=libertinesups,% - supscaled=1.2,% - raised=-.13em]{superiors} -\title{Superior Figures} -\author{Michael Sharpe} -\date{\today} % Activate to display a given date or no date - -\begin{document} -\maketitle -\section{Briefly} -The default behavior of footnote and endnote markers in \LaTeX\ is to print the number as if it were a mathematical superscript. In most cases, this means the size is about 70\% of the normal lining figure and the top is somewhat above the tops of capital letters. In many cases, the superscript figure is simply reduced in all dimensions by about 70\%, making them appear rather slight, though overly tall. (The \textsf{libertine} package used for preparing this document has a custom footnote illustrated below.) - -As an alternative, one may use superior figures---small figures, usually 50\% to 60\% of the height of lining figures, like \textsu{1234567890}. Commonly, they are designed so that the tops of the numbers are aligned with the tops of the capital letters in the font, though sometimes a little higher, corresponding to the ascender height. PostScript fonts have for a long time mostly contained just a small subset $\{1,2,3\}$ of the possible superior digits, and most OpenType fonts in the Adobe portfolio, other than the most popular and the most recent, contain the same small subset. Moreover, the \textsf{TS1} encoding includes slots for only those three superior figures. Even the recent STIX collection contains just the basic three, at least in its original distribution. - - -This package allows you to add a full set of superior figures to a font family that lacks one. It uses two predefined collections---the default is {\tt ntxsups-Regular-t1}, drawn from TeX Gyre Termes, while the second, {\tt libertinesups}, is taken from Libertine-Legacy. (The standard \textsf{libertine} package provides no access to these glyphs other than through footnote markers.) In addition, you may specify any \TeX\ tfm whose figure slots contain superior figures. The package also allows you to scale the size of the imported figures, to take into account your general font scaling, and to specify an amount by which to raise the imported, rescaled figures. You may also specify a spacing to apply before the footnote marker, using the option {\tt supspaced}. The package should be loaded \textbf{after} your Roman text font package\footnote{The {\tt newtxtext} package uses the {\tt ntxsups-*} superiors contained in the newtx package by default for footnote markers.} so that it overwrites any existing definitions of \verb|\sustyle| (a switch to turn on superior letters and figures, usually employed within braces to limit its effect, \verb|\textsu| (a macro that applies the \verb|\sustyle| switch to its argument) and the footnote style macros. - -\textsc{Important Notes:} \\ -\begin{itemize} -\item -\verb|\sustyle| is a simple text switch---the value of the parameter {\tt raised} is ignored; -\item \verb|\textsu| is a macro that reads the value of {\tt raised} and, if it is non-zero, created an \verb|\hbox| from its argument and raises it by the specified amount. In the latter case, the argument must be short as line breaks will not happen. If on the other hand {\tt raised} has a zero value, \verb|\textsu| acts like \verb|\sustyle|, permitting line breaks to occur. -\item This package is not compatible with KOMA classes or packages and will stop loading if one is detected, leaving only a line in the log file. - -\end{itemize} - -\textsc{Sample Invocations:} - -\begin{itemize} -\item Times-like, no rescaling or raising, but with $.03${\tt em} space before footnote markers: -\begin{verbatim} -\usepackage[supspaced=.03em]{superiors} % default value is .04em -\end{verbatim} -\item Libertine superiors scaled up by 20\%, then lowered: -\begin{verbatim} -\usepackage{libertine} -\usepackage[supstfm=libertinesups,% - supscaled=1.2,% - raised=-.13em]% match XHeight of libertine -{superiors} -\end{verbatim} -\item Use MinionPro\footnote{Assumes you have installed MinionPro according to the directions in the \textsf{minion2newtx} package.} - superiors at default size, lowered a bit: -\begin{verbatim} -\usepackage[supstfm=T1-Minion2Pro-Regular-sups-kern-liga,% - raised=-.05em]% -{superiors} -\end{verbatim} -\end{itemize} - -It is best to specify a relative unit for the {\tt raised} and {\tt supspaced} parameters so that they change with the font size. (Recall that for a $10${\tt pt} font, {\tt 1em} is usually {\tt 10pt}, but the actual size of {\tt 1em} is defined relative to font size.) - -The following example compares libertine with its default footnote markers against libertine with the superiors package as described in the second example above: - -\[\includegraphics{libfoot0-crop} \qquad\includegraphics{libfoot1-crop}\] - -There is another parameter named {\tt scaled} that should be used only if you loaded your text font with a scale parameter different from $1.0$, and in this case, you should use the same scale parameter. For example: -\begin{verbatim} -\usepackage[lining,scaled=1.05]{bembo} -\usepackage[scaled=1.05,% - supstfm=libertinesups,% libertine - supscaled=1.2,% - raised=-.13em]% -{superiors} -\end{verbatim} -\section{Issues with superior figures} -If a number of figure styles are available, many packages make use of \textsf{nfssext} (or its further extension \textsf{nfssext-cfr}) to access those special forms. For superior figures, two macros are defined by \textsf{nfssext}: \verb|\sustyle| and \verb|\textsu|, the first of which changes the text font to a font with superior figures (and is usually called with action confined to a group), while the second is a macro called like \verb|\textsu{123}| which applies \verb|\sustyle| to just its argument. In packages generated by {\tt otfinst} and {\tt autoinst}, if superior figures are available (even if only three of them), \verb|\sustyle| and \verb|\textsu| are defined and refer to the superior figures. Moreover, \verb|otfinst| redefines \verb|\@makefnmark|: -\begin{verbatim} -\def\@makefnmark{\hbox{\sustyle\@thefnmark}} -\end{verbatim} -so that it uses figures in \verb|\sustyle|. That leads to problems if you use footnote markers greater than three. For example, in Stempel Garamond, where there are only three superior figures available, the first graphic shows the default footnote markers provided by \textsf{otfinst}, the second shows the document processed with libertine footnote markers using -\begin{verbatim} -\usepackage[supstfm=libertinesups,% - supscaled=1.2,% - raised=-.04em -]{superiors} -\end{verbatim} - -\[\includegraphics{stempelfoot0-crop} \qquad\includegraphics{stempelfoot1-crop}\] -This package redefines these macros so that \verb|\sustyle| changes the font and applies the scaling changes, while changes due to the {\tt raised} parameter are applied only within \verb|\textsu|. For this reason, we have to modify the definition of \verb|\@makefnmark| as essentially as follows, when not in a minipage: -\begin{verbatim} -\def\@makefnmark{\raisebox{\superiors@raised}{\hbox% - {\sustyle\hspace*{\superiors@spaced}\@thefnmark% - \hspace*{.03em}}}} -\end{verbatim} - -Relatively few Opentype text font families have a complete set of superior figures that can be accessed after running \textsf{otfinst}. Other than those listed above, the following have a complete set of superior figures: -\begin{verbatim} -newtxtext -newpxtext -libertine -TeXGyre Termes -TeXGyre Pagella -Erewhon -Heuristica -Baskervaldx -garamondx -XCharter -baskervillef -cochineal -stickstoo -fbb -Adobe Bembo Std -Adobe Caslon Pro -Adobe Warnock Pro -Monotype Dante Std -Monotype Bell Std -Monotype Perpetua Std -Adobe Garamond Premier Pro -Adobe Brioso Pro -Adobe Arno Pro -Adobe Kinesis Std -Adobe Jenson Pro -Adobe Kepler Std -\end{verbatim} -(Those listed without a vendor name are free, and mostly available through \TeX Live.) - -You may, as of version 1.05, refer to a font to use for superior figures by using an abbreviated form. The following abbreviations are known to {\tt superiors} and may be activated by setting the option {\tt supsfam} to one of: -\begin{verbatim} -newtx ---ntxsups-Regular-t1,% -newtxtext ---ntxsups-Regular-t1,% -newpx ---zplsups-Regular-t1,% -newpxtext ---zplsups-Regular-t1,% -libertine ---libertinesups,% -garamondx ---NewG8-sups,% -zgm ---NewG8-sups,% -erewhon ---Erewhon-Regular-sup-t1,% -xcharter ---XCharter-Roman-sup-t1,% -baskervaldx ---Baskervaldx-Reg-sup-t1 -baskervillef ---BaskervilleF-Regular-sup-t1 -cochineal ---Cochineal-Roman-sup-t1 -stickstoo ---SticksToo-Regular-sup-t1 -fbb ---fbb-Regular-sup-t1 -\end{verbatim} -For example, loading {\tt superiors} with the line -\begin{verbatim} -\usepackage[supsfam=newpx]{superiors} -\end{verbatim} -has the same effect as -\begin{verbatim} -\usepackage[supstfm=zplsups-Regular-t1]{superiors} -\end{verbatim} -but may be easier to remember. -\end{document}
\ No newline at end of file diff --git a/fonts/superiors/enc/sups.enc b/fonts/superiors/enc/sups.enc deleted file mode 100644 index f914faff2c..0000000000 --- a/fonts/superiors/enc/sups.enc +++ /dev/null @@ -1,86 +0,0 @@ -% File sups.enc -% -% Encodes superior figures which may serve as replacements for font lacking them. -/SupsEncoding [ -% 0x00 - /.notdef /.notdef /.notdef /.notdef - /.notdef /.notdef /.notdef /.notdef - /.notdef /.notdef /.notdef /.notdef - /.notdef /.notdef /.notdef /.notdef -% 0x10 - /.notdef /.notdef /.notdef /.notdef - /.notdef /.notdef /.notdef /.notdef - /.notdef /.notdef /.notdef /.notdef - /.notdef /.notdef /.notdef /.notdef -% 0x20 - /.notdef /.notdef /.notdef /.notdef - /.notdef /.notdef /.notdef /.notdef - /.notdef /.notdef /.notdef /.notdef - /.notdef /.notdef /.notdef /.notdef -% 0x30 - /zero.superior /one.superior /two.superior /three.superior - /four.superior /five.superior /six.superior /seven.superior - /eight.superior /nine.superior /.notdef /.notdef - /.notdef /.notdef /.notdef /.notdef -% 0x40 - /.notdef /.notdef /.notdef /.notdef - /.notdef /.notdef /.notdef /.notdef - /.notdef /.notdef /.notdef /.notdef - /.notdef /.notdef /.notdef /.notdef - % 0x50 - /.notdef /.notdef /.notdef /.notdef - /.notdef /.notdef /.notdef /.notdef - /.notdef /.notdef /.notdef /.notdef - /.notdef /.notdef /.notdef /.notdef -% 0x60 -/.notdef /.notdef /.notdef /.notdef -/.notdef /.notdef /.notdef /.notdef -/.notdef /.notdef /.notdef /.notdef -/.notdef /.notdef /.notdef /.notdef -% 0x70 -/.notdef /.notdef /.notdef /.notdef -/.notdef /.notdef /.notdef /.notdef -/.notdef /.notdef /.notdef /.notdef -/.notdef /.notdef /.notdef /.notdef -% 0x80 - /.notdef /.notdef /.notdef /.notdef - /.notdef /.notdef /.notdef /.notdef - /.notdef /.notdef /.notdef /.notdef - /.notdef /.notdef /.notdef /.notdef -% 0x90 - /.notdef /.notdef /.notdef /.notdef - /.notdef /.notdef /.notdef /.notdef - /.notdef /.notdef /.notdef /.notdef - /.notdef /.notdef /.notdef /.notdef -% 0xA0 - /.notdef /.notdef /.notdef /.notdef - /.notdef /.notdef /.notdef /.notdef - /.notdef /.notdef /.notdef /.notdef - /.notdef /.notdef /.notdef /.notdef -% 0xB0 - /.notdef /.notdef /.notdef /.notdef - /.notdef /.notdef /.notdef /.notdef - /.notdef /.notdef /.notdef /.notdef - /.notdef /.notdef /.notdef /.notdef -% 0xC0 - /.notdef /.notdef /.notdef /.notdef - /.notdef /.notdef /.notdef /.notdef - /.notdef /.notdef /.notdef /.notdef - /.notdef /.notdef /.notdef /.notdef -% 0xD0 - /.notdef /.notdef /.notdef /.notdef - /.notdef /.notdef /.notdef /.notdef - /.notdef /.notdef /.notdef /.notdef - /.notdef /.notdef /.notdef /.notdef -% 0xE0 - /.notdef /.notdef /.notdef /.notdef - /.notdef /.notdef /.notdef /.notdef - /.notdef /.notdef /.notdef /.notdef - /.notdef /.notdef /.notdef /.notdef -% 0xF0 - /.notdef /.notdef /.notdef /.notdef - /.notdef /.notdef /.notdef /.notdef - /.notdef /.notdef /.notdef /.notdef - /.notdef /.notdef /.notdef /.notdef -] def - diff --git a/fonts/superiors/map/superiors.map b/fonts/superiors/map/superiors.map deleted file mode 100644 index 5e6874133d..0000000000 --- a/fonts/superiors/map/superiors.map +++ /dev/null @@ -1,2 +0,0 @@ -libertinesups LibertineSups <libertinesups.pfb -crdo-sups Crdo-sups <crdo-sups.pfb
\ No newline at end of file diff --git a/fonts/superiors/tex/superiors.sty b/fonts/superiors/tex/superiors.sty deleted file mode 100644 index 7ebdc26767..0000000000 --- a/fonts/superiors/tex/superiors.sty +++ /dev/null @@ -1,97 +0,0 @@ -\NeedsTeXFormat{LaTeX2e} -\def\superiorsVersion{1.06} -\def\superiorsDate{2019/08/18} -\ProvidesPackage{superiors}[\superiorsDate\space-\space\superiorsVersion - superiors (License LPPL) Michael Sharpe] -\newif\ifsuperiors@KOMA -\@ifundefined{KOMAClassName}{}{\superiors@KOMAtrue} -\@ifundefined{ver@scrextend.sty}{}{\superiors@KOMAtrue} -\ifsuperiors@KOMA - \message{Cannot load superiors with any KOMA class or package.^^J} - \endinput -\fi -\RequirePackage{xkeyval} -\RequirePackage{pgffor} -% Ensure that T1 is loaded, but don't change existing default encoding -\def\t@one{T1} -\ifx\encodingdefault\t@one\else% - \usepackage[T1,\encodingdefault]{fontenc} -\fi -\def\sups@tfm{ntxsups-Regular-t1} -\let\sups@fam\@empty -\newdimen\superiors@scale -\newdimen\superiors@raise -\def\superiors@raised{\z@} -\def\superiors@spaced{.04em} -\def\superiors@scaledval{1.0} -\def\superiors@supscale{1.0} -\define@key{superiors}{scaled}[1.0]{\def\superiors@scaledval{#1}} -\define@key{superiors}{supscaled}[1.0]{\def\superiors@supscale{#1}} -\define@key{superiors}{raised}[\z@]{\def\superiors@raised{#1}} -\define@key{superiors}{supstfm}{\def\sups@tfm{#1}} -\define@key{superiors}{supsfam}{\def\sups@fam{#1}} -\define@key{superiors}{supspaced}[\z@]{\def\superiors@spaced{#1}} -\DeclareOption*{% - \begingroup - \edef\x{\endgroup - \noexpand\setkeys{superiors}{\CurrentOption}}% - \x} - -\ProcessOptions* - -\setlength{\superiors@raise}{\superiors@raised} -\setlength{\superiors@scale}{\superiors@scaledval\p@} -\superiors@scale=\superiors@supscale\superiors@scale % -\def\superiors@scaled{s*[\strip@pt\superiors@scale]} -\let\superiors@makefnmark\@makefnmark - -\ifx\sups@fam\@empty\else% -\foreach\x/\y in {newtx/ntxsups-Regular-t1,% -newtxtext/ntxsups-Regular-t1,% -newpx/zplsups-Regular-t1,% -newpxtext/zplsups-Regular-t1,% -libertine/libertinesups,% -garamondx/NewG8-sups,% -zgm/NewG8-sups,% -erewhon/Erewhon-Regular-sup-t1,% -xcharter/XCharter-Roman-sup-t1,% -baskervaldx/Baskervaldx-Reg-sup-t1,% -baskervillef/BaskervilleF-Regular-sup-t1,% -Baskervillef/BaskervilleF-Regular-sup-t1,% -cochineal/Cochineal-Roman-sup-t1,% -Cochineal/Cochineal-Reoman-sup-t1,% -cochineal/Cochineal-Regular-sup-t1,% -stickstoo/SticksToo-Regular-sup-t1,% -stickstootext/SticksToo-Regular-sup-t1,% -SticksToo/SticksToo-Regular-sup-t1,% -fbb/fbb-Regular-sup-t1} -{\ifx\x\sups@fam\xdef\sups@tfm{\y}\breakforeach\fi} -\fi - -\DeclareFontFamily{U}{zsups}{}% - \DeclareFontShape{U}{zsups}{m}{n}{% - <-> \superiors@scaled \sups@tfm -}{} -\DeclareRobustCommand{\sustyle}{% - \not@math@alphabet\sustyle\relax - \usefont{U}{zsups}{m}{n}} - -\ifdim\superiors@raise=\z@ - \DeclareRobustCommand{\textsu}[1]{{\sustyle#1}} -\else - \DeclareRobustCommand{\textsu}[1]{% - \raisebox{\superiors@raised}{\hbox{{\sustyle#1}}}} -\fi -%\def\@makefnmark{\hbox{\textsu{\hspace*{\superiors@spaced}\@thefnmark}}} -\def\f@@tn@te{footnote} -\def\@makefnmark{% - \ifx\@mpfn\f@@tn@te% we're not in a minipage - \raisebox{\superiors@raised}{\hbox% - {\sustyle\hspace*{\superiors@spaced}\@thefnmark% - \hspace*{.03em}}}% - \else% minipage---use original def - \superiors@makefnmark% - \fi% -} - -\endinput
\ No newline at end of file diff --git a/fonts/superiors/tfm/libertinesups.tfm b/fonts/superiors/tfm/libertinesups.tfm Binary files differdeleted file mode 100644 index 07ca88f17b..0000000000 --- a/fonts/superiors/tfm/libertinesups.tfm +++ /dev/null diff --git a/fonts/superiors/type1/libertinesups.pfb b/fonts/superiors/type1/libertinesups.pfb Binary files differdeleted file mode 100644 index 0204d7c551..0000000000 --- a/fonts/superiors/type1/libertinesups.pfb +++ /dev/null |