From 8d1d29c0fbacf6b5c2a31bf7c9826f922f723732 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Fri, 15 Dec 2017 22:15:41 +0000 Subject: newtx (15dec17) git-svn-id: svn://tug.org/texlive/trunk@46071 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/newtx/newtxmath.sty | 87 ++++++++++++++++++++----- Master/texmf-dist/tex/latex/newtx/untxmia.fd | 23 +++++-- 2 files changed, 86 insertions(+), 24 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 bad77e83019..845421d53b1 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.527} -\def\filedate{2017/09/11} +\def\fileversion{1.53} +\def\filedate{2017/12/14} \ProvidesPackage{newtxmath}[\filedate\space v\fileversion ] \@ifundefined{newtxmathLoaded}{}{\endinput} @@ -21,6 +21,7 @@ \let\newtxmathLoaded\endinput \RequirePackage{amsmath} % improves extendable delimiter handling \RequirePackage{ifxetex,ifluatex,xkeyval} +\RequirePackage{centernot} % for proper handling of negated relations \newif\ifxl@otf \xl@otffalse \ifxetex \xl@otftrue @@ -1368,7 +1369,7 @@ $\hfil\displaystyle{#1}\hfil$\crcr% % \let\ne=\neq \re@DeclareMathSymbol{\nasymp}{\mathrel}{symbolsC}{45} \re@DeclareMathSymbol{\nequiv}{\mathrel}{symbolsC}{46} -\re@DeclareMathSymbol{\nsim}{\mathrel}{symbolsC}{47} +%\re@DeclareMathSymbol{\nsim}{\mathrel}{symbolsC}{47} \re@DeclareMathSymbol{\napprox}{\mathrel}{symbolsC}{48} %\re@DeclareMathSymbol{\nsubset}{\mathrel}{symbolsC}{49} %\re@DeclareMathSymbol{\nsupset}{\mathrel}{symbolsC}{50} @@ -1483,6 +1484,45 @@ $\hfil\displaystyle{#1}\hfil$\crcr% \re@DeclareMathSymbol{\multimapdotbothvert}{\mathrel}{symbolsC}{150} \re@DeclareMathSymbol{\multimapdotbothBvert}{\mathrel}{symbolsC}{151} \re@DeclareMathSymbol{\multimapdotbothAvert}{\mathrel}{symbolsC}{152} +\else % tx@symbolsCfalse + \newcommand*{\nvarparallel}{\centernot\varparallel} + \newcommand*{\nvarparallelinv}{\centernot\varparallelinv} + \newcommand*{\nprecsim}{\centernot\precsim} + \newcommand*{\nsuccsim}{\centernot\succsim} + \newcommand*{\nlesssim}{\centernot\lesssim} + \newcommand*{\ngtrsim}{\centernot\gtrsim} + \newcommand*{\nlessapprox}{\centernot\lessapprox} + \newcommand*{\ngtrapprox}{\centernot\gtrapprox} + \newcommand*{\npreccurlyeq}{\centernot\preccurlyeq} + \newcommand*{\nsucccurlyeq}{\centernot\succcurlyeq} + \newcommand*{\ngtrless}{\centernot\gtrless} + \newcommand*{\nlessgtr}{\centernot\lessgtr} + \newcommand*{\nbumpeq}{\centernot\bumpeq} + \newcommand*{\nBumpeq}{\centernot\Bumpeq} + \newcommand*{\nbacksim}{\centernot\backsim} + \newcommand*{\nbacksimeq}{\centernot\backsimeq} + \newcommand*{\nasymp}{\centernot\asymp} + \newcommand*{\nequiv}{\centernot\equiv} + %\newcommand*{\nsim}{\centernot\sim} + \newcommand*{\napprox}{\centernot\approx} + \newcommand*{\nll}{\centernot\ll} + \newcommand*{\ngg}{\centernot\gg} + \newcommand*{\nthickapprox}{\centernot\thickapprox} + \newcommand*{\napproxeq}{\centernot\approxeq} + \newcommand*{\nprecapprox}{\centernot\precapprox} + \newcommand*{\nsuccapprox}{\centernot\succapprox} + \newcommand*{\npreceqq}{\centernot\preceqq} + \newcommand*{\nsucceqq}{\centernot\succeqq} + \newcommand*{\nsimeq}{\centernot\simeq} + \newcommand*{\nSubset}{\centernot\Subset} + \newcommand*{\nSupset}{\centernot\Supset} + \newcommand*{\nsqsubseteq}{\centernot\sqsubseteq} + \newcommand*{\nsqsupseteq}{\centernot\sqsupseteq} + \newcommand*{\nplus}{\centernot\plus} + \newcommand*{\nsqsubset}{\centernot\sqsubset} + \newcommand*{\nsqsupset}{\centernot\sqsupset} + \newcommand*{\ntwoheadrightarrow}{\centernot\twoheadrightarrow} + \newcommand*{\ntwoheadleftarrow}{\centernot\twoheadleftarrow} \fi % The following may be used for [[ and ]] without loading symbolsC as a math family. They replace \llbracket and \rrbracket. \def\dlb{\ensuremath\raisebox{.15ex}{\mbox{\usefont{U}{txsyc}{m}{n}\char126}}} @@ -2090,6 +2130,7 @@ $\hfil\displaystyle{#1}\hfil$\crcr% % \fi %%\fi +% Changed again 20171121 to prevent possible damage due pandoc %%% \not redefined: %%% \not= becomes \ne %%% \not< becomes \nless @@ -2099,22 +2140,34 @@ $\hfil\displaystyle{#1}\hfil$\crcr% %%% otherwise, \not\XXX is done in the usual way. \DeclareMathSymbol{\n@tch@r}{\mathrel}{symbols}{54} +\@namedef{not=}{\ne} +\@namedef{not>}{\ngtr} +\@namedef{not<}{\nless} \DeclareRobustCommand*{\not}[1]{% - \ifx #1=\ne\else - \ifx #1<\nless\else - \ifx #1>\ngtr\else - \n@t@@n{#1}\fi\fi\fi} - -\def\n@t@@n#1{% - \begingroup \escapechar\m@ne\xdef\@gtempa{not\string#1}\endgroup% - \expandafter\@ifundefined{\@gtempa}% - {\not@n@{#1}}% - {\@nameuse{\@gtempa}}} + \begingroup \escapechar\m@ne\xdef\@gtempa{not\string#1}\endgroup + \@ifundefined{\@gtempa}% + {\not@n@{#1}}% + {\@nameuse{\@gtempa}}} \def\not@n@#1{% - \begingroup \escapechar\m@ne\xdef\@gtempa{n\string#1}\endgroup% - \expandafter\@ifundefined{\@gtempa}% - {\n@tch@r #1}% - {\@nameuse{\@gtempa}}} + \begingroup \escapechar\m@ne\xdef\@gtempa{n\string#1}\endgroup + \@ifundefined{\@gtempa}% + {\n@tch@r #1}% + {\@nameuse{\@gtempa}}} +% \ifx #1=\ne\else +% \ifx #1<\nless\else +% \ifx #1>\ngtr\else +% \n@t@@n{#1}\fi\fi\fi} +% +%\def\n@t@@n#1{% +% \begingroup \escapechar\m@ne\xdef\@gtempa{not\string#1}\endgroup% +% \expandafter\@ifundefined{\@gtempa}% +% {\not@n@{#1}}% +% {\@nameuse{\@gtempa}}} +%\def\not@n@#1{% +% \begingroup \escapechar\m@ne\xdef\@gtempa{n\string#1}\endgroup% +% \expandafter\@ifundefined{\@gtempa}% +% {\n@tch@r #1}% +% {\@nameuse{\@gtempa}}} %%% %%% for AMS classes diff --git a/Master/texmf-dist/tex/latex/newtx/untxmia.fd b/Master/texmf-dist/tex/latex/newtx/untxmia.fd index 0cd65a77a33..0802dfc7b5b 100644 --- a/Master/texmf-dist/tex/latex/newtx/untxmia.fd +++ b/Master/texmf-dist/tex/latex/newtx/untxmia.fd @@ -39,13 +39,22 @@ <-> \ntxmath@scaled zcochbmia }{} \else - \DeclareFontShape{U}{ntxmia}{m}{it}{ - <-> \ntxmath@scaled ntxmia - }{} - - \DeclareFontShape{U}{ntxmia}{b}{it}{ - <-> \ntxmath@scaled ntxbmia - }{} + \iftx@ch + \DeclareFontShape{U}{ntxmia}{m}{it}{ + <-> \ntxmath@scaled zchmia + }{} + \DeclareFontShape{U}{ntxmia}{b}{it}{ + <-> \ntxmath@scaled zchbmia + }{} + \else + \DeclareFontShape{U}{ntxmia}{m}{it}{ + <-> \ntxmath@scaled ntxmia + }{} + + \DeclareFontShape{U}{ntxmia}{b}{it}{ + <-> \ntxmath@scaled ntxbmia + }{} + \fi \fi \fi \fi -- cgit v1.2.3