newtx (12mar17)

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

4 files changed, 22 insertions, 29 deletions

diff --git a/Master/texmf-dist/doc/fonts/newtx/README b/Master/texmf-dist/doc/fonts/newtx/README
index e9ac53a7c0f..a75bb9aa5ac 100644
--- a/Master/texmf-dist/doc/fonts/newtx/README
+++ b/Master/texmf-dist/doc/fonts/newtx/README
@@ -1,10 +1,13 @@
 This package, initially based on txfonts, provides many fixes and enhancements to the txfonts package, splitting it into two separate packages---newtxtext and newtxmath, which may be run independently of one another. It provides scaling, improved metrics, and other options. In particular, newtxmath offers a libertine option which substitutes Linux Libertine (provided with TeXLive and MikTeX) italic and Greek letters for the default Times letters, providing a good match for the Libertine text font, which is heavier than Computer Modern but lighter than Times, and in my experience, looks very sharp and clear on the screen.
 
-Current version: 1.52 2017-03-08
+Current version: 1.521 2017-03-11
 
 This material is subject to the LaTeX Project Public License. See http://www.ctan.org/license/lppl1.3
 for the details of that license.
 
+Changes in version 1.521
+Modified newtxtext.sty so that text figure styles are selected always in the \AtEndPreamble hook. (Formerly, using babel would prevent this.)
+
 Changes in version 1.52
 Corrected some metadata items in the otf files.
 
diff --git a/Master/texmf-dist/doc/fonts/newtx/newtxdoc.pdf b/Master/texmf-dist/doc/fonts/newtx/newtxdoc.pdf
index c948bc10fa4..5ca124d59c2 100644
--- a/Master/texmf-dist/doc/fonts/newtx/newtxdoc.pdf
+++ b/Master/texmf-dist/doc/fonts/newtx/newtxdoc.pdf
diff --git a/Master/texmf-dist/doc/fonts/newtx/newtxdoc.tex b/Master/texmf-dist/doc/fonts/newtx/newtxdoc.tex
index 5a23fb4877b..7a925ca2e53 100644
--- a/Master/texmf-dist/doc/fonts/newtx/newtxdoc.tex
+++ b/Master/texmf-dist/doc/fonts/newtx/newtxdoc.tex
@@ -84,25 +84,22 @@ to load the roman and typewriter text fonts at 93\% of normal size, and the sans
 \end{verbatim}
 load roman and typewriter text fonts at 95\% of normal size, and the sans serif (\textsf{Helvetica} clone) at scale $0.95*0.96$.
 
-The option \texttt{osf} instructs the text fonts to use old-style figures \oldstylenums{1234567890} rather than the default lining figures $1234567890$. As of version $1.23$, {\tt newtxtext} loads initially with lining figures so the math package uses lining figures in math mode. The option {\tt osf} changes the default to old-style figures in text at the very end of the preamble, forcing the use of old-style figures in text, but not math. In previous versions, it was necessary to run 
-\verb|\useosf| after loading {\tt newtxmath}. This is no longer required except in the circumstances described below.
+The option \texttt{osf} instructs the text fonts to use old-style figures \oldstylenums{1234567890} rather than the default lining figures $1234567890$. As of version $1.23$, {\tt newtxtext} loads initially with lining figures so the math package uses lining figures in math mode. The option {\tt osf} changes the default to old-style figures in text at the very end of the preamble, forcing the use of old-style figures in text, but not math. In earlier versions, it was necessary to run 
+\verb|\useosf| after loading {\tt newtxmath}. This is no longer required. 
 
 If you use the {\tt babel} package, you should load it before {\tt newtxtext}---for example:
-%may receive puzzling error messages if you used a preamble containing
 \begin{verbatim}
 \usepackage[<babel options>]{babel}
 \usepackage[osf]{newtxtext}
-% works as expected if no math package loaded
 \end{verbatim}
-If you want to use {\tt babel} and a math package, you have to be aware of an incompatibility between some {\tt babel} code and the {\tt etoolbox} command \verb|\AtEndPreamble|. In this case, use instead the more cumbersome form:
+More generally, the pattern of the preamble should be:
 \begin{verbatim}
 <encoding options>
 [optional] \usepackage{substitutefont} % so you can change babel's fonts
-\usepackage[<babel options>]{babel}
-\usepackage{newtxtext}
+[optional] \usepackage[<babel options>]{babel}
+\usepackage[p,osf]{newtxtext}% osf in text, lining figures in math
 <other font loading commands>
 \usepackage{newtxmath}
-\useosf % must immediately  follow math package
 <substitutefont commands>
 \end{verbatim}
 Here is a specific example following this pattern.
@@ -111,7 +108,7 @@ Here is a specific example following this pattern.
 \usepackage[utf8]{inputenc} % 
 \usepackage{substitutefont} % so we can use fonts other than those in babel
 \usepackage[greek.polutoniko,english]{babel}
-\usepackage[largesc]{newtxtext} % 
+\usepackage[largesc,osf]{newtxtext} % 
 \usepackage[varqu,varl]{zi4}% inconsolata
 \usepackage{cabin}% sans serif
 \usepackage[vvarbb]{newtxmath}
diff --git a/Master/texmf-dist/tex/latex/newtx/newtxtext.sty b/Master/texmf-dist/tex/latex/newtx/newtxtext.sty
index 49f5c4bbc4e..a476d66b5f5 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.517}
-\def\filedate{2017/01/30}
+\def\fileversion{1.521}
+\def\filedate{2017/03/11}
 \ProvidesPackage{newtxtext}[\filedate\space v\fileversion]
 
 \message{`newtxtext' v\fileversion, \filedate\space Text macros taking advantage of TeX-Gyre Termes fonts (msharpe)}
@@ -24,16 +24,16 @@
 \newif\ifntx@adobesc
 \newif\ifntx@scosf
 \newif\ifntx@largesc
-\newif\ifntx@babel
-\ifdefined\bbl@version \ntx@babeltrue\fi
+%\newif\ifntx@babel
+%\ifdefined\bbl@version \ntx@babeltrue\fi
 \define@boolkey{ntx}{defaultsups}[true]{%
 \csname ntx@defaultsups#1\endcsname}
 \define@boolkey{ntx}{largesc}[true]{%
 \csname ntx@largesc#1\endcsname}
 \define@boolkey{ntx}{adobesc}[true]{%
 \csname ntx@adobesc#1\endcsname}
-\define@key{ntx}{babel}[true]{%
-\csname ntx@babel#1\endcsname}
+\define@key{ntx}{babel}[true]{\relax}% keep, though no effect
+%\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]}%
@@ -240,23 +240,16 @@
 \ifx\encodingdefault\LY@n@@nc@d@ng\LY@n@@nc@d@ngM@cr@M@d\fi%
 }
 
-\ifntx@babel
-	\message{^^JBabel^^J}
-\else
-	\message{^^JNo Babel^^J}
-\fi
-
-
-\ifntx@babel
-    \renewcommand*{\rmdefault}{ntx\ntx@figurealign%
-	\ntx@figurestyle}
-	\normalfont
-\else
+%\ifntx@babel
+%    \renewcommand*{\rmdefault}{ntx\ntx@figurealign%
+%	\ntx@figurestyle}
+%	\normalfont
+%\else
     \AtEndPreamble{%
 \renewcommand*{\rmdefault}{ntx\ntx@figurealign%
 \ntx@figurestyle}
 \normalfont}
-\fi
+%\fi
 
 
 \endinput