superiors (2mar15)

git-svn-id: svn://tug.org/texlive/trunk@36422 c570f23f-e606-0410-a88d-b1316a301751

4 files changed, 74 insertions, 15 deletions

diff --git a/Master/texmf-dist/doc/fonts/superiors/README b/Master/texmf-dist/doc/fonts/superiors/README
index 573d3b18d3c..6e79c35d69a 100644
--- a/Master/texmf-dist/doc/fonts/superiors/README
+++ b/Master/texmf-dist/doc/fonts/superiors/README
@@ -1,11 +1,15 @@
 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.04
+Current version: 1.05
 
 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.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.
 
diff --git a/Master/texmf-dist/doc/fonts/superiors/superiors-doc.pdf b/Master/texmf-dist/doc/fonts/superiors/superiors-doc.pdf
index 6f255f25dcd..9aaed00d3c2 100644
--- a/Master/texmf-dist/doc/fonts/superiors/superiors-doc.pdf
+++ b/Master/texmf-dist/doc/fonts/superiors/superiors-doc.pdf
diff --git a/Master/texmf-dist/doc/fonts/superiors/superiors-doc.tex b/Master/texmf-dist/doc/fonts/superiors/superiors-doc.tex
index 3df34a16531..b6713d580dd 100644
--- a/Master/texmf-dist/doc/fonts/superiors/superiors-doc.tex
+++ b/Master/texmf-dist/doc/fonts/superiors/superiors-doc.tex
@@ -1,3 +1,4 @@
+% !TEX TS-program = pdflatexmk
 \documentclass[11pt]{amsart}
 \usepackage[margin=.75in]{geometry} 
 \usepackage[parfill]{parskip}%\usepackage{graphicx}
@@ -29,14 +30,14 @@ The default behavior of footnote and endnote markers in \LaTeX\ is to print the
 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.
 
 
-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}, a collection matching Times, derived from the STIX fonts (digits 1..8 were taken from the vulgar fraction glyphs, and the digits 0, 9 were constructed to match them using FontForge) 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 parameter {\tt supspaced}. The package should be loaded 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.}. 
+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 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.}. 
 
 \textsc{Sample Invocations:}
 
 \begin{itemize}
-\item Times-like, no rescaling or raising, but with $.04${\tt em} space before footnote markers:
+\item Times-like, no rescaling or raising, but with $.03${\tt em} space before footnote markers:
 \begin{verbatim}
-\usepackage[supspaced=.04em]{superiors}
+\usepackage[supspaced=.03em]{superiors} % default value is .04em
 \end{verbatim}
 \item Libertine superiors scaled up by 20\%, then lowered:
 \begin{verbatim}
@@ -71,7 +72,7 @@ There is another parameter named {\tt scaled} that should be used only if you lo
 {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}, if superior figures are available (even if only three of them), it redefines \verb|\@makefnmark|:
+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}
@@ -84,13 +85,25 @@ so that it uses figures in \verb|\sustyle|. That leads to problems if you use fo
 \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 follows:
+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{\hbox{\textsu{\hspace*{superiors@spaced}\@thefnmark}}}
+\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 are known to me to have a complete set of superior figures:
+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
 Adobe Bembo Std
 Adobe Caslon Pro
 Adobe Warnock Pro
@@ -104,5 +117,28 @@ 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-ot1,%
+newtxtext   ---ntxsups-Regular-ot1,%
+newpx   ---zplsups-Regular-ot1,%
+newpxtext  ---zplsups-Regular-ot1,%
+libertine  ---libertinesups,%
+garamondx  ---NewG8-sups,%
+zgm        ---NewG8-sups,%
+erewhon    ---Erewhon-Regular-sup-t1,%
+xcharter   ---XCharter-Roman-sup-t1,%
+baskervaldx   ---Baskervaldx-Reg-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-ot1]{superiors}
+\end{verbatim}
+but may be easier to remember.
 \end{document}  
\ No newline at end of file
diff --git a/Master/texmf-dist/tex/latex/superiors/superiors.sty b/Master/texmf-dist/tex/latex/superiors/superiors.sty
index db6fb8a36b5..c42eb7cc7d5 100644
--- a/Master/texmf-dist/tex/latex/superiors/superiors.sty
+++ b/Master/texmf-dist/tex/latex/superiors/superiors.sty
@@ -1,20 +1,23 @@
 \NeedsTeXFormat{LaTeX2e}
-\def\superiorsVersion{1.04}
-\def\superiorsDate{2014/01/18}
+\def\superiorsVersion{1.05}
+\def\superiorsDate{2015/03/01}
 \ProvidesPackage{superiors}[\superiorsDate\space-\space\superiorsVersion
  superiors (License LPPL) Michael Sharpe]
 \RequirePackage{xkeyval}
+\RequirePackage{pgffor}
 
-\def\supstfm{ntxsups}
+\def\sups@tfm{ntxsups-Regular-t1}
+\let\sups@fam\@empty
 \newdimen\superiors@scale
 \def\superiors@raised{\z@}
-\def\superiors@spaced{\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}[ntxsups]{\def\supstfm{#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
@@ -29,9 +32,23 @@
 \def\superiors@scaled{s*[\strip@pt\superiors@scale]}
 \let\superiors@makefnmark\@makefnmark
 
+\ifx\sups@fam\@empty\else%
+\foreach\x/\y in {newtx/ntxsups-Regular-ot1,%
+newtxtext/ntxsups-Regular-ot1,%
+newpx/zplsups-Regular-ot1,%
+newpxtext/zplsups-Regular-ot1,%
+libertine/libertinesups,%
+garamondx/NewG8-sups,%
+zgm/NewG8-sups,%
+erewhon/Erewhon-Regular-sup-t1,%
+xcharter/XCharter-Roman-sup-t1,%
+baskervaldx/Baskervaldx-Reg-sup-t1}
+{\ifx\x\sups@fam\xdef\sups@tfm{\y}\breakforeach\fi}
+\fi
+
 \DeclareFontFamily{U}{zsups}{}%
   \DeclareFontShape{U}{zsups}{m}{n}{%
-    <-> \superiors@scaled \supstfm
+    <-> \superiors@scaled \sups@tfm
 }{}
 \DeclareRobustCommand{\sustyle}{%
   \not@math@alphabet\sustyle\relax
@@ -43,7 +60,9 @@
 \def\f@@tn@te{footnote}
 \def\@makefnmark{%
     \ifx\@mpfn\f@@tn@te% we're not in a minipage
-        \hbox{\sustyle\hspace*{.04em}\@thefnmark\hspace*{.03em}}%
+        \raisebox{\superiors@raised}{\hbox%
+        {\sustyle\hspace*{\superiors@spaced}\@thefnmark%
+        \hspace*{.03em}}}%
     \else% minipage---use original def
         \superiors@makefnmark%
     \fi%