From 7a35554f4e772af148bee6c51b8e9ac8b67d33b2 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Fri, 10 Jul 2015 22:38:16 +0000 Subject: newtx (10jul15) git-svn-id: svn://tug.org/texlive/trunk@37826 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/newtx/newtxmath.sty | 145 ++++++++++++++++-------- Master/texmf-dist/tex/latex/newtx/newtxtext.sty | 4 +- 2 files changed, 98 insertions(+), 51 deletions(-) (limited to 'Master/texmf-dist/tex/latex/newtx') diff --git a/Master/texmf-dist/tex/latex/newtx/newtxmath.sty b/Master/texmf-dist/tex/latex/newtx/newtxmath.sty index 3956795c494..1d5a7b0afd8 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.44} -\def\filedate{2015/07/01} +\def\fileversion{1.45} +\def\filedate{2015/07/09} \ProvidesPackage{newtxmath}[\filedate\space v\fileversion] \@ifundefined{newtxmathLoaded}{}{\endinput} @@ -31,6 +31,7 @@ \newcommand{\cmr@default}{cmr} \def\ly@one{LY1} \def\t@one{T1} +\def\ot@one{OT1} \input{binhex} \let\ntxmath@scaled\@empty @@ -51,6 +52,8 @@ \newif\iftx@largelibfigs \newif\iftx@frenchm % french math \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 \DeclareOption{timesmathacc}{\tx@tmatrue} \DeclareOption{bigdelims}{\tx@bigdelimstrue} \DeclareOption{varbb}{\tx@varbbtrue} @@ -58,18 +61,18 @@ \DeclareOption{libaltvw}{\tx@libaltvwtrue} \DeclareOption{nosymbolsc}{\tx@symbolsCfalse} \DeclareOption{libertine}{\tx@libertinetrue} -\DeclareOption{minion}{\tx@miniontrue} +\DeclareOption{minion}{\tx@miniontrue\tx@otfalse} \DeclareOption{crimson}{\tx@crimsontrue} -\DeclareOption{garamondx}{\tx@gmtrue} -\DeclareOption{baskervaldx}{\tx@bvtrue} -\DeclareOption{Baskervaldx}{\tx@bvtrue} -\DeclareOption{utopia}{\tx@uttrue} -\DeclareOption{heuristica}{\tx@uttrue} -\DeclareOption{Heuristica}{\tx@uttrue} -\DeclareOption{Erewhon}{\tx@uttrue} -\DeclareOption{erewhon}{\tx@uttrue} -\DeclareOption{charter}{\tx@chtrue} -\DeclareOption{xcharter}{\tx@chtrue} +\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\tx@otfalse} +\DeclareOption{xcharter}{\tx@chtrue\tx@otfalse} \DeclareOption{cmintegrals}{\tx@cminttrue} \DeclareOption{cmbraces}{\tx@bracestrue} \DeclareOption{noamssymbols}{\tx@amsfalse} @@ -105,19 +108,21 @@ amssymbols,uprightGreek} \fi \fi \edef\bold@wt{\ifx\iflibertine@otf\undefined b\else sb\fi} -\DeclareSymbolFont{operators}{\encodingdefault}{\rmdefault}{m}{n} -\SetSymbolFont{operators}{bold}{\encodingdefault}{\rmdefault}{\bold@wt}{n} +\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} \def\operator@font{\mathgroup\symoperators} \DeclareSymbolFontAlphabet{\mathrm}{operators} \DeclareMathAlphabet{\mathsf}{\encodingdefault}{\sfdefault}{m}{n} -\DeclareMathAlphabet{\mathit}{\encodingdefault}{\rmdefault}{m}{it} +\DeclareMathAlphabet{\mathit}{\tx@enc}{\rmdefault}{m}{it} \DeclareMathAlphabet{\mathtt}{\encodingdefault}{\ttdefault}{m}{n} \DeclareSymbolFontAlphabet{\mathrm}{operators} -\DeclareMathAlphabet{\mathbf}{\encodingdefault}{\rmdefault}{\bold@wt}{n} -\SetMathAlphabet{\mathit}{bold}{\encodingdefault}{\rmdefault}{\bold@wt}{it} +\DeclareMathAlphabet{\mathbf}{\tx@enc}{\rmdefault}{\bold@wt}{n} +\SetMathAlphabet{\mathit}{bold}{\tx@enc}{\rmdefault}{\bold@wt}{it} \SetMathAlphabet{\mathsf}{bold}{\encodingdefault}{\sfdefault}{b}{n} \SetMathAlphabet{\mathtt}{bold}{\encodingdefault}{\ttdefault}{b}{n} @@ -408,6 +413,8 @@ amssymbols,uprightGreek} \re@DeclareMathAccent{\tilde}{\mathord}{lettersA}{219} \re@DeclareMathAccent{\ddot}{\mathord}{lettersA}{220} \else + \iftx@ot %no change needed if using OT1 for operators + \else \ifx\encodingdefault\t@one% \re@DeclareMathAccent{\grave}{\mathalpha}{operators}{0} \re@DeclareMathAccent{\acute}{\mathalpha}{operators}{1} @@ -424,7 +431,7 @@ amssymbols,uprightGreek} \re@DeclareMathAccent{\hat}{\mathalpha}{operators}{94} \re@DeclareMathAccent{\dot}{\mathalpha}{operators}{5} \DeclareMathAccent{\tilde}{\mathalpha}{operators}{152} - \fi\fi + \fi\fi\fi \fi % \iftx@slantedG @@ -1201,38 +1208,38 @@ $\hfil\displaystyle{#1}\hfil$\crcr% \re@DeclareMathSymbol{\Phiup}{\mathalpha}{lettersA}{8} \re@DeclareMathSymbol{\Psiup}{\mathalpha}{lettersA}{9} \re@DeclareMathSymbol{\Omegaup}{\mathalpha}{lettersA}{10} -\re@DeclareMathSymbol{\alphaup}{\mathalpha}{lettersA}{11} -\re@DeclareMathSymbol{\betaup}{\mathalpha}{lettersA}{12} -\re@DeclareMathSymbol{\gammaup}{\mathalpha}{lettersA}{13} -\re@DeclareMathSymbol{\deltaup}{\mathalpha}{lettersA}{14} -\re@DeclareMathSymbol{\epsilonup}{\mathalpha}{lettersA}{15} -\re@DeclareMathSymbol{\zetaup}{\mathalpha}{lettersA}{16} -\re@DeclareMathSymbol{\etaup}{\mathalpha}{lettersA}{17} -\re@DeclareMathSymbol{\thetaup}{\mathalpha}{lettersA}{18} -\re@DeclareMathSymbol{\iotaup}{\mathalpha}{lettersA}{19} -\re@DeclareMathSymbol{\kappaup}{\mathalpha}{lettersA}{20} -\re@DeclareMathSymbol{\lambdaup}{\mathalpha}{lettersA}{21} -\re@DeclareMathSymbol{\muup}{\mathalpha}{lettersA}{22} -\re@DeclareMathSymbol{\nuup}{\mathalpha}{lettersA}{23} +\re@DeclareMathSymbol{\alphaup}{\mathord}{lettersA}{11} +\re@DeclareMathSymbol{\betaup}{\mathord}{lettersA}{12} +\re@DeclareMathSymbol{\gammaup}{\mathord}{lettersA}{13} +\re@DeclareMathSymbol{\deltaup}{\mathord}{lettersA}{14} +\re@DeclareMathSymbol{\epsilonup}{\mathord}{lettersA}{15} +\re@DeclareMathSymbol{\zetaup}{\mathord}{lettersA}{16} +\re@DeclareMathSymbol{\etaup}{\mathord}{lettersA}{17} +\re@DeclareMathSymbol{\thetaup}{\mathord}{lettersA}{18} +\re@DeclareMathSymbol{\iotaup}{\mathord}{lettersA}{19} +\re@DeclareMathSymbol{\kappaup}{\mathord}{lettersA}{20} +\re@DeclareMathSymbol{\lambdaup}{\mathord}{lettersA}{21} +\re@DeclareMathSymbol{\muup}{\mathord}{lettersA}{22} +\re@DeclareMathSymbol{\nuup}{\mathord}{lettersA}{23} \iftx@altnu - \re@DeclareMathSymbol{\nuup}{\mathalpha}{lettersA}{40} + \re@DeclareMathSymbol{\nuup}{\mathord}{lettersA}{40} \fi -\re@DeclareMathSymbol{\xiup}{\mathalpha}{lettersA}{24} -\re@DeclareMathSymbol{\piup}{\mathalpha}{lettersA}{25} -\re@DeclareMathSymbol{\rhoup}{\mathalpha}{lettersA}{26} -\re@DeclareMathSymbol{\sigmaup}{\mathalpha}{lettersA}{27} -\re@DeclareMathSymbol{\tauup}{\mathalpha}{lettersA}{28} -\re@DeclareMathSymbol{\upsilonup}{\mathalpha}{lettersA}{29} -\re@DeclareMathSymbol{\phiup}{\mathalpha}{lettersA}{30} -\re@DeclareMathSymbol{\chiup}{\mathalpha}{lettersA}{31} -\re@DeclareMathSymbol{\psiup}{\mathalpha}{lettersA}{32} -\re@DeclareMathSymbol{\omegaup}{\mathalpha}{lettersA}{33} -\re@DeclareMathSymbol{\varepsilonup}{\mathalpha}{lettersA}{34} -\re@DeclareMathSymbol{\varthetaup}{\mathalpha}{lettersA}{35} -\re@DeclareMathSymbol{\varpiup}{\mathalpha}{lettersA}{36} -\re@DeclareMathSymbol{\varrhoup}{\mathalpha}{lettersA}{37} -\re@DeclareMathSymbol{\varsigmaup}{\mathalpha}{lettersA}{38} -\re@DeclareMathSymbol{\varphiup}{\mathalpha}{lettersA}{39} +\re@DeclareMathSymbol{\xiup}{\mathord}{lettersA}{24} +\re@DeclareMathSymbol{\piup}{\mathord}{lettersA}{25} +\re@DeclareMathSymbol{\rhoup}{\mathord}{lettersA}{26} +\re@DeclareMathSymbol{\sigmaup}{\mathord}{lettersA}{27} +\re@DeclareMathSymbol{\tauup}{\mathord}{lettersA}{28} +\re@DeclareMathSymbol{\upsilonup}{\mathord}{lettersA}{29} +\re@DeclareMathSymbol{\phiup}{\mathord}{lettersA}{30} +\re@DeclareMathSymbol{\chiup}{\mathord}{lettersA}{31} +\re@DeclareMathSymbol{\psiup}{\mathord}{lettersA}{32} +\re@DeclareMathSymbol{\omegaup}{\mathord}{lettersA}{33} +\re@DeclareMathSymbol{\varepsilonup}{\mathord}{lettersA}{34} +\re@DeclareMathSymbol{\varthetaup}{\mathord}{lettersA}{35} +\re@DeclareMathSymbol{\varpiup}{\mathord}{lettersA}{36} +\re@DeclareMathSymbol{\varrhoup}{\mathord}{lettersA}{37} +\re@DeclareMathSymbol{\varsigmaup}{\mathord}{lettersA}{38} +\re@DeclareMathSymbol{\varphiup}{\mathord}{lettersA}{39} % and, for compatibility with other packages (mtpro2, lucida, etc) \let\upGamma\Gammaup \let\upDelta\Deltaup @@ -1343,6 +1350,46 @@ $\hfil\displaystyle{#1}\hfil$\crcr% \DeclareMathSymbol{\nexistsAlt}{\mathord}{lettersA}{93}%added 20130726 \DeclareMathSymbol{\emptysetAlt}{\mathord}{lettersA}{94}%added 20130726 \re@DeclareMathSymbol{\varnothing}{\mathord}{lettersA}{95}%added 20130807 +\re@DeclareMathSymbol{\Gammait}{\mathalpha}{letters}{0} +\re@DeclareMathSymbol{\Deltait}{\mathalpha}{letters}{1} +\re@DeclareMathSymbol{\Thetait}{\mathalpha}{letters}{2} +\re@DeclareMathSymbol{\Lambdait}{\mathalpha}{letters}{3} +\re@DeclareMathSymbol{\Xiit}{\mathalpha}{letters}{4} +\re@DeclareMathSymbol{\Piit}{\mathalpha}{letters}{5} +\re@DeclareMathSymbol{\Sigmait}{\mathalpha}{letters}{6} +\re@DeclareMathSymbol{\Upsilonit}{\mathalpha}{letters}{7} +\re@DeclareMathSymbol{\Phiit}{\mathalpha}{letters}{8} +\re@DeclareMathSymbol{\Psiit}{\mathalpha}{letters}{9} +\re@DeclareMathSymbol{\Omegait}{\mathalpha}{letters}{10} +\re@DeclareMathSymbol{\alphait}{\mathord}{letters}{11} +\re@DeclareMathSymbol{\betait}{\mathord}{letters}{12} +\re@DeclareMathSymbol{\gammait}{\mathord}{letters}{13} +\re@DeclareMathSymbol{\deltait}{\mathord}{letters}{14} +\re@DeclareMathSymbol{\epsilonit}{\mathord}{letters}{15} +\re@DeclareMathSymbol{\zetait}{\mathord}{letters}{16} +\re@DeclareMathSymbol{\etait}{\mathord}{letters}{17} +\re@DeclareMathSymbol{\thetait}{\mathord}{letters}{18} +\re@DeclareMathSymbol{\iotait}{\mathord}{letters}{19} +\re@DeclareMathSymbol{\kappait}{\mathord}{letters}{20} +\re@DeclareMathSymbol{\lambdait}{\mathord}{letters}{21} +\re@DeclareMathSymbol{\muit}{\mathord}{letters}{22} +\re@DeclareMathSymbol{\nuit}{\mathord}{letters}{23} +\re@DeclareMathSymbol{\xiit}{\mathord}{letters}{24} +\re@DeclareMathSymbol{\piit}{\mathord}{letters}{25} +\re@DeclareMathSymbol{\rhoit}{\mathord}{letters}{26} +\re@DeclareMathSymbol{\sigmait}{\mathord}{letters}{27} +\re@DeclareMathSymbol{\tauit}{\mathord}{letters}{28} +\re@DeclareMathSymbol{\upsilonit}{\mathord}{letters}{29} +\re@DeclareMathSymbol{\phiit}{\mathord}{letters}{30} +\re@DeclareMathSymbol{\chiit}{\mathord}{letters}{31} +\re@DeclareMathSymbol{\psiit}{\mathord}{letters}{32} +\re@DeclareMathSymbol{\omegait}{\mathord}{letters}{33} +\re@DeclareMathSymbol{\varepsilonit}{\mathord}{letters}{34} +\re@DeclareMathSymbol{\varthetait}{\mathord}{letters}{35} +\re@DeclareMathSymbol{\varpiit}{\mathord}{letters}{36} +\re@DeclareMathSymbol{\varrhoit}{\mathord}{letters}{37} +\re@DeclareMathSymbol{\varsigmait}{\mathord}{letters}{38} +\re@DeclareMathSymbol{\varphiit}{\mathord}{letters}{39} \DeclareMathSymbol{\uppartial}{\mathord}{lettersA}{64}%added 20120416 diff --git a/Master/texmf-dist/tex/latex/newtx/newtxtext.sty b/Master/texmf-dist/tex/latex/newtx/newtxtext.sty index 0a3331f00c8..0c5e250093d 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.44} -\def\filedate{2015/07/01} +\def\fileversion{1.45} +\def\filedate{2015/07/09} \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