CTAN sync 202005280303

31 files changed, 253 insertions, 103 deletions

diff --git a/macros/latex-dev/required/amsmath/README.md b/macros/latex-dev/required/amsmath/README.md
index e10fadce5d..60947e6717 100644
--- a/macros/latex-dev/required/amsmath/README.md
+++ b/macros/latex-dev/required/amsmath/README.md
@@ -1,7 +1,7 @@
 The amsmath bundle for LaTeX
 ============================
 
-Release 2020-02-01 pre-release 1
+Release 2020-10-01 pre-release 1
 
 Overview
 --------
@@ -77,5 +77,5 @@ version 1.3c or later.
 -----
 
 <p>Copyright (C) 2001-2004, 2007, 2008, 2010, 2011, 2013 American Mathematical Society. <br />
-<p>Copyright (C) 2016-2019 The LaTeX Project and American Mathematical Society. <br />
+<p>Copyright (C) 2016-2020 The LaTeX Project and American Mathematical Society. <br />
 
diff --git a/macros/latex-dev/required/amsmath/amsbsy.dtx b/macros/latex-dev/required/amsmath/amsbsy.dtx
index 890fbd0d82..1174784278 100644
--- a/macros/latex-dev/required/amsmath/amsbsy.dtx
+++ b/macros/latex-dev/required/amsmath/amsbsy.dtx
@@ -2,7 +2,7 @@
 % \iffalse meta-comment
 %
 % Copyright (C) 1995, 1999 American Mathematical Society.
-% Copyright (C) 2016-2019 LaTeX3 Project and American Mathematical Society. 
+% Copyright (C) 2016-2020 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
@@ -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
diff --git a/macros/latex-dev/required/amsmath/amsbsy.ins b/macros/latex-dev/required/amsmath/amsbsy.ins
index fe1cd5413d..07707907e9 100644
--- a/macros/latex-dev/required/amsmath/amsbsy.ins
+++ b/macros/latex-dev/required/amsmath/amsbsy.ins
@@ -1,7 +1,7 @@
-%% 
+%%
 %% Copyright 2010 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.
@@ -9,9 +9,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.
 %%
 %% ====================================================================
diff --git a/macros/latex-dev/required/amsmath/amsbsy.pdf b/macros/latex-dev/required/amsmath/amsbsy.pdf
index 385669d431..7c3449cd04 100644
--- a/macros/latex-dev/required/amsmath/amsbsy.pdf
+++ b/macros/latex-dev/required/amsmath/amsbsy.pdf
diff --git a/macros/latex-dev/required/amsmath/amscd.dtx b/macros/latex-dev/required/amsmath/amscd.dtx
index 2d0a35d685..12e94a11dc 100644
--- a/macros/latex-dev/required/amsmath/amscd.dtx
+++ b/macros/latex-dev/required/amsmath/amscd.dtx
@@ -2,7 +2,7 @@
 % \iffalse meta-comment
 %
 % Copyright (C) 1995, 1999 American Mathematical Society.
-% Copyright (C) 2016-2019 LaTeX3 Project and American Mathematical Society.
+% Copyright (C) 2016-2020 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
@@ -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
diff --git a/macros/latex-dev/required/amsmath/amscd.ins b/macros/latex-dev/required/amsmath/amscd.ins
index 148c4cb32e..5890ca06c1 100644
--- a/macros/latex-dev/required/amsmath/amscd.ins
+++ b/macros/latex-dev/required/amsmath/amscd.ins
@@ -1,7 +1,7 @@
-%% 
+%%
 %% Copyright 2010 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.
@@ -9,9 +9,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.
 %%
 %% ====================================================================
diff --git a/macros/latex-dev/required/amsmath/amscd.pdf b/macros/latex-dev/required/amsmath/amscd.pdf
index 3ef1ed5ed1..2fba393436 100644
--- a/macros/latex-dev/required/amsmath/amscd.pdf
+++ b/macros/latex-dev/required/amsmath/amscd.pdf
diff --git a/macros/latex-dev/required/amsmath/amsgen.dtx b/macros/latex-dev/required/amsmath/amsgen.dtx
index 5edc26b9cc..92df548f12 100644
--- a/macros/latex-dev/required/amsmath/amsgen.dtx
+++ b/macros/latex-dev/required/amsmath/amsgen.dtx
@@ -2,7 +2,7 @@
 % \iffalse meta-comment
 %
 % Copyright (C) 1995, 1999 American Mathematical Society.
-% Copyright (C) 2016-2019 LaTeX3 Project and American Mathematical Society. 
+% Copyright (C) 2016-2020 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
@@ -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
diff --git a/macros/latex-dev/required/amsmath/amsgen.ins b/macros/latex-dev/required/amsmath/amsgen.ins
index 8c5683cb5a..be7720bc89 100644
--- a/macros/latex-dev/required/amsmath/amsgen.ins
+++ b/macros/latex-dev/required/amsmath/amsgen.ins
@@ -1,7 +1,7 @@
-%% 
+%%
 %% Copyright 2010 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.
@@ -9,9 +9,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.
 %%
 %% ====================================================================
diff --git a/macros/latex-dev/required/amsmath/amsgen.pdf b/macros/latex-dev/required/amsmath/amsgen.pdf
index 9867352fe7..5a66176289 100644
--- a/macros/latex-dev/required/amsmath/amsgen.pdf
+++ b/macros/latex-dev/required/amsmath/amsgen.pdf
diff --git a/macros/latex-dev/required/amsmath/amsldoc.pdf b/macros/latex-dev/required/amsmath/amsldoc.pdf
index 59248ae49f..53ff255a9d 100644
--- a/macros/latex-dev/required/amsmath/amsldoc.pdf
+++ b/macros/latex-dev/required/amsmath/amsldoc.pdf
diff --git a/macros/latex-dev/required/amsmath/amsldoc.tex b/macros/latex-dev/required/amsmath/amsldoc.tex
index 8573682a66..b29a8b8468 100644
--- a/macros/latex-dev/required/amsmath/amsldoc.tex
+++ b/macros/latex-dev/required/amsmath/amsldoc.tex
@@ -1,6 +1,6 @@
 %
 % Copyright (C) 1995, 2000, 2013 American Mathematical Society.
-% Copyright (C) 2016-2019 LaTeX3 Project and American Mathematical Society.
+% Copyright (C) 2016-2020 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
@@ -9,9 +9,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.
 %
 \documentclass[leqno,titlepage,openany]{amsldoc}[1999/12/13]
@@ -64,7 +64,7 @@ Bug reports can be opened (category \texttt{#1}) at\\%
 
 \title{User's Guide for the \nipkg{amsmath} Package (Version~2.1)}
 \author{American Mathematical Society, \LaTeX3 Project}
-\date{1999-12-13\\(revised 2002-02-25, 2016-11-14, 2018-04-05, 2019-10-14)}
+\date{1999-12-13\\(revised 2002-02-25, 2016-11-14, 2018-04-05, 2019-10-14, 2020-02-18)}
 \makeatletter
 \def\@thanks{\bigskip\MaintainedByLaTeXTeam{amslatex}}
 \makeatother
@@ -928,7 +928,11 @@ in accurately calculating the profile of an equation can occasionally
 result in number movement that doesn't look right.
 A \cn{raisetag} command is provided to adjust the vertical position of the
 current equation number, if it has been shifted away from its normal
-position. To move a particular number up by six points, write
+position. If it is in its normal position the command has no effect whatsoever.
+In particular, this means that one can't use it to shift the tag of an \env{equation}
+environment.
+
+To move a particular number up by six points, write
 |\raisetag{6pt}|. (At the end of a display, this also shifts up the
 text following the display.)
 This kind of adjustment is fine tuning like line
@@ -1032,7 +1036,7 @@ C.8.4]{lamport}:
 This works pretty well, except that the equation counter won't be reset
 to zero at the beginning of a new section or chapter, unless you do it
 yourself using \cn{setcounter}. To make this a little more convenient,
-the \nipkg{amsmath} package provides a 
+the \nipkg{amsmath} package provides a
 command\index{equationn@equation numbers!hierarchy} \cn{numberwithin}.
 To have equation numbering tied to section numbering, with automatic
 reset of the equation counter, write
diff --git a/macros/latex-dev/required/amsmath/amsmath-2018-12-01.sty b/macros/latex-dev/required/amsmath/amsmath-2018-12-01.sty
index f684834649..6bcb03e217 100644
--- a/macros/latex-dev/required/amsmath/amsmath-2018-12-01.sty
+++ b/macros/latex-dev/required/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/macros/latex-dev/required/amsmath/amsmath.dtx b/macros/latex-dev/required/amsmath/amsmath.dtx
index 11b7545c26..e3ad7c6042 100644
--- a/macros/latex-dev/required/amsmath/amsmath.dtx
+++ b/macros/latex-dev/required/amsmath/amsmath.dtx
@@ -2,7 +2,7 @@
 % \iffalse meta-comment
 %
 % Copyright (C) 1995, 2000, 2013 American Mathematical Society.
-% Copyright (C) 2016-2019 LaTeX3 Project and American Mathematical Society.
+% Copyright (C) 2016-2020 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
@@ -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
@@ -86,7 +86,7 @@ Bug reports can be opened (category \texttt{#1}) at\\%
 %    \end{macrocode}
 %
 %    \begin{macrocode}
-\ProvidesPackage{amsmath}[2019/11/16 v2.17d AMS math features]
+\ProvidesPackage{amsmath}[2020/03/17 v2.17g AMS math features]
 %    \end{macrocode}
 %
 % \section{Catcode defenses}
@@ -302,10 +302,13 @@ For additional information on amsmath, use the \lq ?\rq\space option.%
 %    \end{macrocode}
 %
 %    Processing to handle the \opt{cmex10} option is a little tricky
-%    because of different possible loading orders for \pkg{amsmath} and
-%    \pkg{amsfonts}. The package \pkg{amsmath} sets the \cs{cmex@opt}
-%    flag to 7 or 10, and the package \pkg{amsfonts} sets the flag to 1
-%    or 0.
+%    because of different possible loading orders for \pkg{amsmath}
+%    and \pkg{amsfonts}. The package \pkg{amsmath} sets the
+%    \cs{cmex@opt} flag to 0, 7 or 10, and in the past the package
+%    \pkg{amsfonts} did set the flag to 1 or 0. These days it always
+%    sets it to 10. The situation is a bit unsettled but we don't own
+%    \pkg{amsfonts}.
+% \changes{v2.17d}{2019/12/01}{docu update, no code change (gh/200)}
 %    \begin{macrocode}
 \ifnum\cmex@opt=7 \relax
   \DeclareFontShape{OMX}{cmex}{m}{n}{%
@@ -463,24 +466,41 @@ For additional information on amsmath, use the \lq ?\rq\space option.%
 %    \cs{DeclareRobustCommand}.
 % \changes{v2.17b}{2018/12/01}{Start LR-mode for \cs{thinspace} and
 %   friends if necessary (github/49)}
+%
+%    We start by undefining a number of commands (which in a current
+%    \LaTeX{} kernel will be defined, so that the
+%    \cs{DeclareRobustCommand} declarations below do not add a
+%    ``Command redefined'' info into the log.
+%    \begin{macrocode}
+\let\tmspace\@undefined
+\let\,\@undefined
+\let\!\@undefined
+\let\:\@undefined
+\let\negmedspace\@undefined
+\let\negthickspace\@undefined
+%    \end{macrocode}
+%
+%  
+% \changes{v2.17g}{2020/03/07}{Math/text spacing commands are now in
+%    the \LaTeX{} kernel and are made robust (gh/303)}
 %    \begin{macrocode}
 \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}}
 %    \end{macrocode}
 %    \end{macro}
 %    \end{macro}
@@ -517,9 +537,13 @@ 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 }
+%    \end{macrocode}
+%    Use \cs{protected} on the new delimiters.
+% \changes{v2.17e}{2020/01/20}{Make delimiters robust (gh/251))}
+%    \begin{macrocode}
+  \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.
@@ -532,9 +556,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}
@@ -645,13 +669,13 @@ Foreign command \@backslashchar#1;\MessageBreak
 %    \end{macrocode}
 %
 %    \begin{macrocode}
-\else   
+\else
 %    \end{macrocode}
 %     XeTeX version
 %    \begin{macrocode}
 \def\genfrac@rule#1#2#3#4{%
 \hbox{$\left#1\vcenter{\hrule \@width\z@
-                       \@height 
+                       \@height
                        \ifdim\fontdimen#2#3\tw@=\z@
                        #4\fontdimen6#3\tw@
                        \else
@@ -697,7 +721,7 @@ Foreign command \@backslashchar#1;\MessageBreak
 %    \begin{macrocode}
 \def\genfrac@rule#1#2#3{%
 \hbox{$\left#1\vcenter{\hrule \@width\z@
-                       \@height 
+                       \@height
                        \ifdim\Umathfractiondelsize#2=\z@
                        #3\fontdimen6#3\tw@
                        \else
@@ -1093,7 +1117,7 @@ Foreign command \@backslashchar#1;\MessageBreak
 % \changes{v2.15}{2016/02/20}{Indent \cs{mdots@@} for readability and add additional tests}
 %    \begin{macrocode}
 \def\mdots@@{\gdef\thedots@{\dotso@}%
- \ifx\@let@token\boldsymbol 
+ \ifx\@let@token\boldsymbol
    \gdef\thedots@\boldsymbol{\boldsymboldots@}%
  \else
    \ifx,\@let@token \gdef\thedots@{\dotsc}%
@@ -1167,7 +1191,7 @@ Foreign command \@backslashchar#1;\MessageBreak
 %    \begin{macrocode}
              \fi % end macro \ifgtest@ test (no else)
            \fi % end if \Umathchar test
-         \fi % end \math@   \ifgtest@ 
+         \fi % end \math@   \ifgtest@
        \fi % end \keybin@ \ifgtest@ test (no else)
      \fi % end if \not (no else)
    \fi % end if comma (no else)
@@ -1626,13 +1650,15 @@ Foreign command \@backslashchar#1;\MessageBreak
 %    \begin{macro}{\dddot}
 %    \begin{macro}{\ddddot}
 %    Triple and quadruple dot accents.
+% \changes{v2.17f}{2020/02/20}{Add a kern so that a single char is not
+%       vertically shifted and move the dots slightly to the right (gh/126)}
 %    \begin{macrocode}
 \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}}}}
 %    \end{macrocode}
 %    \end{macro}
 %    \end{macro}
@@ -3190,9 +3216,10 @@ ill-advised in LaTeX.%
 % \end{macro}
 %
 % \begin{macro}{\ifst@rred}
-%    The switch |st@rred| is set to true by all starred
-%    environments
-%    and set to false by the unstarred versions.
+%   The switch |st@rred| is set to true by all starred environments
+%   and set to false by the unstarred versions.
+%   One exception is the \env{xxalignat} environment where this is set
+%   to true.
 %    \begin{macrocode}
 \newif\ifst@rred
 %    \end{macrocode}
@@ -3430,7 +3457,8 @@ and fix things up.}
 % \end{macro}
 %
 % \begin{macro}{\black@}
-% \changes{v2.17a}{2017/09/02}{add fixed width box so overfull warning generated in centred environments in lists}
+% \changes{v2.17a}{2017/09/02}{Add fixed width box so overfull warning
+%       generated in centred environments in lists}
 %    This macro is made to produce an overfull box message and
 %    possibly (depending on the value of \cs{overfullrule})
 %    a rule in the margin if the total width of an alignment
@@ -3443,7 +3471,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
     }%
@@ -3645,6 +3674,77 @@ and fix things up.}
 %    \end{macrocode}
 %  \end{macro}
 %
+%
+%
+%  \begin{macro}{\ams@start@box}
+%    This macro tests the optional  positioning argument (in
+%    \texttt{gathered} or \texttt{aligned}. It explicitly tests for the
+%    value \texttt{b}, \texttt{c} and \texttt{t} and if the value is
+%    different, then we assume that it is a bracket group that belongs
+%    to the formula instead of being an misspelled optional argument.
+%    (In earlier versions of the code anything other than \texttt{b}
+%    or \texttt{t} was interpreted as \texttt{c} and the data was
+%    otherwise dropped.)
+% \changes{v2.17g}{2020/03/10}{Explicity test for b/t/c and return
+%    optional argument is different (gh/5)}
+%    \begin{macrocode}
+\def\ams@start@box#1{%
+%    \end{macrocode}
+%    As we may pick up an arbitrary part of the formula by mistake, we
+%    need to be very careful with the testing to avoid low-level
+%    errors. This is why we use \cs{detokenize}. But we also need to
+%    expand the argument (if possible) in case the position value is
+%    hidden inside a macro. We therefore apply the \cs{romannumeral}
+%    trick (known as f-expansion in \texttt{expl3}) in its old form.
+%    The code assumes that
+%    the default is correctly set up (which in this case is \texttt{c}).
+%    \begin{macrocode}
+  \edef\reserved@a{\csname ams@pos@\expandafter\detokenize
+    \expandafter{\romannumeral-`\0#1}\endcsname}%
+  \expandafter\ifx\reserved@a\relax
+%    \end{macrocode}
+%    If the argument is neither \texttt{b}, \texttt{c} or \texttt{t}
+%    we save it in \cs{ams@return@opt@arg}, so it can later be
+%    returned as part of the environment body. We could at this point
+%    also issue a warning that bracket group was found at the start of
+%    the formula and that it is safer to  add a \cs{relax} before it.
+%    \begin{macrocode}
+     \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
+%    \end{macrocode}
+%    If the argument was identified then we clear
+%    \cs{ams@return@opt@arg} (just in case somebod ever nests these
+%    environment.
+%    \begin{macrocode}
+  \else
+     \let\ams@return@opt@arg\@empty\reserved@a
+  \fi
+}
+%    \end{macrocode}
+%    
+%  \begin{macro}{\ams@pos@t}
+%  \begin{macro}{\ams@pos@b}
+%  \begin{macro}{\ams@pos@c}
+%
+%    \begin{macrocode}
+\def\ams@pos@t{\vtop}
+\def\ams@pos@b{\vbox}
+\def\ams@pos@c{\vcenter}
+%    \end{macrocode}
+%    And we accept an empty argument as a way to get the default (as
+%    that was the case before as well, albeit by mistake in some sense).
+%    \begin{macrocode}
+\let\ams@pos@\ams@pos@c
+%    \end{macrocode}
+%  \end{macro}
+%  \end{macro}
+%  \end{macro}
+%  \end{macro}
+%
 %    \begin{macro}{\start@aligned}
 %    The \env{aligned} and \env{alignedat} environments are identical
 %    except that the latter takes a mandatory argument to specify the
@@ -3669,7 +3769,10 @@ and fix things up.}
 %    to the margin.
 %    \begin{macrocode}
     \alignedspace@left
-    \if #1t\vtop \else \if#1b \vbox \else \vcenter \fi \fi \bgroup
+%    \end{macrocode}
+%    Select the right kind of box based on the optional argument \verb=#1=.
+%    \begin{macrocode}
+      \ams@start@box{#1}\bgroup
         \maxfields@#2\relax
         \ifnum\maxfields@>\m@ne
             \multiply\maxfields@\tw@
@@ -3712,6 +3815,13 @@ and fix things up.}
             \hfil
             \tabskip\alignsep@
             \crcr
+%    \end{macrocode}
+%    If we picked up a bracket group by mistake here is the place to
+%    return it for processing.            
+% \changes{v2.17g}{2020/03/10}{Explicity test for b/t/c and return
+%    optional argument is different (gh/5)}
+%    \begin{macrocode}
+          \ams@return@opt@arg        
 }
 %    \end{macrocode}
 %    \end{macro}
@@ -3796,12 +3906,21 @@ and fix things up.}
         \nonmatherr@{\begin{gathered}}%
     \fi
     \alignedspace@left
-    \if #1t\vtop \else \if#1b\vbox \else \vcenter \fi\fi \bgroup
+%    \end{macrocode}
+%    Select the right kind of box based on the optional argument \verb=#1=.
+%    \begin{macrocode}
+    \ams@start@box{#1}\bgroup
         \Let@ \chardef\dspbrk@context\@ne \restore@math@cr
         \spread@equation
         \ialign\bgroup
             \hfil\strut@$\m@th\displaystyle##$\hfil
             \crcr
+%    \end{macrocode}
+%    And put a mistaking picked up bracket group back:
+% \changes{v2.17g}{2020/03/10}{Explicity test for b/t/c and return
+%    optional argument is different (gh/5)}
+%    \begin{macrocode}
+    \ams@return@opt@arg        
 }{%
   \endaligned
 }
diff --git a/macros/latex-dev/required/amsmath/amsmath.ins b/macros/latex-dev/required/amsmath/amsmath.ins
index 7a6a087359..55e4089804 100644
--- a/macros/latex-dev/required/amsmath/amsmath.ins
+++ b/macros/latex-dev/required/amsmath/amsmath.ins
@@ -1,7 +1,7 @@
-%% 
+%%
 %% Copyright 2010 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.
@@ -9,9 +9,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.
 %%
 %% ====================================================================
diff --git a/macros/latex-dev/required/amsmath/amsmath.pdf b/macros/latex-dev/required/amsmath/amsmath.pdf
index ec130fb9d7..8a5dbcd335 100644
--- a/macros/latex-dev/required/amsmath/amsmath.pdf
+++ b/macros/latex-dev/required/amsmath/amsmath.pdf
diff --git a/macros/latex-dev/required/amsmath/amsopn.dtx b/macros/latex-dev/required/amsmath/amsopn.dtx
index b7047377f3..35c3b1605b 100644
--- a/macros/latex-dev/required/amsmath/amsopn.dtx
+++ b/macros/latex-dev/required/amsmath/amsopn.dtx
@@ -2,7 +2,7 @@
 % \iffalse meta-comment
 %
 % Copyright (C) 1995, 1999 American Mathematical Society.
-% Copyright (C) 2016-2019 LaTeX3 Project and American Mathematical Society.
+% Copyright (C) 2016-2020 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
@@ -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
diff --git a/macros/latex-dev/required/amsmath/amsopn.ins b/macros/latex-dev/required/amsmath/amsopn.ins
index 8c977446cc..84aff6243b 100644
--- a/macros/latex-dev/required/amsmath/amsopn.ins
+++ b/macros/latex-dev/required/amsmath/amsopn.ins
@@ -1,7 +1,7 @@
-%% 
+%%
 %% Copyright 2010 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.
@@ -9,9 +9,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.
 %%
 %% ====================================================================
diff --git a/macros/latex-dev/required/amsmath/amsopn.pdf b/macros/latex-dev/required/amsmath/amsopn.pdf
index b518ffd88e..8da892be6d 100644
--- a/macros/latex-dev/required/amsmath/amsopn.pdf
+++ b/macros/latex-dev/required/amsmath/amsopn.pdf
diff --git a/macros/latex-dev/required/amsmath/amstex.sty b/macros/latex-dev/required/amsmath/amstex.sty
index edb57c1214..6ce36f52c9 100644
--- a/macros/latex-dev/required/amsmath/amstex.sty
+++ b/macros/latex-dev/required/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
diff --git a/macros/latex-dev/required/amsmath/amstext.dtx b/macros/latex-dev/required/amsmath/amstext.dtx
index a4c9aeb5d9..5e7e6ca672 100644
--- a/macros/latex-dev/required/amsmath/amstext.dtx
+++ b/macros/latex-dev/required/amsmath/amstext.dtx
@@ -2,7 +2,7 @@
 % \iffalse meta-comment
 %
 % Copyright (C) 1995, 1999 American Mathematical Society.
-% Copyright (C) 2016-2019 LaTeX3 Project and American Mathematical Society.
+% Copyright (C) 2016-2020 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
@@ -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
@@ -139,7 +139,7 @@ Bug reports can be opened (category \texttt{#1}) at\\%
 %    The macros \cs{f@size}, \cs{sf@size} and \cs{ssf@size} hold the
 %    sizes which should be used when we are loading a new font for use
 %    in \cs{textfont}, \cs{scriptfont} and \cs{scriptscriptfont}. There
-%    is some question whether we should use use \cs{tf@size} or
+%    is some question whether we should use \cs{tf@size} or
 %    \cs{f@size} for the main size, but since the primary purpose of the
 %    \cn{text} macro is to switch back to text within a display, it
 %    seems that \cs{f@size} is the better choice. (Indeed it could be
diff --git a/macros/latex-dev/required/amsmath/amstext.ins b/macros/latex-dev/required/amsmath/amstext.ins
index 84fcb0cb95..5f9a5c4076 100644
--- a/macros/latex-dev/required/amsmath/amstext.ins
+++ b/macros/latex-dev/required/amsmath/amstext.ins
@@ -1,7 +1,7 @@
-%% 
+%%
 %% Copyright 2010 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.
@@ -9,9 +9,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.
 %%
 %% ====================================================================
@@ -48,4 +48,3 @@ The Current Maintainer of this work is the LaTeX3 project.
 }
 
 \endbatchfile
-
diff --git a/macros/latex-dev/required/amsmath/amstext.pdf b/macros/latex-dev/required/amsmath/amstext.pdf
index 2df324d60a..c0e854f4c7 100644
--- a/macros/latex-dev/required/amsmath/amstext.pdf
+++ b/macros/latex-dev/required/amsmath/amstext.pdf
diff --git a/macros/latex-dev/required/amsmath/amsxtra.dtx b/macros/latex-dev/required/amsmath/amsxtra.dtx
index 2165dde41a..9cc0b71027 100644
--- a/macros/latex-dev/required/amsmath/amsxtra.dtx
+++ b/macros/latex-dev/required/amsmath/amsxtra.dtx
@@ -2,7 +2,7 @@
 % \iffalse meta-comment
 %
 % Copyright (C) 1995, 1999 American Mathematical Society.
-% Copyright (C) 2016-2019 LaTeX3 Project and American Mathematical Society.
+% Copyright (C) 2016-2020 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
@@ -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
diff --git a/macros/latex-dev/required/amsmath/amsxtra.ins b/macros/latex-dev/required/amsmath/amsxtra.ins
index 9e739c3d4b..bbcd08e3f7 100644
--- a/macros/latex-dev/required/amsmath/amsxtra.ins
+++ b/macros/latex-dev/required/amsmath/amsxtra.ins
@@ -1,7 +1,7 @@
-%% 
+%%
 %% Copyright 2010 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.
@@ -9,9 +9,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.
 %%
 %% ====================================================================
@@ -48,4 +48,3 @@ The Current Maintainer of this work is the LaTeX3 project.
 }
 
 \endbatchfile
-
diff --git a/macros/latex-dev/required/amsmath/amsxtra.pdf b/macros/latex-dev/required/amsmath/amsxtra.pdf
index 1130ed79aa..1fb0b379fa 100644
--- a/macros/latex-dev/required/amsmath/amsxtra.pdf
+++ b/macros/latex-dev/required/amsmath/amsxtra.pdf
diff --git a/macros/latex-dev/required/amsmath/changes.txt b/macros/latex-dev/required/amsmath/changes.txt
index e5e234cea2..bf5bbfe397 100644
--- a/macros/latex-dev/required/amsmath/changes.txt
+++ b/macros/latex-dev/required/amsmath/changes.txt
@@ -1,3 +1,31 @@
+2020-03-10  Frank Mittelbach  <Frank.Mittelbach@latex-project.org>
+
+	* amsmath.dtx (subsection{Simple aligning environments}):
+	Explicity test for b,t,c and return optional argument is
+	different (gh/5)
+
+2020-03-07  Frank Mittelbach  <Frank.Mittelbach@latex-project.org>
+
+	* amsmath.dtx (subsection{Math spacing commands}):
+	Math/text spacing commands are now in the \LaTeX{} kernel and are
+	made robust. We still define them here so that the package
+	continues to work with older formats (gh/303)
+
+
+#########################
+# 2020-02-02 Release
+#########################
+
+2020-01-20  Frank Mittelbach  <Frank.Mittelbach@latex-project.org>
+
+	* amsmath.dtx (subsection{Vertical bar symbols}):
+	Make \lvert, \rvert, \lVert and \rVert robust to match kernel
+	correction (gh/251)
+
+2019-12-01  Frank Mittelbach  <Frank.Mittelbach@latex-project.org>
+
+	* amsmath.dtx: docu update for gh/200 no code change.
+
 #########################
 # 2019-11-17 Release
 #########################
@@ -14,7 +42,8 @@
 
 2019-10-11  David Carlisle  <David.Carlisle@latex-project.org>
 
-	* build.lua: package amsmath-2018-12-01.sty (only ctan build script no source changes)
+	* build.lua: package amsmath-2018-12-01.sty (only ctan build script
+	no source changes)
 
 #########################
 # 2019-10-01 Release
diff --git a/macros/latex-dev/required/amsmath/subeqn.pdf b/macros/latex-dev/required/amsmath/subeqn.pdf
index 0b5cdd1ff6..2653db5fc6 100644
--- a/macros/latex-dev/required/amsmath/subeqn.pdf
+++ b/macros/latex-dev/required/amsmath/subeqn.pdf
diff --git a/macros/latex-dev/required/amsmath/subeqn.tex b/macros/latex-dev/required/amsmath/subeqn.tex
index c34b3f6952..7e07f61d01 100644
--- a/macros/latex-dev/required/amsmath/subeqn.tex
+++ b/macros/latex-dev/required/amsmath/subeqn.tex
@@ -90,7 +90,7 @@ C=D
 And that was equation \eqref{e:prevprime}.
 
 Notice, by the way, that when a \verb"\ref" occurs inside a \verb"\tag",
-and that \verb"\tag" is then \verb"\label"'d, a \verb"\ref" for the the
+and that \verb"\tag" is then \verb"\label"'d, a \verb"\ref" for the
 second \verb"\label" requires \emph{three} runs of \LaTeX{} in order to
 get the proper value. (If you run through the logic of \LaTeX{}'s
 cross-referencing mechanisms as they apply in this case, you will see
diff --git a/macros/latex-dev/required/amsmath/technote.pdf b/macros/latex-dev/required/amsmath/technote.pdf
index c517a1cdf8..ed9eb2ff83 100644
--- a/macros/latex-dev/required/amsmath/technote.pdf
+++ b/macros/latex-dev/required/amsmath/technote.pdf
diff --git a/macros/latex-dev/required/amsmath/testmath.pdf b/macros/latex-dev/required/amsmath/testmath.pdf
index e8e64c8fce..c764b160b8 100644
--- a/macros/latex-dev/required/amsmath/testmath.pdf
+++ b/macros/latex-dev/required/amsmath/testmath.pdf