summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2013-03-29 22:54:31 +0000
committerKarl Berry <karl@freefriends.org>2013-03-29 22:54:31 +0000
commita7280bb54e4a65b22df19b766dfbac44d327a8c5 (patch)
tree308a6c0d6fcd5c4572fe89c364691c102349f9cd /Master/texmf-dist/tex
parent6144e158828b4bf657bf525ddbb73c73725af6d5 (diff)
newtx (29mar13)
git-svn-id: svn://tug.org/texlive/trunk@29551 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.sty8
-rw-r--r--Master/texmf-dist/tex/latex/newtx/t1ntxr1.fd34
3 files changed, 24 insertions, 22 deletions
diff --git a/Master/texmf-dist/tex/latex/newtx/newtxmath.sty b/Master/texmf-dist/tex/latex/newtx/newtxmath.sty
index 5c31d0cb78a..108b961e967 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.08}
-\def\filedate{2013/02/10}
+\def\fileversion{1.09}
+\def\filedate{2013/03/27}
\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 138ea64f489..bf2eecafbe7 100644
--- a/Master/texmf-dist/tex/latex/newtx/newtxtext.sty
+++ b/Master/texmf-dist/tex/latex/newtx/newtxtext.sty
@@ -13,13 +13,15 @@
% Added scaled keyword and osf option;
% Modified the definition of \k to bypass problem with grouping;
-\def\fileversion{1.07}
-\def\filedate{2012/12/25}
+\def\fileversion{1.09}
+\def\filedate{2013/03/28}
\ProvidesPackage{newtxtext}[\filedate\space v\fileversion]
\message{`newtxtext' v\fileversion, \filedate\space Text macros based on txfonts (msharpe)}
\RequirePackage{fontaxes}% so we can have [bold] italic small caps
+\let\orig@footnote=\thefootnote
+\let\orig@makefnmark=\@makefnmark
\RequirePackage{xkeyval}
\define@key{ntx}{scaled}[1.0]{\def\ntx@scaled{s*[#1]}%
\@tempdima=#1\p@\@tempdima=.9\@tempdima%
@@ -39,7 +41,7 @@
\not@math@alphabet\sustyle\relax
\fontfamily{ntxr1}\selectfont}
-\def\@makefnmark{\hbox{\sustyle\hspace*{.04em}\@thefnmark}}% footnotemark from sups
+\def\@makefnmark{\ifx \thefootnote\orig@footnote \hbox{\sustyle\hspace*{.04em}\@thefnmark}\else\orig@makefnmark\fi}
%%%%%%%%%%%%%%%%%%%%%%
% Text Serif (Times) %
diff --git a/Master/texmf-dist/tex/latex/newtx/t1ntxr1.fd b/Master/texmf-dist/tex/latex/newtx/t1ntxr1.fd
index 480ef8dda2c..75ce6274339 100644
--- a/Master/texmf-dist/tex/latex/newtx/t1ntxr1.fd
+++ b/Master/texmf-dist/tex/latex/newtx/t1ntxr1.fd
@@ -8,54 +8,54 @@
<-> \ntx@scaled ntxsups%
}{}
\DeclareFontShape{T1}{ntxr1}{m}{sc}{ %cap & small cap
- <-> ssub * ntxr/m/n%
+ <-> ssub * ntxr1/m/n%
}{}
\DeclareFontShape{T1}{ntxr1}{m}{sl}{ %slanted
- <-> ssub * ntxr/m/n%
+ <-> ssub * ntxr1/m/n%
}{}
\DeclareFontShape{T1}{ntxr1}{m}{it}{ %italic
- <-> ssub * ntxr/m/n%
+ <-> ssub * ntxr1/m/n%
}{}
\DeclareFontShape{T1}{ntxr1}{m}{scit}{ %italic
- <-> ssub * ntxr/m/n%
+ <-> ssub * ntxr1/m/n%
}{}
\DeclareFontShape{T1}{ntxr1}{m}{ui}{ %unslanted italic
- <-> ssub * ntxr/m/n%
+ <-> ssub * ntxr1/m/n%
}{}
\DeclareFontShape{T1}{ntxr1}{bx}{n}{ %bold extended
- <-> ssub * ntxr/m/n%
+ <-> ssub * ntxr1/m/n%
}{}
\DeclareFontShape{T1}{ntxr1}{bx}{sc}{ %bold extended cap & small cap
- <-> ssub * ntxr/m/n%
+ <-> ssub * ntxr1/m/n%
}{}
\DeclareFontShape{T1}{ntxr1}{bx}{sl}{ %bold extended slanted
- <-> ssub * ntxr/m/n%
+ <-> ssub * ntxr1/m/n%
}{}
\DeclareFontShape{T1}{ntxr1}{bx}{it}{ %bold extended italic
- <-> ssub * ntxr/m/n%
+ <-> ssub * ntxr1/m/n%
}{}
\DeclareFontShape{T1}{ntxr1}{bx}{scit}{ %bold extended italic
- <-> ssub * ntxr/m/n%
+ <-> ssub * ntxr1/m/n%
}{}
\DeclareFontShape{T1}{ntxr1}{bx}{ui}{ %bold extended unslanted italic
- <-> ssub * ntxr/m/n%
+ <-> ssub * ntxr1/m/n%
}{}
\DeclareFontShape{T1}{ntxr1}{b}{n}{ %bold
- <-> ssub * ntxr/m/n%
+ <-> ssub * ntxr1/m/n%
}{}
\DeclareFontShape{T1}{ntxr1}{b}{sc}{ %bold cap & small cap
- <-> ssub * ntxr/m/n%
+ <-> ssub * ntxr1/m/n%
}{}
\DeclareFontShape{T1}{ntxr1}{b}{sl}{ %bold slanted
- <-> ssub * ntxr/m/n%
+ <-> ssub * ntxr1/m/n%
}{}
\DeclareFontShape{T1}{ntxr1}{b}{it}{ %bold italic
- <-> ssub * ntxr/m/n%
+ <-> ssub * ntxr1/m/n%
}{}
\DeclareFontShape{T1}{ntxr1}{b}{ui}{ %bold unslanted italic
- <-> ssub * ntxr/m/n%
+ <-> ssub * ntxr1/m/n%
}{}
\DeclareFontShape{T1}{ntxr1}{b}{scit}{ %bold italic
- <-> ssub * ntxr/m/n%
+ <-> ssub * ntxr1/m/n%
}{}
\endinput