diff options
author | Karl Berry <karl@freefriends.org> | 2024-01-11 21:32:27 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2024-01-11 21:32:27 +0000 |
commit | 2cc683e5280edd19c4548db332d46430568c1f0e (patch) | |
tree | 474474b366bdb7660c3f957dc76e59bbd87d9085 /Master | |
parent | 5fbf0c366d1dddc77a685bb9cf565fc5a0bc3cbf (diff) |
superiors (11jan24)
git-svn-id: svn://tug.org/texlive/trunk@69387 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
25 files changed, 799 insertions, 339 deletions
diff --git a/Master/texmf-dist/doc/fonts/superiors/superiors-doc.pdf b/Master/texmf-dist/doc/fonts/superiors/superiors-doc.pdf Binary files differdeleted file mode 100644 index f7ec72312d4..00000000000 --- a/Master/texmf-dist/doc/fonts/superiors/superiors-doc.pdf +++ /dev/null diff --git a/Master/texmf-dist/doc/fonts/superiors/superiors-doc.tex b/Master/texmf-dist/doc/fonts/superiors/superiors-doc.tex deleted file mode 100644 index 1ad8d27fd3a..00000000000 --- a/Master/texmf-dist/doc/fonts/superiors/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/Master/texmf-dist/doc/fonts/superiors/README b/Master/texmf-dist/doc/latex/superiors/README index cdf43ffbff1..2281ca0a6eb 100644 --- a/Master/texmf-dist/doc/fonts/superiors/README +++ b/Master/texmf-dist/doc/latex/superiors/README @@ -1,11 +1,14 @@ -This small package provides a means of adding to or modifying the superior figures used for footnote and endnote markers in any font collection. +This small package provides a means of adding to or modifying the superior figures and symbols used for footnote markers in any font collection. -Current version: 1.06 +Current version: 2.0 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 2.0 +Complete revision of the code in version 1.06. The package is now compatible with all LaTeX engines and the KOMA document classes. + Changes in 1.06 Added more abbreviations and added a check for KOMA, with which it is incompatibe. diff --git a/Master/texmf-dist/doc/latex/superiors/footsnippet1-crop.pdf b/Master/texmf-dist/doc/latex/superiors/footsnippet1-crop.pdf Binary files differnew file mode 100644 index 00000000000..65ba1b476d8 --- /dev/null +++ b/Master/texmf-dist/doc/latex/superiors/footsnippet1-crop.pdf diff --git a/Master/texmf-dist/doc/latex/superiors/footsnippet1.tex b/Master/texmf-dist/doc/latex/superiors/footsnippet1.tex new file mode 100644 index 00000000000..4ccb0e96bdf --- /dev/null +++ b/Master/texmf-dist/doc/latex/superiors/footsnippet1.tex @@ -0,0 +1,72 @@ +% !TEX TS-program = lualatexmk +\def\zz{1} +\if1\zz\documentclass[11pt]{article} +\else\documentclass[11pt]{scrartcl} +\def\tt{\normalfont\ttfamily} +\fi +\usepackage{iftex} +%\iftutex +%\else +%\pdfmapfile{=newtx.map} +%\fi +%\usepackage{trace} +\usepackage[margin=1.1in]{geometry} +\usepackage[parfill]{parskip} +\usepackage[newsu,%defaultsups, +p]{newtxtext} +%\usepackage{textcomp} +\usepackage[supscolor=red!70!black]{superiors} +%\usepackage[uprightGreek]{newpxmath} +%\usepackage[perpage +%%,flushmargin +%]{footmisc} +\title{Footnote examples\footnote{with newtxtext}} +\author{Michael Sharpe\thanks{Thanks much.}} +\pagestyle{empty} +\begin{document} +%\traceon +\maketitle +%\traceoff +\thispagestyle{empty} +%In\footnote{Testing} this note...\textinf{12} +% +%X{\infstyle%\addfontfeatures{RawFeature=+subs} +%2}{\destyle4} +%X{\addfontfeatures{VerticalPosition=Denominator}2} + +%X\textsuperscript{2} +%\end{document} + +%\makeatletter +%{\sustyle8}\normalfont{\textsuperscript{8\textdagger}}In % +%{\addfontfeature{VerticalPosition=Superior}8\textdagger}\textdagger +%{\addfontfeature{RawFeature=+smcp}AzX} +%\makeatletter +%%\show\@makefntext +%\makeatother +%\traceon\textsuperscript{\textasteriskcentered} \traceoff + +The standard LaTeX document classes {\tt article}, {{\tt report} and {\tt book}, the macro \verb|\maketitle| \verb|\let|s \verb|\footnote| to \verb|\thanks| and footnote marks are taken from a specified list of symbols. (In the AMS classes\footnote{amsart, amsproc, amsbook} the title footnote marks will appear only in the footnote itself at the bottom of the page.)\\ + +\centerline{\fbox{\begin{minipage}{4in} +Footnotes after $\backslash$maketitle use by default numeric markers beginning at 1, in some form\footnote{Best not using scaled-down lining figures.} smaller than lining numbers. (Footnotes in minipages use lowercase letters\footnote{italic except in KOMA classes} as markers.) +\end{minipage}} +} +This footnote page snippet was prepared with {\tt lualatex} using the preamble: +\begin{verbatim} +\documentclass[11pt]{article} +\usepackage{trace} +\usepackage[margin=1.1in]{geometry} +\usepackage[parfill]{parskip} +\usepackage[newsu,p]{newtxtext} % larger sups figures +\usepackage[supscolor=red!70!black]{superiors} +\title{Footnote examples\footnote{with newtxtext}} +\author{Michael Sharpe\thanks{Thanks much.}} +\end{verbatim} + +%As the {\tt defaultsups} option was not specified, footnote markers were drawn from the superior symbols and figures in the text font. + +%By setting the options {\tt supscale} and {\tt supsraised}, the footnote markers were made a bit more prominent while keeping their tops about the same as without the options. +% (The superior numbers in this font have baseline at .350{\tt em} and top at .763{\tt em}. Scaling up by the factor 1.15 increases the top by 15\% of .763{\tt em} = .114{\tt em} and moves the baseline up to 1.15 \textasteriskcentered\ 350{\tt em} = 403{\tt em}.) It is not a good idea to use the {\tt supscolor} option if you are using {\tt hyperref}. + +\end{document} diff --git a/Master/texmf-dist/doc/latex/superiors/footsnippet2-crop.pdf b/Master/texmf-dist/doc/latex/superiors/footsnippet2-crop.pdf Binary files differnew file mode 100644 index 00000000000..9f64a5a2050 --- /dev/null +++ b/Master/texmf-dist/doc/latex/superiors/footsnippet2-crop.pdf diff --git a/Master/texmf-dist/doc/latex/superiors/footsnippet2.tex b/Master/texmf-dist/doc/latex/superiors/footsnippet2.tex new file mode 100644 index 00000000000..97b5dc9affa --- /dev/null +++ b/Master/texmf-dist/doc/latex/superiors/footsnippet2.tex @@ -0,0 +1,73 @@ +% !TEX TS-program = lualatexmk +\def\zz{0} +\if1\zz\documentclass[11pt]{article} +\else\documentclass[11pt]{scrartcl} +\def\tt{\normalfont\ttfamily} +\fi +\usepackage{iftex} +%\iftutex +%\else +%\pdfmapfile{=newtx.map} +%\fi +%\usepackage{trace} +\usepackage[margin=1.1in]{geometry} +\usepackage[parfill]{parskip} +\usepackage[newsu,%defaultsups, +p]{newtxtext} +%\usepackage{textcomp} +\usepackage[supscolor=red!70!black]{superiors} +%\usepackage[uprightGreek]{newpxmath} +%\usepackage[perpage +%%,flushmargin +%]{footmisc} +\title{Footnote examples\footnote{with newtxtext}} +\author{Michael Sharpe\thanks{Thanks much.}} +\pagestyle{empty} +\begin{document} +%\traceon +\maketitle +%\traceoff +\thispagestyle{empty} +%In\footnote{Testing} this note...\textinf{12} +% +%X{\infstyle%\addfontfeatures{RawFeature=+subs} +%2}{\destyle4} +%X{\addfontfeatures{VerticalPosition=Denominator}2} + +%X\textsuperscript{2} +%\end{document} + +%\makeatletter +%{\sustyle8}\normalfont{\textsuperscript{8\textdagger}}In % +%{\addfontfeature{VerticalPosition=Superior}8\textdagger}\textdagger +%{\addfontfeature{RawFeature=+smcp}AzX} +%\makeatletter +%%\show\@makefntext +%\makeatother +%\traceon\textsuperscript{\textasteriskcentered} \traceoff + +The standard LaTeX document classes {\tt article}, {\tt report} and {\tt book}, the macro \verb|\maketitle| \verb|\let|s \verb|\footnote| to \verb|\thanks| and footnote marks are taken from a specified list of symbols. (In the AMS classes\footnote{amsart, amsproc, amsbook} the title footnote marks will appear only in the footnote itself at the bottom of the page.)\\ + +\centerline{\fbox{\begin{minipage}{4in} +Footnotes after $\backslash$maketitle use by default numeric markers beginning at 1, in some form\footnote{Best not using scaled-down lining figures.} smaller than lining numbers. (Footnotes in minipages use lowercase letters\footnote{italic except in KOMA classes} as markers.) +\end{minipage}} +} +This footnote page snippet was prepared with {\tt lualatex} using the preamble: +\begin{verbatim} +\documentclass[11pt]{scrartcl} +\usepackage{trace} +\usepackage[margin=1.1in]{geometry} +\usepackage[parfill]{parskip} +\usepackage[no-math]{fontspec} +\usepackage[newsu,p]{newtxtext} % larger sups figures +\usepackage[supscolor=red!70!black]{superiors} +\title{Footnote examples\footnote{with newtxtext}} +\author{Michael Sharpe\thanks{Thanks much.}} +\end{verbatim} + +%As the {\tt defaultsups} option was not specified, footnote markers were drawn from the superior symbols and figures in the text font. + +%By setting the options {\tt supscale} and {\tt supsraised}, the footnote markers were made a bit more prominent while keeping their tops about the same as without the options. +% (The superior numbers in this font have baseline at .350{\tt em} and top at .763{\tt em}. Scaling up by the factor 1.15 increases the top by 15\% of .763{\tt em} = .114{\tt em} and moves the baseline up to 1.15 \textasteriskcentered\ 350{\tt em} = 403{\tt em}.) It is not a good idea to use the {\tt supscolor} option if you are using {\tt hyperref}. + +\end{document} diff --git a/Master/texmf-dist/doc/latex/superiors/footsnippet3-crop.pdf b/Master/texmf-dist/doc/latex/superiors/footsnippet3-crop.pdf Binary files differnew file mode 100644 index 00000000000..ed325dad6e1 --- /dev/null +++ b/Master/texmf-dist/doc/latex/superiors/footsnippet3-crop.pdf diff --git a/Master/texmf-dist/doc/latex/superiors/footsnippet3.tex b/Master/texmf-dist/doc/latex/superiors/footsnippet3.tex new file mode 100644 index 00000000000..8fbfe1eba76 --- /dev/null +++ b/Master/texmf-dist/doc/latex/superiors/footsnippet3.tex @@ -0,0 +1,66 @@ +% !TEX TS-program = lualatexmk +\def\zz{1} +\if1\zz\documentclass[11pt]{article} +\else\documentclass[11pt]{scrartcl} +\def\tt{\normalfont\ttfamily} +\fi +\usepackage{iftex} +\usepackage[margin=1.1in]{geometry} +\usepackage[parfill]{parskip} +\usepackage[p]{newpxtext} +%\usepackage{textcomp} +\usepackage[npx,supscolor=red!70!black]{superiors} +%\usepackage[uprightGreek]{newpxmath} +%\usepackage[perpage +%%,flushmargin +%]{footmisc} +\title{Footnote examples\footnote{with newpxtext}} +\author{Michael Sharpe\thanks{Thanks much.}} +\pagestyle{empty} +\begin{document} +%\traceon +\maketitle +%\traceoff +\thispagestyle{empty} +%In\footnote{Testing} this note...\textinf{12} +% +%X{\infstyle%\addfontfeatures{RawFeature=+subs} +%2}{\destyle4} +%X{\addfontfeatures{VerticalPosition=Denominator}2} + +%X\textsuperscript{2} +%\end{document} + +%\makeatletter +%{\sustyle8}\normalfont{\textsuperscript{8\textdagger}}In % +%{\addfontfeature{VerticalPosition=Superior}8\textdagger}\textdagger +%{\addfontfeature{RawFeature=+smcp}AzX} +%\makeatletter +%%\show\@makefntext +%\makeatother +%\traceon\textsuperscript{\textasteriskcentered} \traceoff + +The standard LaTeX document classes {\tt article}, {\tt report} and {\tt book}, the macro \verb|\maketitle| \verb|\let|s \verb|\footnote| to \verb|\thanks| and footnote marks are taken from a specified list of symbols. (In the AMS classes\footnote{amsart, amsproc, amsbook} the title footnote marks will appear only in the footnote itself at the bottom of the page.)\\ + +\centerline{\fbox{\begin{minipage}{4in} +Footnotes after $\backslash$maketitle use by default numeric markers beginning at 1, in some form\footnote{Best not using scaled-down lining figures.} smaller than lining numbers. (Footnotes in minipages use lowercase letters\footnote{italic except in KOMA classes} as markers.) +\end{minipage}} +} +This footnote page snippet was prepared with {\tt lualatex} using the preamble: +\begin{verbatim} +\documentclass[11pt]{article} +\usepackage{trace} +\usepackage[margin=1.1in]{geometry} +\usepackage[parfill]{parskip} +\usepackage[p]{newpxtext} % larger sups figures +\usepackage[npx,supscolor=red!70!black]{superiors} +\title{Footnote examples\footnote{with newpxtext}} +\author{Michael Sharpe\thanks{Thanks much.}} +\end{verbatim} + +%As the {\tt defaultsups} option was not specified, footnote markers were drawn from the superior symbols and figures in the text font. + +%By setting the options {\tt supscale} and {\tt supsraised}, the footnote markers were made a bit more prominent while keeping their tops about the same as without the options. +% (The superior numbers in this font have baseline at .350{\tt em} and top at .763{\tt em}. Scaling up by the factor 1.15 increases the top by 15\% of .763{\tt em} = .114{\tt em} and moves the baseline up to 1.15 \textasteriskcentered\ 350{\tt em} = 403{\tt em}.) It is not a good idea to use the {\tt supscolor} option if you are using {\tt hyperref}. + +\end{document} diff --git a/Master/texmf-dist/doc/latex/superiors/footsnippet4-crop.pdf b/Master/texmf-dist/doc/latex/superiors/footsnippet4-crop.pdf Binary files differnew file mode 100644 index 00000000000..65e2bafc703 --- /dev/null +++ b/Master/texmf-dist/doc/latex/superiors/footsnippet4-crop.pdf diff --git a/Master/texmf-dist/doc/latex/superiors/footsnippet4.tex b/Master/texmf-dist/doc/latex/superiors/footsnippet4.tex new file mode 100644 index 00000000000..3d02c3dc3b1 --- /dev/null +++ b/Master/texmf-dist/doc/latex/superiors/footsnippet4.tex @@ -0,0 +1,67 @@ +% !TEX TS-program = lualatexmk +\def\zz{0} +\if1\zz\documentclass[11pt]{article} +\else\documentclass[11pt]{scrartcl} +\def\tt{\normalfont\ttfamily} +\fi +\usepackage{iftex} +%\iftutex +%\else +%\pdfmapfile{=newtx.map} +%\fi +%\usepackage{trace} +\usepackage[margin=1.1in]{geometry} +\usepackage[parfill]{parskip} +\usepackage[p]{newpx} +%\usepackage{textcomp} +\usepackage[npx,supscolor=red!70!black]{superiors} +\title{Footnote examples\footnote{with newpxtext}} +\author{Michael Sharpe\thanks{Thanks much.}} +\pagestyle{empty} +\begin{document} +%\traceon +\maketitle +%\traceoff +\thispagestyle{empty} +%In\footnote{Testing} this note...\textinf{12} +% +%X{\infstyle%\addfontfeatures{RawFeature=+subs} +%2}{\destyle4} +%X{\addfontfeatures{VerticalPosition=Denominator}2} + +%X\textsuperscript{2} +%\end{document} + +%\makeatletter +%{\sustyle8}\normalfont{\textsuperscript{8\textdagger}}In % +%{\addfontfeature{VerticalPosition=Superior}8\textdagger}\textdagger +%{\addfontfeature{RawFeature=+smcp}AzX} +%\makeatletter +%%\show\@makefntext +%\makeatother +%\traceon\textsuperscript{\textasteriskcentered} \traceoff + +The standard LaTeX document classes {\tt article}, {\tt report} and {\tt book}, the macro \verb|\maketitle| \verb|\let|s \verb|\footnote| to \verb|\thanks| and footnote marks are taken from a specified list of symbols. (In the AMS classes\footnote{amsart, amsproc, amsbook} the title footnote marks will appear only in the footnote itself at the bottom of the page.)\\ + +\centerline{\fbox{\begin{minipage}{4in} +Footnotes after $\backslash$maketitle use by default numeric markers beginning at 1, in some form\footnote{Best not using scaled-down lining figures.} smaller than lining numbers. (Footnotes in minipages use lowercase letters\footnote{italic except in KOMA classes} as markers.) +\end{minipage}} +} +This footnote page snippet was prepared with {\tt lualatex} using the preamble: +\begin{verbatim} +\documentclass[11pt]{scrartcl} +\usepackage{trace} +\usepackage[margin=1.1in]{geometry} +\usepackage[parfill]{parskip} +\usepackage[p]{newpxtext} +\usepackage[npx,supscolor=red!70!black]{superiors} +\title{Footnote examples\footnote{with newpxtext}} +\author{Michael Sharpe\thanks{Thanks much.}} +\end{verbatim} + +%As the {\tt defaultsups} option was not specified, footnote markers were drawn from the superior symbols and figures in the text font. + +%By setting the options {\tt supscale} and {\tt supsraised}, the footnote markers were made a bit more prominent while keeping their tops about the same as without the options. +% (The superior numbers in this font have baseline at .350{\tt em} and top at .763{\tt em}. Scaling up by the factor 1.15 increases the top by 15\% of .763{\tt em} = .114{\tt em} and moves the baseline up to 1.15 \textasteriskcentered\ 350{\tt em} = 403{\tt em}.) It is not a good idea to use the {\tt supscolor} option if you are using {\tt hyperref}. + +\end{document} diff --git a/Master/texmf-dist/doc/fonts/superiors/libfoot0-crop.pdf b/Master/texmf-dist/doc/latex/superiors/libfoot0-crop.pdf Binary files differindex d241a9fbc4b..d241a9fbc4b 100644 --- a/Master/texmf-dist/doc/fonts/superiors/libfoot0-crop.pdf +++ b/Master/texmf-dist/doc/latex/superiors/libfoot0-crop.pdf diff --git a/Master/texmf-dist/doc/fonts/superiors/libfoot1-crop.pdf b/Master/texmf-dist/doc/latex/superiors/libfoot1-crop.pdf Binary files differindex 7468771f3dd..7468771f3dd 100644 --- a/Master/texmf-dist/doc/fonts/superiors/libfoot1-crop.pdf +++ b/Master/texmf-dist/doc/latex/superiors/libfoot1-crop.pdf diff --git a/Master/texmf-dist/doc/fonts/superiors/stempelfoot0-crop.pdf b/Master/texmf-dist/doc/latex/superiors/stempelfoot0-crop.pdf Binary files differindex 3ae5d3ec1b1..3ae5d3ec1b1 100644 --- a/Master/texmf-dist/doc/fonts/superiors/stempelfoot0-crop.pdf +++ b/Master/texmf-dist/doc/latex/superiors/stempelfoot0-crop.pdf diff --git a/Master/texmf-dist/doc/fonts/superiors/stempelfoot1-crop.pdf b/Master/texmf-dist/doc/latex/superiors/stempelfoot1-crop.pdf Binary files differindex e39fe5ca900..e39fe5ca900 100644 --- a/Master/texmf-dist/doc/fonts/superiors/stempelfoot1-crop.pdf +++ b/Master/texmf-dist/doc/latex/superiors/stempelfoot1-crop.pdf diff --git a/Master/texmf-dist/doc/latex/superiors/superiors-doc.pdf b/Master/texmf-dist/doc/latex/superiors/superiors-doc.pdf Binary files differnew file mode 100644 index 00000000000..ce63eb2cca0 --- /dev/null +++ b/Master/texmf-dist/doc/latex/superiors/superiors-doc.pdf diff --git a/Master/texmf-dist/doc/latex/superiors/superiors-doc.tex b/Master/texmf-dist/doc/latex/superiors/superiors-doc.tex new file mode 100644 index 00000000000..0f42285bf6f --- /dev/null +++ b/Master/texmf-dist/doc/latex/superiors/superiors-doc.tex @@ -0,0 +1,286 @@ +% !TEX TS-program = pdflatexmk +\documentclass[11pt]{article} +\usepackage[margin=.75in]{geometry} +\usepackage[parfill]{parskip} +\usepackage{graphicx,booktabs} +%SetFonts +% libertine text and newtxmath +\usepackage{newpxtext} +\usepackage[TS1,T1]{fontenc} +\usepackage{textcomp} +\usepackage[scaled=.85]{beramono} +\usepackage{newpxmath} +\usepackage[npx]{superiors} +\makeatletter +\def\libertine@figurestyle{OsF} +\makeatother +%\def\libertine{\fontfamily{fxlj}\selectfont} +%SetFonts +%\usepackage[supstfm=libertinesups,% +% supscaled=1.2,% +% raised=-.13em, +% supscolor=red]{superiors} +\title{Superiors} +\author{Michael Sharpe} +\date{\today} % Activate to display a given date or no date + +\begin{document} +\maketitle +\section*{Briefly} +Superior letters, figures and symbols are most commonly used as footnote markers but are occasionally used to imitate eighteenth century writing abbreviations such as M\textsu{me}. Footnote markers in \LaTeX\ are superscripted versions of characters governed by the regimes in which they appear---title, minipage and body. Normally, those generated in the body of a document are successive integers starting at 1, while those in a minipage are italic letters beginning at \emph{a} and those in the document title use symbols like \textasteriskcentered, \textdagger, etc. + +The default behavior of footnote markers in \LaTeX\ is to typeset the marker 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 a bit above the tops of capital letters. They appear rather slight compared to normal text. + + +As an alternative, one may use superior figures---small figures, usually 50\% to 70\% 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. + +This package, now updated to version~2, expands on the macros of version~1 and works with {\tt lualatex}, {\tt xelatex} and legacy {\tt [pdf]latex}, and with document classes defined in {\tt latex.ltx}, the AMS classes and the KOMA classes. It also cooperates with {\tt realscripts}, which it calls under both {\tt lualatex} and {\tt xelatex}, leaving most of its macro definitions unchanged except for \verb|\@makefnmark|. Unlike version~1, which based the replacement superiors by means of a specified {\tt tfm} file, with version~2 you must specify either a latex font family name or an {\tt otf} filename ({\tt lualatex} and {\tt xelatex} only.) The macro that does the work is \verb|\textfnscript|. + +\section*{Some Details} +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 first version of the STIX collection contains just the basic three superior figures. + + +It is now not uncommon to find Opentype fonts with four vertical levels of small figures. Two of these, numerators and denominators, are supposed to be used only for text fractions, and most commonly the baseline of a denominator is the same as the text baseline, while the top of the numerators is either the height of a lining figure or the cap-height. The other two levels are superiors and either scientific inferiors or subscripts. (The corresponding opentype lookups are {\tt numr}, {\tt dnom}, {\tt sups}, {\tt sinf} and {\tt subs}.) Most commonly, these figures all have the same size, but is becoming more common for {\tt sups}, {\tt subs} and {\tt sinf} to be about 20\% larger than {\tt numr} and {\tt dnom}. It is also now more common for {\tt sups} to contain a full set of Roman letters and a good selection of text punctuation and symbols. + +This package allows you to substitute a set of superiors from one font family into a font family that either lacks superiors or has an inadequate set of superiors. Unlike version~1 of this package, version~2 can work with all LaTeX engines and works to some extent with KOMA classes. The methods amount to a variant of Will Robertson's {\tt realscripts} package that isolates the use of {\tt fontspec} to the unicode latex case. + +Speaking in general terms, this package does the following: +\begin{itemize} +\item You provide through options to {\tt superiors} the information about the font which will provide the substitutions. +\item The information may be a latex font family, an otf font or an abbreviation understood by the package from which to draw the superior glyphs. There are three different option types to convey the source for the substitute superiors: +\begin{itemize} +\item +{\tt supsfam=...} may be used to specify the latex font family to be used to render the substitute superiors. If specified, this overrides option choices using {\tt supsotf} or an abbreviated family name. E.g., to substitute superiors from the {\tt ETbb} font: +\begin{verbatim} +\usepackage[supsfam=ETbb-Sup]{superiors} +\end{verbatim} + +\item +{\tt supsotf=...} may be used to specify the {\tt otf} to be used to render the substitute superiors. If specified, this overrides option choices using an abbreviated family name. (Ignored except by {\tt lualatex} and {\tt xelatex}.) E.g., to substitute superiors from the {\tt XCharter} otf font: +\begin{verbatim} +\usepackage[supsotf=XCharter-Roman.otf]{superiors} +\end{verbatim} + +\item +An abbreviated family name may be used to specify the family/otf to be used to render the substitute superiors. The possible abbreviation options are: +\begin{center} + \begin{tabular}{@{} lll @{}} + \toprule + LaTeX Family Name & Otf Name & Abbreviations \\ + \midrule + ntxsups & TeXGyreTermesX-Regular.otf & newtx, newtxtext, ntx, ztm \\ + zplsups & TeXGyrePagellaX-Regular.otf & newpx, newpxtext, npx, zpl \\ + LibertinusSerif-Sup & LibertinusSerif-Regular.otf & lbtn, libertine, libertinus \\ + Cochineal-Sup & Cochineal-Roman.otf & coch, cochineal, Cochineal \\ + SticksTooText-Sup & STIXTwoText-Regular.otf & stix2, stickstoo, stickstootext, SticksToo \\ + ETbb--Sup & ETbb-Regular.otf & etbb, ETbb \\ + fbb-Sup & fbb-Regular.otf & fbb \\ + Erewhon-Sup & Erewhon-Regular.otf & erewhon, Erewhon\\ + XCharter-Sup & XCharter-Roman.otf & xch, xcharter, XCharter \\ + BaskervilleF-Sup & BaskervilleF-Regular.otf & baskervillef, Baskerville\\ + Baskervaldx-Sup & Baskervaldx-Regular.otf & baskervaldx, Baskervaldx \\ + zgm1 & • & zgm, garamondx \\ + scholax-Sups & TeXGyreScholaX-Regular.otf & scholax \\ + EBGaramond-Sup & EBGaramond-Regular.otf & ebg, ebgaramond, EBGaramond \\ + \bottomrule + \end{tabular} +\end{center} +\end{itemize} +\end{itemize} + +\textsc{Examples:} +\begin{itemize} +\item +\begin{verbatim} +\usepackage[lbtn, supsfam=Cochineal-Sup]{superiors} +\end{verbatim} +would ignore the {\tt lbtn} because {\tt supsfam=} takes precedence, and similarly with +\begin{verbatim} +\usepackage[lbtn, supsotf=Cochineal-Roman.otf]{superiors} +\end{verbatim} +In both cases, {\tt Cochineal-Roman} superiors would made available to replace the original superiors. Under {\tt lualatex} or {\tt xelatex}, the lines above would be equivalent to +\begin{verbatim} +\usepackage[supsotf=Cochineal-Roman.otf]{superiors} +\end{verbatim} +and under legacy {\tt latex}, to +\begin{verbatim} +\usepackage[supsfam=Cochineal-Sup]{superiors} +\end{verbatim} +\end{itemize} +\textsc{Notes:} +\begin{itemize} +\item +If no source is specified for the replacement superiors, {\tt ntxsups} will be used. +\item +The {\tt superiors} package should be loaded after other font package. +\item Unless using a legacy latex, {\tt realscripts} will be loaded by {\tt superiors}, if need be. +\item With both {\tt lualatex} and {\tt xelatex}, you may specify a legacy font family for superiors. +\end{itemize} +%\item +%\[Re\]define \verb|\sustyle| and \verb|\textsu| so they lead to the sups family that will be substituted. (The first is a font switch and the second is a macro which applies the font switch to its argument.) +%\end{itemize} +\section*{Other {\tt options}} + The package also allows you to scale the size of the imported superiors and to specify an amount by which to raise them. You may also specify a spacing to apply before and after the footnote marker and set a color. + \begin{itemize} +\item + {\tt supscale} (or {\tt supscaled}) controls the scale factor applied to superiors. + \item + {\tt supsraised} (or {\tt raised}) controls the amount to raise the superiors. It should have a unit that responds to the overall scaling of the document text, like {\tt em} or {\tt ex}. +\item +{\tt supsLspaced} and {\tt supsRspaced} govern the amount of kerning to be inserted to the Left and Right. (Default value for both is {\tt .04em}.) Option {\tt supspaced} sets its argument to both. +\item + {\tt supscolor} controls the color applied to superiors. (Default value is {\tt black}.) You may use any color specification understood by the {\tt xcolor} package. +\item +{\tt notitlepatch} causes the \verb|\maketitle| macro, which specifies among other things how footnotes and \verb|\thanks| operate within title, to not be patched to behave like body footnotes. The effect is to not use the superiors modifications within titles. This can be useful if your substitute superiors lack \verb|\textasteriskcentered|, \verb|\textdagger|, etc. +\end{itemize} + +\section*{Some Background} +Modern versions of {\tt latex.ltx} define the basic macros for subscripts and superscripts making use of the mathematical superscripts and subscript constructions that involve shrinking fullsize letters, figures and symbols to \verb|\scriptstyle|. The control sequences of importance to superscripts are: +\begin{itemize} +\item +\verb|\@textsuperscript#1| switches to math mode, shrinks \verb|#1| and puts it in an \verb|\mbox| which is rendered as a math superscript. +\item +\verb|\textsuperscript#1| is a robust macro which applies \verb|\@textsuperscript| to \verb|#1|. +\item +\verb|\@makefnmark| makes an \verb|\hbox| containing \verb|\@thefnmark|, the actual character to show as the marker for the footnote, acted upon by \verb|\@textsuperscript|. +\end{itemize} +The {\tt realscripts} package, which requires {\tt lualatex} or {\tt xelatex}, defines new macros \verb|\fakesuperscript| (essentially, the latex \verb|\textsuperscript|) and \verb|\realsuperscript| (makes use of the superiors in an Opentype font, if available) and then redefines \verb|\textsuperscript| to use \verb|\realsuperscript|, if possible. Then \verb|\@makefnmark| is redefined to make use of \verb|\textsuperscript| while paying attention to whether a KOMA class is active. So, to summarize, in {\tt realscripts}, assuming the {\tt opentype} font is properly set up with superiors: +\begin{itemize} +\item +\verb|\realsuperscript#1| is defined to use those superiors. +\item +\verb|\textsuperscript#1| is redefined to \verb|\realsuperscript#1|. +\item +\verb|\@makefnmark| is redefined to use \verb|\textsuperscript#1| instead of \verb|\@textsuperscript#1|. +\end{itemize} + +Part of what happens in {\tt superiors.sty} is making similar code that works in legacy latex and which adds for all latex engines the additional features (scaling, raising, spacing and coloring) that do not appear in {\tt realscripts.}) + +Meanwhile, there is a separate strand that affects only footnotes and \verb|\thanks| that occur during the processing of \verb|\maketitle|. (This macro is not part of {\tt latex}---it is defined in the document class file, e.g., {\tt article.cls}.) This is where footnote markers other than figures may need to be generated. This package adds patches to the code in \verb|\maketitle| that adds the same feature to footnotes and \verb|\thanks| in that setting. + +\textsc{Important Notes:} +\begin{itemize} +\item +{\tt superiors} defines \verb|\realsuperscript| in legacy latex processing and extends \verb|\textsuperscript| to cover all latex engines, not changing the {\tt realscripts} definition where it applies. +\item +{\tt superiors} defines a new macro \verb|\textSuperscript| that adds the features mentioned above on top of \verb|\textsuperscript|. This is the basis for a redefinition of \verb|\@makefnmark| that uses real superior glyphs, where possible. +\item +Many font packages, especially those generated by {\tt autoinst}, define macros \verb|\sustyle| (or \verb|\sufigures|) and \verb|\textsu| that may be used to specify superiors. The first two are simple text switches and the latter is a macro that applies the switch to its argument. I don't think there is any official latex position about these names. These macros are not affected by the options mentioned above, and nor are \verb|\textsuperscript| and \verb|\realsuperscript|. The macro that does respond to the package options \verb|\textfnscript|, which is used for footnote markers. E.g., \verb|\textfnscript{abc}| produces \textfnscript{abc} provided your superiors font has those glyphs. + +\end{itemize} + +\section*{Sample Invocations} + +\begin{itemize} +\item Times-like, no rescaling or raising, but with $.03${\tt em} space before and after footnote markers: +\begin{verbatim} +\usepackage[supspaced=.03em]{superiors} % default value is .04em +\end{verbatim} +\item Add colored {\tt newtx} superiors to {\tt newtx}, no rescaling or raising: +\begin{verbatim} +\usepackage{newtx} +\usepackage[supscolor=red!70!black]{superiors} \end{verbatim} +\item Libertine superiors scaled up by 20\%, then lowered: +\begin{verbatim} +\usepackage{libertine} +\usepackage[lbtn,% + supscaled=1.2,% + raised=-.13em]% match ascender height 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 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,% +% lbtn,% libertine +% supscaled=1.2,% +% raised=-.13em]% +%{superiors} +%\end{verbatim} +\section*{Issues with superiors} +%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|. +You may run into problems with older fonts having just three superior figures \textsu{123} +because footnote marker figures greater than three will render using normal size figures. For example, in Stempel Garamond, where there are only three superior figures available, the first graphic shows the default footnote markers, the second shows the document processed with libertine footnote markers using +\begin{verbatim} +\usepackage[lbtn,% + 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}. +The following have a complete set of superior figures: +\begin{verbatim} +newtxtext +newpxtext +libertine +libertinus-serif +TeXGyreTermesX +TeXGyrePagellaX +Erewhon +Heuristica +Baskervaldx +EBGaramond +garamondx +XCharter +baskervillef +cochineal +STIX2 +stickstoo +fbb +ETbb +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.) + +A second problem is the current paucity of fonts containing a full set of superior symbols that may be required. Note that {\tt latex} does a good job using faked superiors, but they don't always have the quality of real superiors. Currently (January 2024), from the list above, only the first two provide superior versions of these symbols. Even if the opentype font contains them and they are correctly referenced in the {\tt sups} lookup table so that they function properly with {\tt lualatex} and {\tt xelatex}, legacy latex may fail because the latex font family for superiors does have a TS1 fd file by which to locate them. This is the case with {\tt EBGaramond}, for example. + +The next four pages show some footnote examples, all made with {\tt lualatex} and {\tt superiors} but with either {\tt article} or {\tt scrartcl} and either {\tt newtxtext} or {\tt newpxtext}. +\newpage +\includegraphics{footsnippet1-crop.pdf} +\newpage +\includegraphics{footsnippet2-crop} +\newpage +\includegraphics{footsnippet3-crop} +\newpage +\includegraphics{footsnippet4-crop} +\end{document}
\ No newline at end of file diff --git a/Master/texmf-dist/fonts/enc/dvips/superiors/sups.enc b/Master/texmf-dist/fonts/enc/dvips/superiors/sups.enc deleted file mode 100644 index f914faff2cc..00000000000 --- a/Master/texmf-dist/fonts/enc/dvips/superiors/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/Master/texmf-dist/fonts/map/dvips/superiors/superiors.map b/Master/texmf-dist/fonts/map/dvips/superiors/superiors.map deleted file mode 100644 index 5e6874133d7..00000000000 --- a/Master/texmf-dist/fonts/map/dvips/superiors/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/Master/texmf-dist/fonts/tfm/public/superiors/libertinesups.tfm b/Master/texmf-dist/fonts/tfm/public/superiors/libertinesups.tfm Binary files differdeleted file mode 100644 index 07ca88f17b5..00000000000 --- a/Master/texmf-dist/fonts/tfm/public/superiors/libertinesups.tfm +++ /dev/null diff --git a/Master/texmf-dist/fonts/type1/public/superiors/libertinesups.pfb b/Master/texmf-dist/fonts/type1/public/superiors/libertinesups.pfb Binary files differdeleted file mode 100644 index 0204d7c5511..00000000000 --- a/Master/texmf-dist/fonts/type1/public/superiors/libertinesups.pfb +++ /dev/null diff --git a/Master/texmf-dist/tex/latex/superiors/superiors.sty b/Master/texmf-dist/tex/latex/superiors/superiors.sty index 7ebdc26767a..21c82394837 100644 --- a/Master/texmf-dist/tex/latex/superiors/superiors.sty +++ b/Master/texmf-dist/tex/latex/superiors/superiors.sty @@ -1,97 +1,239 @@ \NeedsTeXFormat{LaTeX2e} -\def\superiorsVersion{1.06} -\def\superiorsDate{2019/08/18} -\ProvidesPackage{superiors}[\superiorsDate\space-\space\superiorsVersion +\def\supsVersion{2.0} +\def\supsDate{2024/01/07} +\ProvidesPackage{superiors}[\supsDate\space-\space\supsVersion 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} +\newif\ifsups@KOMA +\@ifundefined{ftntm@font}{}{\sups@KOMAtrue} -\ProcessOptions* +\RequirePackage{xkeyval,xcolor,iftex,etoolbox,ifthen,trace} -\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 +\NewCommandCopy\orig@makefnmark\@makefnmark +\def\f@@tn@te{footnote} +\def\sups@id{-1} +\def\sups@scaledval{1} +\def\sups@raised{\z@} +\def\sups@Lspaced{.04em} +\def\sups@Rspaced{.04em} +\def\sups@supscale{1.0} +\def\sups@color{black} +\newif\ifsups@fam %true if a fam specced +\newif\ifsups@otf %true if an otf specced +\newif\ifsups@titlepatch % true if \maketitle should be patched +\sups@titlepatchtrue +%\traceon +\DeclareOptionX{notitlepatch}[true]{% +\@nameuse{if#1}\sups@titlepatchfalse\fi} +\DeclareOptionX{supscale}[1.0]{\def\sups@scaledval{#1}} +\DeclareOptionX{supscaled}[1.0]{\def\sups@scaledval{#1}} +\DeclareOptionX{supscolor}[\z@]{\def\sups@color{#1}} +\DeclareOptionX{raised}[\z@]{\def\sups@raised{#1}} +\DeclareOptionX{supsraised}[\z@]{\def\sups@raised{#1}} +\DeclareOptionX{supsfam}{\def\sups@fam{#1}\sups@famtrue} +\DeclareOptionX{supsotf}{\def\sups@otf{#1}\sups@otftrue} +\DeclareOptionX{supsLspaced}[.04em]{\def\sups@Lspaced{#1}} +\DeclareOptionX{supsRspaced}[.04em]{\def\sups@Rspaced{#1}} +\DeclareOptionX{supspaced}[.04em]{\def\sups@Lspaced{#1}\def\sups@Rspaced{#1}} +% The following options affect the choice of source for the superiors +\DeclareOptionX{newtx}{\def\sups@id{\z@}} +\DeclareOptionX{ntx}{\def\sups@id{\z@}} +\DeclareOptionX{ztm}{\def\sups@id{\z@}} +\DeclareOptionX{newtxtext}{\def\sups@id{\z@}} +\DeclareOptionX{newpx}{\def\sups@id{1}} +\DeclareOptionX{npx}{\def\sups@id{1}} +\DeclareOptionX{zpl}{\def\sups@id{1}} +\DeclareOptionX{newpxtext}{\def\sups@id{1}} +\DeclareOptionX{lbtn}{\def\sups@id{2}} +\DeclareOptionX{libertine}{\def\sups@id{2}} +\DeclareOptionX{libertinus}{\def\sups@id{2}} +\DeclareOptionX{cochineal}{\def\sups@id{3}} +\DeclareOptionX{Cochineal}{\def\sups@id{3}} +\DeclareOptionX{coch}{\def\sups@id{3}} +\DeclareOptionX{stickstoo}{\def\sups@id{4}} +\DeclareOptionX{Stickstoo}{\def\sups@id{4}} +\DeclareOptionX{SticksToo}{\def\sups@id{4}} +\DeclareOptionX{stix2}{\def\sups@id{4}} +\DeclareOptionX{stickstootext}{\def\sups@id{4}} +\DeclareOptionX{etbb}{\def\sups@id{5}} +\DeclareOptionX{ETbb}{\def\sups@id{5}} +\DeclareOptionX{fbb}{\def\sups@id{6}} +\DeclareOptionX{erewhon}{\def\sups@id{7}} +\DeclareOptionX{Erewhon}{\def\sups@id{7}} +\DeclareOptionX{xcharter}{\def\sups@id{8}} +\DeclareOptionX{xch}{\def\sups@id{8}} +\DeclareOptionX{XCharter}{\def\sups@id{8}} +\DeclareOptionX{baskervillef}{\def\sups@id{9}} +\DeclareOptionX{BaskervilleF}{\def\sups@id{9}} +\DeclareOptionX{baskervaldx}{\def\sups@id{10}} +\DeclareOptionX{Baskervaldx}{\def\sups@id{10}} +\DeclareOptionX{garamondx}{\def\sups@id{11}} +\DeclareOptionX{zgm}{\def\sups@id{11}} +\DeclareOptionX{scholax}{\def\sups@id{12}} +\DeclareOptionX{ebg}{\def\sups@id{13}} +\DeclareOptionX{ebgaramond}{\def\sups@id{13}} +\DeclareOptionX{EBGaramond}{\def\sups@id{13}} -\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 +\ProcessOptionsX\relax -\DeclareFontFamily{U}{zsups}{}% - \DeclareFontShape{U}{zsups}{m}{n}{% - <-> \superiors@scaled \sups@tfm -}{} -\DeclareRobustCommand{\sustyle}{% - \not@math@alphabet\sustyle\relax - \usefont{U}{zsups}{m}{n}} +\iftutex\else\sups@otffalse\fi -\ifdim\superiors@raise=\z@ - \DeclareRobustCommand{\textsu}[1]{{\sustyle#1}} -\else - \DeclareRobustCommand{\textsu}[1]{% - \raisebox{\superiors@raised}{\hbox{{\sustyle#1}}}} +\def\sups@getbyndx#1#2{% + \def\sups@tmpa{}\def\sups@tmpb{} + \ifcase#1%\sups@id%0 + \def\sups@tmpb{ntxsups} + \def\sups@tmpa{TeXGyreTermesX-Regular.otf} + + \or %1 + \def\sups@tmpb{zplsups} + \def\sups@tmpa{TeXGyrePagellaX-Regular.otf} + + \or %2 + \def\sups@tmpb{LibertinusSerif-Sup} + \def\sups@tmpa{LibertinusSerif-Regular.otf} + + \or %3 + \def\sups@tmpb{Cochineal-Sup} + \def\sups@tmpa{Cochineal-Roman.otf} + + \or %4 + \def\sups@tmpb{SticksTooText-Sup} + \def\sups@tmpa{STIXTwoText-Regular.otf} + + \or %5 + \def\sups@tmpb{ETbb-Sup} + \def\sups@tmpa{ETbb-Regular.otf} + + \or %6 + \def\sups@tmpb{fbb-Sup} + \def\sups@tmpa{fbb-Regular.otf} + + \or %7 + \def\sups@tmpb{Erewhon-Sup} + \def\sups@tmpa{Erewhon-Regular.otf} + + \or %8 + \def\sups@tmpb{XCharter-Sup} + \def\sups@tmpa{XCharter-Roman.otf} + + \or %9 + \def\sups@tmpb{BaskervilleF-Sup} + \def\sups@tmpa{BaskervilleF-Regular.otf} + + \or %10 + \def\sups@tmpb{Baskervaldx-Sup} + \def\sups@tmpa{Baskervaldx-Regular.otf} + + \or %11 + \def\sups@tmpb{zgm1} + \def\sups@tmpa{zgm1} + + \or %12 + \def\sups@tmpb{TeXGyreScholaX-Sup} + \def\sups@tmpa{TeXGyreScholaX-Regular.otf} + + \or %13 + \def\sups@tmpb{EBGaramond-Sup} + \def\sups@tmpa{EBGaramond-Regular.otf} + + \fi % \ifcase + \iftutex + \NewCommandCopy{#2}{\sups@tmpa} + \else + \NewCommandCopy{#2}{\sups@tmpb} + \fi +} + +\ifsups@fam\else% + \ifsups@otf\else% + \ifnum\sups@id=11\relax + \def\sups@fam{zgm1} + \sups@famtrue + \else + \ifnum\sups@id=-1\relax + \def\sups@id{0} + \fi + \iftutex + \sups@getbyndx{\sups@id}{\sups@otf} + \sups@otftrue + \else + \sups@getbyndx{\sups@id}{\sups@fam} + \sups@famtrue + \fi + \fi + \fi +\fi + +\DeclareRobustCommand{\supsStyle}{% + \not@math@alphabet\supsStyle\relax + \ifsups@fam% + \fontencoding{T1}\fontfamily{\sups@fam}\selectfont + \else% must be otf + \newfontface\supsStylef{\sups@otf}[RawFeature=+sups]% +\supsStylef % \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% } +\DeclareTextFontCommand{\textSuperscript}{\supsStyle} +%\iftutex +% \RequirePackage{realscripts} +% \@ifundefined{supsSuprstyle}{% +% \newfontface\supsSuprstyle{\sups@otf} +%[RawFeature=+sups]}{} +%\else %type1 +%% \DeclareFontFamily{U}{zsups}{}% +%% \DeclareFontShape{U}{zsups}{m}{n}{% +%% <-> \sups@tfm +%%}{} +% \DeclareRobustCommand{\supsSuprstyle}{% +% \not@math@alphabet\supsSuprstyle\relax +% \fontencoding{T1}\fontfamily{\sups@fam}\selectfont } +%\fi % type1 + +% The following apples to both tutex and type1 + +\ExplSyntaxOn + \NewDocumentCommand \textfnscript {m} { + \hbox_set:Nn \l_tmpa_box {{\supsStyle #1}} + \box_scale:Nnn \l_tmpa_box { \sups@scaledval } { \sups@scaledval } + \hbox_set:Nn \l_tmpa_box + { \box_move_up:nn \sups@raised {\box_use:N \l_tmpa_box} } + \hspace*{\sups@Lspaced}{\color{\sups@color}\box_use:N \l_tmpa_box} \hspace*{\sups@Rspaced}} + + \cs_set:Npn \@makefnmark { + \ifx\@mpfn\f@@tn@te% we're not in a minipage + \mbox{\footnotemarkfont\textfnscript{\@thefnmark}} + \else\orig@makefnmark\fi} + + \@ifundefined{ftntm@font}{ + \cs_new:Npn \footnotemarkfont {\normalfont} + } + {% Unable to run xpatchcmd on \deffootnote + \cs_new:Npn \footnotemarkfont {\ftntm@font} + \deffootnote[1em]{1.5em}{1em}{% + \textfnscript{\thefootnotemark}} + \deffootnotemark{\textfnscript{\thefootnotemark}}% + } + \ifsups@titlepatch + \patchcmd{\maketitle}{\@textsuperscript{\normalfont\@thefnmark}}{\footnotemarkfont\textfnscript{\@thefnmark}}{}{} + \patchcmd{\maketitle}{\@textsuperscript{\normalfont\@thefnmark}}{\footnotemarkfont\textfnscript{\@thefnmark}}{}{} + \fi + \ExplSyntaxOff + + \iftutex\else + \ifsups@KOMA + \def\footnotemarkfont{\ftntm@font} + \else% + \def\footnotemarkfont{\normalfont} + \fi + \fi +%\def\f@@tn@te{footnote} +%\def\@makefnmark{% +% \ifx\@mpfn\f@@tn@te% we're not in a minipage +% \raisebox{\sups@raised}{\hbox% +% {\sustyle\hspace*{\sups@spaced}\@thefnmark% +% \hspace*{.03em}}}% +% \else% minipage---use original def +% \sups@makefnmark% +% \fi% +%} \endinput
\ No newline at end of file diff --git a/Master/tlpkg/bin/tlpkg-ctan-check b/Master/tlpkg/bin/tlpkg-ctan-check index 5355946b0d9..99d2035a52e 100755 --- a/Master/tlpkg/bin/tlpkg-ctan-check +++ b/Master/tlpkg/bin/tlpkg-ctan-check @@ -551,7 +551,7 @@ my @TLP_working = qw( matrix-skeleton mattens maybemath maze mcaption mceinleger mcexam mcf2graph mcite mciteplus mcmthesis mdframed mdputu mdsymbol mdwtools - mecaso media4svg media9 medmath medstarbeamer + mecaso media4svg media9 medstarbeamer meetingmins membranecomputing memdesign memexsupp memoir memoirchapterstyles memoize memory memorygraphs mendex-doc mentis mensa-tex menu menucard menukeys mercatormap merriweather diff --git a/Master/tlpkg/libexec/ctan2tds b/Master/tlpkg/libexec/ctan2tds index 68c16ae98ba..54c4e4a5914 100755 --- a/Master/tlpkg/libexec/ctan2tds +++ b/Master/tlpkg/libexec/ctan2tds @@ -1855,6 +1855,7 @@ chomp (my $ctan_root = `tlpkginfo --ctan-root`); 'startex' => '&POST_otherformat', 'starray' => '&POST_onelevel', 'stex', => '&POSTstex', + 'superiors' => '&POST_onelevel', 'sympycalc' => '&POST_onelevel', 'tangramtikz' => '&POST_onelevel', 'tap' => '&POSTtap', diff --git a/Master/tlpkg/tlpsrc/superiors.tlpsrc b/Master/tlpkg/tlpsrc/superiors.tlpsrc index 972a5412c0b..e69de29bb2d 100644 --- a/Master/tlpkg/tlpsrc/superiors.tlpsrc +++ b/Master/tlpkg/tlpsrc/superiors.tlpsrc @@ -1 +0,0 @@ -execute addMap superiors.map |