diff options
Diffstat (limited to 'Master/texmf-dist/tex/latex')
| -rw-r--r-- | Master/texmf-dist/tex/latex/newtx/newtxmath.sty | 135 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/latex/newtx/newtxtext.sty | 4 |
2 files changed, 70 insertions, 69 deletions
diff --git a/Master/texmf-dist/tex/latex/newtx/newtxmath.sty b/Master/texmf-dist/tex/latex/newtx/newtxmath.sty index 108b961e967..bba5213e3ae 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.09} -\def\filedate{2013/03/27} +\def\fileversion{1.10} +\def\filedate{2013/05/17} \ProvidesPackage{newtxmath} [\filedate\space v\fileversion] \@ifundefined{newtxmathLoaded}{}{\endinput} @@ -20,6 +20,7 @@ \csname newtxmathLoaded\endcsname \let\newtxmathLoaded\endinput +\RequirePackage{amsmath} % improves extendable delimiter handling \input{binhex} \RequirePackage{xkeyval} @@ -121,7 +122,6 @@ amssymbols,uprightGreek} \DeclareFontSubstitution{U}{ntxmia}{m}{it} \DeclareSymbolFontAlphabet{\mathfrak}{lettersA} - %%%%%%%%%%%%%%% % Math Symbol % %%%%%%%%%%%%%%% @@ -183,10 +183,11 @@ amssymbols,uprightGreek} % Math Extension A % %%%%%%%%%%%%%%%%%%%% -\DeclareSymbolFont{largesymbolsA}{U}{ntxexa}{m}{n} -\SetSymbolFont{largesymbolsA}{bold}{U}{ntxexa}{b}{n} +\DeclareSymbolFont{largesymbolsTXA}{U}{ntxexa}{m}{n} +\SetSymbolFont{largesymbolsTXA}{bold}{U}{ntxexa}{b}{n} \DeclareFontSubstitution{U}{ntxexa}{m}{n} + %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % Common Macros %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -305,29 +306,29 @@ amssymbols,uprightGreek} \fi\fi % \iftx@slantedG - \re@DeclareMathSymbol{\Gamma}{\mathalpha}{letters}{0} - \re@DeclareMathSymbol{\Delta}{\mathalpha}{letters}{1} - \re@DeclareMathSymbol{\Theta}{\mathalpha}{letters}{2} - \re@DeclareMathSymbol{\Lambda}{\mathalpha}{letters}{3} - \re@DeclareMathSymbol{\Xi}{\mathalpha}{letters}{4} - \re@DeclareMathSymbol{\Pi}{\mathalpha}{letters}{5} - \re@DeclareMathSymbol{\Sigma}{\mathalpha}{letters}{6} - \re@DeclareMathSymbol{\Upsilon}{\mathalpha}{letters}{7} - \re@DeclareMathSymbol{\Phi}{\mathalpha}{letters}{8} - \re@DeclareMathSymbol{\Psi}{\mathalpha}{letters}{9} - \re@DeclareMathSymbol{\Omega}{\mathalpha}{letters}{10} + \re@DeclareMathSymbol{\Gamma}{\mathord}{letters}{0} + \re@DeclareMathSymbol{\Delta}{\mathord}{letters}{1} + \re@DeclareMathSymbol{\Theta}{\mathord}{letters}{2} + \re@DeclareMathSymbol{\Lambda}{\mathord}{letters}{3} + \re@DeclareMathSymbol{\Xi}{\mathord}{letters}{4} + \re@DeclareMathSymbol{\Pi}{\mathord}{letters}{5} + \re@DeclareMathSymbol{\Sigma}{\mathord}{letters}{6} + \re@DeclareMathSymbol{\Upsilon}{\mathord}{letters}{7} + \re@DeclareMathSymbol{\Phi}{\mathord}{letters}{8} + \re@DeclareMathSymbol{\Psi}{\mathord}{letters}{9} + \re@DeclareMathSymbol{\Omega}{\mathord}{letters}{10} \else - \re@DeclareMathSymbol{\Gamma}{\mathalpha}{lettersA}{0} - \re@DeclareMathSymbol{\Delta}{\mathalpha}{lettersA}{1} - \re@DeclareMathSymbol{\Theta}{\mathalpha}{lettersA}{2} - \re@DeclareMathSymbol{\Lambda}{\mathalpha}{lettersA}{3} - \re@DeclareMathSymbol{\Xi}{\mathalpha}{lettersA}{4} - \re@DeclareMathSymbol{\Pi}{\mathalpha}{lettersA}{5} - \re@DeclareMathSymbol{\Sigma}{\mathalpha}{lettersA}{6} - \re@DeclareMathSymbol{\Upsilon}{\mathalpha}{lettersA}{7} - \re@DeclareMathSymbol{\Phi}{\mathalpha}{lettersA}{8} - \re@DeclareMathSymbol{\Psi}{\mathalpha}{lettersA}{9} - \re@DeclareMathSymbol{\Omega}{\mathalpha}{lettersA}{10} + \re@DeclareMathSymbol{\Gamma}{\mathord}{lettersA}{0} + \re@DeclareMathSymbol{\Delta}{\mathord}{lettersA}{1} + \re@DeclareMathSymbol{\Theta}{\mathord}{lettersA}{2} + \re@DeclareMathSymbol{\Lambda}{\mathord}{lettersA}{3} + \re@DeclareMathSymbol{\Xi}{\mathord}{lettersA}{4} + \re@DeclareMathSymbol{\Pi}{\mathord}{lettersA}{5} + \re@DeclareMathSymbol{\Sigma}{\mathord}{lettersA}{6} + \re@DeclareMathSymbol{\Upsilon}{\mathord}{lettersA}{7} + \re@DeclareMathSymbol{\Phi}{\mathord}{lettersA}{8} + \re@DeclareMathSymbol{\Psi}{\mathord}{lettersA}{9} + \re@DeclareMathSymbol{\Omega}{\mathord}{lettersA}{10} \fi %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -805,8 +806,8 @@ amssymbols,uprightGreek} \re@DeclareMathSymbol{\strictfi}{\mathrel}{symbolsC}{75} \re@DeclareMathSymbol{\strictiff}{\mathrel}{symbolsC}{76} \re@DeclareMathSymbol{\invamp}{\mathbin}{symbolsC}{77} -\re@DeclareMathDelimiter{\lbag}{\mathopen}{symbolsC}{78}{largesymbolsA}{48} -\re@DeclareMathDelimiter{\rbag}{\mathclose}{symbolsC}{79}{largesymbolsA}{49} +\re@DeclareMathDelimiter{\lbag}{\mathopen}{symbolsC}{78}{largesymbolsTXA}{48} +\re@DeclareMathDelimiter{\rbag}{\mathclose}{symbolsC}{79}{largesymbolsTXA}{49} \re@DeclareMathSymbol{\Lbag}{\mathopen}{symbolsC}{80} \re@DeclareMathSymbol{\Rbag}{\mathclose}{symbolsC}{81} \re@DeclareMathSymbol{\circledless}{\mathrel}{symbolsC}{82} @@ -857,8 +858,8 @@ amssymbols,uprightGreek} \re@DeclareMathSymbol\leadsto{\mathrel}{symbolsC}{123} \re@DeclareMathSymbol{\sqcupplus}{\mathbin}{symbolsC}{124} \re@DeclareMathSymbol{\sqcapplus}{\mathbin}{symbolsC}{125} -\re@DeclareMathDelimiter{\llbracket}{\mathopen}{symbolsC}{126}{largesymbolsA}{18} -\re@DeclareMathDelimiter{\rrbracket}{\mathclose}{symbolsC}{127}{largesymbolsA}{19} +\re@DeclareMathDelimiter{\llbracket}{\mathopen}{symbolsC}{126}{largesymbolsTXA}{18} +\re@DeclareMathDelimiter{\rrbracket}{\mathclose}{symbolsC}{127}{largesymbolsTXA}{19} \re@DeclareMathSymbol{\boxright}{\mathrel}{symbolsC}{128} \re@DeclareMathSymbol{\boxleft}{\mathrel}{symbolsC}{129} \re@DeclareMathSymbol{\boxdotright}{\mathrel}{symbolsC}{130} @@ -1158,22 +1159,22 @@ amssymbols,uprightGreek} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% Math Extension A (ntxexa) Definition % largesymbolsA +% Math Extension A (ntxexa) Definition % largesymbolsTXA %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -\re@DeclareMathSymbol{\bignplus}{\mathop}{largesymbolsA}{0} -\re@DeclareMathSymbol{\bigsqcupplus}{\mathop}{largesymbolsA}{2} -\re@DeclareMathSymbol{\bigsqcapplus}{\mathop}{largesymbolsA}{4} -\re@DeclareMathSymbol{\bigsqcap}{\mathop}{largesymbolsA}{6} -\re@DeclareMathSymbol{\varprod}{\mathop}{largesymbolsA}{16} -%\re@DeclareMathDelimiter{\llbracket}{\mathopen}{symbolsC}{126}{largesymbolsA}{18} -%\re@DeclareMathDelimiter{\rrbracket}{\mathclose}{symbolsC}{127}{largesymbolsA}{19} -\re@DeclareMathSymbol{\br@cext}{\mathord}{largesymbolsA}{32} +\re@DeclareMathSymbol{\bignplus}{\mathop}{largesymbolsTXA}{0} +\re@DeclareMathSymbol{\bigsqcupplus}{\mathop}{largesymbolsTXA}{2} +\re@DeclareMathSymbol{\bigsqcapplus}{\mathop}{largesymbolsTXA}{4} +\re@DeclareMathSymbol{\bigsqcap}{\mathop}{largesymbolsTXA}{6} +\re@DeclareMathSymbol{\varprod}{\mathop}{largesymbolsTXA}{16} +%\re@DeclareMathDelimiter{\llbracket}{\mathopen}{symbolsC}{126}{largesymbolsTXA}{18} +%\re@DeclareMathDelimiter{\rrbracket}{\mathclose}{symbolsC}{127}{largesymbolsTXA}{19} +\re@DeclareMathSymbol{\br@cext}{\mathord}{largesymbolsTXA}{32} % \iftx@cmint % added 2012-04-16 - \re@DeclareMathSymbol{\ointop}{\mathop}{largesymbolsA}{84} - \re@DeclareMathSymbol{\intop}{\mathop}{largesymbolsA}{86} + \re@DeclareMathSymbol{\ointop}{\mathop}{largesymbolsTXA}{84} + \re@DeclareMathSymbol{\intop}{\mathop}{largesymbolsTXA}{86} \ifx\AmSfont\@undefined \def\oint{\ointop\nolimits} \def\int{\intop\nolimits} @@ -1186,49 +1187,49 @@ amssymbols,uprightGreek} \let\iiiint\relax \let\idotsint\relax \fi -\re@DeclareMathSymbol{\oiintop}{\mathop}{largesymbolsA}{8} +\re@DeclareMathSymbol{\oiintop}{\mathop}{largesymbolsTXA}{8} \def\oiint{\oiintop\nolimits} -\re@DeclareMathSymbol{\ointctrclockwiseop}{\mathop}{largesymbolsA}{10} +\re@DeclareMathSymbol{\ointctrclockwiseop}{\mathop}{largesymbolsTXA}{10} \def\ointctrclockwise{\ointctrclockwiseop\nolimits} -\re@DeclareMathSymbol{\ointclockwiseop}{\mathop}{largesymbolsA}{12} +\re@DeclareMathSymbol{\ointclockwiseop}{\mathop}{largesymbolsTXA}{12} \def\ointclockwise{\ointclockwiseop\nolimits} -\re@DeclareMathSymbol{\sqintop}{\mathop}{largesymbolsA}{14} +\re@DeclareMathSymbol{\sqintop}{\mathop}{largesymbolsTXA}{14} \def\sqint{\sqintop\nolimits} -\re@DeclareMathSymbol{\iintop}{\mathop}{largesymbolsA}{33} +\re@DeclareMathSymbol{\iintop}{\mathop}{largesymbolsTXA}{33} \def\iint{\iintop\nolimits} -\re@DeclareMathSymbol{\iiintop}{\mathop}{largesymbolsA}{35} +\re@DeclareMathSymbol{\iiintop}{\mathop}{largesymbolsTXA}{35} \def\iiint{\iiintop\nolimits} -\re@DeclareMathSymbol{\iiiintop}{\mathop}{largesymbolsA}{37} +\re@DeclareMathSymbol{\iiiintop}{\mathop}{largesymbolsTXA}{37} \def\iiiint{\iiiintop\nolimits} -\re@DeclareMathSymbol{\idotsintop}{\mathop}{largesymbolsA}{39} +\re@DeclareMathSymbol{\idotsintop}{\mathop}{largesymbolsTXA}{39} \def\idotsint{\idotsintop\nolimits} -\re@DeclareMathSymbol{\oiiintop}{\mathop}{largesymbolsA}{41} +\re@DeclareMathSymbol{\oiiintop}{\mathop}{largesymbolsTXA}{41} \def\oiiint{\oiiintop\nolimits} -\re@DeclareMathSymbol{\varointctrclockwiseop}{\mathop}{largesymbolsA}{43} +\re@DeclareMathSymbol{\varointctrclockwiseop}{\mathop}{largesymbolsTXA}{43} \def\varointctrclockwise{\varointctrclockwiseop\nolimits} -\re@DeclareMathSymbol{\varointclockwiseop}{\mathop}{largesymbolsA}{45} +\re@DeclareMathSymbol{\varointclockwiseop}{\mathop}{largesymbolsTXA}{45} \def\varointclockwise{\varointclockwiseop\nolimits} -\re@DeclareMathSymbol{\fintop}{\mathop}{largesymbolsA}{62} +\re@DeclareMathSymbol{\fintop}{\mathop}{largesymbolsTXA}{62} \def\fint{\fintop\nolimits} -\re@DeclareMathSymbol{\oiintctrclockwiseop}{\mathop}{largesymbolsA}{64} +\re@DeclareMathSymbol{\oiintctrclockwiseop}{\mathop}{largesymbolsTXA}{64} \def\oiintctrclockwise{\oiintctrclockwiseop\nolimits} -\re@DeclareMathSymbol{\varoiintclockwiseop}{\mathop}{largesymbolsA}{66} +\re@DeclareMathSymbol{\varoiintclockwiseop}{\mathop}{largesymbolsTXA}{66} \def\varoiintclockwise{\varoiintclockwiseop\nolimits} -\re@DeclareMathSymbol{\oiiintctrclockwiseop}{\mathop}{largesymbolsA}{68} +\re@DeclareMathSymbol{\oiiintctrclockwiseop}{\mathop}{largesymbolsTXA}{68} \def\oiiintctrclockwise{\oiiintctrclockwiseop\nolimits} -\re@DeclareMathSymbol{\varoiiintclockwiseop}{\mathop}{largesymbolsA}{70} +\re@DeclareMathSymbol{\varoiiintclockwiseop}{\mathop}{largesymbolsTXA}{70} \def\varoiiintclockwise{\varoiiintclockwiseop\nolimits} -\re@DeclareMathSymbol{\oiintclockwiseop}{\mathop}{largesymbolsA}{72} +\re@DeclareMathSymbol{\oiintclockwiseop}{\mathop}{largesymbolsTXA}{72} \def\oiintclockwise{\oiintclockwiseop\nolimits} -\re@DeclareMathSymbol{\varoiintctrclockwiseop}{\mathop}{largesymbolsA}{74} +\re@DeclareMathSymbol{\varoiintctrclockwiseop}{\mathop}{largesymbolsTXA}{74} \def\varoiintctrclockwise{\varoiintctrclockwiseop\nolimits} -\re@DeclareMathSymbol{\oiiintclockwiseop}{\mathop}{largesymbolsA}{76} +\re@DeclareMathSymbol{\oiiintclockwiseop}{\mathop}{largesymbolsTXA}{76} \def\oiiintclockwise{\oiiintclockwiseop\nolimits} -\re@DeclareMathSymbol{\varoiiintctrclockwiseop}{\mathop}{largesymbolsA}{78} +\re@DeclareMathSymbol{\varoiiintctrclockwiseop}{\mathop}{largesymbolsTXA}{78} \def\varoiiintctrclockwise{\varoiiintctrclockwiseop\nolimits} -\re@DeclareMathSymbol{\sqiintop}{\mathop}{largesymbolsA}{80} +\re@DeclareMathSymbol{\sqiintop}{\mathop}{largesymbolsTXA}{80} \def\sqiint{\sqiintop\nolimits} -\re@DeclareMathSymbol{\sqiiintop}{\mathop}{largesymbolsA}{82} +\re@DeclareMathSymbol{\sqiiintop}{\mathop}{largesymbolsTXA}{82} \def\sqiiint{\sqiiintop\nolimits} \fi @@ -1271,7 +1272,7 @@ amssymbols,uprightGreek} %%% For \underbrace and \overbrace: %%% use brace extension bar (in "20 of ntxexa) instead of vrule -%\re@DeclareMathSymbol{\br@cext}{\mathord}{largesymbolsA}{32} +%\re@DeclareMathSymbol{\br@cext}{\mathord}{largesymbolsTXA}{32} \def\downbracefill{$\m@th% \braceld\mkern-1mu\cleaders\hbox{$\mkern-.5mu\br@cext\mkern-.5mu$}\hfill\mkern-1mu% \braceru\bracelu% @@ -1416,8 +1417,8 @@ amssymbols,uprightGreek} \txf@ntname{boldlettersA} \txf@ntname{symbolsC} \txf@ntname{boldsymbolsC} -\txf@ntname{largesymbolsA} -\txf@ntname{boldlargesymbolsA} +\txf@ntname{largesymbolsTXA} +\txf@ntname{boldlargesymbolsTXA} \typeout{*** Mathgroups ***} \count@\z@ \loop\ifnum\count@<16 diff --git a/Master/texmf-dist/tex/latex/newtx/newtxtext.sty b/Master/texmf-dist/tex/latex/newtx/newtxtext.sty index bf2eecafbe7..7cf97b7b860 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.09} -\def\filedate{2013/03/28} +\def\fileversion{1.10} +\def\filedate{2013/05/11} \ProvidesPackage{newtxtext}[\filedate\space v\fileversion] \message{`newtxtext' v\fileversion, \filedate\space Text macros based on txfonts (msharpe)} |