From b8f67cb908880c8fdf6b03eb9c4d5219d7409171 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Tue, 11 Dec 2018 22:32:49 +0000 Subject: latex(2e) (11dec18) git-svn-id: svn://tug.org/texlive/trunk@49390 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/amsmath/amsmath.sty | 31 +++++++++++++++++++++++-- 1 file changed, 29 insertions(+), 2 deletions(-) (limited to 'Master/texmf-dist/tex/latex/amsmath/amsmath.sty') diff --git a/Master/texmf-dist/tex/latex/amsmath/amsmath.sty b/Master/texmf-dist/tex/latex/amsmath/amsmath.sty index bf9c101691f..f684834649e 100644 --- a/Master/texmf-dist/tex/latex/amsmath/amsmath.sty +++ b/Master/texmf-dist/tex/latex/amsmath/amsmath.sty @@ -23,7 +23,7 @@ %% \NeedsTeXFormat{LaTeX2e}% LaTeX 2.09 can't be used (nor non-LaTeX) [1994/12/01]% LaTeX date must be December 1994 or later -\ProvidesPackage{amsmath}[2017/09/02 v2.17a AMS math features] +\ProvidesPackage{amsmath}[2018/12/01 v2.17b AMS math features] \edef\@temp{\catcode 96=\number\catcode 96 } \catcode\string `\`=12 \def\do#1{\catcode\number`#1=\number\catcode`#1} @@ -139,13 +139,23 @@ For additional information on amsmath, use the \lq ?\rq\space option.% A\kern-.1667em\lower.5ex\hbox{M}\kern-.125emS}} \newcommand{\AmSfont}{% \usefont{OMS}{cmsy}{\if\@xp\@car\f@series\@nil bb\else m\fi}{n}} +\ifx\leavevmode@ifvmode\@undefined % kernel is < 2018/12 \def\@mathmeasure#1#2#3{\setbox#1\hbox{\frozen@everymath\@emptytoks + \m@th$#2#3$}} +\else +\def\@mathmeasure#1#2#3{\setbox#1\hbox{% \m@th$#2#3$}} +\fi \@ifundefined{inf@bad}{% \newcount\inf@bad \inf@bad=1000000 \relax }{} +\ifx\leavevmode@ifvmode\@undefined \DeclareRobustCommand{\tmspace}[3]{% \ifmmode\mskip#1#2\else\kern#1#3\fi\relax} +\else +\DeclareRobustCommand{\tmspace}[3]{% + \ifmmode\mskip#1#2\else\leavevmode@ifvmode\kern#1#3\fi\relax} +\fi \renewcommand{\,}{\tmspace+\thinmuskip{.1667em}} \let\thinspace\, \renewcommand{\!}{\tmspace-\thinmuskip{.1667em}} @@ -699,10 +709,17 @@ Foreign command \@backslashchar#1;\MessageBreak \renewcommand{\Big}{\bBigg@{1.5}} \renewcommand{\bigg}{\bBigg@\tw@} \renewcommand{\Bigg}{\bBigg@{2.5}} +\ifx\leavevmode@ifvmode\@undefined \def\bBigg@#1#2{% {\@mathmeasure\z@{\nulldelimiterspace\z@}% {\left#2\vcenter to#1\big@size{}\right.}% \box\z@}} +\else +\def\bBigg@#1#2{\leavevmode@ifvmode + {\@mathmeasure\z@{\nulldelimiterspace\z@}% + {\left#2\vcenter to#1\big@size{}\right.}% + \box\z@}} +\fi \addto@hook\every@math@size{% \global\big@size 1.2\ht\Mathstrutbox@ \global\advance\big@size 1.2\dp\Mathstrutbox@ } @@ -883,13 +900,23 @@ Foreign command \@backslashchar#1;\MessageBreak \dimen@-\wd6 \advance\dimen@\wd4 \advance\dimen@\wd\z@ \hbox to\dimen@{}\mathop{\kern-\dimen@\box4\box6}% } +\ifx\leavevmode@ifvmode\@undefined \renewcommand{\smash}[1][tb]{% \def\mb@t{\ht}\def\mb@b{\dp}\def\mb@tb{\ht\z@\z@\dp}% - \edef\finsm@sh{\csname mb@#1\endcsname\z@\z@ \box\z@}% + \edef\finsm@sh{\csname mb@#1\endcsname\z@\z@\box\z@}% \ifmmode \@xp\mathpalette\@xp\mathsm@sh \else \@xp\makesm@sh \fi } +\else +\renewcommand{\smash}[1][tb]{% + \def\mb@t{\ht}\def\mb@b{\dp}\def\mb@tb{\ht\z@\z@\dp}% + \edef\finsm@sh{\csname mb@#1\endcsname\z@\z@ \leavevmode@ifvmode\box\z@}% + \ifmmode \@xp\mathpalette\@xp\mathsm@sh + \else \@xp\makesm@sh + \fi +} +\fi \mathchardef\std@minus\mathcode`\-\relax \mathchardef\std@equal\mathcode`\=\relax \AtBeginDocument{% -- cgit v1.2.3