diff options
33 files changed, 208 insertions, 115 deletions
diff --git a/Master/texmf-dist/doc/fonts/newtx/README b/Master/texmf-dist/doc/fonts/newtx/README index b1f1ec9511f..55b220ce7b3 100644 --- a/Master/texmf-dist/doc/fonts/newtx/README +++ b/Master/texmf-dist/doc/fonts/newtx/README @@ -1,9 +1,13 @@ This package, based on txfonts, provides many fixes and enhancements to the txfonts package, splitting it into two separate packages---newtxtext and newtxmath, which may be run independently of one another. It provides scaling, improved metrics, and other options. In particular, newtxmath offers a libertine option which substitutes Linux Libertine (provided with TeXLive and MikTeX) italic and Greek letters for the default Times letters, providing a good match for the Libertine text font, which is heavier than Computer Modern but lighter than Times, and in my experience, looks very sharp and clear on the screen. -Current version: 1.12 +Current version: 1.13 This material is subject to the LaTeX Project Public License. See http://www.ctan.org/tex-archive/help/Catalogue/licenses.lppl.html for the details of that license. +Changes in version 1.13 +1. Provides alternate versions of some math symbols. See newtxdoc.pdf for details. +2. Corrected behavior of scaled in newtxmath. + Changes in version 1.12: 1. Changed newtxtext.sty so that Helvetica is scaled by .9 times newtx scale in all cases. diff --git a/Master/texmf-dist/doc/fonts/newtx/newtxdoc.pdf b/Master/texmf-dist/doc/fonts/newtx/newtxdoc.pdf Binary files differindex c88761e78ef..62c5daa6ad7 100644 --- a/Master/texmf-dist/doc/fonts/newtx/newtxdoc.pdf +++ b/Master/texmf-dist/doc/fonts/newtx/newtxdoc.pdf diff --git a/Master/texmf-dist/doc/fonts/newtx/newtxdoc.tex b/Master/texmf-dist/doc/fonts/newtx/newtxdoc.tex index 3f70d6e344d..844f24d599e 100644 --- a/Master/texmf-dist/doc/fonts/newtx/newtxdoc.tex +++ b/Master/texmf-dist/doc/fonts/newtx/newtxdoc.tex @@ -88,7 +88,7 @@ allows you to use the forms \verb|\iint|, \verb|\iiint|, \verb|\iiiint| and \ver \item {\tt libaltvw} has effect only if the libertine option is selected---in this case, it substitutes for math italic v and w hand-crafted versions based on the Libertine upsilon glyphs. \item {largelibfigs} has effect only if the libertine option is selected---with this option, full-sized figures are substituted in math mode for the default Libertine figures, which are about 8\% below Libertine's Capheight. \end{itemize} -\textbf{IMPORTANT:} The Libertine text package is now once again {\tt libertine}, and requires arguments that are different from the original {\tt libertine} package. +\textbf{IMPORTANT:} The Libertine text package is now once again named {\tt libertine}, but requires arguments that are different from the original {\tt libertine} package. \textsc{Example 1:} \begin{verbatim} @@ -109,8 +109,8 @@ allows you to use the forms \verb|\iint|, \verb|\iiint|, \verb|\iiiint| and \ver \usepackage[libertine,cmintegrals,cmbraces,vvmathbb]{newtxmath} \usepackage[scr=rsfso]{mathalfa} \usepackage{bm}% load after all math to give access to bold math -%After loading math package, switch to osf in text -%The following 4 lines are required. This is not so obvious +%After loading math package, switch to osf in text, for which +% the following 4 lines are required. This is not so obvious. \makeatletter \def\libertine@figurestyle{OsF} %affects \libertine macro \makeatother @@ -118,6 +118,25 @@ allows you to use the forms \verb|\iint|, \verb|\iiint|, \verb|\iiiint| and \ver \end{verbatim} \textbf{Caution:} In encodings {\tt T1} and {\tt LY1}, the macro \verb|\mathrm| does not produce what you might expect for Greek letters, due to the difference between those encodings and {\tt OT1}. But what were you expecting with \verb|\mathrm{Gamma}| anyway? In {\tt T1} and {\tt LY1}, you'll get a math accent. +\section{Alternate forms of glyphs} +Several math glyphs have alternate forms: +\begin{center} + \begin{tabular}{@{} llll @{}} + \hline + Command & Result & Alternate Commands & Alternate Forms\\ + \hline + \verb|\emptyset| & $\emptyset$ & \verb|\varnothing, \emptysetAlt|& $\varnothing, \emptysetAlt$ \\ + \verb|\forall| & $\forall$ & \verb|\forallAlt| & $\forallAlt$ \\ + \verb|\exists| & $\exists$ & \verb|\existsAlt| & $\existsAlt$ \\ + \verb|\nexists| & $\nexists$ & \verb|\nexistsAlt| & $\nexistsAlt$ \\ + \hline + \end{tabular} +\end{center} +You should be aware that using \verb|\varnothing| requires loading AMSb.\\ +To use an alternate form throughout your document without changing all occurrencesvof the usual command, insert something like the following in your preamble after loading \texttt{newtxmath}: +\begin{verbatim} +\let\forall\forallAlt +\end{verbatim} \section{The {\tt minion} option} This option allows the use of MinionPro as math letters (Latin and Greek) within the math font, but there are some caveats: \begin{itemize} diff --git a/Master/texmf-dist/fonts/enc/dvips/newtx/ntxmiaalt.enc b/Master/texmf-dist/fonts/enc/dvips/newtx/ntxmiaalt.enc new file mode 100644 index 00000000000..6f405417550 --- /dev/null +++ b/Master/texmf-dist/fonts/enc/dvips/newtx/ntxmiaalt.enc @@ -0,0 +1,86 @@ +% File ntxmiaalt.enc +% +% Encodes alternative glyphs in ntx[b]mia. +/ntxmiaaltEncoding [ +% 0x00 + /.notdef /.notdef /.notdef /.notdef + /.notdef /.notdef /.notdef /.notdef + /.notdef /.notdef /.notdef /.notdef + /.notdef /.notdef /.notdef /.notdef +% 0x10 + /.notdef /.notdef /.notdef /.notdef + /.notdef /.notdef /.notdef /.notdef + /.notdef /.notdef /.notdef /.notdef + /.notdef /.notdef /.notdef /.notdef +% 0x20 + /.notdef /.notdef /.notdef /.notdef + /.notdef /.notdef /.notdef /.notdef + /.notdef /.notdef /.notdef /.notdef + /.notdef /.notdef /.notdef /.notdef +% 0x30 + /.notdef /.notdef /.notdef /.notdef + /.notdef /.notdef /.notdef /.notdef + /universal /existential /nexists /emptyset + /.notdef /.notdef /.notdef /.notdef +% 0x40 + /.notdef /.notdef /.notdef /.notdef + /.notdef /.notdef /.notdef /.notdef + /.notdef /.notdef /.notdef /.notdef + /.notdef /.notdef /.notdef /.notdef + % 0x50 + /.notdef /.notdef /.notdef /.notdef + /.notdef /.notdef /.notdef /.notdef + /.notdef /.notdef /.notdef /.notdef + /.notdef /.notdef /.notdef /.notdef +% 0x60 +/.notdef /.notdef /.notdef /.notdef +/.notdef /.notdef /.notdef /.notdef +/.notdef /.notdef /.notdef /.notdef +/.notdef /.notdef /.notdef /.notdef +% 0x70 +/.notdef /.notdef /.notdef /.notdef +/.notdef /.notdef /.notdef /.notdef +/.notdef /.notdef /.notdef /.notdef +/.notdef /.notdef /.notdef /.notdef +% 0x80 + /.notdef /.notdef /.notdef /.notdef + /.notdef /.notdef /.notdef /.notdef + /.notdef /.notdef /.notdef /.notdef + /.notdef /.notdef /.notdef /.notdef +% 0x90 + /.notdef /.notdef /.notdef /.notdef + /.notdef /.notdef /.notdef /.notdef + /.notdef /.notdef /.notdef /.notdef + /.notdef /.notdef /.notdef /.notdef +% 0xA0 + /.notdef /.notdef /.notdef /.notdef + /.notdef /.notdef /.notdef /.notdef + /.notdef /.notdef /.notdef /.notdef + /.notdef /.notdef /.notdef /.notdef +% 0xB0 + /.notdef /.notdef /.notdef /.notdef + /.notdef /.notdef /.notdef /.notdef + /.notdef /.notdef /.notdef /.notdef + /.notdef /.notdef /.notdef /.notdef +% 0xC0 + /.notdef /.notdef /.notdef /.notdef + /.notdef /.notdef /.notdef /.notdef + /.notdef /.notdef /.notdef /.notdef + /.notdef /.notdef /.notdef /.notdef +% 0xD0 + /.notdef /.notdef /.notdef /.notdef + /.notdef /.notdef /.notdef /.notdef + /.notdef /.notdef /.notdef /.notdef + /.notdef /.notdef /.notdef /.notdef +% 0xE0 + /.notdef /.notdef /.notdef /.notdef + /.notdef /.notdef /.notdef /.notdef + /.notdef /.notdef /.notdef /.notdef + /.notdef /.notdef /.notdef /.notdef +% 0xF0 + /.notdef /.notdef /.notdef /.notdef + /.notdef /.notdef /.notdef /.notdef + /.notdef /.notdef /.notdef /.notdef + /.notdef /.notdef /.notdef /.notdef +] def + diff --git a/Master/texmf-dist/fonts/map/dvips/newtx/newtx.map b/Master/texmf-dist/fonts/map/dvips/newtx/newtx.map index 8710b10d439..5b61ddd43dc 100644 --- a/Master/texmf-dist/fonts/map/dvips/newtx/newtx.map +++ b/Master/texmf-dist/fonts/map/dvips/newtx/newtx.map @@ -88,3 +88,5 @@ ly1-ntxrc-osf TeXGyreTermes-Regular " encqtexnansisc ReEncodeFont " <[q-texnansi ly1-ntxbc-osf TeXGyreTermes-Bold " encqtexnansisc ReEncodeFont " <[q-texnansi-sc.enc <qtmb.pfb txex-bar txex-bar <txex-bar.pfb txbex-bar txbex-bar <txbex-bar.pfb +ntxsyralt ntxsyralt " ntxmiaaltEncoding ReEncodeFont " <[ntxmiaalt.enc <ntxsyralt.pfb +ntxsybalt ntxsybalt " ntxmiaaltEncoding ReEncodeFont " <[ntxmiaalt.enc <ntxsybalt.pfb diff --git a/Master/texmf-dist/fonts/tfm/public/newtx/ntxbmia.tfm b/Master/texmf-dist/fonts/tfm/public/newtx/ntxbmia.tfm Binary files differindex d76a14a4a5c..8878282b3e7 100644 --- a/Master/texmf-dist/fonts/tfm/public/newtx/ntxbmia.tfm +++ b/Master/texmf-dist/fonts/tfm/public/newtx/ntxbmia.tfm diff --git a/Master/texmf-dist/fonts/tfm/public/newtx/ntxmi1.tfm b/Master/texmf-dist/fonts/tfm/public/newtx/ntxmi1.tfm Binary files differindex 3689fe623a7..cfcee591ac4 100644 --- a/Master/texmf-dist/fonts/tfm/public/newtx/ntxmi1.tfm +++ b/Master/texmf-dist/fonts/tfm/public/newtx/ntxmi1.tfm diff --git a/Master/texmf-dist/fonts/tfm/public/newtx/ntxmia.tfm b/Master/texmf-dist/fonts/tfm/public/newtx/ntxmia.tfm Binary files differindex ec7f8900177..316440d7dcd 100644 --- a/Master/texmf-dist/fonts/tfm/public/newtx/ntxmia.tfm +++ b/Master/texmf-dist/fonts/tfm/public/newtx/ntxmia.tfm diff --git a/Master/texmf-dist/fonts/tfm/public/newtx/ntxsybalt.tfm b/Master/texmf-dist/fonts/tfm/public/newtx/ntxsybalt.tfm Binary files differnew file mode 100644 index 00000000000..04f5ece002d --- /dev/null +++ b/Master/texmf-dist/fonts/tfm/public/newtx/ntxsybalt.tfm diff --git a/Master/texmf-dist/fonts/tfm/public/newtx/ntxsyralt.tfm b/Master/texmf-dist/fonts/tfm/public/newtx/ntxsyralt.tfm Binary files differnew file mode 100644 index 00000000000..d9b1f188917 --- /dev/null +++ b/Master/texmf-dist/fonts/tfm/public/newtx/ntxsyralt.tfm diff --git a/Master/texmf-dist/fonts/tfm/public/newtx/nxlbmia.tfm b/Master/texmf-dist/fonts/tfm/public/newtx/nxlbmia.tfm Binary files differindex 51235d2b3b8..7d3a1b34ebd 100644 --- a/Master/texmf-dist/fonts/tfm/public/newtx/nxlbmia.tfm +++ b/Master/texmf-dist/fonts/tfm/public/newtx/nxlbmia.tfm diff --git a/Master/texmf-dist/fonts/tfm/public/newtx/nxlmia.tfm b/Master/texmf-dist/fonts/tfm/public/newtx/nxlmia.tfm Binary files differindex 4f5149beb1c..2624ca53bd6 100644 --- a/Master/texmf-dist/fonts/tfm/public/newtx/nxlmia.tfm +++ b/Master/texmf-dist/fonts/tfm/public/newtx/nxlmia.tfm diff --git a/Master/texmf-dist/fonts/type1/public/newtx/ntxsybalt.pfb b/Master/texmf-dist/fonts/type1/public/newtx/ntxsybalt.pfb Binary files differnew file mode 100644 index 00000000000..18704be8f7d --- /dev/null +++ b/Master/texmf-dist/fonts/type1/public/newtx/ntxsybalt.pfb diff --git a/Master/texmf-dist/fonts/type1/public/newtx/ntxsyralt.pfb b/Master/texmf-dist/fonts/type1/public/newtx/ntxsyralt.pfb Binary files differnew file mode 100644 index 00000000000..293b18ae65b --- /dev/null +++ b/Master/texmf-dist/fonts/type1/public/newtx/ntxsyralt.pfb diff --git a/Master/texmf-dist/fonts/vf/public/newtx/ntxbmia.vf b/Master/texmf-dist/fonts/vf/public/newtx/ntxbmia.vf Binary files differindex b3e08c3eb5f..bd684d10b36 100644 --- a/Master/texmf-dist/fonts/vf/public/newtx/ntxbmia.vf +++ b/Master/texmf-dist/fonts/vf/public/newtx/ntxbmia.vf diff --git a/Master/texmf-dist/fonts/vf/public/newtx/ntxmi1.vf b/Master/texmf-dist/fonts/vf/public/newtx/ntxmi1.vf Binary files differindex 188a68d843a..b22a36d3506 100644 --- a/Master/texmf-dist/fonts/vf/public/newtx/ntxmi1.vf +++ b/Master/texmf-dist/fonts/vf/public/newtx/ntxmi1.vf diff --git a/Master/texmf-dist/fonts/vf/public/newtx/ntxmia.vf b/Master/texmf-dist/fonts/vf/public/newtx/ntxmia.vf Binary files differindex 10f86d8bb93..2915c7985d7 100644 --- a/Master/texmf-dist/fonts/vf/public/newtx/ntxmia.vf +++ b/Master/texmf-dist/fonts/vf/public/newtx/ntxmia.vf diff --git a/Master/texmf-dist/fonts/vf/public/newtx/nxlbmia.vf b/Master/texmf-dist/fonts/vf/public/newtx/nxlbmia.vf Binary files differindex 34bf66fccb5..bc45373c7ab 100644 --- a/Master/texmf-dist/fonts/vf/public/newtx/nxlbmia.vf +++ b/Master/texmf-dist/fonts/vf/public/newtx/nxlbmia.vf diff --git a/Master/texmf-dist/fonts/vf/public/newtx/nxlmia.vf b/Master/texmf-dist/fonts/vf/public/newtx/nxlmia.vf Binary files differindex ff99dcdc048..5e506505beb 100644 --- a/Master/texmf-dist/fonts/vf/public/newtx/nxlmia.vf +++ b/Master/texmf-dist/fonts/vf/public/newtx/nxlmia.vf diff --git a/Master/texmf-dist/tex/latex/newtx/newtxmath.sty b/Master/texmf-dist/tex/latex/newtx/newtxmath.sty index 0877192af26..db0b4186c3b 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.11} -\def\filedate{2013/05/25} +\def\fileversion{1.13} +\def\filedate{2013/08/07} \ProvidesPackage{newtxmath} [\filedate\space v\fileversion] \@ifundefined{newtxmathLoaded}{}{\endinput} @@ -677,7 +677,7 @@ amssymbols,uprightGreek} \re@DeclareMathSymbol{\nLeftrightarrow}{\mathrel}{AMSb}{60} \re@DeclareMathSymbol{\nleftrightarrow}{\mathrel}{AMSb}{61} \re@DeclareMathSymbol{\divideontimes}{\mathbin}{AMSb}{62} -\re@DeclareMathSymbol{\varnothing}{\mathord}{AMSb}{63} +%\re@DeclareMathSymbol{\varnothing}{\mathord}{AMSb}{63} \re@DeclareMathSymbol{\nexists}{\mathord}{AMSb}{64} \re@DeclareMathSymbol{\Finv}{\mathord}{AMSb}{96} \re@DeclareMathSymbol{\Game}{\mathord}{AMSb}{97} @@ -1060,6 +1060,12 @@ amssymbols,uprightGreek} \re@DeclareMathSymbol{\vary}{\mathord}{lettersA}{50} \re@DeclareMathSymbol{\varv}{\mathord}{lettersA}{51} \re@DeclareMathSymbol{\varw}{\mathord}{lettersA}{52} +\DeclareMathSymbol{\forallAlt}{\mathord}{lettersA}{91}%added 20130726 +\DeclareMathSymbol{\existsAlt}{\mathord}{lettersA}{92}%added 20130726 +\DeclareMathSymbol{\nexistsAlt}{\mathord}{lettersA}{93}%added 20130726 +\DeclareMathSymbol{\emptysetAlt}{\mathord}{lettersA}{94}%added 20130726 +\re@DeclareMathSymbol{\varnothing}{\mathord}{lettersA}{95}%added 20130807 + \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} diff --git a/Master/texmf-dist/tex/latex/newtx/newtxtext.sty b/Master/texmf-dist/tex/latex/newtx/newtxtext.sty index 43c3e65ad2c..0e25b8491c8 100644 --- a/Master/texmf-dist/tex/latex/newtx/newtxtext.sty +++ b/Master/texmf-dist/tex/latex/newtx/newtxtext.sty @@ -26,7 +26,7 @@ \def\ntx@helvscaled{s*[.9]} \define@key{ntx}{scaled}[1.0]{\def\ntx@scaled{s*[#1]}% \@tempdima=#1\p@\@tempdima=.9\@tempdima% -\def\ntx@helvscaled{s*[\strip@pt\@tempdima]}} +\edef\ntx@helvscaled{s*[\strip@pt\@tempdima]}} \DeclareOption*{% \begingroup \edef\x{\endgroup diff --git a/Master/texmf-dist/tex/latex/newtx/omlntxmi.fd b/Master/texmf-dist/tex/latex/newtx/omlntxmi.fd index 633c7285f4c..ba411f516c7 100644 --- a/Master/texmf-dist/tex/latex/newtx/omlntxmi.fd +++ b/Master/texmf-dist/tex/latex/newtx/omlntxmi.fd @@ -7,34 +7,32 @@ [2012/03/22 Fontinst v1.933 font definitions for OML/ntxmi.] \expandafter\ifx\csname ntxmath@scaled\endcsname\relax - \let\ntxmath@@scaled\@empty% -\else - \edef\ntxmath@@scaled{s*[\csname ntxmath@scaled\endcsname]}% + \let\ntxmath@scaled\@empty% \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 5fc7b23d757..3a803cc753d 100644 --- a/Master/texmf-dist/tex/latex/newtx/omlnxlmi.fd +++ b/Master/texmf-dist/tex/latex/newtx/omlnxlmi.fd @@ -8,9 +8,7 @@ [2012/05/19 Fontinst v1.933 font definitions for OML/nxlmi.] \expandafter\ifx\csname ntxmath@scaled\endcsname\relax - \let\ntxmath@@scaled\@empty% -\else - \edef\ntxmath@@scaled{s*[\csname ntxmath@scaled\endcsname]}% + \let\ntxmath@scaled\@empty% \fi \DeclareFontFamily{OML}{nxlmi}{\skewchar \font =127} @@ -18,53 +16,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 223c2e8d2b3..6428aeee1b6 100644 --- a/Master/texmf-dist/tex/latex/newtx/omlzmnmi.fd +++ b/Master/texmf-dist/tex/latex/newtx/omlzmnmi.fd @@ -8,19 +8,17 @@ [2012/06/23 Fontinst v1.933 font definitions for OML/zmnmi.] \expandafter\ifx\csname ntxmath@scaled\endcsname\relax - \let\ntxmath@@scaled\@empty% -\else - \edef\ntxmath@@scaled{s*[\csname ntxmath@scaled\endcsname]}% + \let\ntxmath@scaled\@empty% \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 70179ab9310..815ac594957 100644 --- a/Master/texmf-dist/tex/latex/newtx/omsntxsy.fd +++ b/Master/texmf-dist/tex/latex/newtx/omsntxsy.fd @@ -8,36 +8,34 @@ [2012/11/14 Fontinst v1.933 font definitions for OMS/ntxsy.] \expandafter\ifx\csname ntxmath@scaled\endcsname\relax - \let\ntxmath@@scaled\@empty% -\else - \edef\ntxmath@@scaled{s*[\csname ntxmath@scaled\endcsname]}% + \let\ntxmath@scaled\@empty% \fi \DeclareFontFamily{OMS}{ntxsy}{\skewchar \font =120} \iftx@libertine \DeclareFontShape{OMS}{ntxsy}{m}{n}{ - <-6.3> \ntxmath@@scaled nxlsy5 - <6.3-8.6> \ntxmath@@scaled nxlsy7 - <8.6-> \ntxmath@@scaled ntxsy + <-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 + <-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 + <-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 + <-6.3> \ntxmath@scaled ntxbsy5 + <6.3-8.6> \ntxmath@scaled ntxbsy7 + <8.6-> \ntxmath@scaled ntxbsy }{} \fi diff --git a/Master/texmf-dist/tex/latex/newtx/omxntxex.fd b/Master/texmf-dist/tex/latex/newtx/omxntxex.fd index b619f508688..413b59ba21a 100644 --- a/Master/texmf-dist/tex/latex/newtx/omxntxex.fd +++ b/Master/texmf-dist/tex/latex/newtx/omxntxex.fd @@ -8,19 +8,17 @@ [2012/04/18 Fontinst v1.933 font definitions for OMX/ntxex.] \expandafter\ifx\csname ntxmath@scaled\endcsname\relax - \let\ntxmath@@scaled\@empty% -\else - \edef\ntxmath@@scaled{s*[\csname ntxmath@scaled\endcsname]}% + \let\ntxmath@scaled\@empty% \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 cfdc758052d..6a71aef220b 100644 --- a/Master/texmf-dist/tex/latex/newtx/omxntxexv.fd +++ b/Master/texmf-dist/tex/latex/newtx/omxntxexv.fd @@ -8,19 +8,17 @@ [2012/04/29 Fontinst v1.933 font definitions for OMX/ntxexv.] \expandafter\ifx\csname ntxmath@scaled\endcsname\relax - \let\ntxmath@@scaled\@empty% -\else - \edef\ntxmath@@scaled{s*[\csname ntxmath@scaled\endcsname]}% + \let\ntxmath@scaled\@empty% \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 cd158fbd43c..27efa97e1a3 100644 --- a/Master/texmf-dist/tex/latex/newtx/untxexa.fd +++ b/Master/texmf-dist/tex/latex/newtx/untxexa.fd @@ -8,19 +8,17 @@ [2012/04/16 Fontinst v1.933 font definitions for U/ntxexa.] \expandafter\ifx\csname ntxmath@scaled\endcsname\relax - \let\ntxmath@@scaled\@empty% -\else - \edef\ntxmath@@scaled{s*[\csname ntxmath@scaled\endcsname]}% + \let\ntxmath@scaled\@empty% \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 6ddbf5df909..ab1d2ba1bbf 100644 --- a/Master/texmf-dist/tex/latex/newtx/untxmia.fd +++ b/Master/texmf-dist/tex/latex/newtx/untxmia.fd @@ -8,37 +8,35 @@ [2012/04/16 Fontinst v1.933 font definitions for U/ntxmia.] \expandafter\ifx\csname ntxmath@scaled\endcsname\relax - \let\ntxmath@@scaled\@empty% -\else - \edef\ntxmath@@scaled{s*[\csname ntxmath@scaled\endcsname]}% + \let\ntxmath@scaled\@empty% \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 79e8a73b794..38997f1e611 100644 --- a/Master/texmf-dist/tex/latex/newtx/untxsya.fd +++ b/Master/texmf-dist/tex/latex/newtx/untxsya.fd @@ -8,19 +8,17 @@ [2012/04/12 Fontinst v1.933 font definitions for U/ntxsya.] \expandafter\ifx\csname ntxmath@scaled\endcsname\relax - \let\ntxmath@@scaled\@empty% -\else - \edef\ntxmath@@scaled{s*[\csname ntxmath@scaled\endcsname]}% + \let\ntxmath@scaled\@empty% \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 77e8ff311fc..fab9938fc4c 100644 --- a/Master/texmf-dist/tex/latex/newtx/untxsyb.fd +++ b/Master/texmf-dist/tex/latex/newtx/untxsyb.fd @@ -8,19 +8,17 @@ [2012/04/12 Fontinst v1.933 font definitions for U/ntxsyb.] \expandafter\ifx\csname ntxmath@scaled\endcsname\relax - \let\ntxmath@@scaled\@empty% -\else - \edef\ntxmath@@scaled{s*[\csname ntxmath@scaled\endcsname]}% + \let\ntxmath@scaled\@empty% \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 c96d992e8ab..76f4cc9271c 100644 --- a/Master/texmf-dist/tex/latex/newtx/untxsyc.fd +++ b/Master/texmf-dist/tex/latex/newtx/untxsyc.fd @@ -8,19 +8,17 @@ [2012/04/12 Fontinst v1.933 font definitions for U/ntxsyc.] \expandafter\ifx\csname ntxmath@scaled\endcsname\relax - \let\ntxmath@@scaled\@empty% -\else - \edef\ntxmath@@scaled{s*[\csname ntxmath@scaled\endcsname]}% + \let\ntxmath@scaled\@empty% \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 ebc01d14576..5ffaa9358c2 100644 --- a/Master/texmf-dist/tex/latex/newtx/uzmnmia.fd +++ b/Master/texmf-dist/tex/latex/newtx/uzmnmia.fd @@ -8,19 +8,17 @@ [2012/06/23 Fontinst v1.933 font definitions for U/zmnmia.] \expandafter\ifx\csname ntxmath@scaled\endcsname\relax - \let\ntxmath@@scaled\@empty% -\else - \edef\ntxmath@@scaled{s*[\csname ntxmath@scaled\endcsname]}% + \let\ntxmath@scaled\@empty% \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}{} |