From 30ae7ee6eed959e0df4c31b3e35ebc7cb6f8f9c3 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sat, 26 Sep 2015 21:15:38 +0000 Subject: newtx (26sep15) git-svn-id: svn://tug.org/texlive/trunk@38467 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/newtx/newtxmath.sty | 44 +++++++++++++++---------- 1 file changed, 27 insertions(+), 17 deletions(-) (limited to 'Master/texmf-dist/tex/latex/newtx/newtxmath.sty') 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 -- cgit v1.2.3