From 2823ef13b9166bb2c78fe4822b9e6809c3924240 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Wed, 27 May 2020 21:43:57 +0000 Subject: latex-dev (27may20) git-svn-id: svn://tug.org/texlive/trunk@55299 c570f23f-e606-0410-a88d-b1316a301751 --- .../tex/latex-dev/amsmath/amsmath-2018-12-01.sty | 12 ++-- .../texmf-dist/tex/latex-dev/amsmath/amsmath.sty | 67 +++++++++++++++------- Master/texmf-dist/tex/latex-dev/amsmath/amstex.sty | 4 +- 3 files changed, 55 insertions(+), 28 deletions(-) (limited to 'Master/texmf-dist/tex/latex-dev/amsmath') diff --git a/Master/texmf-dist/tex/latex-dev/amsmath/amsmath-2018-12-01.sty b/Master/texmf-dist/tex/latex-dev/amsmath/amsmath-2018-12-01.sty index f684834649e..6bcb03e2177 100644 --- a/Master/texmf-dist/tex/latex-dev/amsmath/amsmath-2018-12-01.sty +++ b/Master/texmf-dist/tex/latex-dev/amsmath/amsmath-2018-12-01.sty @@ -4,11 +4,11 @@ %% %% The original source files were: %% -%% amsmath.dtx -%% +%% amsmath.dtx +%% %% Copyright 1995, 1999, 2000, 2013 American Mathematical Society. %% Copyright 2016 LaTeX3 Project and American Mathematical Society. -%% +%% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3c %% of this license or (at your option) any later version. @@ -16,11 +16,11 @@ %% https://www.latex-project.org/lppl.txt %% and version 1.3c or later is part of all distributions of LaTeX %% version 2005/12/01 or later. -%% +%% %% This work has the LPPL maintenance status `maintained'. -%% +%% %% The Current Maintainer of this work is the LaTeX3 project. -%% +%% \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}[2018/12/01 v2.17b AMS math features] diff --git a/Master/texmf-dist/tex/latex-dev/amsmath/amsmath.sty b/Master/texmf-dist/tex/latex-dev/amsmath/amsmath.sty index 0b8113127e7..331d9225b72 100644 --- a/Master/texmf-dist/tex/latex-dev/amsmath/amsmath.sty +++ b/Master/texmf-dist/tex/latex-dev/amsmath/amsmath.sty @@ -27,7 +27,7 @@ \providecommand\DeclareCurrentRelease[2]{} \DeclareRelease{}{2018-12-01}{amsmath-2018-12-01.sty} \DeclareCurrentRelease{}{2019-04-01} -\ProvidesPackage{amsmath}[2019/11/16 v2.17d AMS math features] +\ProvidesPackage{amsmath}[2020/03/17 v2.17g AMS math features] \edef\@temp{\catcode 96=\number\catcode 96 } \catcode\string `\`=12 \def\do#1{\catcode\number`#1=\number\catcode`#1} @@ -153,23 +153,29 @@ For additional information on amsmath, use the \lq ?\rq\space option.% \@ifundefined{inf@bad}{% \newcount\inf@bad \inf@bad=1000000 \relax }{} +\let\tmspace\@undefined +\let\,\@undefined +\let\!\@undefined +\let\:\@undefined +\let\negmedspace\@undefined +\let\negthickspace\@undefined \ifx\leavevmode@ifvmode\@undefined -\DeclareRobustCommand{\tmspace}[3]{% +\DeclareRobustCommand\tmspace[3]{% \ifmmode\mskip#1#2\else\kern#1#3\fi\relax} \else -\DeclareRobustCommand{\tmspace}[3]{% +\DeclareRobustCommand\tmspace[3]{% \ifmmode\mskip#1#2\else\leavevmode@ifvmode\kern#1#3\fi\relax} \fi -\renewcommand{\,}{\tmspace+\thinmuskip{.1667em}} +\DeclareRobustCommand\,{\tmspace+\thinmuskip{.1667em}} \let\thinspace\, -\renewcommand{\!}{\tmspace-\thinmuskip{.1667em}} +\DeclareRobustCommand\!{\tmspace-\thinmuskip{.1667em}} \let\negthinspace\! -\renewcommand{\:}{\tmspace+\medmuskip{.2222em}} +\DeclareRobustCommand\:{\tmspace+\medmuskip{.2222em}} \let\medspace\: -\newcommand{\negmedspace}{\tmspace-\medmuskip{.2222em}} -\renewcommand{\;}{\tmspace+\thickmuskip{.2777em}} +\DeclareRobustCommand\negmedspace{\tmspace-\medmuskip{.2222em}} +\renewcommand\;{\tmspace+\thickmuskip{.2777em}} \let\thickspace\; -\newcommand{\negthickspace}{\tmspace-\thickmuskip{.2777em}} +\DeclareRobustCommand\negthickspace{\tmspace-\thickmuskip{.2777em}} \newcommand{\mspace}[1]{\mskip#1\relax} \def\@tempa#1#2\@nil{% \ifx\delimiter#1\@tempcnta#2\relax\else\@tempcnta\z@\fi @@ -177,9 +183,9 @@ For additional information on amsmath, use the \lq ?\rq\space option.% \@xp\@tempa\vert\@empty\@nil \ifnum\@tempcnta>\z@ \advance\@tempcnta "4000000 - \xdef\lvert{\delimiter\number\@tempcnta\space } + \protected\xdef\lvert{\delimiter\number\@tempcnta\space } \advance\@tempcnta "1000000 - \xdef\rvert{\delimiter\number\@tempcnta\space } + \protected\xdef\rvert{\delimiter\number\@tempcnta\space } \else \ifx\@@undefined\lvert % Fall back to cmex encoding since we don't know what else to do. @@ -192,9 +198,9 @@ For additional information on amsmath, use the \lq ?\rq\space option.% \@xp\@tempa\Vert\@empty\@nil \ifnum\@tempcnta>\z@ \advance\@tempcnta "4000000 - \xdef\lVert{\delimiter\number\@tempcnta\space } + \protected\xdef\lVert{\delimiter\number\@tempcnta\space } \advance\@tempcnta "1000000 - \xdef\rVert{\delimiter\number\@tempcnta\space } + \protected\xdef\rVert{\delimiter\number\@tempcnta\space } \else \ifx\@@undefined\lVert \DeclareMathDelimiter{\lVert} @@ -733,11 +739,11 @@ Foreign command \@backslashchar#1;\MessageBreak \DeclareFontEncoding{OML}{}{\noaccents@} \DeclareFontEncoding{OMS}{}{\noaccents@} \ams@newcommand{\dddot}[1]{% - {\mathop{#1}\limits^{\vbox to-1.4\ex@{\kern-\tw@\ex@ - \hbox{\normalfont ...}\vss}}}} + {\mathop{\kern\z@#1}\limits^{\vbox to-1.4\ex@{\kern-\tw@\ex@ + \hbox{\,\normalfont...}\vss}}}} \ams@newcommand{\ddddot}[1]{% - {\mathop{#1}\limits^{\vbox to-1.4\ex@{\kern-\tw@\ex@ - \hbox{\normalfont....}\vss}}}} + {\mathop{\kern\z@#1}\limits^{\vbox to-1.4\ex@{\kern-\tw@\ex@ + \hbox{\,\normalfont....}\vss}}}} \def\set@mathaccent#1#2#3#4{% \xdef#2{% \@nx\mathaccentV @@ -1309,7 +1315,8 @@ and fix things up.} \nointerlineskip \vskip-\ht\strutbox@ \vskip-\dp\strutbox@ - \vbox{\noindent\hbox to\displaywidth{\hbox to#1{\strut@\hfill}}}% + \vbox{\noindent\hbox to\displaywidth{% + \hbox to#1{\strut@\hfill}}}% \prevdepth\dimen@ \fi }% @@ -1378,13 +1385,31 @@ and fix things up.} \fi \next@ \cr } +\def\ams@start@box#1{% + \edef\reserved@a{\csname ams@pos@\expandafter\detokenize + \expandafter{\romannumeral-`\0#1}\endcsname}% + \expandafter\ifx\reserved@a\relax + \PackageWarning{amsmath}{% + Bracket group \detokenize{[#1]} at formula start!\MessageBreak + It could be a misspelled positional argument.\MessageBreak + If it belongs to the formula add a \relax in\MessageBreak + front to hide it}% + \def\ams@return@opt@arg{[#1]}\vcenter + \else + \let\ams@return@opt@arg\@empty\reserved@a + \fi +} +\def\ams@pos@t{\vtop} +\def\ams@pos@b{\vbox} +\def\ams@pos@c{\vcenter} +\let\ams@pos@\ams@pos@c \newcommand{\start@aligned}[2]{% \RIfM@\else \nonmatherr@{\begin{\@currenvir}}% \fi \savecolumn@ % Assumption: called inside a group \alignedspace@left - \if #1t\vtop \else \if#1b \vbox \else \vcenter \fi \fi \bgroup + \ams@start@box{#1}\bgroup \maxfields@#2\relax \ifnum\maxfields@>\m@ne \multiply\maxfields@\tw@ @@ -1409,6 +1434,7 @@ and fix things up.} \hfil \tabskip\alignsep@ \crcr + \ams@return@opt@arg } \def\math@cr@@@alignedat{% \ifnum\column@>\maxfields@ @@ -1448,12 +1474,13 @@ and fix things up.} \nonmatherr@{\begin{gathered}}% \fi \alignedspace@left - \if #1t\vtop \else \if#1b\vbox \else \vcenter \fi\fi \bgroup + \ams@start@box{#1}\bgroup \Let@ \chardef\dspbrk@context\@ne \restore@math@cr \spread@equation \ialign\bgroup \hfil\strut@$\m@th\displaystyle##$\hfil \crcr + \ams@return@opt@arg }{% \endaligned } diff --git a/Master/texmf-dist/tex/latex-dev/amsmath/amstex.sty b/Master/texmf-dist/tex/latex-dev/amsmath/amstex.sty index edb57c1214a..6ce36f52c9c 100644 --- a/Master/texmf-dist/tex/latex-dev/amsmath/amstex.sty +++ b/Master/texmf-dist/tex/latex-dev/amsmath/amstex.sty @@ -11,9 +11,9 @@ % https://www.latex-project.org/lppl.txt % and version 1.3c or later is part of all distributions of LaTeX % version 2005/12/01 or later. -% +% % This work has the LPPL maintenance status `maintained'. -% +% % The Current Maintainer of this work is the LaTeX3 Project. % % \fi -- cgit v1.2.3