From b165b0f9b0e15b177d4cc7cc721464549fee1380 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sun, 16 Oct 2016 21:36:08 +0000 Subject: newtx (16oct16) git-svn-id: svn://tug.org/texlive/trunk@42286 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/newtx/newtxmath.sty | 85 ++++++++++++++++++++----- 1 file changed, 70 insertions(+), 15 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 55766d5dec1..0f0cf64a7ee 100644 --- a/Master/texmf-dist/tex/latex/newtx/newtxmath.sty +++ b/Master/texmf-dist/tex/latex/newtx/newtxmath.sty @@ -10,9 +10,9 @@ % of glyph collisions. % These modifications are by Michael Sharpe, msharpe at ucsd dot edu -\def\fileversion{1.5} -\def\filedate{2016/08/12} -\ProvidesPackage{newtxmath}[\filedate\space v\fileversion] +\def\fileversion{1.51} +\def\filedate{2016/10/15} +\ProvidesPackage{newtxmath}[\filedate\space v\fileversion ] \@ifundefined{newtxmathLoaded}{}{\endinput} \message{`newtxmath' v\fileversion, \filedate\space Math macros based on txfonts (msharpe)} @@ -44,7 +44,8 @@ \edef\x{\endgroup \noexpand\setkeys{ntxmath}{\CurrentOption}}% \x} -\DeclareOption{varg}{\def\X@s@v@rg{}} +\DeclareOption{varg}{\def\X@s@v@rg{1}} +\DeclareOption{varvw}{\def\X@s@v@rg{0}} \newcount\tx@Isdigit \newif\iftx@ams \newif\iftx@slantedG \newif\iftx@cmint \newif\iftx@braces \newif\iftx@libertine \newif\iftx@varbb \newif\iftx@vvarbb \newif\iftx@symbolsC @@ -115,11 +116,14 @@ amssymbols,uprightGreek,nosubscriptcorrection} %bigdelims cancels cmbraces \iftx@bigdelims\tx@bracesfalse\fi -% No varg option with option libertine or option minion or garamond -\iftx@libertine\ifx\X@s@v@rg\undefined\else\let\X@s@v@rg\@undefined\fi\fi -\iftx@minion\ifx\X@s@v@rg\undefined\else\let\X@s@v@rg\@undefined\fi\fi -\iftx@gm\ifx\X@s@v@rg\undefined\else\let\X@s@v@rg\@undefined\fi\fi -\iftx@bv\ifx\X@s@v@rg\undefined\else\let\X@s@v@rg\@undefined\fi\fi +% No varg or varvw with options other than newtx or newpx +\iftx@libertine\let\X@s@v@rg\@undefined\fi +\iftx@minion\let\X@s@v@rg\@undefined\fi +\iftx@ut\let\X@s@v@rg\@undefined\fi +\iftx@ch\let\X@s@v@rg\@undefined\fi +\iftx@coch\let\X@s@v@rg\@undefined\fi +\iftx@gm\let\X@s@v@rg\@undefined\fi +\iftx@bv\let\X@s@v@rg\@undefined\fi % altnu, liby and largelibfigs valid only with libertine \iftx@libertine\else\tx@altnufalse\tx@largelibfigsfalse\tx@libyfalse\fi % Use existing text fonts for operators, mathrm, etc @@ -347,7 +351,58 @@ amssymbols,uprightGreek,nosubscriptcorrection} } \DeclareRobustCommand{\BI@}[1]{% \begingroup\text{\mathversion{bold}$#1$}\endgroup} -%\DeclareRobustCommand{\BIA}{\BI@{A}} % etc +\DeclareRobustCommand{\BIA}{\BI@{A}} +\DeclareRobustCommand{\BIB}{\BI@{B}} +\DeclareRobustCommand{\BIC}{\BI@{C}} +\DeclareRobustCommand{\BID}{\BI@{D}} +\DeclareRobustCommand{\BIE}{\BI@{E}} +\DeclareRobustCommand{\BIF}{\BI@{F}} +\DeclareRobustCommand{\BIG}{\BI@{G}} +\DeclareRobustCommand{\BIH}{\BI@{H}} +\DeclareRobustCommand{\BII}{\BI@{I}} +\DeclareRobustCommand{\BIJ}{\BI@{J}} +\DeclareRobustCommand{\BIK}{\BI@{K}} +\DeclareRobustCommand{\BIL}{\BI@{L}} +\DeclareRobustCommand{\BIM}{\BI@{M}} +\DeclareRobustCommand{\BIN}{\BI@{N}} +\DeclareRobustCommand{\BIO}{\BI@{O}} +\DeclareRobustCommand{\BIP}{\BI@{P}} +\DeclareRobustCommand{\BIQ}{\BI@{Q}} +\DeclareRobustCommand{\BIR}{\BI@{R}} +\DeclareRobustCommand{\BIS}{\BI@{S}} +\DeclareRobustCommand{\BIT}{\BI@{T}} +\DeclareRobustCommand{\BIU}{\BI@{U}} +\DeclareRobustCommand{\BIV}{\BI@{V}} +\DeclareRobustCommand{\BIW}{\BI@{W}} +\DeclareRobustCommand{\BIX}{\BI@{X}} +\DeclareRobustCommand{\BIY}{\BI@{Y}} +\DeclareRobustCommand{\BIZ}{\BI@{Z}} +\DeclareRobustCommand{\BIa}{\BI@{a}} +\DeclareRobustCommand{\BIb}{\BI@{b}} +\DeclareRobustCommand{\BIc}{\BI@{c}} +\DeclareRobustCommand{\BId}{\BI@{d}} +\DeclareRobustCommand{\BIe}{\BI@{e}} +\DeclareRobustCommand{\BIf}{\BI@{f}} +\DeclareRobustCommand{\BIg}{\BI@{g}} +\DeclareRobustCommand{\BIh}{\BI@{h}} +\DeclareRobustCommand{\BIi}{\BI@{i}} +\DeclareRobustCommand{\BIj}{\BI@{j}} +\DeclareRobustCommand{\BIk}{\BI@{k}} +\DeclareRobustCommand{\BIl}{\BI@{l}} +\DeclareRobustCommand{\BIm}{\BI@{m}} +\DeclareRobustCommand{\BIn}{\BI@{n}} +\DeclareRobustCommand{\BIo}{\BI@{o}} +\DeclareRobustCommand{\BIp}{\BI@{p}} +\DeclareRobustCommand{\BIq}{\BI@{q}} +\DeclareRobustCommand{\BIr}{\BI@{r}} +\DeclareRobustCommand{\BIs}{\BI@{s}} +\DeclareRobustCommand{\BIt}{\BI@{t}} +\DeclareRobustCommand{\BIu}{\BI@{u}} +\DeclareRobustCommand{\BIv}{\BI@{v}} +\DeclareRobustCommand{\BIw}{\BI@{w}} +\DeclareRobustCommand{\BIx}{\BI@{x}} +\DeclareRobustCommand{\BIy}{\BI@{y}} +\DeclareRobustCommand{\BIz}{\BI@{z}} \def\tx@XXX#1#2\@nil{% #1=first character, #2=rest of string \tx@isdigit{#1}% @@ -1375,10 +1430,10 @@ $\hfil\displaystyle{#1}\hfil$\crcr% \re@DeclareMathSymbol\leadsto{\mathrel}{symbolsC}{123} \re@DeclareMathSymbol{\sqcupplus}{\mathbin}{symbolsC}{124} \re@DeclareMathSymbol{\sqcapplus}{\mathbin}{symbolsC}{125} -\iftx@bigdelims\else - \re@DeclareMathDelimiter{\llbracket}{\mathopen}{symbolsC}{126}{largesymbolsTXA}{18} - \re@DeclareMathDelimiter{\rrbracket}{\mathclose}{symbolsC}{127}{largesymbolsTXA}{19} -\fi +%\iftx@bigdelims\else +% \re@DeclareMathDelimiter{\llbracket}{\mathopen}{symbolsC}{126}{largesymbolsTXA}{18} +% \re@DeclareMathDelimiter{\rrbracket}{\mathclose}{symbolsC}{127}{largesymbolsTXA}{19} +%\fi \re@DeclareMathSymbol{\boxright}{\mathrel}{symbolsC}{128} \re@DeclareMathSymbol{\boxleft}{\mathrel}{symbolsC}{129} \re@DeclareMathSymbol{\boxdotright}{\mathrel}{symbolsC}{130} @@ -1416,7 +1471,7 @@ $\hfil\displaystyle{#1}\hfil$\crcr% \re@DeclareMathSymbol{\nsupset}{\mathrel}{lettersA}{55} \re@DeclareMathSymbol{\notin}{\mathrel}{lettersA}{56} \re@DeclareMathSymbol{\notni}{\mathrel}{lettersA}{57} - \let\notowns=\notni + \let\notowns=\notni \let\nni=\notni \re@DeclareMathSymbol{\coloneq}{\mathrel}{lettersA}{58} \re@DeclareMathSymbol{\eqcolon}{\mathrel}{lettersA}{59} \re@DeclareMathSymbol{\neq}{\mathrel}{lettersA}{60} -- cgit v1.2.3