amsmath (19nov19)

git-svn-id: svn://tug.org/texlive/trunk@52854 c570f23f-e606-0410-a88d-b1316a301751

1 files changed, 19 insertions, 3 deletions

diff --git a/Master/texmf-dist/source/latex/amsmath/amsmath.dtx b/Master/texmf-dist/source/latex/amsmath/amsmath.dtx
index 8671694b706..11b7545c266 100644
--- a/Master/texmf-dist/source/latex/amsmath/amsmath.dtx
+++ b/Master/texmf-dist/source/latex/amsmath/amsmath.dtx
@@ -86,7 +86,7 @@ Bug reports can be opened (category \texttt{#1}) at\\%
 %    \end{macrocode}
 %
 %    \begin{macrocode}
-\ProvidesPackage{amsmath}[2019/04/01 v2.17c AMS math features]
+\ProvidesPackage{amsmath}[2019/11/16 v2.17d AMS math features]
 %    \end{macrocode}
 %
 % \section{Catcode defenses}
@@ -1641,10 +1641,19 @@ Foreign command \@backslashchar#1;\MessageBreak
 %    By redefining \cs{set@mathaccent} we ensure that
 %    \cn{DeclareMathAccent} will define accent commands to run our
 %    \cs{mathaccentV} function instead of the primitive \cs{mathaccent}.
+% \changes{v2.17d}{2019/11/16}{Added \cs{MakeRobust} to match kernel
+%                              change (gh/216)}
 %    \begin{macrocode}
 \def\set@mathaccent#1#2#3#4{%
-  \xdef#2{\@nx\protect\@nx\mathaccentV
+%    \end{macrocode}
+%    Now that the redefinitions done inside amsmath of the basic accents
+%    are all robust  we can drop the \cs{protect} here.
+%    \begin{macrocode}
+  \xdef#2{%
+%    \@nx\protect
+    \@nx\mathaccentV
     {\@xp\@gobble\string#2}\hexnumber@#1#4}%
+  \MakeRobust#2%
 }
 %    \end{macrocode}
 %
@@ -1714,6 +1723,13 @@ Foreign command \@backslashchar#1;\MessageBreak
       Unable to redefine math accent \string#5}%
   \fi\fi}
 \def\@tempc#1"#2#3#4#5#6\@nil#7{%
+%    \end{macrocode}
+%    Drop the inner part of the robust accent so that it can be recreated
+%    without a warning.
+% \changes{v2.17d}{2019/11/16}{Make temporarily fragile to match kernel
+%                              change (gh/216)}
+%    \begin{macrocode}
+  \@xp\let\csname\@xp\@gobble\string#7\space\endcsname\@undefined
   \chardef\@tempd="#3\relax\set@mathaccent\@tempd{#7}{#2}{#4#5}}
 \def\@tempd#1\@nil#2{%
     \PackageWarningNoLine{amsmath}{%
@@ -2091,7 +2107,7 @@ Foreign command \@backslashchar#1;\MessageBreak
 %  \begin{macro}{\overunderset}
 %    This is the combination of the previous two commands which is
 %    something that is sometimes needed.
-% \changes{v2.17c}{FMi}{New command \cs{overunderset}}
+% \changes{v2.17c}{2019/04/01}{New command \cs{overunderset}}
 %    \begin{macrocode}
 \newcommand{\overunderset}[3]{\binrel@{#3}%
   \binrel@@{\mathop{\kern\z@#3}\limits^{#1}_{#2}}}