From 0506981cdfe86dc9d94f970876f2722a2993665c Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Tue, 22 May 2012 23:06:11 +0000 Subject: newtx 0.93 (22may12) git-svn-id: svn://tug.org/texlive/trunk@26575 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/newtx/newtxmath.sty | 73 +++++++++++++++---------- Master/texmf-dist/tex/latex/newtx/newtxtext.sty | 8 +-- Master/texmf-dist/tex/latex/newtx/omlntxmi.fd | 16 ++++-- Master/texmf-dist/tex/latex/newtx/omlnxlmi.fd | 12 ++-- Master/texmf-dist/tex/latex/newtx/omsntxsy.fd | 6 +- 5 files changed, 73 insertions(+), 42 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 d10356b3e14..02704edebb7 100644 --- a/Master/texmf-dist/tex/latex/newtx/newtxmath.sty +++ b/Master/texmf-dist/tex/latex/newtx/newtxmath.sty @@ -10,16 +10,16 @@ % of glyph collisions. % These modifications are by Michael Sharpe, msharpe at ucsd dot edu -\def\fileversion{0.92} -\def\filedate{2012/05/09} -\ProvidesPackage{ntxmath} +\def\fileversion{0.93} +\def\filedate{2012/05/19} +\ProvidesPackage{newtxmath} [\filedate\space v\fileversion] \@ifundefined{ntxmathLoaded}{}{\endinput} -\message{`ntxmath' v\fileversion, \filedate\space Math macros based on txfonts (msharpe)} +\message{`newtxmath' v\fileversion, \filedate\space Math macros based on txfonts (msharpe)} -\csname ntxmathLoaded\endcsname -\let\ntxmathLoaded\endinput +\csname newtxmathLoaded\endcsname +\let\newtxmathLoaded\endinput \RequirePackage{xkeyval} \define@key{ntxmath}{scaled}[1.0]{\def\ntxmath@scaled{s*[#1]}} @@ -1120,29 +1120,29 @@ amssymbols,uprightGreek} \raise4\p@\hbox{$\m@th.$}\mkern2mu\raise\p@\hbox{$\m@th.$}\mkern1mu}} %%% \sqrt redefined -\let\sqrt=\undefined -\DeclareRobustCommand\sqrt{\@ifnextchar[\@sqrt{\mathpalette\@x@sqrt}} -\def\@x@sqrt#1#2{% - \setbox\z@\hbox{$\m@th#1\sqrtsign{\mkern1mu #2}$} - \mkern3mu\box\z@} -\ifx\@@undefined\@amsmath@err - \def\r@@t#1#2{% from latex.ltx - \setbox\z@\hbox{$\m@th#1\sqrtsign{\mkern1mu #2}$}% - \dimen@\ht\z@ \advance\dimen@-\dp\z@ -% \mkern5mu\raise.6\dimen@\copy\rootbox - \mkern6mu\raise.68\dimen@\copy\rootbox -% \mkern-10mu\box\z@} - \mkern-9mu\box\z@} -\else - \def\r@@t#1#2{\setboxz@h{$\m@th#1\sqrtsign{\mkern1mu #2}$}% from amsmath.sty - \dimen@\ht\z@\advance\dimen@-\dp\z@ - \setbox\@ne\hbox{$\m@th#1\mskip\uproot@ mu$}% - \advance\dimen@ by1.667\wd\@ne -% \mkern-\leftroot@ mu\mkern5mu\raise.6\dimen@\copy\rootbox - \mkern-\leftroot@ mu\mkern6mu\raise.68\dimen@\copy\rootbox -% \mkern-10mu\mkern\leftroot@ mu\boxz@} - \mkern-9mu\mkern\leftroot@ mu\boxz@} -\fi +%\let\sqrt=\undefined +%\DeclareRobustCommand\sqrt{\@ifnextchar[\@sqrt{\mathpalette\@x@sqrt}} +%\def\@x@sqrt#1#2{% +% \setbox\z@\hbox{$\m@th#1\sqrtsign{\mkern1mu #2}$} +% \mkern3mu\box\z@} +%\ifx\@@undefined\@amsmath@err +% \def\r@@t#1#2{% from latex.ltx +% \setbox\z@\hbox{$\m@th#1\sqrtsign{\mkern1mu #2}$}% +% \dimen@\ht\z@ \advance\dimen@-\dp\z@ +%% \mkern5mu\raise.6\dimen@\copy\rootbox +% \mkern6mu\raise.68\dimen@\copy\rootbox +%% \mkern-10mu\box\z@} +% \mkern-9mu\box\z@} +%\else +% \def\r@@t#1#2{\setboxz@h{$\m@th#1\sqrtsign{\mkern1mu #2}$}% from amsmath.sty +% \dimen@\ht\z@\advance\dimen@-\dp\z@ +% \setbox\@ne\hbox{$\m@th#1\mskip\uproot@ mu$}% +% \advance\dimen@ by1.667\wd\@ne +%% \mkern-\leftroot@ mu\mkern5mu\raise.6\dimen@\copy\rootbox +% \mkern-\leftroot@ mu\mkern6mu\raise.68\dimen@\copy\rootbox +%% \mkern-10mu\mkern\leftroot@ mu\boxz@} +% \mkern-9mu\mkern\leftroot@ mu\boxz@} +%\fi %%% For \underbrace and \overbrace: %%% use brace extension bar (in "20 of ntxexa) instead of vrule @@ -1188,4 +1188,19 @@ amssymbols,uprightGreek} \DeclareRobustCommand{\textsquare}{\begingroup \usefont{U}{ntxsya}{m}{n}\thr@@\endgroup} \DeclareRobustCommand{\openbox}{\begingroup \usefont{U}{ntxsya}{m}{n}\thr@@\endgroup} +\def\defaultscriptratio{.73} % default is .7 +\def\defaultscriptscriptratio{.55} % default is .5 +\DeclareMathSizes{5} {5.5} {5.5} {5.5} +\DeclareMathSizes{6} {6.5} {5.5} {5.5} +\DeclareMathSizes{7} {7.3} {5.5} {5.5} +\DeclareMathSizes{8} {8} {6.2} {5.5} +\DeclareMathSizes{9} {9} {7.3} {5.5} +\DeclareMathSizes{10} {10} {7.3} {5.5} +\DeclareMathSizes{10.95}{10.95}{8} {6.1} +\DeclareMathSizes{12} {12} {8.8} {6.6} +\DeclareMathSizes{14.4} {14.4} {10.5} {7.9} +\DeclareMathSizes{17.28}{17.28}{12.5} {9.4} +\DeclareMathSizes{20.74}{20.74}{16.1} {11.4} +\DeclareMathSizes{24.88}{24.88}{18.2}{13.7} + \endinput diff --git a/Master/texmf-dist/tex/latex/newtx/newtxtext.sty b/Master/texmf-dist/tex/latex/newtx/newtxtext.sty index d0a3c4d5231..7d5c08da939 100644 --- a/Master/texmf-dist/tex/latex/newtx/newtxtext.sty +++ b/Master/texmf-dist/tex/latex/newtx/newtxtext.sty @@ -12,11 +12,11 @@ % Added scaled keyword and osf option; % Modified the definition of \k to bypass problem with grouping; -\def\fileversion{0.92} -\def\filedate{2012/05/09} -\ProvidesPackage{ntxtext}[\filedate\space v\fileversion] +\def\fileversion{0.93} +\def\filedate{2012/05/11} +\ProvidesPackage{newtxtext}[\filedate\space v\fileversion] -\message{`ntxtext' v\fileversion, \filedate\space Text macros based on txfonts (ms)} +\message{`newtxtext' v\fileversion, \filedate\space Text macros based on txfonts (msharpe)} \RequirePackage{xkeyval} \define@key{ntx}{scaled}[1.0]{\def\ntx@scaled{s*[#1]}% \@tempdima=#1\p@\@tempdima=.9\@tempdima% diff --git a/Master/texmf-dist/tex/latex/newtx/omlntxmi.fd b/Master/texmf-dist/tex/latex/newtx/omlntxmi.fd index 7ee6ca0c14b..51f8dffa953 100644 --- a/Master/texmf-dist/tex/latex/newtx/omlntxmi.fd +++ b/Master/texmf-dist/tex/latex/newtx/omlntxmi.fd @@ -14,17 +14,25 @@ \ifx\X@s@v@rg\undefined \DeclareFontShape{OML}{ntxmi}{m}{it}{ - <-> \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}{ - <-> \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}{ - <-> \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}{ - <-> \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 64d06bb3112..261bed9fae7 100644 --- a/Master/texmf-dist/tex/latex/newtx/omlnxlmi.fd +++ b/Master/texmf-dist/tex/latex/newtx/omlnxlmi.fd @@ -1,11 +1,11 @@ %Filename: omlnxlmi.fd -%Created by: tex mi-drv +%Created by: tex lmi-drv %Created using fontinst v1.933 %THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY \ProvidesFile{omlnxlmi.fd} - [2012/05/06 Fontinst v1.933 font definitions for OML/nxlmi.] + [2012/05/19 Fontinst v1.933 font definitions for OML/nxlmi.] \expandafter\ifx\csname ntxmath@scaled\endcsname\relax \let\ntxmath@scaled\@empty% @@ -14,11 +14,15 @@ \DeclareFontFamily{OML}{nxlmi}{\skewchar \font =127} \DeclareFontShape{OML}{nxlmi}{m}{it}{ - <-> \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}{ - <-> \ntxmath@scaled nxlbmi + <-6.3> \ntxmath@scaled nxlbmi5 + <6.3-8.6> \ntxmath@scaled nxlbmi7 + <8.6-> \ntxmath@scaled nxlbmi }{} \DeclareFontShape{OML}{nxlmi}{m}{sl}{<->ssub * nxlmi/m/it}{} diff --git a/Master/texmf-dist/tex/latex/newtx/omsntxsy.fd b/Master/texmf-dist/tex/latex/newtx/omsntxsy.fd index c5e8f5167a5..1c963021199 100644 --- a/Master/texmf-dist/tex/latex/newtx/omsntxsy.fd +++ b/Master/texmf-dist/tex/latex/newtx/omsntxsy.fd @@ -14,10 +14,14 @@ \DeclareFontFamily{OMS}{ntxsy}{\skewchar \font =120} \DeclareFontShape{OMS}{ntxsy}{m}{n}{ - <-> \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 <-> \ntxmath@scaled ntxbsy }{} -- cgit v1.2.3