summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2014-01-10 23:19:39 +0000
committerKarl Berry <karl@freefriends.org>2014-01-10 23:19:39 +0000
commit5a142b6af0acc78a549773d33c2e09fb0f6abd64 (patch)
tree911be252d6fe0776dca5ca7be1b1bf3b83771755 /Master/texmf-dist/tex
parent2beb28d9364942cafba87c0fd5ace4b9803079c6 (diff)
newtx (10jan14)
git-svn-id: svn://tug.org/texlive/trunk@32628 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.sty25
2 files changed, 17 insertions, 12 deletions
diff --git a/Master/texmf-dist/tex/latex/newtx/newtxmath.sty b/Master/texmf-dist/tex/latex/newtx/newtxmath.sty
index 0ed1c13743b..f2588d44f6e 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.18}
-\def\filedate{2013/12/28}
+\def\fileversion{1.19}
+\def\filedate{2014/01/09}
\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 d97d91713bd..0de62094d3d 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.18}
-\def\filedate{2013/12/28}
+\def\fileversion{1.19}
+\def\filedate{2014/01/09}
\ProvidesPackage{newtxtext}[\filedate\space v\fileversion]
\message{`newtxtext' v\fileversion, \filedate\space Text macros based on txfonts (msharpe)}
@@ -24,13 +24,12 @@
\let\orig@makefnmark=\@makefnmark
\RequirePackage{xkeyval}
-\def\ntx@helvscaled{s*[.9]}
\newif\ifntx@defaultsups
\define@boolkey{ntx}{defaultsups}[true]{%
\csname ntx@defaultsups#1\endcsname}
+\define@key{ntx}{helvratio}[0.9]{\def\ntx@helvratio{#1}}
\define@key{ntx}{scaled}[1.0]{\def\ntx@scaled{s*[#1]}%
-\@tempdima=#1\p@\@tempdima=.9\@tempdima%
-\edef\ntx@helvscaled{s*[\strip@pt\@tempdima]}}
+\def\ntx@scale{#1}}
\DeclareOption*{%
\begingroup
\edef\x{\endgroup
@@ -39,8 +38,11 @@
\def\ntx@style{x}% default is lining figures
\DeclareOption{osf}{\def\ntx@style{j}}
\DeclareOption{oldstyle}{\def\ntx@style{j}}
-
+\setkeys{ntx}{helvratio} % set this first, at least to default 0.9
+\setkeys{ntx}{scaled} % get at least default
\ProcessOptions*
+\@tempdima=\ntx@scale\p@\@tempdima=\ntx@helvratio\@tempdima%
+\edef\qhv@scale{\strip@pt\@tempdima}
\RequirePackage[T1]{fontenc}
\DeclareRobustCommand{\sustyle}{%
@@ -54,12 +56,12 @@
\def\@makefnmark{%
\ifx\@mpfn\f@@tn@te%
\ifx\thefootnote\orig@footnote%
- \hbox{\sustyle\hspace*{.04em}\@thefnmark}
+ \hbox{\sustyle\hspace*{.04em}\@thefnmark\hspace*{.03em}}%
\else%
- \orig@makefnmark
+ \orig@makefnmark%
\fi
\else%
- \orig@makefnmark
+ \orig@makefnmark%
\fi}
\fi
@@ -89,7 +91,10 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\renewcommand{\sfdefault}{ntxss}
+%\renewcommand{\sfdefault}{ntxss}
+\renewcommand*{\sfdefault}{qhv}
+%\show\qhv@scale
+%\show\ntx@helvratio
%\DeclareMathAlphabet{\mathsf}{OT1}{txss}{m}{n}
%\SetMathAlphabet{\mathsf}{bold}{OT1}{txss}{b}{n}