From 05e4cc432cac4d2b2e33a09be8b44d0cb8d8d252 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sun, 26 Jul 2015 22:49:38 +0000 Subject: newtx (26jul15) git-svn-id: svn://tug.org/texlive/trunk@37961 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/newtx/newtxmath.sty | 33 ++++++++++++++----------- Master/texmf-dist/tex/latex/newtx/newtxtext.sty | 4 +-- 2 files changed, 21 insertions(+), 16 deletions(-) (limited to 'Master/texmf-dist/tex') diff --git a/Master/texmf-dist/tex/latex/newtx/newtxmath.sty b/Master/texmf-dist/tex/latex/newtx/newtxmath.sty index 1d5a7b0afd8..dbebf6a478e 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.45} -\def\filedate{2015/07/09} +\def\fileversion{1.451} +\def\filedate{2015/07/28} \ProvidesPackage{newtxmath}[\filedate\space v\fileversion] \@ifundefined{newtxmathLoaded}{}{\endinput} @@ -53,7 +53,13 @@ \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 -\tx@ottrue % true by default +\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 \DeclareOption{timesmathacc}{\tx@tmatrue} \DeclareOption{bigdelims}{\tx@bigdelimstrue} \DeclareOption{varbb}{\tx@varbbtrue} @@ -71,8 +77,8 @@ \DeclareOption{Heuristica}{\tx@uttrue\tx@otfalse} \DeclareOption{Erewhon}{\tx@uttrue\tx@otfalse} \DeclareOption{erewhon}{\tx@uttrue\tx@otfalse} -\DeclareOption{charter}{\tx@chtrue\tx@otfalse} -\DeclareOption{xcharter}{\tx@chtrue\tx@otfalse} +\DeclareOption{charter}{\tx@chtrue} +\DeclareOption{xcharter}{\tx@chtrue} \DeclareOption{cmintegrals}{\tx@cminttrue} \DeclareOption{cmbraces}{\tx@bracestrue} \DeclareOption{noamssymbols}{\tx@amsfalse} @@ -86,7 +92,6 @@ \ExecuteOptions{% amssymbols,uprightGreek} \ProcessOptions* - % frenchmath implies uprightGreek \iftx@frenchm\tx@slantedGfalse\fi @@ -102,7 +107,7 @@ amssymbols,uprightGreek} % Use existing text fonts for operators, mathrm, etc \ifxl@otf \iftx@libertine - \ifx\rmdefault\cmr@default + \ifx\tx@rmdefault\cmr@default \renewcommand{\rmdefault}{minlibertine}% since can't load libertine twice \fi \fi @@ -110,24 +115,24 @@ amssymbols,uprightGreek} \edef\bold@wt{\ifx\iflibertine@otf\undefined b\else sb\fi} \let\tx@enc\encodingdefault \iftx@ot\let\tx@enc\ot@one\fi -\DeclareSymbolFont{operators}{\tx@enc}{\rmdefault}{m}{n} -\SetSymbolFont{operators}{bold}{\tx@enc}{\rmdefault}{\bold@wt}{n} +\DeclareSymbolFont{operators}{\tx@enc}{\rmdefaultB}{m}{n} +\SetSymbolFont{operators}{bold}{\tx@enc}{\rmdefaultB}{\bold@wt}{n} \def\operator@font{\mathgroup\symoperators} \DeclareSymbolFontAlphabet{\mathrm}{operators} \DeclareMathAlphabet{\mathsf}{\encodingdefault}{\sfdefault}{m}{n} -\DeclareMathAlphabet{\mathit}{\tx@enc}{\rmdefault}{m}{it} +\DeclareMathAlphabet{\mathit}{\tx@enc}{\rmdefaultB}{m}{it} \DeclareMathAlphabet{\mathtt}{\encodingdefault}{\ttdefault}{m}{n} \DeclareSymbolFontAlphabet{\mathrm}{operators} -\DeclareMathAlphabet{\mathbf}{\tx@enc}{\rmdefault}{\bold@wt}{n} -\SetMathAlphabet{\mathit}{bold}{\tx@enc}{\rmdefault}{\bold@wt}{it} +\DeclareMathAlphabet{\mathbf}{\tx@enc}{\rmdefaultB}{\bold@wt}{n} +\SetMathAlphabet{\mathit}{bold}{\tx@enc}{\rmdefaultB}{\bold@wt}{it} \SetMathAlphabet{\mathsf}{bold}{\encodingdefault}{\sfdefault}{b}{n} \SetMathAlphabet{\mathtt}{bold}{\encodingdefault}{\ttdefault}{b}{n} % change default def of \hbar in case noamssymbols -\ifx\encodingdefault\t@one +\ifx\tx@encdefault\t@one \renewcommand{\hbar}{\raisebox{-.13ex}{\mbox{$\mathchar'11$}}\mkern-8mu h}% \else \renewcommand{\hbar}{\raisebox{-.13ex}{\mbox{$\mathchar'26$}}\mkern-8mu h}% @@ -308,7 +313,7 @@ amssymbols,uprightGreek} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% Math Symols & Notations Definitions +% Math Symbols & Notations Definitions %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \def\joinrel{\mathrel{\mkern-2.5mu}} %-3mu in plain TeX diff --git a/Master/texmf-dist/tex/latex/newtx/newtxtext.sty b/Master/texmf-dist/tex/latex/newtx/newtxtext.sty index 0c5e250093d..1178051916b 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.45} -\def\filedate{2015/07/09} +\def\fileversion{1.451} +\def\filedate{2015/07/28} \ProvidesPackage{newtxtext}[\filedate\space v\fileversion] \message{`newtxtext' v\fileversion, \filedate\space Text macros taking advantage of TeX-Gyre Termes fonts (msharpe)} -- cgit v1.2.3