diff options
author | Karl Berry <karl@freefriends.org> | 2012-11-20 01:04:24 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2012-11-20 01:04:24 +0000 |
commit | b32ce7e0896b7e5b0b4fa40e944cb98a9dc5d878 (patch) | |
tree | 765276bff042585f95f8d0d6cbc6cc6fd0865abb /Master/texmf-dist/tex/latex/newtx | |
parent | 5c33a7e8f795f33fb75fe756b5210abe7347992a (diff) |
newtx (19nov12)
git-svn-id: svn://tug.org/texlive/trunk@28299 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/newtx')
-rw-r--r-- | Master/texmf-dist/tex/latex/newtx/newtxmath.sty | 89 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/newtx/newtxtext.sty | 4 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/newtx/omlntxmi.fd | 28 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/newtx/omlnxlmi.fd | 52 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/newtx/omlzmnmi.fd | 8 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/newtx/omsntxsy.fd | 44 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/newtx/omxntxex.fd | 8 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/newtx/omxntxexv.fd | 8 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/newtx/untxexa.fd | 8 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/newtx/untxmia.fd | 16 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/newtx/untxsya.fd | 8 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/newtx/untxsyb.fd | 8 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/newtx/untxsyc.fd | 8 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/newtx/uzmnmia.fd | 8 |
14 files changed, 195 insertions, 102 deletions
diff --git a/Master/texmf-dist/tex/latex/newtx/newtxmath.sty b/Master/texmf-dist/tex/latex/newtx/newtxmath.sty index c34291a2887..6a38ec837c4 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.04} -\def\filedate{2012/09/27} +\def\fileversion{1.05} +\def\filedate{2012/11/10} \ProvidesPackage{newtxmath} [\filedate\space v\fileversion] \@ifundefined{newtxmathLoaded}{}{\endinput} @@ -30,10 +30,12 @@ \noexpand\setkeys{ntxmath}{\CurrentOption}}% \x} \DeclareOption{varg}{\def\X@s@v@rg{}} +\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 \tx@symbolsCtrue \newif\iftx@altnu +\newif\iftx@largelibfigs \newif\iftx@minion \newif\iftx@libaltvw \DeclareOption{varbb}{\tx@varbbtrue} \DeclareOption{vvarbb}{\tx@vvarbbtrue} @@ -48,18 +50,20 @@ \DeclareOption{uprightGreek}{\tx@slantedGfalse} \DeclareOption{slantedGreek}{\tx@slantedGtrue} \DeclareOption{altnu}{\tx@altnutrue} +\DeclareOption{largelibfigs}{\tx@largelibfigstrue} \ExecuteOptions{% amssymbols,uprightGreek} \ProcessOptions* + % No varg option with option libertine or option minion \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 -% altnu valid only with libertine -\iftx@libertine\else\tx@altnufalse\fi +% altnu and largelibfigs valid only with libertine +\iftx@libertine\else\tx@altnufalse\tx@largelibfigsfalse\fi % Use existing text fonts for operators, mathrm, etc \DeclareSymbolFont{operators}{\encodingdefault}{\rmdefault}{m}{n} \iftx@libertine - \SetSymbolFont{operators}{bold}{\encodingdefault}{\rmdefault}{z}{n} + \SetSymbolFont{operators}{bold}{\encodingdefault}{\rmdefault}{sb}{n} \else \SetSymbolFont{operators}{bold}{\encodingdefault}{\rmdefault}{b}{n} \fi @@ -70,8 +74,8 @@ amssymbols,uprightGreek} \DeclareMathAlphabet{\mathtt}{\encodingdefault}{\ttdefault}{m}{n} \DeclareSymbolFontAlphabet{\mathrm}{operators} \iftx@libertine - \DeclareMathAlphabet{\mathbf}{\encodingdefault}{\rmdefault}{z}{n} - \SetMathAlphabet{\mathit}{bold}{\encodingdefault}{\rmdefault}{z}{it} + \DeclareMathAlphabet{\mathbf}{\encodingdefault}{\rmdefault}{sb}{n} + \SetMathAlphabet{\mathit}{bold}{\encodingdefault}{\rmdefault}{sb}{it} \else \DeclareMathAlphabet{\mathbf}{\encodingdefault}{\rmdefault}{b}{n} \SetMathAlphabet{\mathit}{bold}{\encodingdefault}{\rmdefault}{b}{it} @@ -194,6 +198,23 @@ amssymbols,uprightGreek} \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% +} + +\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} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -1252,16 +1273,50 @@ amssymbols,uprightGreek} \mkern-1mu\cleaders\hbox{$\mkern-.5mu\br@cext\mkern-.5mu$}\hfill\mkern-1mu\braceru$} \iftx@libertine% - \DeclareMathSymbol{0}{\mathalpha}{letters}{48} - \DeclareMathSymbol{1}{\mathalpha}{letters}{49} - \DeclareMathSymbol{2}{\mathalpha}{letters}{50} - \DeclareMathSymbol{3}{\mathalpha}{letters}{51} - \DeclareMathSymbol{4}{\mathalpha}{letters}{52} - \DeclareMathSymbol{5}{\mathalpha}{letters}{53} - \DeclareMathSymbol{6}{\mathalpha}{letters}{54} - \DeclareMathSymbol{7}{\mathalpha}{letters}{55} - \DeclareMathSymbol{8}{\mathalpha}{letters}{56} - \DeclareMathSymbol{9}{\mathalpha}{letters}{57} + \iftx@largelibfigs% + \DeclareMathSymbol{0}{\mathalpha}{lettersA}{155} + \DeclareMathSymbol{1}{\mathalpha}{lettersA}{156} + \DeclareMathSymbol{2}{\mathalpha}{lettersA}{157} + \DeclareMathSymbol{3}{\mathalpha}{lettersA}{158} + \DeclareMathSymbol{4}{\mathalpha}{lettersA}{159} + \DeclareMathSymbol{5}{\mathalpha}{lettersA}{160} + \DeclareMathSymbol{6}{\mathalpha}{lettersA}{161} + \DeclareMathSymbol{7}{\mathalpha}{lettersA}{162} + \DeclareMathSymbol{8}{\mathalpha}{lettersA}{163} + \DeclareMathSymbol{9}{\mathalpha}{lettersA}{164} + \else + \DeclareMathSymbol{0}{\mathalpha}{letters}{48} + \DeclareMathSymbol{1}{\mathalpha}{letters}{49} + \DeclareMathSymbol{2}{\mathalpha}{letters}{50} + \DeclareMathSymbol{3}{\mathalpha}{letters}{51} + \DeclareMathSymbol{4}{\mathalpha}{letters}{52} + \DeclareMathSymbol{5}{\mathalpha}{letters}{53} + \DeclareMathSymbol{6}{\mathalpha}{letters}{54} + \DeclareMathSymbol{7}{\mathalpha}{letters}{55} + \DeclareMathSymbol{8}{\mathalpha}{letters}{56} + \DeclareMathSymbol{9}{\mathalpha}{letters}{57} + \fi + \DeclareMathSymbol{\Libzero}{\mathord}{lettersA}{155} + \DeclareMathSymbol{\Libone}{\mathalpha}{lettersA}{156} + \DeclareMathSymbol{\Libtwo}{\mathalpha}{lettersA}{157} + \DeclareMathSymbol{\Libthree}{\mathalpha}{lettersA}{158} + \DeclareMathSymbol{\Libfour}{\mathalpha}{lettersA}{159} + \DeclareMathSymbol{\Libfive}{\mathalpha}{lettersA}{160} + \DeclareMathSymbol{\Libsix}{\mathalpha}{lettersA}{161} + \DeclareMathSymbol{\Libseven}{\mathalpha}{lettersA}{162} + \DeclareMathSymbol{\Libeight}{\mathalpha}{lettersA}{163} + \DeclareMathSymbol{\Libnine}{\mathalpha}{lettersA}{164} +% + \DeclareMathSymbol{\libzero}{\mathalpha}{letters}{48} + \DeclareMathSymbol{\libone}{\mathalpha}{letters}{49} + \DeclareMathSymbol{\libtwo}{\mathalpha}{letters}{50} + \DeclareMathSymbol{\libthree}{\mathalpha}{letters}{51} + \DeclareMathSymbol{\libfour}{\mathalpha}{letters}{52} + \DeclareMathSymbol{\libfive}{\mathalpha}{letters}{53} + \DeclareMathSymbol{\libsix}{\mathalpha}{letters}{54} + \DeclareMathSymbol{\libseven}{\mathalpha}{letters}{55} + \DeclareMathSymbol{\libeight}{\mathalpha}{letters}{56} + \DeclareMathSymbol{\libnine}{\mathalpha}{letters}{57} \fi %%% \not redefined: diff --git a/Master/texmf-dist/tex/latex/newtx/newtxtext.sty b/Master/texmf-dist/tex/latex/newtx/newtxtext.sty index 9ca2877ba35..4c348f4dee4 100644 --- a/Master/texmf-dist/tex/latex/newtx/newtxtext.sty +++ b/Master/texmf-dist/tex/latex/newtx/newtxtext.sty @@ -13,8 +13,8 @@ % Added scaled keyword and osf option; % Modified the definition of \k to bypass problem with grouping; -\def\fileversion{1.03} -\def\filedate{2012/08/13} +\def\fileversion{1.05} +\def\filedate{2012/11/13} \ProvidesPackage{newtxtext}[\filedate\space v\fileversion] \message{`newtxtext' v\fileversion, \filedate\space Text macros based on txfonts (msharpe)} diff --git a/Master/texmf-dist/tex/latex/newtx/omlntxmi.fd b/Master/texmf-dist/tex/latex/newtx/omlntxmi.fd index 51f8dffa953..633c7285f4c 100644 --- a/Master/texmf-dist/tex/latex/newtx/omlntxmi.fd +++ b/Master/texmf-dist/tex/latex/newtx/omlntxmi.fd @@ -7,32 +7,34 @@ [2012/03/22 Fontinst v1.933 font definitions for OML/ntxmi.] \expandafter\ifx\csname ntxmath@scaled\endcsname\relax - \let\ntxmath@scaled\@empty% + \let\ntxmath@@scaled\@empty% +\else + \edef\ntxmath@@scaled{s*[\csname ntxmath@scaled\endcsname]}% \fi \DeclareFontFamily{OML}{ntxmi}{\skewchar\font127 } \ifx\X@s@v@rg\undefined \DeclareFontShape{OML}{ntxmi}{m}{it}{ - <-6.3> \ntxmath@scaled ntxmi5 - <6.3-8.6> \ntxmath@scaled ntxmi7 % from 6.3 up to, but not including, 8.6 - <8.6-> \ntxmath@scaled ntxmi% + <-6.3> \ntxmath@@scaled ntxmi5 + <6.3-8.6> \ntxmath@@scaled ntxmi7 % from 6.3 up to, but not including, 8.6 + <8.6-> \ntxmath@@scaled ntxmi% }{} \DeclareFontShape{OML}{ntxmi}{b}{it}{ - <-6.3> \ntxmath@scaled ntxbmi5 - <6.3-8.6> \ntxmath@scaled ntxbmi7 % from 6.3 up to, but not including, 8.6 - <8.6-> \ntxmath@scaled ntxbmi% + <-6.3> \ntxmath@@scaled ntxbmi5 + <6.3-8.6> \ntxmath@@scaled ntxbmi7 % from 6.3 up to, but not including, 8.6 + <8.6-> \ntxmath@@scaled ntxbmi% }{} \else \DeclareFontShape{OML}{ntxmi}{m}{it}{ - <-6.3> \ntxmath@scaled ntxmi15 - <6.3-8.6> \ntxmath@scaled ntxmi17 % from 6.3 up to, but not including, 8.6 - <8.6-> \ntxmath@scaled ntxmi1% + <-6.3> \ntxmath@@scaled ntxmi15 + <6.3-8.6> \ntxmath@@scaled ntxmi17 % from 6.3 up to, but not including, 8.6 + <8.6-> \ntxmath@@scaled ntxmi1% }{} \DeclareFontShape{OML}{ntxmi}{b}{it}{ - <-6.3> \ntxmath@scaled ntxbmi15 - <6.3-8.6> \ntxmath@scaled ntxbmi17 % from 6.3 up to, but not including, 8.6 - <8.6-> \ntxmath@scaled ntxbmi1% + <-6.3> \ntxmath@@scaled ntxbmi15 + <6.3-8.6> \ntxmath@@scaled ntxbmi17 % from 6.3 up to, but not including, 8.6 + <8.6-> \ntxmath@@scaled ntxbmi1% }{} \fi \DeclareFontShape{OML}{ntxmi}{l}{it}{<->ssub * ntxmi/m/it}{} diff --git a/Master/texmf-dist/tex/latex/newtx/omlnxlmi.fd b/Master/texmf-dist/tex/latex/newtx/omlnxlmi.fd index 3a803cc753d..5fc7b23d757 100644 --- a/Master/texmf-dist/tex/latex/newtx/omlnxlmi.fd +++ b/Master/texmf-dist/tex/latex/newtx/omlnxlmi.fd @@ -8,7 +8,9 @@ [2012/05/19 Fontinst v1.933 font definitions for OML/nxlmi.] \expandafter\ifx\csname ntxmath@scaled\endcsname\relax - \let\ntxmath@scaled\@empty% + \let\ntxmath@@scaled\@empty% +\else + \edef\ntxmath@@scaled{s*[\csname ntxmath@scaled\endcsname]}% \fi \DeclareFontFamily{OML}{nxlmi}{\skewchar \font =127} @@ -16,53 +18,53 @@ \iftx@libaltvw % new v, w \iftx@altnu % new nu \DeclareFontShape{OML}{nxlmi}{m}{it}{ - <-6.3> \ntxmath@scaled nxlmi35 - <6.3-8.6> \ntxmath@scaled nxlmi37 - <8.6-> \ntxmath@scaled nxlmi3 + <-6.3> \ntxmath@@scaled nxlmi35 + <6.3-8.6> \ntxmath@@scaled nxlmi37 + <8.6-> \ntxmath@@scaled nxlmi3 }{} \DeclareFontShape{OML}{nxlmi}{b}{it}{ - <-6.3> \ntxmath@scaled nxlbmi35 - <6.3-8.6> \ntxmath@scaled nxlbmi37 - <8.6-> \ntxmath@scaled nxlbmi3 + <-6.3> \ntxmath@@scaled nxlbmi35 + <6.3-8.6> \ntxmath@@scaled nxlbmi37 + <8.6-> \ntxmath@@scaled nxlbmi3 }{} \else % old nu \DeclareFontShape{OML}{nxlmi}{m}{it}{ - <-6.3> \ntxmath@scaled nxlmi15 - <6.3-8.6> \ntxmath@scaled nxlmi17 - <8.6-> \ntxmath@scaled nxlmi1 + <-6.3> \ntxmath@@scaled nxlmi15 + <6.3-8.6> \ntxmath@@scaled nxlmi17 + <8.6-> \ntxmath@@scaled nxlmi1 }{} \DeclareFontShape{OML}{nxlmi}{b}{it}{ - <-6.3> \ntxmath@scaled nxlbmi15 - <6.3-8.6> \ntxmath@scaled nxlbmi17 - <8.6-> \ntxmath@scaled nxlbmi1 + <-6.3> \ntxmath@@scaled nxlbmi15 + <6.3-8.6> \ntxmath@@scaled nxlbmi17 + <8.6-> \ntxmath@@scaled nxlbmi1 }{} \fi \else % original v, w \iftx@altnu \DeclareFontShape{OML}{nxlmi}{m}{it}{ - <-6.3> \ntxmath@scaled nxlmi25 - <6.3-8.6> \ntxmath@scaled nxlmi27 - <8.6-> \ntxmath@scaled nxlmi2 + <-6.3> \ntxmath@@scaled nxlmi25 + <6.3-8.6> \ntxmath@@scaled nxlmi27 + <8.6-> \ntxmath@@scaled nxlmi2 }{} \DeclareFontShape{OML}{nxlmi}{b}{it}{ - <-6.3> \ntxmath@scaled nxlbmi25 - <6.3-8.6> \ntxmath@scaled nxlbmi27 - <8.6-> \ntxmath@scaled nxlbmi2 + <-6.3> \ntxmath@@scaled nxlbmi25 + <6.3-8.6> \ntxmath@@scaled nxlbmi27 + <8.6-> \ntxmath@@scaled nxlbmi2 }{} \else \DeclareFontShape{OML}{nxlmi}{m}{it}{ - <-6.3> \ntxmath@scaled nxlmi5 - <6.3-8.6> \ntxmath@scaled nxlmi7 - <8.6-> \ntxmath@scaled nxlmi + <-6.3> \ntxmath@@scaled nxlmi5 + <6.3-8.6> \ntxmath@@scaled nxlmi7 + <8.6-> \ntxmath@@scaled nxlmi }{} \DeclareFontShape{OML}{nxlmi}{b}{it}{ - <-6.3> \ntxmath@scaled nxlbmi5 - <6.3-8.6> \ntxmath@scaled nxlbmi7 - <8.6-> \ntxmath@scaled nxlbmi + <-6.3> \ntxmath@@scaled nxlbmi5 + <6.3-8.6> \ntxmath@@scaled nxlbmi7 + <8.6-> \ntxmath@@scaled nxlbmi }{} \fi \fi diff --git a/Master/texmf-dist/tex/latex/newtx/omlzmnmi.fd b/Master/texmf-dist/tex/latex/newtx/omlzmnmi.fd index 6428aeee1b6..223c2e8d2b3 100644 --- a/Master/texmf-dist/tex/latex/newtx/omlzmnmi.fd +++ b/Master/texmf-dist/tex/latex/newtx/omlzmnmi.fd @@ -8,17 +8,19 @@ [2012/06/23 Fontinst v1.933 font definitions for OML/zmnmi.] \expandafter\ifx\csname ntxmath@scaled\endcsname\relax - \let\ntxmath@scaled\@empty% + \let\ntxmath@@scaled\@empty% +\else + \edef\ntxmath@@scaled{s*[\csname ntxmath@scaled\endcsname]}% \fi \DeclareFontFamily{OML}{zmnmi}{\skewchar \font =127} \DeclareFontShape{OML}{zmnmi}{m}{it}{ - <-> \ntxmath@scaled zmnmi + <-> \ntxmath@@scaled zmnmi }{} \DeclareFontShape{OML}{zmnmi}{b}{it}{ - <-> \ntxmath@scaled zmnbmi + <-> \ntxmath@@scaled zmnbmi }{} \DeclareFontShape{OML}{zmnmi}{m}{sl}{<->ssub * zmnmi/m/it}{} diff --git a/Master/texmf-dist/tex/latex/newtx/omsntxsy.fd b/Master/texmf-dist/tex/latex/newtx/omsntxsy.fd index 1c963021199..70179ab9310 100644 --- a/Master/texmf-dist/tex/latex/newtx/omsntxsy.fd +++ b/Master/texmf-dist/tex/latex/newtx/omsntxsy.fd @@ -1,29 +1,45 @@ %Filename: omsntxsy.fd -%Created by: tex sy-drv +%Created by: tex tx-sy-drv %Created using fontinst v1.933 %THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY \ProvidesFile{omsntxsy.fd} - [2012/04/10 Fontinst v1.933 font definitions for OMS/ntxsy.] + [2012/11/14 Fontinst v1.933 font definitions for OMS/ntxsy.] \expandafter\ifx\csname ntxmath@scaled\endcsname\relax - \let\ntxmath@scaled\@empty% + \let\ntxmath@@scaled\@empty% +\else + \edef\ntxmath@@scaled{s*[\csname ntxmath@scaled\endcsname]}% \fi \DeclareFontFamily{OMS}{ntxsy}{\skewchar \font =120} -\DeclareFontShape{OMS}{ntxsy}{m}{n}{ - <-6.3> \ntxmath@scaled ntxsy5 - <6.3-8.6> \ntxmath@scaled ntxsy7 % from 6.3 up to, but not including, 8.6 - <8.6-> \ntxmath@scaled ntxsy -}{} - -\DeclareFontShape{OMS}{ntxsy}{b}{n}{ - <-6.3> \ntxmath@scaled ntxbsy5 - <6.3-8.6> \ntxmath@scaled ntxbsy7 - <-> \ntxmath@scaled ntxbsy -}{} +\iftx@libertine + \DeclareFontShape{OMS}{ntxsy}{m}{n}{ + <-6.3> \ntxmath@@scaled nxlsy5 + <6.3-8.6> \ntxmath@@scaled nxlsy7 + <8.6-> \ntxmath@@scaled ntxsy + }{} + + \DeclareFontShape{OMS}{ntxsy}{b}{n}{ + <-6.3> \ntxmath@@scaled nxlbsy5 + <6.3-8.6> \ntxmath@@scaled nxlbsy7 + <8.6-> \ntxmath@@scaled ntxbsy + }{} +\else + \DeclareFontShape{OMS}{ntxsy}{m}{n}{ + <-6.3> \ntxmath@@scaled ntxsy5 + <6.3-8.6> \ntxmath@@scaled ntxsy7 % from 6.3 up to, but not including, 8.6 + <8.6-> \ntxmath@@scaled ntxsy + }{} + + \DeclareFontShape{OMS}{ntxsy}{b}{n}{ + <-6.3> \ntxmath@@scaled ntxbsy5 + <6.3-8.6> \ntxmath@@scaled ntxbsy7 + <8.6-> \ntxmath@@scaled ntxbsy + }{} +\fi \DeclareFontShape{OMS}{ntxsy}{bx}{n}{<->ssub * ntxsy/b/n}{} diff --git a/Master/texmf-dist/tex/latex/newtx/omxntxex.fd b/Master/texmf-dist/tex/latex/newtx/omxntxex.fd index 413b59ba21a..b619f508688 100644 --- a/Master/texmf-dist/tex/latex/newtx/omxntxex.fd +++ b/Master/texmf-dist/tex/latex/newtx/omxntxex.fd @@ -8,17 +8,19 @@ [2012/04/18 Fontinst v1.933 font definitions for OMX/ntxex.] \expandafter\ifx\csname ntxmath@scaled\endcsname\relax - \let\ntxmath@scaled\@empty% + \let\ntxmath@@scaled\@empty% +\else + \edef\ntxmath@@scaled{s*[\csname ntxmath@scaled\endcsname]}% \fi \DeclareFontFamily{OMX}{ntxex}{} \DeclareFontShape{OMX}{ntxex}{m}{n}{ - <-> \ntxmath@scaled ntxex + <-> \ntxmath@@scaled ntxex }{} \DeclareFontShape{OMX}{ntxex}{b}{n}{ - <-> \ntxmath@scaled ntxbex + <-> \ntxmath@@scaled ntxbex }{} \DeclareFontShape{OMX}{ntxex}{bx}{n}{<->ssub * ntxex/b/n}{} diff --git a/Master/texmf-dist/tex/latex/newtx/omxntxexv.fd b/Master/texmf-dist/tex/latex/newtx/omxntxexv.fd index 6a71aef220b..cfdc758052d 100644 --- a/Master/texmf-dist/tex/latex/newtx/omxntxexv.fd +++ b/Master/texmf-dist/tex/latex/newtx/omxntxexv.fd @@ -8,17 +8,19 @@ [2012/04/29 Fontinst v1.933 font definitions for OMX/ntxexv.] \expandafter\ifx\csname ntxmath@scaled\endcsname\relax - \let\ntxmath@scaled\@empty% + \let\ntxmath@@scaled\@empty% +\else + \edef\ntxmath@@scaled{s*[\csname ntxmath@scaled\endcsname]}% \fi \DeclareFontFamily{OMX}{ntxexv}{} \DeclareFontShape{OMX}{ntxexv}{m}{n}{ - <-> \ntxmath@scaled ntxexv + <-> \ntxmath@@scaled ntxexv }{} \DeclareFontShape{OMX}{ntxexv}{b}{n}{ - <-> \ntxmath@scaled ntxbexv + <-> \ntxmath@@scaled ntxbexv }{} \DeclareFontShape{OMX}{ntxexv}{bx}{n}{<->ssub * ntxexv/b/n}{} diff --git a/Master/texmf-dist/tex/latex/newtx/untxexa.fd b/Master/texmf-dist/tex/latex/newtx/untxexa.fd index 27efa97e1a3..cd158fbd43c 100644 --- a/Master/texmf-dist/tex/latex/newtx/untxexa.fd +++ b/Master/texmf-dist/tex/latex/newtx/untxexa.fd @@ -8,17 +8,19 @@ [2012/04/16 Fontinst v1.933 font definitions for U/ntxexa.] \expandafter\ifx\csname ntxmath@scaled\endcsname\relax - \let\ntxmath@scaled\@empty% + \let\ntxmath@@scaled\@empty% +\else + \edef\ntxmath@@scaled{s*[\csname ntxmath@scaled\endcsname]}% \fi \DeclareFontFamily{U}{ntxexa}{} \DeclareFontShape{U}{ntxexa}{m}{n}{ - <-> \ntxmath@scaled ntxexa + <-> \ntxmath@@scaled ntxexa }{} \DeclareFontShape{U}{ntxexa}{b}{n}{ - <-> \ntxmath@scaled ntxbexa + <-> \ntxmath@@scaled ntxbexa }{} \DeclareFontShape{U}{ntxexa}{bx}{n}{<->ssub * ntxexa/b/n}{} diff --git a/Master/texmf-dist/tex/latex/newtx/untxmia.fd b/Master/texmf-dist/tex/latex/newtx/untxmia.fd index ab1d2ba1bbf..6ddbf5df909 100644 --- a/Master/texmf-dist/tex/latex/newtx/untxmia.fd +++ b/Master/texmf-dist/tex/latex/newtx/untxmia.fd @@ -8,35 +8,37 @@ [2012/04/16 Fontinst v1.933 font definitions for U/ntxmia.] \expandafter\ifx\csname ntxmath@scaled\endcsname\relax - \let\ntxmath@scaled\@empty% + \let\ntxmath@@scaled\@empty% +\else + \edef\ntxmath@@scaled{s*[\csname ntxmath@scaled\endcsname]}% \fi \DeclareFontFamily{U}{ntxmia}{\skewchar \font =127} \iftx@libertine \DeclareFontShape{U}{ntxmia}{m}{it}{ - <-> \ntxmath@scaled nxlmia + <-> \ntxmath@@scaled nxlmia }{} \DeclareFontShape{U}{ntxmia}{b}{it}{ - <-> \ntxmath@scaled nxlbmia + <-> \ntxmath@@scaled nxlbmia }{} \else \iftx@minion \DeclareFontShape{U}{ntxmia}{m}{it}{ - <-> \ntxmath@scaled zmnmia + <-> \ntxmath@@scaled zmnmia }{} \DeclareFontShape{U}{ntxmia}{b}{it}{ - <-> \ntxmath@scaled zmnbmia + <-> \ntxmath@@scaled zmnbmia }{} \else \DeclareFontShape{U}{ntxmia}{m}{it}{ - <-> \ntxmath@scaled ntxmia + <-> \ntxmath@@scaled ntxmia }{} \DeclareFontShape{U}{ntxmia}{b}{it}{ - <-> \ntxmath@scaled ntxbmia + <-> \ntxmath@@scaled ntxbmia }{} \fi \fi diff --git a/Master/texmf-dist/tex/latex/newtx/untxsya.fd b/Master/texmf-dist/tex/latex/newtx/untxsya.fd index 38997f1e611..79e8a73b794 100644 --- a/Master/texmf-dist/tex/latex/newtx/untxsya.fd +++ b/Master/texmf-dist/tex/latex/newtx/untxsya.fd @@ -8,17 +8,19 @@ [2012/04/12 Fontinst v1.933 font definitions for U/ntxsya.] \expandafter\ifx\csname ntxmath@scaled\endcsname\relax - \let\ntxmath@scaled\@empty% + \let\ntxmath@@scaled\@empty% +\else + \edef\ntxmath@@scaled{s*[\csname ntxmath@scaled\endcsname]}% \fi \DeclareFontFamily{U}{ntxsya}{} \DeclareFontShape{U}{ntxsya}{m}{n}{ - <-> \ntxmath@scaled ntxsya + <-> \ntxmath@@scaled ntxsya }{} \DeclareFontShape{U}{ntxsya}{b}{n}{ - <-> \ntxmath@scaled ntxbsya + <-> \ntxmath@@scaled ntxbsya }{} \DeclareFontShape{U}{ntxsya}{bx}{n}{<->ssub * ntxsya/b/n}{} diff --git a/Master/texmf-dist/tex/latex/newtx/untxsyb.fd b/Master/texmf-dist/tex/latex/newtx/untxsyb.fd index fab9938fc4c..77e8ff311fc 100644 --- a/Master/texmf-dist/tex/latex/newtx/untxsyb.fd +++ b/Master/texmf-dist/tex/latex/newtx/untxsyb.fd @@ -8,17 +8,19 @@ [2012/04/12 Fontinst v1.933 font definitions for U/ntxsyb.] \expandafter\ifx\csname ntxmath@scaled\endcsname\relax - \let\ntxmath@scaled\@empty% + \let\ntxmath@@scaled\@empty% +\else + \edef\ntxmath@@scaled{s*[\csname ntxmath@scaled\endcsname]}% \fi \DeclareFontFamily{U}{ntxsyb}{} \DeclareFontShape{U}{ntxsyb}{m}{n}{ - <-> \ntxmath@scaled ntxsyb + <-> \ntxmath@@scaled ntxsyb }{} \DeclareFontShape{U}{ntxsyb}{b}{n}{ - <-> \ntxmath@scaled ntxbsyb + <-> \ntxmath@@scaled ntxbsyb }{} \DeclareFontShape{U}{ntxsyb}{bx}{n}{<->ssub * ntxsyb/b/n}{} diff --git a/Master/texmf-dist/tex/latex/newtx/untxsyc.fd b/Master/texmf-dist/tex/latex/newtx/untxsyc.fd index 76f4cc9271c..c96d992e8ab 100644 --- a/Master/texmf-dist/tex/latex/newtx/untxsyc.fd +++ b/Master/texmf-dist/tex/latex/newtx/untxsyc.fd @@ -8,17 +8,19 @@ [2012/04/12 Fontinst v1.933 font definitions for U/ntxsyc.] \expandafter\ifx\csname ntxmath@scaled\endcsname\relax - \let\ntxmath@scaled\@empty% + \let\ntxmath@@scaled\@empty% +\else + \edef\ntxmath@@scaled{s*[\csname ntxmath@scaled\endcsname]}% \fi \DeclareFontFamily{U}{ntxsyc}{} \DeclareFontShape{U}{ntxsyc}{m}{n}{ - <-> \ntxmath@scaled ntxsyc + <-> \ntxmath@@scaled ntxsyc }{} \DeclareFontShape{U}{ntxsyc}{b}{n}{ - <-> \ntxmath@scaled ntxbsyc + <-> \ntxmath@@scaled ntxbsyc }{} \DeclareFontShape{U}{ntxsyc}{bx}{n}{<->ssub * ntxsyc/b/n}{} diff --git a/Master/texmf-dist/tex/latex/newtx/uzmnmia.fd b/Master/texmf-dist/tex/latex/newtx/uzmnmia.fd index 5ffaa9358c2..ebc01d14576 100644 --- a/Master/texmf-dist/tex/latex/newtx/uzmnmia.fd +++ b/Master/texmf-dist/tex/latex/newtx/uzmnmia.fd @@ -8,17 +8,19 @@ [2012/06/23 Fontinst v1.933 font definitions for U/zmnmia.] \expandafter\ifx\csname ntxmath@scaled\endcsname\relax - \let\ntxmath@scaled\@empty% + \let\ntxmath@@scaled\@empty% +\else + \edef\ntxmath@@scaled{s*[\csname ntxmath@scaled\endcsname]}% \fi \DeclareFontFamily{U}{zmnmia}{\skewchar \font =127} \DeclareFontShape{U}{zmnmia}{m}{it}{ - <-> \ntxmath@scaled zmnmia + <-> \ntxmath@@scaled zmnmia }{} \DeclareFontShape{U}{zmnmia}{b}{it}{ - <-> \ntxmath@scaled zmnbmia + <-> \ntxmath@@scaled zmnbmia }{} \DeclareFontShape{U}{zmnmia}{m}{sl}{<->ssub * zmnmia/m/it}{} |