superiors (2mar15)

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

1 files changed, 26 insertions, 7 deletions

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%