newtx (14feb15)

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

1 files changed, 36 insertions, 18 deletions

diff --git a/Master/texmf-dist/tex/latex/newtx/newtxtext.sty b/Master/texmf-dist/tex/latex/newtx/newtxtext.sty
index b8dc42eb5d8..7fd5ce97d61 100644
--- a/Master/texmf-dist/tex/latex/newtx/newtxtext.sty
+++ b/Master/texmf-dist/tex/latex/newtx/newtxtext.sty
@@ -1,7 +1,7 @@
 \NeedsTeXFormat{LaTeX2e}
 
-\def\fileversion{1.4}
-\def\filedate{2015/01/31}
+\def\fileversion{1.41}
+\def\filedate{2015/02/12}
 \ProvidesPackage{newtxtext}[\filedate\space v\fileversion]
 
 \message{`newtxtext' v\fileversion, \filedate\space Text macros taking advantage of TeX-Gyre Termes fonts (msharpe)}
@@ -30,6 +30,10 @@
 \csname ntx@prop#1\endcsname}
 \define@boolkey{ntx}{adobesc}[true]{%
 \csname ntx@adobesc#1\endcsname}
+\newif\ifntx@babel
+\define@key{ntx}{babel}[true]{%
+\csname ntx@babel#1\endcsname}
+\newif\ifntx@thrm
 \define@key{ntx}{helvratio}[0.9]{\def\ntx@helvratio{#1}}
 \define@key{ntx}{scaled}[1.0]{\def\ntx@scaled{s*[#1]}%
 \def\ntx@scale{#1}}
@@ -37,6 +41,7 @@
 \setkeys{ntx}{scaled} % get at least default
 \DeclareOption{lining}{\edef\ntx@figurestyle{lf}}
 \DeclareOption{lf}{\edef\ntx@figurestyle{lf}}
+\DeclareOption{theoremfont}{\ntx@thrmtrue}
 \DeclareOption{oldstyle}{\useosf}
 \DeclareOption{osf}{\useosf}
 \DeclareOption{tabular}{\edef\ntx@figurealign{t}}
@@ -53,18 +58,15 @@
   \x}
 
 \ProcessOptions*
-%Each tosf fd file should contain:
-%\def\ntx@asfx{}
-%\ifdefined\ntx@adobescfalse %
-%	\ifntx@adobesc \def\ntx@asfx{a}\def\ntx@lsfx{l}
-%\else
-%\ifntx@largesc\def\ntx@asfx{l}\fi
-%\fi\fi
 \@tempdima=\ntx@scale\p@\@tempdima=\ntx@helvratio\@tempdima%
 \edef\qhv@scale{\strip@pt\@tempdima}
 
 \RequirePackage[T1]{fontenc}
 \RequirePackage[full]{textcomp}
+\DeclareRobustCommand{\sustyle}{%
+  \not@math@alphabet\sustyle\relax
+  \fontfamily{ntxsups}\selectfont}
+
 \ifntx@scosf %
 \DeclareRobustCommand{\textsc}[1]{%
 {\fontfamily{ntx\ntx@figurealign osf}\scshape\selectfont #1}%
@@ -98,11 +100,23 @@
 \DeclareRobustCommand{\texttosf}[1]{%
   {\tosfstyle #1}%
 }% to get tosf
-
-\DeclareRobustCommand{\sustyle}{%
-  \not@math@alphabet\sustyle\relax
-  \fontfamily{ntxsups}\selectfont}
-\DeclareTextFontCommand{\textsu}{\sustyle}
+\DeclareRobustCommand{\textsu}[1]{%
+  {\sustyle #1}%
+}% to get sup style
+
+\ifntx@thrm
+	\ifdefined\newtheoremstyle
+	\newtheoremstyle{plain}
+	{\topsep}   % ABOVESPACE
+    {\topsep}   % BELOWSPACE
+    {\slshape}  % BODYFONT--\slshape is defined to be \itshape with upright figures and punctuation
+    {}       % INDENT (empty value is the same as 0pt)
+    {\bfseries} % HEADFONT--you may want to add \tlfstyle so the number is tab lining, regardless of text figure selection
+    {.}         % HEADPUNCT
+    {5pt plus 1pt minus 1pt} % HEADSPACE
+    {}          % CUSTOM-HEAD-SPEC\newtheorem{thm}{Theorem}[section]
+    \fi%
+\fi%\DeclareTextFontCommand{\textsu}{\sustyle}
 %\def\@makefnmark{\ifx \thefootnote\orig@footnote \hbox{\sustyle\hspace*{.04em}\@thefnmark}\else\orig@makefnmark\fi}
 \ifntx@defaultsups %
 \else
@@ -146,10 +160,7 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 
-%\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}
@@ -204,9 +215,16 @@
 \ifx\encodingdefault\LY@n@@nc@d@ng\LY@n@@nc@d@ngM@cr@M@d\fi%
 }
 
-\AtEndPreamble{%
+\ifntx@babel
+    \renewcommand*{\rmdefault}{ntx\ntx@figurealign%
+	\ntx@figurestyle}
+	\normalfont
+\else
+    \AtEndPreamble{%
 \renewcommand*{\rmdefault}{ntx\ntx@figurealign%
 \ntx@figurestyle}
 \normalfont}
+\fi
+
 
 \endinput