[latex3-commits] [latex3/latex2e] main: revert to 066ad1dd3 and re-apply 3c68c5656 (#1541) (d4fc5846d)
github at latex-project.org
github at latex-project.org
Tue Nov 5 18:41:07 CET 2024
Repository : https://github.com/latex3/latex2e
On branch : main
Link : https://github.com/latex3/latex2e/commit/d4fc5846da1ac365384e46b2de04b51a67ec8415
>---------------------------------------------------------------
commit d4fc5846da1ac365384e46b2de04b51a67ec8415
Author: David Carlisle <d.p.carlisle at gmail.com>
Date: Tue Nov 5 17:41:07 2024 +0000
revert to 066ad1dd3 and re-apply 3c68c5656 (#1541)
* revert to 066ad1dd3 and re-apply 3c68c5656
* remove test file for #1448
* today's date and changes.txt entry
* Update date/version
---------
Co-authored-by: Joseph Wright <joseph at texdev.net>
>---------------------------------------------------------------
d4fc5846da1ac365384e46b2de04b51a67ec8415
required/amsmath/amsmath.dtx | 66 +-------
required/amsmath/changes.txt | 5 +
required/amsmath/testfiles/github-1448.luatex.tlg | 178 ----------------------
required/amsmath/testfiles/github-1448.lvt | 34 -----
required/amsmath/testfiles/github-1448.tlg | 148 ------------------
5 files changed, 10 insertions(+), 421 deletions(-)
diff --git a/required/amsmath/amsmath.dtx b/required/amsmath/amsmath.dtx
index 9d45cc2f9..591d17564 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/11/05 v2.17t 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.
diff --git a/required/amsmath/changes.txt b/required/amsmath/changes.txt
index 170c7fe0d..9d0161c62 100644
--- a/required/amsmath/changes.txt
+++ b/required/amsmath/changes.txt
@@ -1,3 +1,8 @@
+2024-11-05 David Carlisle <David.Carlisle at latex-project.org>
+
+ * amsmath.dtx
+ Revert last \dots change (gh/1448)
+
================================================================================
All changes above are only part of the development branch for the next release.
================================================================================
diff --git a/required/amsmath/testfiles/github-1448.luatex.tlg b/required/amsmath/testfiles/github-1448.luatex.tlg
deleted file mode 100644
index 2a9e03835..000000000
--- a/required/amsmath/testfiles/github-1448.luatex.tlg
+++ /dev/null
@@ -1,178 +0,0 @@
-This is a generated file for the LaTeX2e validation system.
-Don't change this file in any respect.
-Completed box being shipped out [1]
-\vbox(633.0+0.0)x407.0, direction TLT
-.\glue 16.0
-.\vbox(617.0+0.0)x345.0, shifted 62.0, direction TLT
-..\vbox(12.0+0.0)x345.0, glue set 12.0fil, direction TLT
-...\glue 0.0 plus 1.0fil
-...\hbox(0.0+0.0)x345.0, direction TLT
-....\hbox(0.0+0.0)x345.0, direction TLT
-..\glue 25.0
-..\glue(\lineskip) 0.0
-..\vbox(550.0+0.0)x345.0, glue set 479.94873fil, direction TLT
-...\write-{}
-...\glue(\topskip) 4.16667
-...\hbox(5.83333+0.83333)x345.0, glue set 301.50708fil, direction TLT
-....\localpar
-.....\localinterlinepenalty=0
-.....\localbrokenpenalty=0
-.....\localleftbox=null
-.....\localrightbox=null
-....\hbox(0.0+0.0)x15.0, direction TLT
-....\mathon
-....\OML/cmm/m/it/10 x
-....\glue(\thinmuskip) 1.66663
-....\hbox(4.44444+0.0)x11.66661, direction TLT
-.....\OMS/cmsy/m/n/10 ^^A
-.....\glue(\thinmuskip) 1.66663
-.....\OMS/cmsy/m/n/10 ^^A
-.....\glue(\thinmuskip) 1.66663
-.....\OMS/cmsy/m/n/10 ^^A
-....\glue(\thinmuskip) 1.66663
-....\OT1/cmr/m/n/10 +
-....\mathoff
-....\penalty 10000
-....\glue(\parfillskip) 0.0 plus 1.0fil
-....\glue(\rightskip) 0.0
-...\glue(\parskip) 0.0 plus 1.0
-...\glue(\parskip) 0.0
-...\glue(\baselineskip) 5.33334
-...\hbox(5.83333+0.83333)x345.0, glue set 301.50708fil, direction TLT
-....\localpar
-.....\localinterlinepenalty=0
-.....\localbrokenpenalty=0
-.....\localleftbox=null
-.....\localrightbox=null
-....\hbox(0.0+0.0)x15.0, direction TLT
-....\mathon
-....\OML/cmm/m/it/10 x
-....\glue(\thinmuskip) 1.66663
-....\hbox(4.44444+0.0)x11.66661, direction TLT
-.....\OMS/cmsy/m/n/10 ^^A
-.....\glue(\thinmuskip) 1.66663
-.....\OMS/cmsy/m/n/10 ^^A
-.....\glue(\thinmuskip) 1.66663
-.....\OMS/cmsy/m/n/10 ^^A
-....\glue(\thinmuskip) 1.66663
-....\OMS/cmsy/m/n/10 ^^@
-....\mathoff
-....\penalty 10000
-....\glue(\parfillskip) 0.0 plus 1.0fil
-....\glue(\rightskip) 0.0
-...\glue(\parskip) 0.0 plus 1.0
-...\glue(\parskip) 0.0
-...\glue(\baselineskip) 6.51389
-...\hbox(4.65279+0.0)x345.0, glue set 304.28485fil, direction TLT
-....\localpar
-.....\localinterlinepenalty=0
-.....\localbrokenpenalty=0
-.....\localleftbox=null
-.....\localrightbox=null
-....\hbox(0.0+0.0)x15.0, direction TLT
-....\mathon
-....\OML/cmm/m/it/10 x
-....\glue(\thinmuskip) 1.66663
-....\hbox(4.44444+0.0)x11.66661, direction TLT
-.....\OMS/cmsy/m/n/10 ^^A
-.....\glue(\thinmuskip) 1.66663
-.....\OMS/cmsy/m/n/10 ^^A
-.....\glue(\thinmuskip) 1.66663
-.....\OMS/cmsy/m/n/10 ^^A
-....\glue(\thinmuskip) 1.66663
-....\OMS/cmsy/m/n/10 ^^C
-....\mathoff
-....\penalty 10000
-....\glue(\parfillskip) 0.0 plus 1.0fil
-....\glue(\rightskip) 0.0
-...\glue(\parskip) 0.0 plus 1.0
-...\glue(\parskip) 0.0
-...\glue(\baselineskip) 5.05556
-...\hbox(6.94444+0.0)x345.0, glue set 304.99323fil, direction TLT
-....\localpar
-.....\localinterlinepenalty=0
-.....\localbrokenpenalty=0
-.....\localleftbox=null
-.....\localrightbox=null
-....\hbox(0.0+0.0)x15.0, direction TLT
-....\mathon
-....\OML/cmm/m/it/10 x
-....\glue(\thinmuskip) 1.66663
-....\hbox(1.05554+0.0)x11.66661, direction TLT
-.....\OML/cmm/m/it/10 :
-.....\glue(\thinmuskip) 1.66663
-.....\OML/cmm/m/it/10 :
-.....\glue(\thinmuskip) 1.66663
-.....\OML/cmm/m/it/10 :
-....\glue(\thinmuskip) 1.66663
-....\OML/cmm/m/it/10 b
-....\mathoff
-....\penalty 10000
-....\glue(\parfillskip) 0.0 plus 1.0fil
-....\glue(\rightskip) 0.0
-...\glue(\parskip) 0.0 plus 1.0
-...\glue(\parskip) 0.0
-...\glue(\baselineskip) 7.69446
-...\hbox(4.30554+0.0)x345.0, glue set 303.56958fil, direction TLT
-....\localpar
-.....\localinterlinepenalty=0
-.....\localbrokenpenalty=0
-.....\localleftbox=null
-.....\localrightbox=null
-....\hbox(0.0+0.0)x15.0, direction TLT
-....\mathon
-....\OML/cmm/m/it/10 x
-....\glue(\thinmuskip) 1.66663
-....\hbox(1.05554+0.0)x11.66661, direction TLT
-.....\OML/cmm/m/it/10 :
-.....\glue(\thinmuskip) 1.66663
-.....\OML/cmm/m/it/10 :
-.....\glue(\thinmuskip) 1.66663
-.....\OML/cmm/m/it/10 :
-....\glue(\thinmuskip) 1.66663
-....\OML/cmm/m/it/10 x
-....\mathoff
-....\penalty 10000
-....\glue(\parfillskip) 0.0 plus 1.0fil
-....\glue(\rightskip) 0.0
-...\glue(\parskip) 0.0 plus 1.0
-...\glue(\parskip) 0.0
-...\glue(\baselineskip) 7.55556
-...\hbox(4.44444+1.94444)x345.0, glue set 303.01172fil, direction TLT
-....\localpar
-.....\localinterlinepenalty=0
-.....\localbrokenpenalty=0
-.....\localleftbox=null
-.....\localrightbox=null
-....\hbox(0.0+0.0)x15.0, direction TLT
-....\mathon
-....\OML/cmm/m/it/10 x
-....\glue(\thinmuskip) 1.66663
-....\hbox(1.05554+0.0)x11.66661, direction TLT
-.....\OML/cmm/m/it/10 :
-.....\glue(\thinmuskip) 1.66663
-.....\OML/cmm/m/it/10 :
-.....\glue(\thinmuskip) 1.66663
-.....\OML/cmm/m/it/10 :
-....\glue(\thinmuskip) 1.66663
-....\hbox(4.44444+1.94444)x6.27313, direction TLT
-.....\hbox(4.44444+1.94444)x6.27313, direction TLT
-......\mathon
-......\OML/cmm/b/it/10 y
-......\kern0.37038 (italic)
-......\mathoff
-....\mathoff
-....\penalty 10000
-....\glue(\parfillskip) 0.0 plus 1.0fil
-....\glue(\rightskip) 0.0
-...\glue -1.94444
-...\glue 0.0 plus 1.0fil
-...\glue 0.0
-...\glue 0.0 plus 0.0001fil
-..\glue(\baselineskip) 23.55556
-..\hbox(6.44444+0.0)x345.0, direction TLT
-...\hbox(6.44444+0.0)x345.0, glue set 170.0fil, direction TLT
-....\glue 0.0 plus 1.0fil
-....\OT1/cmr/m/n/10 1
-....\glue 0.0 plus 1.0fil
-(github-1448.aux)
diff --git a/required/amsmath/testfiles/github-1448.lvt b/required/amsmath/testfiles/github-1448.lvt
deleted file mode 100644
index 8bd5449fc..000000000
--- a/required/amsmath/testfiles/github-1448.lvt
+++ /dev/null
@@ -1,34 +0,0 @@
-\documentclass{article}
-
-\input{test2e}
-
-% 2.17r gave low level argument errors as teh \if nesting
-% was wrong if the \futurelet found a primitive \if... token
-
-\usepackage{amsmath}
-
-
-\newcommand\test{\iftrue x\fi}
-
-\DeclareRobustCommand\testr{\DOTSB+}
-\protected\def\testp{\DOTSB-}
-\def\testd{\DOTSB*}
-
-\begin{document}
-
-\START
-\showoutput
-$ x \dots \testr$
-
-$ x \dots \testp$
-
-$ x \dots \testd$
-
-$x \dots \iffalse a\else b\fi $
-
-$x \dots \test$
-
-$x \dots \boldsymbol{y} $
-
-
-\end{document}
diff --git a/required/amsmath/testfiles/github-1448.tlg b/required/amsmath/testfiles/github-1448.tlg
deleted file mode 100644
index 3d445cf7a..000000000
--- a/required/amsmath/testfiles/github-1448.tlg
+++ /dev/null
@@ -1,148 +0,0 @@
-This is a generated file for the LaTeX2e validation system.
-Don't change this file in any respect.
-Completed box being shipped out [1]
-\vbox(633.0+0.0)x407.0
-.\glue 16.0
-.\vbox(617.0+0.0)x345.0, shifted 62.0
-..\vbox(12.0+0.0)x345.0, glue set 12.0fil
-...\glue 0.0 plus 1.0fil
-...\hbox(0.0+0.0)x345.0
-....\hbox(0.0+0.0)x345.0
-..\glue 25.0
-..\glue(\lineskip) 0.0
-..\vbox(550.0+0.0)x345.0, glue set 479.94873fil
-...\write-{}
-...\glue(\topskip) 4.16667
-...\hbox(5.83333+0.83333)x345.0, glue set 301.50706fil
-....\hbox(0.0+0.0)x15.0
-....\mathon
-....\OML/cmm/m/it/10 x
-....\glue(\thinmuskip) 1.66663
-....\hbox(4.44444+0.0)x11.66661
-.....\OMS/cmsy/m/n/10 ^^A
-.....\glue(\thinmuskip) 1.66663
-.....\OMS/cmsy/m/n/10 ^^A
-.....\glue(\thinmuskip) 1.66663
-.....\OMS/cmsy/m/n/10 ^^A
-....\glue(\thinmuskip) 1.66663
-....\OT1/cmr/m/n/10 +
-....\mathoff
-....\penalty 10000
-....\glue(\parfillskip) 0.0 plus 1.0fil
-....\glue(\rightskip) 0.0
-...\glue(\parskip) 0.0 plus 1.0
-...\glue(\parskip) 0.0
-...\glue(\baselineskip) 5.33334
-...\hbox(5.83333+0.83333)x345.0, glue set 301.50706fil
-....\hbox(0.0+0.0)x15.0
-....\mathon
-....\OML/cmm/m/it/10 x
-....\glue(\thinmuskip) 1.66663
-....\hbox(4.44444+0.0)x11.66661
-.....\OMS/cmsy/m/n/10 ^^A
-.....\glue(\thinmuskip) 1.66663
-.....\OMS/cmsy/m/n/10 ^^A
-.....\glue(\thinmuskip) 1.66663
-.....\OMS/cmsy/m/n/10 ^^A
-....\glue(\thinmuskip) 1.66663
-....\OMS/cmsy/m/n/10 ^^@
-....\mathoff
-....\penalty 10000
-....\glue(\parfillskip) 0.0 plus 1.0fil
-....\glue(\rightskip) 0.0
-...\glue(\parskip) 0.0 plus 1.0
-...\glue(\parskip) 0.0
-...\glue(\baselineskip) 6.51389
-...\hbox(4.65279+0.0)x345.0, glue set 304.28485fil
-....\hbox(0.0+0.0)x15.0
-....\mathon
-....\OML/cmm/m/it/10 x
-....\glue(\thinmuskip) 1.66663
-....\hbox(4.44444+0.0)x11.66661
-.....\OMS/cmsy/m/n/10 ^^A
-.....\glue(\thinmuskip) 1.66663
-.....\OMS/cmsy/m/n/10 ^^A
-.....\glue(\thinmuskip) 1.66663
-.....\OMS/cmsy/m/n/10 ^^A
-....\glue(\thinmuskip) 1.66663
-....\OMS/cmsy/m/n/10 ^^C
-....\mathoff
-....\penalty 10000
-....\glue(\parfillskip) 0.0 plus 1.0fil
-....\glue(\rightskip) 0.0
-...\glue(\parskip) 0.0 plus 1.0
-...\glue(\parskip) 0.0
-...\glue(\baselineskip) 5.05556
-...\hbox(6.94444+0.0)x345.0, glue set 304.99321fil
-....\hbox(0.0+0.0)x15.0
-....\mathon
-....\OML/cmm/m/it/10 x
-....\glue(\thinmuskip) 1.66663
-....\hbox(1.05554+0.0)x11.66661
-.....\OML/cmm/m/it/10 :
-.....\glue(\thinmuskip) 1.66663
-.....\OML/cmm/m/it/10 :
-.....\glue(\thinmuskip) 1.66663
-.....\OML/cmm/m/it/10 :
-....\glue(\thinmuskip) 1.66663
-....\OML/cmm/m/it/10 b
-....\mathoff
-....\penalty 10000
-....\glue(\parfillskip) 0.0 plus 1.0fil
-....\glue(\rightskip) 0.0
-...\glue(\parskip) 0.0 plus 1.0
-...\glue(\parskip) 0.0
-...\glue(\baselineskip) 7.69446
-...\hbox(4.30554+0.0)x345.0, glue set 303.5696fil
-....\hbox(0.0+0.0)x15.0
-....\mathon
-....\OML/cmm/m/it/10 x
-....\glue(\thinmuskip) 1.66663
-....\hbox(1.05554+0.0)x11.66661
-.....\OML/cmm/m/it/10 :
-.....\glue(\thinmuskip) 1.66663
-.....\OML/cmm/m/it/10 :
-.....\glue(\thinmuskip) 1.66663
-.....\OML/cmm/m/it/10 :
-....\glue(\thinmuskip) 1.66663
-....\OML/cmm/m/it/10 x
-....\mathoff
-....\penalty 10000
-....\glue(\parfillskip) 0.0 plus 1.0fil
-....\glue(\rightskip) 0.0
-...\glue(\parskip) 0.0 plus 1.0
-...\glue(\parskip) 0.0
-...\glue(\baselineskip) 7.55556
-...\hbox(4.44444+1.94444)x345.0, glue set 303.01173fil
-....\hbox(0.0+0.0)x15.0
-....\mathon
-....\OML/cmm/m/it/10 x
-....\glue(\thinmuskip) 1.66663
-....\hbox(1.05554+0.0)x11.66661
-.....\OML/cmm/m/it/10 :
-.....\glue(\thinmuskip) 1.66663
-.....\OML/cmm/m/it/10 :
-.....\glue(\thinmuskip) 1.66663
-.....\OML/cmm/m/it/10 :
-....\glue(\thinmuskip) 1.66663
-....\hbox(4.44444+1.94444)x6.27313
-.....\hbox(4.44444+1.94444)x6.27313
-......\mathon
-......\OML/cmm/b/it/10 y
-......\kern0.37038
-......\mathoff
-....\mathoff
-....\penalty 10000
-....\glue(\parfillskip) 0.0 plus 1.0fil
-....\glue(\rightskip) 0.0
-...\glue -1.94444
-...\glue 0.0 plus 1.0fil
-...\glue 0.0
-...\glue 0.0 plus 0.0001fil
-..\glue(\baselineskip) 23.55556
-..\hbox(6.44444+0.0)x345.0
-...\hbox(6.44444+0.0)x345.0, glue set 170.0fil
-....\glue 0.0 plus 1.0fil
-....\OT1/cmr/m/n/10 1
-....\glue 0.0 plus 1.0fil
-(github-1448.aux)
More information about the latex3-commits
mailing list.