[latex3-commits] [latex3/latex2e] revert-dots-main: revert to 066ad1dd3 and re-apply 3c68c5656 (f137f36ed)

[github at latex-project.org]

Repository : https://github.com/latex3/latex2e
On branch  : revert-dots-main
Link       : https://github.com/latex3/latex2e/commit/f137f36ed43f56f40100239e18cbceee1b27c00e

>---------------------------------------------------------------

commit f137f36ed43f56f40100239e18cbceee1b27c00e
Author: David Carlisle <d.p.carlisle at gmail.com>
Date:   Tue Nov 5 14:47:05 2024 +0000

    revert to 066ad1dd3 and re-apply 3c68c5656


>---------------------------------------------------------------

f137f36ed43f56f40100239e18cbceee1b27c00e
 required/amsmath/amsmath.dtx | 66 ++++----------------------------------------
 1 file changed, 5 insertions(+), 61 deletions(-)

diff --git a/required/amsmath/amsmath.dtx b/required/amsmath/amsmath.dtx
index 9d45cc2f9..10dff38f8 100644
--- a/required/amsmath/amsmath.dtx
+++ b/required/amsmath/amsmath.dtx
@@ -81,11 +81,11 @@ Bug reports can be opened (category \texttt{#1}) at\\%
 %    \begin{macrocode}
 \DeclareRelease{}{1994-06-01}{amsmath-2018-12-01.sty}
 \DeclareRelease{}{2018-12-01}{amsmath-2018-12-01.sty}
-\DeclareCurrentRelease{}{2024-10-30}
+\DeclareCurrentRelease{}{2019-04-01}
 %    \end{macrocode}
 %
 %    \begin{macrocode}
-\ProvidesPackage{amsmath}[2024/10/30 v2.17s AMS math features]
+\ProvidesPackage{amsmath}[2024/07/01 v2.17q AMS math features]
 %    \end{macrocode}
 %
 % \section{Catcode defenses}
@@ -1002,10 +1002,6 @@ Foreign command \@backslashchar#1;\MessageBreak
 \let\DOTSI\relax
 \let\DOTSB\relax
 \let\DOTSX\relax
-%    \end{macrocode}
-%  In the definitions below, special \cs{uccode}s are used to generate macros
-%  with arguments delimited by catcode 12 letters as returned by \cs{meaning}.
-%    \begin{macrocode}
 {\uccode`7=`\\ \uccode`8=`m \uccode`9=`a \uccode`0=`t \uccode`!=`h
  \uppercase{%
   \gdef\math@#1#2#3#4#5#6\math@{\gtest at false\ifx 7#1\ifx 8#2%
@@ -1043,13 +1039,6 @@ Foreign command \@backslashchar#1;\MessageBreak
 }
 \fi
 %    \end{macrocode}
-%   \changes{v2.17s}{2024/10/30}{guard against primitive if (gh/1448)}
-%    \begin{macrocode}
-{\uccode`7=`\\ \uccode`(=`i \uccode`)=`f
-  \uppercase{\gdef\testif@#1#2#3#4\testif@{%
-    \ifx7#1\ifx(#2\ifx)#3\@tempswafalse\fi\fi\fi}
-}}
-%    \end{macrocode}
 %    \begin{macrocode}
 \newcount\classnum@
 \def\getmathch@#1.#2\getmathch@{\classnum@#1 \divide\classnum at 4096
@@ -1098,14 +1087,6 @@ Foreign command \@backslashchar#1;\MessageBreak
   \ifx9#2 \@xp\@xp\@xp\zap at to@space\fi}}}
 \def\zap at to@space#1 {}
 %    \end{macrocode}
-%    
-% \changes{v2.17r}{2024/06/29}{macro added to strip \cs{protected} (gh/1265)}
-%    \begin{macrocode}
-{\uccode`9=`\p %
-  \uppercase{\gdef\stripprotected@#1#2#3\relax{%
-      \ifx9#2 \@xp\@xp\@xp\zap at to@space\fi}}}
-%    \end{macrocode}
-%
 %    \begin{macrocode}
 \def\keybin@{\gtest at true
  \ifx\@let at token+\else\ifx\@let at token=\else
@@ -1158,43 +1139,15 @@ Foreign command \@backslashchar#1;\MessageBreak
          \gdef\thedots@{\dotsb@}%
        \else
 %    \end{macrocode}
-%    In case \cs{@let at token} is a robust \LaTeXe{} command, i.e.,
-%    expands to \cs{protect}
-%    \verb*=\somename =, we save the \cs{meaning} of
-%    \verb*=\somename = in \cs{meaning@} (possibly followed by some dots that have
-%    not been consumed as arguments during the expansion).
-%    Otherwise, we save the
-%    \cs{meaning} of \cs{@let at token} in \cs{meaning@}.  The dots at the end
-%    as well as the space are
-%    used in later parts of the checking (this could probably be cleaned up a bit).
-% \changes{v2.15d}{2016/06/28}{Add space token to prevent runaway
-%    argument error}
-% \changes{v2.17r}{2024/06/29}{Drop \cs{protect} if present (gh/1265)}
-% \changes{v2.17s}{2024/10/30}{skip protect testif detect primitive if (gh/1448)}
+% \changes{v2.15d}{2016/06/28}{Add space token to prevent runaway argument error}
 %    \begin{macrocode}
          \xdef\meaning@{\meaning\@let at token. .........}%
-         \@tempswatrue
-         \@xp\testif@\meaning at ....\testif@
-         \if at tempswa
-           \begingroup
-             \def\protect{\protect}% % make it a quark
-             \xdef\meaning@{\@xp\stripprotect@\@let at token.........\stripprotect at . .........}%
-           \endgroup
-         \fi
-%    \end{macrocode}
-% In previous versions \verb|\long| macros were not seen by the lookahead.
+%    \end{macrocode}
+% In previous versions \verb|\long| macros were not seen by the lokkahead.
 % That was bad as this file uses \verb|\(re)newcommand| for \verb|\implies| etc.
 %    \begin{macrocode}
          \xdef\meaning@@{\@xp\striplong@\meaning@\relax\meaning@}%
 %    \end{macrocode}
-%    Until now \cs{protected} macros also stopped the lookahead, e.g.,
-%    $\cong$ wasn't recognized correctly for that reason.
-%         
-% \changes{v2.17r}{2024/06/29}{Handle \cs{protected} macros in
-%    lookahead for dots (gh/1265)}
-%    \begin{macrocode}
-         \xdef\meaning@@{\@xp\stripprotected@\meaning@@\relax\meaning@@}%
-%    \end{macrocode}
 %    \begin{macrocode}
          \@xp\math@\meaning@\math@
          \ifgtest@ % if \mathxxx test
@@ -1255,15 +1208,6 @@ Foreign command \@backslashchar#1;\MessageBreak
  \thedots@}
 %    \end{macrocode}
 %
-%    The helper to generate the meaning of \cs{\@let at token}, or of its
-%    first-level expansion with \cs{protect} removed.
-% \changes{v2.17r}{2024/06/29}{Drop \cs{protect} if present (gh/1265)}
-%    \begin{macrocode}
-\def\stripprotect@#1#2\stripprotect@{\ifx#1\protect
-  \meaning#2\else \meaning\@let at token \fi}
-
-%    \end{macrocode}
-%
 %    The \qc{\=} character is necessary in the two \cs{let} assignments
 %    in \cs{boldsymboldots@}, because the symbol we are making
 %    bold might be an \qc{\=} sign.