summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2013-10-18 23:20:07 +0000
committerKarl Berry <karl@freefriends.org>2013-10-18 23:20:07 +0000
commitb4775ec0da5d48800a6abad06e41a68fbe420292 (patch)
treee9536ccc52a74b7da774a4a5c0d5f7ba805265da /Master/texmf-dist/tex
parentd6adda9b74f9be5ffc3757b5e00b781d64a4ebc4 (diff)
newtx (18oct13)
git-svn-id: svn://tug.org/texlive/trunk@31942 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex')
-rw-r--r--Master/texmf-dist/tex/latex/newtx/newtxmath.sty4
-rw-r--r--Master/texmf-dist/tex/latex/newtx/newtxtext.sty24
2 files changed, 23 insertions, 5 deletions
diff --git a/Master/texmf-dist/tex/latex/newtx/newtxmath.sty b/Master/texmf-dist/tex/latex/newtx/newtxmath.sty
index d68a351d058..dbc6ef10604 100644
--- a/Master/texmf-dist/tex/latex/newtx/newtxmath.sty
+++ b/Master/texmf-dist/tex/latex/newtx/newtxmath.sty
@@ -10,8 +10,8 @@
% of glyph collisions.
% These modifications are by Michael Sharpe, msharpe at ucsd dot edu
-\def\fileversion{1.15}
-\def\filedate{2013/10/12}
+\def\fileversion{1.151}
+\def\filedate{2013/10/17}
\ProvidesPackage{newtxmath}
[\filedate\space v\fileversion]
\@ifundefined{newtxmathLoaded}{}{\endinput}
diff --git a/Master/texmf-dist/tex/latex/newtx/newtxtext.sty b/Master/texmf-dist/tex/latex/newtx/newtxtext.sty
index 5fdbb31aaf5..ca82cf14634 100644
--- a/Master/texmf-dist/tex/latex/newtx/newtxtext.sty
+++ b/Master/texmf-dist/tex/latex/newtx/newtxtext.sty
@@ -13,8 +13,8 @@
% Added scaled keyword and osf option;
% Modified the definition of \k to bypass problem with grouping;
-\def\fileversion{1.15}
-\def\filedate{2013/10/12}
+\def\fileversion{1.151}
+\def\filedate{2013/10/15}
\ProvidesPackage{newtxtext}[\filedate\space v\fileversion]
\message{`newtxtext' v\fileversion, \filedate\space Text macros based on txfonts (msharpe)}
@@ -22,8 +22,12 @@
\let\orig@footnote=\thefootnote
\let\orig@makefnmark=\@makefnmark
+
\RequirePackage{xkeyval}
\def\ntx@helvscaled{s*[.9]}
+\newif\ifntx@defaultsups
+\define@key{ntx}{defaultsups}[true]{%
+\csname ntx@defaultsups#1\endcsname}
\define@key{ntx}{scaled}[1.0]{\def\ntx@scaled{s*[#1]}%
\@tempdima=#1\p@\@tempdima=.9\@tempdima%
\edef\ntx@helvscaled{s*[\strip@pt\@tempdima]}}
@@ -42,7 +46,21 @@
\not@math@alphabet\sustyle\relax
\fontfamily{ntxr1}\selectfont}
-\def\@makefnmark{\ifx \thefootnote\orig@footnote \hbox{\sustyle\hspace*{.04em}\@thefnmark}\else\orig@makefnmark\fi}
+%\def\@makefnmark{\ifx \thefootnote\orig@footnote \hbox{\sustyle\hspace*{.04em}\@thefnmark}\else\orig@makefnmark\fi}
+\ifntx@defaultsups %
+\else
+ \def\f@@tn@te{footnote}
+ \def\@makefnmark{%
+ \ifx\@mpfn\f@@tn@te%
+ \ifx\thefootnote\orig@footnote%
+ \hbox{\sustyle\hspace*{.04em}\@thefnmark}
+ \else%
+ \orig@makefnmark
+ \fi
+ \else%
+ \orig@makefnmark
+ \fi}
+\fi
%%%%%%%%%%%%%%%%%%%%%%
% Text Serif (Times) %