superiors (18oct13)

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

4 files changed, 20 insertions, 6 deletions

diff --git a/Master/texmf-dist/doc/fonts/superiors/README b/Master/texmf-dist/doc/fonts/superiors/README
index 6e6520e41db..c02303285d8 100644
--- a/Master/texmf-dist/doc/fonts/superiors/README
+++ b/Master/texmf-dist/doc/fonts/superiors/README
@@ -1,9 +1,12 @@
 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.02
+Current version: 1.03
 
 This material is subject to the LaTeX Project Public License. See http://www.ctan.org/tex-archive/help/Catalogue/licenses.lppl.html for the details of that license.
 
+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.
 
diff --git a/Master/texmf-dist/doc/fonts/superiors/superiors-doc.pdf b/Master/texmf-dist/doc/fonts/superiors/superiors-doc.pdf
index 531e7db334e..6f255f25dcd 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 e1d775d0cdb..3df34a16531 100644
--- a/Master/texmf-dist/doc/fonts/superiors/superiors-doc.tex
+++ b/Master/texmf-dist/doc/fonts/superiors/superiors-doc.tex
@@ -9,8 +9,10 @@
 \usepackage{textcomp}
 \usepackage[scaled=.85]{beramono} 
 \usepackage[libertine,cmbraces]{newtxmath}
-\renewcommand*{\rmdefault}{fxlj} %old-style figures in text, not math
-\def\libertine{\fontfamily{fxlj}\selectfont}
+\makeatletter
+\def\libertine@figurestyle{OsF}
+\makeatother
+%\def\libertine{\fontfamily{fxlj}\selectfont}
 %SetFonts
 \usepackage[supstfm=libertinesups,%
   supscaled=1.2,%
diff --git a/Master/texmf-dist/tex/latex/public/superiors/superiors.sty b/Master/texmf-dist/tex/latex/superiors/superiors.sty
index cbeebe35369..f37f3fbe1cc 100644
--- a/Master/texmf-dist/tex/latex/public/superiors/superiors.sty
+++ b/Master/texmf-dist/tex/latex/superiors/superiors.sty
@@ -1,6 +1,6 @@
 \NeedsTeXFormat{LaTeX2e}
-\def\superiorsVersion{1.02}
-\def\superiorsDate{2013/02/18}
+\def\superiorsVersion{1.03}
+\def\superiorsDate{2013/10/17}
 \ProvidesPackage{superiors}[\superiorsDate\space-\space\superiorsVersion
  superiors (License LPPL) Michael Sharpe]
 \RequirePackage{xkeyval}
@@ -27,6 +27,7 @@
 \setlength{\superiors@scale}{\superiors@scaledval\p@}
 \superiors@scale=\superiors@supscale\superiors@scale %
 \def\superiors@scaled{s*[\strip@pt\superiors@scale]}
+\let\superiors@makefnmark\@makefnmark
 
 \DeclareFontFamily{U}{zsups}{}%
   \DeclareFontShape{U}{zsups}{m}{n}{%
@@ -38,6 +39,14 @@
 
 \def\textsu#1{\raisebox{\superiors@raised}{\hbox{{\sustyle#1}}}}
 
-\def\@makefnmark{\hbox{\textsu{\hspace*{\superiors@spaced}\@thefnmark}}}
+%\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
+        \hbox{\sustyle\hspace*{.04em}\@thefnmark}
+    \else% minipage---use original def
+        \superiors@makefnmark
+    \fi%
+}
 
 \endinput
\ No newline at end of file