From 0e53f017906714054c2d533bf05a33780320576b Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sat, 12 May 2018 21:23:43 +0000 Subject: newtx (12may18) git-svn-id: svn://tug.org/texlive/trunk@47693 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/newtx/newtxmath.sty | 263 ++++++++++++++++++---- Master/texmf-dist/tex/latex/newtx/omlntxstx2mi.fd | 27 +++ Master/texmf-dist/tex/latex/newtx/untxmia.fd | 25 +- 3 files changed, 262 insertions(+), 53 deletions(-) create mode 100644 Master/texmf-dist/tex/latex/newtx/omlntxstx2mi.fd (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 845421d53b1..00243667ba9 100644 --- a/Master/texmf-dist/tex/latex/newtx/newtxmath.sty +++ b/Master/texmf-dist/tex/latex/newtx/newtxmath.sty @@ -10,16 +10,18 @@ % of glyph collisions. % These modifications are by Michael Sharpe, msharpe at ucsd dot edu -\def\fileversion{1.53} -\def\filedate{2017/12/14} +\def\fileversion{1.55} +\def\filedate{2018/05/09} \ProvidesPackage{newtxmath}[\filedate\space v\fileversion ] \@ifundefined{newtxmathLoaded}{}{\endinput} -\message{`newtxmath' v\fileversion, \filedate\space Math macros based on txfonts (msharpe)} +\message{`newtxmath' v\fileversion, \filedate\space Math macros based originally on txfonts (msharpe)} \csname newtxmathLoaded\endcsname \let\newtxmathLoaded\endinput \RequirePackage{amsmath} % improves extendable delimiter handling +\RequirePackage{etoolbox} +\RequirePackage{etextools} % for \ifiscs \RequirePackage{ifxetex,ifluatex,xkeyval} \RequirePackage{centernot} % for proper handling of negated relations \newif\ifxl@otf \xl@otffalse @@ -48,6 +50,7 @@ \DeclareOption{varg}{\def\X@s@v@rg{1}} \DeclareOption{varvw}{\def\X@s@v@rg{0}} \newcount\tx@Isdigit +\newcount\tx@IsAlNum \newif\iftx@ams \newif\iftx@slantedG \newif\iftx@cmint \newif\iftx@braces \newif\iftx@libertine \newif\iftx@varbb \newif\iftx@vvarbb \newif\iftx@symbolsC \newif\iftx@gm \newif\iftx@bigdelims @@ -65,6 +68,8 @@ \newif\iftx@BI \tx@BIfalse \def\@tx@ptm{ptm} \newif\iftx@ptm +\newif\iftx@nozchvw +\newif\iftx@stxtwo %\show\rmdefault \edef\tx@rmdefault{\rmdefault} \edef\tx@encdefault{\encodingdefault} @@ -117,9 +122,15 @@ \DeclareOption{upint}{\tx@upinttrue} \DeclareOption{smallerops}{\tx@smopstrue} \DeclareOption{useBImacros}{\tx@BItrue} +\DeclareOption{noxchvw}{\tx@nozchvwtrue} +\DeclareOption{noXchvw}{\tx@nozchvwtrue} +\DeclareOption{stix2}{\tx@stxtwotrue} % added in 1.55 +\DeclareOption{stickstoo}{\tx@stxtwotrue} % added in 1.55 \ExecuteOptions{% amssymbols,uprightGreek,nosubscriptcorrection} \ProcessOptions* +% stix2 forces timesmathacc and no optical sizes +\iftx@stxtwo\tx@tmatrue \tx@noopttrue\fi % frenchmath implies uprightGreek \iftx@frenchm\tx@slantedGfalse\fi @@ -134,6 +145,7 @@ amssymbols,uprightGreek,nosubscriptcorrection} \iftx@gm\let\X@s@v@rg\@undefined\fi \iftx@bv\let\X@s@v@rg\@undefined\fi \iftx@ba\let\X@s@v@rg\@undefined\fi +\iftx@stxtwo\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 @@ -158,6 +170,8 @@ amssymbols,uprightGreek,nosubscriptcorrection} \def\operator@font{\mathgroup\symoperators} +%\show\ttdefault + \DeclareSymbolFontAlphabet{\mathrm}{operators} \DeclareMathAlphabet{\mathsf}{\encodingdefault}{\sfdefault}{m}{n} @@ -218,9 +232,15 @@ amssymbols,uprightGreek,nosubscriptcorrection} \SetSymbolFont{letters}{bold}{OML}{zbami}{b}{it} \DeclareFontSubstitution{OML}{zbami}{m}{it} \else - \DeclareSymbolFont{letters}{OML}{ntxmi}{m}{it} - \SetSymbolFont{letters}{bold}{OML}{ntxmi}{b}{it} - \DeclareFontSubstitution{OML}{ntxmi}{m}{it} + \iftx@stxtwo + \DeclareSymbolFont{letters}{OML}{ntxstx2mi}{m}{it} + \SetSymbolFont{letters}{bold}{OML}{ntxstx2mi}{b}{it} + \DeclareFontSubstitution{OML}{ntxstx2mi}{m}{it} + \else + \DeclareSymbolFont{letters}{OML}{ntxmi}{m}{it} + \SetSymbolFont{letters}{bold}{OML}{ntxmi}{b}{it} + \DeclareFontSubstitution{OML}{ntxmi}{m}{it} + \fi \fi \fi \fi @@ -357,15 +377,6 @@ amssymbols,uprightGreek,nosubscriptcorrection} \DeclareMathSymbol{#1}{#2}{#3}{#4} \advance #4 by1} -\def\tx@isdigit#1{% #1 should be a single character -\tx@Isdigit=\z@ % -\count0=\number`#1\relax% -\ifnum\count0>47\relax% -\ifnum\count0<58\relax% -\tx@Isdigit=\@ne % -\fi% -\fi% -} \DeclareRobustCommand{\BI@}[1]{% \begingroup\text{\mathversion{bold}$#1$}\endgroup} \iftx@BI @@ -423,13 +434,44 @@ amssymbols,uprightGreek,nosubscriptcorrection} \DeclareRobustCommand{\BIz}{\BI@{z}} \fi% end \iftx@BI -\def\tx@XXX#1#2\@nil{% #1=first character, #2=rest of string -\tx@isdigit{#1}% -\ifnum\tx@Isdigit>\z@ $#1$\else#1\fi% -\if\relax\detokenize{#2}\relax \else -\edef\tx@XXXcmd{\noexpand\tx@XXX #2\noexpand\@nil}\tx@XXXcmd \fi} +\def\tx@isdigit#1{% #1 should be a single character +\tx@Isdigit=\z@ % +\count0=\number`#1\relax% +\ifnum\count0>47\relax% +\ifnum\count0<58\relax% +\tx@Isdigit=\@ne % +\fi% +\fi% +} +\def\tx@isAlNum#1{% #1 should be a single character +\tx@IsAlNum=\z@ % +\count0=\number`#1\relax% +\ifnum\count0>47\relax% + \ifnum\count0<58\relax% + \tx@IsAlNum=\@ne % + \else + \ifnum\count0>64\relax% + \ifnum\count0<91\relax% + \tx@IsAlNum=\tw@ % + \else + \ifnum\count0>96\relax% + \ifnum\count0<123\relax% + \tx@IsAlNum=3\relax % + \fi + \fi + \fi + \fi + \fi +\fi +} -\def\equalht#1{\tx@XXX #1\@nil} +%\def\tx@XXX#1#2\@nil{% #1=first character, #2=rest of string +%\tx@isdigit{#1}% +%\ifnum\tx@Isdigit>\z@ $#1$\else#1\fi% +%\if\relax\detokenize{#2}\relax \else +%\edef\tx@XXXcmd{\noexpand\tx@XXX #2\noexpand\@nil}\tx@XXXcmd \fi} +% +%\def\equalht#1{\tx@XXX #1\@nil} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % Subscript correction code @@ -630,6 +672,7 @@ amssymbols,uprightGreek,nosubscriptcorrection} \re@DeclareMathSymbol{\Omega}{\mathalpha}{lettersA}{10} \fi + %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % Math Symbol (txsy) Definition % symbols %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -1525,8 +1568,10 @@ $\hfil\displaystyle{#1}\hfil$\crcr% \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}}} -\def\drb{\ensuremath\raisebox{.15ex}{\mbox{\usefont{U}{txsyc}{m}{n}\char127}}} +%\def\dlb{\ensuremath\raisebox{.15ex}{\mbox{\usefont{U}{txsyc}{m}{n}\char126}}} +%\def\drb{\ensuremath\raisebox{.15ex}{\mbox{\usefont{U}{txsyc}{m}{n}\char127}}} +\let\dlb\llbracket +\let\drb\rrbracket % Changes to put some symbolsC glyphs into lettersA \re@DeclareMathSymbol{\nsubset}{\mathrel}{lettersA}{54} @@ -1634,8 +1679,10 @@ $\hfil\displaystyle{#1}\hfil$\crcr% % \re@DeclareMathSymbol{\varkappa}{\mathord}{AMSm}{123} % \re@DeclareMathSymbol{\varkappaup}{\mathord}{AMSm}{123} %\else - \re@DeclareMathSymbol{\varkappa}{\mathord}{lettersA}{41} + \re@DeclareMathSymbol{\varkappait}{\mathord}{lettersA}{41} + \let\varkappa\varkappait \re@DeclareMathSymbol{\varkappaup}{\mathord}{lettersA}{42} + %\fi % upright Greek \re@DeclareMathSymbol{\Gammaup}{\mathalpha}{lettersA}{0} @@ -1787,10 +1834,10 @@ $\hfil\displaystyle{#1}\hfil$\crcr% \re@DeclareMathSymbol{\varv}{\mathord}{lettersA}{51} \re@DeclareMathSymbol{\varw}{\mathord}{lettersA}{52} \re@DeclareMathSymbol{\nexists}{\mathord}{symbols}{"9A} - \let\nexistsAlt=\exists -\re@DeclareMathSymbol{\exists}{\mathord}{lettersA}{92} + \let\nexistsAlt=\nexists +%\re@DeclareMathSymbol{\exists}{\mathord}{lettersA}{92} \let\existsAlt=\exists -\re@DeclareMathSymbol{\forall}{\mathord}{lettersA}{91} +%\re@DeclareMathSymbol{\forall}{\mathord}{lettersA}{91} \let\forallAlt=\forall %\DeclareMathSymbol{\forallAlt}{\mathord}{lettersA}{91}%added 20130726 %\DeclareMathSymbol{\nexistsAlt}{\mathord}{lettersA}{93}%added 20130726 @@ -1841,13 +1888,41 @@ $\hfil\displaystyle{#1}\hfil$\crcr% \DeclareMathSymbol{\uppartial}{\mathord}{lettersA}{64}%added 20120416 -\def\ntx@UC{A,B,C,D,E,F,G,H,I,J,K,L,M,N,O,P,Q,R,S,T,U,V,W,X,Y,Z} -\def\ntx@lc{a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z} -\def\ntx@num{0,1,2,3,4,5,6,7,8,9} +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% Special considerations for stix2 +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +% Accents change, as do Bbb alphabets, some special symbols in mia +\iftx@stxtwo % + \DeclareMathSymbol{\upnabla}{\mathord}{lettersA}{43} + \re@DeclareMathSymbol{\nsubset}{\mathrel}{lettersA}{44} + \re@DeclareMathSymbol{\nsupset}{\mathrel}{lettersA}{45} + \re@DeclareMathSymbol{\notin}{\mathrel}{lettersA}{46} + \re@DeclareMathSymbol{\notni}{\mathrel}{lettersA}{47} + \let\notowns=\notni \let\nni=\notni + \re@DeclareMathSymbol{\coloneq}{\mathrel}{lettersA}{58} + \re@DeclareMathSymbol{\eqcolon}{\mathrel}{lettersA}{59} + \re@DeclareMathSymbol{\neq}{\mathrel}{lettersA}{60} + \let\ne=\neq + \re@DeclareMathAccent{\grave}{\mathord}{lettersA}{237} + \re@DeclareMathAccent{\acute}{\mathord}{lettersA}{238} + \re@DeclareMathAccent{\hat}{\mathord}{lettersA}{239} + \re@DeclareMathAccent{\tilde}{\mathord}{lettersA}{240} + \re@DeclareMathAccent{\bar}{\mathord}{lettersA}{241} + \re@DeclareMathAccent{\breve}{\mathord}{lettersA}{242} + \re@DeclareMathAccent{\dot}{\mathord}{lettersA}{243} + \re@DeclareMathAccent{\ddot}{\mathord}{lettersA}{244} + \re@DeclareMathAccent{\mathring}{\mathord}{lettersA}{245} + \re@DeclareMathAccent{\check}{\mathord}{lettersA}{246} +\fi + +%\def\ntx@UC{A,B,C,D,E,F,G,H,I,J,K,L,M,N,O,P,Q,R,S,T,U,V,W,X,Y,Z} +%\def\ntx@lc{a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z} +%\def\ntx@num{0,1,2,3,4,5,6,7,8,9} %\@for\ntx@x:=\ntx@UC\do{\edef\ntx@tmp{\edef\csname -%\DeclareMathSymbol{\m@thbbch@rA}{\mathord}{lettersA}{129} +\DeclareMathSymbol{\m@thbbch@rA}{\mathord}{lettersA}{129} \DeclareMathSymbol{\m@thbbch@rA}{\mathord}{lettersA}{129} \DeclareMathSymbol{\m@thbbch@rB}{\mathord}{lettersA}{130} \DeclareMathSymbol{\m@thbbch@rC}{\mathord}{lettersA}{131} @@ -1888,12 +1963,13 @@ $\hfil\displaystyle{#1}\hfil$\crcr% }% \futurelet\@FutureLetToken\@FutureLetDecide}% end DoFutureLet +\def\F@ntPrefix{m@thbbch@r} %\def\m@keCharacter#1{% % \@tempcnta=`#1\relax \advance\@tempcnta "40\relax % \edef\ntx@char{\ntx@lettersA\nhex{2}{\the\@tempcnta}} % \expandafter\mathchar\ntx@char} %\def\@PickUpTheCharacter#1{\m@keCharacter{#1}\DoFutureLet} -%\def\@EachCharacterDone \@nil{}% cleanup---get rid of \@nil +\def\@EachCharacterDone \@nil{}% cleanup---get rid of \@nil %\newif\ifntx@notnil %\def\@EachCharacter{% % \DoFutureLet{\@EachCharacterDone}{\@PickUpTheCharacter}} @@ -1904,35 +1980,132 @@ $\hfil\displaystyle{#1}\hfil$\crcr% % %\DeclareRobustCommand*{\varmathbb}[1]{\gdef\F@ntPrefix{m@thbbch@r}% % \@EachCharacter #1\@nil} -\DeclareRobustCommand*{\varmathbb}[1]{\gdef\F@ntPrefix{m@thbbch@r}% +\DeclareRobustCommand*{\varmathbb}[1]{%\gdef\F@ntPrefix{m@thbbch@r}% \DoFutureLet #1\@nil} -% Additional macros to access process a single character only, work with \bm +% Changed macros which are not limited to a single character, and can include digits, \imath, \jmath +%%%%%% +% Experimental code May 8, 2018 +\newcount\ntx@numstart +\newcount\ntx@UCstart +\newcount\ntx@lcstart +\newcount\ntx@tmpc +\newcount\ntx@imath +\newcount\ntx@jmath +\newif\ifntx@notempty +\def\ntx@fam{} \def\ntx@char{} -\DeclareRobustCommand*{\vmathbb}[1]{% for original variant bb - \@tempcnta=`#1\relax \advance\@tempcnta "40\relax - \edef\ntx@char{"\hexnumber@\symlettersA\nhex{2}{\the\@tempcnta}} - \expandafter\mathchar\ntx@char -} -\DeclareRobustCommand*{\vvmathbb}[1]{% for new (STIX) variant - \@tempcnta=`#1\relax \advance\@tempcnta "80\relax - \edef\ntx@char{"\hexnumber@\symlettersA\nhex{2}{\the\@tempcnta}} - \expandafter\mathchar\ntx@char +\def\ntx@alfa#1#2#3#4#5#6#7{%#1=string, #2=UC,#3=lc,#4=imath,#5=jmath,#6=numstart,#7=fam + \ntx@UCstart=#2 + %\gdef\xx{x#3x} + \@xp\ifblank\@xp{#3}{\ntx@lcstart=512 }{\ntx@lcstart=#3} + \@xp\ifblank\@xp{#4}{\ntx@imath=512 }{\ntx@imath=#4} + \@xp\ifblank\@xp{#5}{\ntx@jmath=512 }{\ntx@jmath=#5} + \@xp\ifblank\@xp{#6}{\ntx@numstart=512 }{\ntx@numstart=#6} + \def\ntx@fam{#7} + \@xp\ifblank\@xp{#1}{\relax}{\@xp\ntx@@alfa #1\@nil}} + +\def\ntx@@alfa#1#2\@nil{% + \ntx@out{#1} + \ifblank{#2}{\relax}{\ntx@@alfa #2\@nil}} + +\def\ntx@out#1{% #1 is always a single token---use values from \ntx@alfa + %\showthe\ntx@numstart + \ntx@tmpc=\z@ + \ifx#1\imath\ntx@tmpc=128\relax + \ifnum\ntx@imath>255\relax #1\ntx@tmpc=256 \message{^^JNo imath in this alphabet^^J}\fi + \else % not \imath + \ifx#1\jmath\ntx@tmpc=129\relax + \ifnum\ntx@jmath>255\relax #1\ntx@tmpc=256 \message{^^JNo jmath in this alphabet^^J}\fi + \else % neither \imath nor \jmath + \ifiscs{#1}{#1\ntx@tmpc=256 }{% not a cs + \ntx@tmpc=\number\@xp`#1} + \fi + \fi + %\message{^^JCharacter index = \the\ntx@tmpc^^J} + \ifnum\ntx@tmpc<128\relax % neither \imath nor \jmath nor cs + \tx@isAlNum{#1} + %\message{^^JIsAlNum = \the\tx@IsAlNum^^J} + \ifnum\tx@IsAlNum=\@ne % it's a digit + \ifnum\ntx@numstart>255\relax #1\ntx@tmpc=256 \message{^^JNo digits in this alphabet^^J} + \else + \advance\ntx@tmpc -48 % 0..9 + \advance\ntx@tmpc \ntx@numstart + \fi + \else + \ifnum\tx@IsAlNum=\tw@ % it's UC + \advance\ntx@tmpc -65 % 0..25 + \advance\ntx@tmpc\ntx@UCstart + \else + \ifnum\tx@IsAlNum>\tw@ % it's lc + \ifnum\ntx@lcstart>255 #1\ntx@tmpc=256 \message{^^JNo lowercase in this alphabet^^J} + \else + %\message{^^JCharacter index = \the\ntx@tmpc^^J + %lcstart = \the\ntx@lcstart^^J} + \advance\ntx@tmpc -97 % 0..25 + \advance\ntx@tmpc\ntx@lcstart + %\message{^^JCharacter index = \the\ntx@tmpc^^J} + \fi + \else % it must be a character outside alphanumerics + #1 + \fi + \fi + \fi + \else % ntx@tmpc>127 + \ifnum\ntx@tmpc=128\relax % imath + \ntx@tmpc=\ntx@imath + \else + \ifnum\ntx@tmpc=129\relax % jmath + \ntx@tmpc=\ntx@jmath + \fi + \fi + \fi + \ifnum\ntx@tmpc<256\relax + \def\ntx@char{"\@xp\hexnumber@\csname sym\ntx@fam\endcsname\nhex{2}{\the\ntx@tmpc}} + %\message{^^Joutput char = \ntx@char^^J} + \@xp\mathchar\ntx@char%\traceoff + \fi %end of ifnum <256 } +% This really needs to be reorganized +\iftx@stxtwo + \DeclareRobustCommand{\vvmathbb}[1]{\ntx@alfa{#1}{129}{155}{181}{182}{48}{lettersA}} + \DeclareRobustCommand{\vmathbb}[1]{\ntx@alfa{#1}{183}{209}{235}{236}{48}{lettersA}} +\else + \DeclareRobustCommand{\vmathbb}[1]{\ntx@alfa{#1}{129}{159}{}{}{}{lettersA}} + \DeclareRobustCommand{\vvmathbb}[1]{\ntx@alfa{#1}{193}{225}{}{}{}{lettersA}} + %\DeclareRobustCommand{\vvmathbbb}[1]{\ntx@alfa{#1}{193}{225}{}{}{48}{boldlettersA}} +\fi +%%%%%%%%%%% +%End experimental code +%%%%%%%%%%% +% Additional macros to access process a single character only, work with \bm +%\def\ntx@char{} +%\DeclareRobustCommand*{\vmathbb}[1]{% for original variant bb +% \@tempcnta=`#1\relax \advance\@tempcnta "40\relax +% \edef\ntx@char{"\hexnumber@\symlettersA\nhex{2}{\the\@tempcnta}} +% \expandafter\mathchar\ntx@char +%} +%\DeclareRobustCommand*{\vvmathbb}[1]{% for new (STIX) variant +% \@tempcnta=`#1\relax \advance\@tempcnta "80\relax +% \edef\ntx@char{"\hexnumber@\symlettersA\nhex{2}{\the\@tempcnta}} +% \expandafter\mathchar\ntx@char +%} %\DeclareRobustCommand*{\vvmathbbb}[1]{% for new (STIX) variant % \@tempcnta=`#1\relax \advance\@tempcnta "80\relax % \edef\ntx@char{"\hexnumber@\symboldlettersA\nhex{2}{\the\@tempcnta}} % \expandafter\mathchar\ntx@char %} + \iftx@vvarbb - \let\mathbb\vvmathbb + \let\mathbb\vvmathbb %\DeclareRobustCommand*{\mathbb}{\vvmathbb} \else \iftx@varbb - \let\mathbb\varmathbb + \let\mathbb\vmathbb %\DeclareRobustCommand*{\mathbb}{\varmathbb} \else \iftx@ams\else\let\mathbb\varmathbb\fi \fi \fi +%\show\mathbb %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % Math Extension (ntxex) Definition % largesymbols %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% diff --git a/Master/texmf-dist/tex/latex/newtx/omlntxstx2mi.fd b/Master/texmf-dist/tex/latex/newtx/omlntxstx2mi.fd new file mode 100644 index 00000000000..573645e86d1 --- /dev/null +++ b/Master/texmf-dist/tex/latex/newtx/omlntxstx2mi.fd @@ -0,0 +1,27 @@ +%Filename: omlntxstx2mi.fd +%Created by: tex stx2-drv +%Created using fontinst v1.933 + +%THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY + +\ProvidesFile{omlntxstx2mi.fd} + [2018/04/26 Fontinst v1.933 font definitions for OML/ntxstx2mi.] + +\providecommand{\ntxmath@scaled}{} + +\DeclareFontFamily{OML}{ntxstx2mi}{\skewchar \font =127} + +\DeclareFontShape{OML}{ntxstx2mi}{m}{it}{ + <-> \ntxmath@scaled ntxstx2mi +}{} + +\DeclareFontShape{OML}{ntxstx2mi}{b}{it}{ + <-> \ntxmath@scaled ntxstx2bmi +}{} + +\DeclareFontShape{OML}{ntxstx2mi}{m}{sl}{<->ssub * ntxstx2mi/m/it}{} +\DeclareFontShape{OML}{ntxstx2mi}{bx}{it}{<->ssub * ntxstx2mi/b/it}{} +\DeclareFontShape{OML}{ntxstx2mi}{b}{sl}{<->ssub * ntxstx2mi/b/it}{} +\DeclareFontShape{OML}{ntxstx2mi}{bx}{sl}{<->ssub * ntxstx2mi/b/sl}{} + +\endinput diff --git a/Master/texmf-dist/tex/latex/newtx/untxmia.fd b/Master/texmf-dist/tex/latex/newtx/untxmia.fd index 0802dfc7b5b..2ea2ebfcef6 100644 --- a/Master/texmf-dist/tex/latex/newtx/untxmia.fd +++ b/Master/texmf-dist/tex/latex/newtx/untxmia.fd @@ -5,7 +5,7 @@ %THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY \ProvidesFile{untxmia.fd} - [2016/01/31 Fontinst v1.933 font definitions for U/ntxmia.] + [2018/04/14 Fontinst v1.933 font definitions for U/ntxmia.] \expandafter\ifx\csname ntxmath@scaled\endcsname\relax \let\ntxmath@scaled\@empty% @@ -47,13 +47,22 @@ <-> \ntxmath@scaled zchbmia }{} \else - \DeclareFontShape{U}{ntxmia}{m}{it}{ - <-> \ntxmath@scaled ntxmia - }{} - - \DeclareFontShape{U}{ntxmia}{b}{it}{ - <-> \ntxmath@scaled ntxbmia - }{} + \iftx@stxtwo + \DeclareFontShape{U}{ntxmia}{m}{it}{ + <-> \ntxmath@scaled ntxstx2mia + }{} + \DeclareFontShape{U}{ntxmia}{b}{it}{ + <-> \ntxmath@scaled ntxstx2bmia + }{} + + \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