diff options
author | Karl Berry <karl@freefriends.org> | 2014-02-11 23:43:44 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2014-02-11 23:43:44 +0000 |
commit | 9a1be5b98214a77966642ba65ac76f1105dafba1 (patch) | |
tree | 223be2f74868bfc469f4598bace0099b3bca9647 /Master/texmf-dist/tex/latex | |
parent | edbb93f0565f6fff4955ee5f2e077134415ae933 (diff) |
newtx (11feb14)
git-svn-id: svn://tug.org/texlive/trunk@32943 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex')
-rw-r--r-- | Master/texmf-dist/tex/latex/newtx/newtxmath.sty | 51 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/newtx/newtxtext.sty | 4 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/newtx/omsntxsy.fd | 22 |
3 files changed, 32 insertions, 45 deletions
diff --git a/Master/texmf-dist/tex/latex/newtx/newtxmath.sty b/Master/texmf-dist/tex/latex/newtx/newtxmath.sty index 203ae7eb265..e91814a8224 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.21} -\def\filedate{2014/02/03} +\def\fileversion{1.22} +\def\filedate{2014/02/10} \ProvidesPackage{newtxmath} [\filedate\space v\fileversion] \@ifundefined{newtxmathLoaded}{}{\endinput} @@ -330,6 +330,7 @@ amssymbols,uprightGreek} \fi \fi %\DeclareMathSymbol{+}{\mathbin}{operators}{43} +\DeclareMathSymbol{+}{\mathbin}{lettersA}{253} %\DeclareMathDelimiter{/}{\mathord}{operators}{47}{largesymbols}{14} %\DeclareMathSymbol{:}{\mathrel}{operators}{58} %\DeclareMathSymbol{\colon}{\mathpunct}{operators}{58} @@ -1399,29 +1400,29 @@ $\hfil\displaystyle{#1}\hfil$\crcr% \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 diff --git a/Master/texmf-dist/tex/latex/newtx/newtxtext.sty b/Master/texmf-dist/tex/latex/newtx/newtxtext.sty index cef58c9fd10..aae7f68f5d9 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.21} -\def\filedate{2014/02/03} +\def\fileversion{1.22} +\def\filedate{2014/02/10} \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/omsntxsy.fd b/Master/texmf-dist/tex/latex/newtx/omsntxsy.fd index 815ac594957..55f55f7b4ba 100644 --- a/Master/texmf-dist/tex/latex/newtx/omsntxsy.fd +++ b/Master/texmf-dist/tex/latex/newtx/omsntxsy.fd @@ -13,31 +13,17 @@ \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 - }{} - - \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}{ +\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}{ +\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}{} |