newtx (26sep15)

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

2 files changed, 29 insertions, 19 deletions

diff --git a/Master/texmf-dist/tex/latex/newtx/newtxmath.sty b/Master/texmf-dist/tex/latex/newtx/newtxmath.sty
index 93b12c33956..d2c9e5f7271 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.461}
-\def\filedate{2015/09/14}
+\def\fileversion{1.462}
+\def\filedate{2015/09/24}
 \ProvidesPackage{newtxmath}[\filedate\space v\fileversion]
 \@ifundefined{newtxmathLoaded}{}{\endinput}
 
@@ -56,13 +56,18 @@
 \newif\iftx@minion \newif\iftx@libaltvw \newif\iftx@bv \newif\iftx@ut
 \newif\iftx@ch \newif\iftx@crimson
 \newif\iftx@ot % use OT1 for operators
+\newif\iftx@ntxmath \tx@ntxmathtrue % default is Times operators and math italic
 \def\@tx@ptm{ptm}
 \newif\iftx@ptm
 \edef\tx@rmdefault{\rmdefault}
 \edef\tx@encdefault{\encodingdefault}
 \tx@ottrue % default is true
-\let\rmdefaultB\rmdefault 
-\ifx\tx@rmdefault\@tx@ptm \def\rmdefaultB{ntxtlf}\fi % newtxtext
+\let\rmdefaultB\rmdefault
+\newif\iftx@hastm  
+\ifx\tx@rmdefault\@tx@ptm \tx@hastmtrue\fi\@ifundefined{ver@newtxtext.sty}{}{\tx@hastmtrue}
+\@ifundefined{ver@tgtermes.sty}{}{\tx@hastmtrue}
+\iftx@hastm\def\rmdefaultB{ntxtlf}\fi
+%
 \newcommand\enablesbcorrection{\AtBeginDocument{\mathcode`\_=\string"8000 \catcode`\_=12\relax}}
 \newcommand\disablesbcorrection{\catcode`\_=8\relax}
 \DeclareOption{nosubscriptcorrection}{\disablesbcorrection}
@@ -73,19 +78,19 @@
 \DeclareOption{vvarbb}{\tx@vvarbbtrue}
 \DeclareOption{libaltvw}{\tx@libaltvwtrue}
 \DeclareOption{nosymbolsc}{\tx@symbolsCfalse}
-\DeclareOption{libertine}{\tx@libertinetrue}
-\DeclareOption{minion}{\tx@miniontrue\tx@otfalse}
-\DeclareOption{crimson}{\tx@crimsontrue}
-\DeclareOption{garamondx}{\tx@gmtrue\tx@otfalse}
-\DeclareOption{baskervaldx}{\tx@bvtrue\tx@otfalse}
-\DeclareOption{Baskervaldx}{\tx@bvtrue\tx@otfalse}
-\DeclareOption{utopia}{\tx@uttrue\tx@otfalse}
-\DeclareOption{heuristica}{\tx@uttrue\tx@otfalse}
-\DeclareOption{Heuristica}{\tx@uttrue\tx@otfalse}
-\DeclareOption{Erewhon}{\tx@uttrue\tx@otfalse}
-\DeclareOption{erewhon}{\tx@uttrue\tx@otfalse}
-\DeclareOption{charter}{\tx@chtrue}
-\DeclareOption{xcharter}{\tx@chtrue}
+\DeclareOption{libertine}{\tx@libertinetrue\tx@ntxmathfalse}
+\DeclareOption{minion}{\tx@miniontrue\tx@ntxmathfalse\tx@otfalse}
+\DeclareOption{crimson}{\tx@crimsontrue\tx@ntxmathfalse}
+\DeclareOption{garamondx}{\tx@gmtrue\tx@ntxmathfalse\tx@otfalse}
+\DeclareOption{baskervaldx}{\tx@bvtrue\tx@ntxmathfalse\tx@otfalse}
+\DeclareOption{Baskervaldx}{\tx@bvtrue\tx@ntxmathfalse\tx@otfalse}
+\DeclareOption{utopia}{\tx@uttrue\tx@ntxmathfalse\tx@otfalse}
+\DeclareOption{heuristica}{\tx@uttrue\tx@ntxmathfalse\tx@otfalse}
+\DeclareOption{Heuristica}{\tx@uttrue\tx@ntxmathfalse\tx@otfalse}
+\DeclareOption{Erewhon}{\tx@uttrue\tx@ntxmathfalse\tx@otfalse}
+\DeclareOption{erewhon}{\tx@uttrue\tx@ntxmathfalse\tx@otfalse}
+\DeclareOption{charter}{\tx@chtrue\tx@ntxmathfalse}
+\DeclareOption{xcharter}{\tx@chtrue\tx@ntxmathfalse}
 \DeclareOption{cmintegrals}{\tx@cminttrue}
 \DeclareOption{cmbraces}{\tx@bracestrue}
 \DeclareOption{noamssymbols}{\tx@amsfalse}
@@ -120,6 +125,11 @@ amssymbols,uprightGreek,nosubscriptcorrection}
       \renewcommand{\rmdefault}{minlibertine}% since can't load libertine twice
     \fi
   \fi
+\else
+  \iftx@libertine
+    \ifx\iflibertine@otf\undefined % libertine text not loaded
+  	  \tx@otfalse
+  \fi\fi
 \fi
 \edef\bold@wt{\ifx\iflibertine@otf\undefined b\else sb\fi}
 \let\tx@enc\encodingdefault
diff --git a/Master/texmf-dist/tex/latex/newtx/newtxtext.sty b/Master/texmf-dist/tex/latex/newtx/newtxtext.sty
index 42bd4ea4650..91eadce7757 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.461}
-\def\filedate{2015/09/14}
+\def\fileversion{1.462}
+\def\filedate{2015/09/24}
 \ProvidesPackage{newtxtext}[\filedate\space v\fileversion]
 
 \message{`newtxtext' v\fileversion, \filedate\space Text macros taking advantage of TeX-Gyre Termes fonts (msharpe)}