[latex3-commits] [git/LaTeX3-latex3-latex2e] develop: Gh687 (#691) (b5641251)
GitHub
noreply at github.com
Fri Oct 15 21:36:52 CEST 2021
Repository : https://github.com/latex3/latex2e
On branch : develop
Link : https://github.com/latex3/latex2e/commit/b5641251bff4075aa9e0995c7089b2eb7ea2cc0c
>---------------------------------------------------------------
commit b5641251bff4075aa9e0995c7089b2eb7ea2cc0c
Author: Frank Mittelbach <frank.mittelbach at latex-project.org>
Date: Fri Oct 15 21:36:52 2021 +0200
Gh687 (#691)
* drop unnecessary definition for \footref
* fix for #687
* don't use refstepcounter with eqnarray
* test for fleqn eqnarray version
* also add a definition for \@currentcounter to amsmath
* add news entry
>---------------------------------------------------------------
b5641251bff4075aa9e0995c7089b2eb7ea2cc0c
base/changes.txt | 8 +
base/doc/ltnews34.tex | 17 +
base/ltboxes.dtx | 25 +-
base/ltcmdhooks.dtx | 9 +-
base/ltfloat.dtx | 27 +-
base/ltmath.dtx | 8 +-
base/testfiles/github-0479-often.luatex.tlg | 2 +
base/testfiles/github-0479-often.tlg | 2 +
base/testfiles/github-0479-often.xetex.tlg | 2 +
base/testfiles/github-0687.lvt | 32 ++
base/testfiles/github-0687.tlg | 356 +++++++++++++++++++++
.../tlb-latexrelease-rollback-003-often.luatex.tlg | 4 +
.../tlb-latexrelease-rollback-003-often.tlg | 4 +
.../tlb-latexrelease-rollback-003-often.xetex.tlg | 4 +
base/testfiles/tlb-rollback-004-often.luatex.tlg | 2 +
base/testfiles/tlb-rollback-004-often.tlg | 2 +
base/testfiles/tlb-rollback-004-often.xetex.tlg | 2 +
base/testfiles/tlb-rollback-005.luatex.tlg | 2 +
base/testfiles/tlb-rollback-005.tlg | 2 +
base/testfiles/tlb-rollback-005.xetex.tlg | 2 +
base/testfiles/{tlb0009.lvt => tlb00009-fleqn.lvt} | 17 +-
base/testfiles/{tlb0009.tlg => tlb00009-fleqn.tlg} | 20 +-
required/amsmath/amsmath.dtx | 10 +-
required/amsmath/changes.txt | 7 +-
24 files changed, 525 insertions(+), 41 deletions(-)
diff --git a/base/changes.txt b/base/changes.txt
index 7c574782..f1032430 100644
--- a/base/changes.txt
+++ b/base/changes.txt
@@ -6,6 +6,14 @@ completeness or accuracy and it contains some references to files that
are not part of the distribution.
================================================================================
+2021-10-14 Frank Mittelbach <Frank.Mittelbach at latex-project.org>
+
+ * ltfloat.dtx (subsection{Footnotes}):
+ * ltboxes.dtx (section{\LaTeX\ Box commands}):
+ * ltmath.dtx (two places}):
+ Explicitly set \@currentcounter when not automatically done
+ through \refstepcounter (gh/687)
+
2021-10-04 Frank Mittelbach <Frank.Mittelbach at latex-project.org>
* classes.dtx, doc.dtx, makeindx.dtx, preload.dtx, slides.dtx, array.dtx
diff --git a/base/doc/ltnews34.tex b/base/doc/ltnews34.tex
index d2507f69..83c0fa7e 100644
--- a/base/doc/ltnews34.tex
+++ b/base/doc/ltnews34.tex
@@ -551,6 +551,23 @@ the callback handler indicates to remove the entire math block.
\githubissue{644}
+\subsection{Extended label handling in Package code}
+
+Since 2020, as noted in \LaTeX News 32~\cite{34:ltnews32}, \LaTeX\ has
+recorded the name of the counter associated with the current label in
+the internal command \cs{@currentcounter}. This facility (originally
+from the \pkg{zref} package of Heiko Oberdiek) can be used to generate
+prefixes such as \enquote{Figure} before the reference text. In the
+common case the current label is set by \cs{refstepcounter} and the
+counter name is stored automatically, but some constructs (alignments
+and footnotes) may need to store the current label directly. In such a
+case it is useful to also update \cs{@currentcounter}. In this release
+the footnote command in the kernel the \pkg{amsmath} package has been
+updated in this way. We encourage maintainers of any class and
+package files that are defining \cs{@currentlabel} to set
+\cs{@currentcounter} at the same point.
+%
+\githubissue{300, 687}
\subsection{???}
diff --git a/base/ltboxes.dtx b/base/ltboxes.dtx
index 8499d3ab..92d9228a 100644
--- a/base/ltboxes.dtx
+++ b/base/ltboxes.dtx
@@ -33,7 +33,7 @@
%<*driver>
% \fi
\ProvidesFile{ltboxes.dtx}
- [2021/02/10 v1.4b LaTeX Kernel (Box Commands)]
+ [2021/10/14 v1.4c LaTeX Kernel (Box Commands)]
% \iffalse
\documentclass{ltxdoc}
\GetFileInfo{ltboxes.dtx}
@@ -1137,10 +1137,12 @@
% {Color groups restored here.}
% \changes{v1.4b}{2021/02/10}
% {Explicitly run \cs{par} in support for paragraph tagging}
+% \changes{v1.4c}{2021/10/14}
+% {Explicitly set \cs{@currentcounter} (gh/687)}
% \begin{macrocode}
%</2ekernel>
%<*2ekernel|latexrelease>
-%<latexrelease>\IncludeInRelease{2021/06/01}%
+%<latexrelease>\IncludeInRelease{2021/11/15}%
%<latexrelease> {\@mpfootnotetext}{footnotetext tagging}%
\long\def\@mpfootnotetext#1{%
\global\setbox\@mpfootins\vbox{%
@@ -1148,6 +1150,7 @@
\reset at font\footnotesize
\hsize\columnwidth
\@parboxrestore
+ \def\@currentcounter{mpfootnote}%
\protected at edef\@currentlabel
{\csname p at mpfootnote\endcsname\@thefnmark}%
\color at begingroup
@@ -1158,6 +1161,24 @@
%</2ekernel|latexrelease>
%<latexrelease>\EndIncludeInRelease
% \end{macrocode}
+% \begin{macrocode}
+%<latexrelease>\IncludeInRelease{2021/06/01}%
+%<latexrelease> {\@mpfootnotetext}{footnotetext tagging}%
+%<latexrelease>\long\def\@mpfootnotetext#1{%
+%<latexrelease> \global\setbox\@mpfootins\vbox{%
+%<latexrelease> \unvbox\@mpfootins
+%<latexrelease> \reset at font\footnotesize
+%<latexrelease> \hsize\columnwidth
+%<latexrelease> \@parboxrestore
+%<latexrelease> \protected at edef\@currentlabel
+%<latexrelease> {\csname p at mpfootnote\endcsname\@thefnmark}%
+%<latexrelease> \color at begingroup
+%<latexrelease> \@makefntext{%
+%<latexrelease> \rule\z@\footnotesep\ignorespaces#1\@finalstrut\strutbox}%
+%<latexrelease> \par
+%<latexrelease> \color at endgroup}}
+%<latexrelease>\EndIncludeInRelease
+% \end{macrocode}
%
% \begin{macrocode}
%<latexrelease>\IncludeInRelease{0000/00/00}%
diff --git a/base/ltcmdhooks.dtx b/base/ltcmdhooks.dtx
index 37ad912e..3f692b2f 100644
--- a/base/ltcmdhooks.dtx
+++ b/base/ltcmdhooks.dtx
@@ -14,20 +14,13 @@
%%% From File: ltcmdhooks.dtx
%
\def\ltcmdhooksversion{v1.0e}
-\def\ltcmdhooksdate{2021/09/28}
+\def\ltcmdhooksdate{2021/10/14}
%
%
%
%<*driver>
\documentclass{l3doc}
%\usepackage{ltcmdhooks}
-\makeatletter
-\providecommand\footref[1]{%
- \begingroup
- \unrestored at protected@xdef\@thefnmark{\ref{#1}}%
- \endgroup
- \@footnotemark}
-\makeatother
\EnableCrossrefs
\CodelineIndex
\begin{document}
diff --git a/base/ltfloat.dtx b/base/ltfloat.dtx
index ed25db3e..ac3b6418 100644
--- a/base/ltfloat.dtx
+++ b/base/ltfloat.dtx
@@ -31,7 +31,7 @@
%
%<*driver>
% \fi
-\ProvidesFile{ltfloat.dtx}[2021/03/03 v1.2f LaTeX Kernel (Floats)]
+\ProvidesFile{ltfloat.dtx}[2021/10/14 v1.2g LaTeX Kernel (Floats)]
% \iffalse
\documentclass{ltxdoc}
\GetFileInfo{ltfloat.dtx}
@@ -1510,10 +1510,12 @@
% {Missing percent, again}
% \changes{v1.2e}{2021/02/10}{Explicitly run \cs{par} at the end of footnote text
% in preparation for paragraph hooks}
+% \changes{v1.2g}{2021/10/14}
+% {Explicitly set \cs{@currentcounter} (gh/687)}
% \begin{macrocode}
%</2ekernel>
%<*2ekernel|latexrelease>
-%<latexrelease>\IncludeInRelease{2021/06/01}%
+%<latexrelease>\IncludeInRelease{2021/11/15}%
%<latexrelease> {\@footnotetext}{footnotetext tagging}%
\long\def\@footnotetext#1{\insert\footins{%
\reset at font\footnotesize
@@ -1521,6 +1523,7 @@
\splittopskip\footnotesep
\splitmaxdepth \dp\strutbox \floatingpenalty \@MM
\hsize\columnwidth \@parboxrestore
+ \def\@currentcounter{footnote}%
\protected at edef\@currentlabel{%
\csname p at footnote\endcsname\@thefnmark
}%
@@ -1534,6 +1537,26 @@
% \end{macrocode}
%
% \begin{macrocode}
+%<latexrelease>\IncludeInRelease{2021/06/01}%
+%<latexrelease> {\@footnotetext}{footnotetext tagging}%
+%<latexrelease>\long\def\@footnotetext#1{\insert\footins{%
+%<latexrelease> \reset at font\footnotesize
+%<latexrelease> \interlinepenalty\interfootnotelinepenalty
+%<latexrelease> \splittopskip\footnotesep
+%<latexrelease> \splitmaxdepth \dp\strutbox \floatingpenalty \@MM
+%<latexrelease> \hsize\columnwidth \@parboxrestore
+%<latexrelease> \protected at edef\@currentlabel{%
+%<latexrelease> \csname p at footnote\endcsname\@thefnmark
+%<latexrelease> }%
+%<latexrelease> \color at begingroup
+%<latexrelease> \@makefntext{%
+%<latexrelease> \rule\z@\footnotesep\ignorespaces#1\@finalstrut\strutbox}%
+%<latexrelease> \par
+%<latexrelease> \color at endgroup}}%
+%<latexrelease>\EndIncludeInRelease
+% \end{macrocode}
+%
+% \begin{macrocode}
%<latexrelease>\IncludeInRelease{0000/00/00}%
%<latexrelease> {\@footnotetext}{footnotetext tagging}%
%<latexrelease>
diff --git a/base/ltmath.dtx b/base/ltmath.dtx
index aadb96fb..59e0d89a 100644
--- a/base/ltmath.dtx
+++ b/base/ltmath.dtx
@@ -38,7 +38,7 @@
%<*driver>
% \fi
\ProvidesFile{ltmath.dtx}
- [2021/04/20 v1.2i LaTeX Kernel (Math Setup)]
+ [2021/10/14 v1.2j LaTeX Kernel (Math Setup)]
% \iffalse
%</driver>
%
@@ -915,10 +915,13 @@
% whole display. Note that we can't use \cs{refstepcounter} as this
% results in |\@currentlabel| getting restored at the wrong and
% thus always writing the first label to the \texttt{.aux} file.
+% \changes{v1.2j}{2021/10/14}
+% {Explicitly set \cs{@currentcounter} (gh/687)}
% \begin{macrocode}
\def\eqnarray{%
\stepcounter{equation}%
\def\@currentlabel{\p at equation\theequation}%
+ \def\@currentcounter{equation}%
\global\@eqnswtrue
\m at th
\global\@eqcnt\z@
@@ -1231,10 +1234,13 @@
%
% \begin{environment}{eqnarray}
% The \textsf{eqnarray} environment
+% \changes{v1.2j}{2021/10/14}
+% {Explicitly set \cs{@currentcounter} (gh/687)}
% \begin{macrocode}
\renewenvironment{eqnarray}{%
\stepcounter{equation}%
\def\@currentlabel{\p at equation\theequation}%
+ \def\@currentcounter{equation}%
\global\@eqnswtrue\m at th
\global\@eqcnt\z@
\tabskip\mathindent
diff --git a/base/testfiles/github-0479-often.luatex.tlg b/base/testfiles/github-0479-often.luatex.tlg
index 76b4cea5..b19ea451 100644
--- a/base/testfiles/github-0479-often.luatex.tlg
+++ b/base/testfiles/github-0479-often.luatex.tlg
@@ -430,6 +430,7 @@ Already applied: [....-..-..] Make \parbox robust on input line ....
Applying: [....-..-..] reset \lineskiplimit on input line ....
Already applied: [....-..-..] reset \lineskiplimit on input line ....
Skipping: [....-..-..] footnotetext tagging on input line ....
+Skipping: [....-..-..] footnotetext tagging on input line ....
Applying: [....-..-..] footnotetext tagging on input line ....
Applying: [....-..-..] Make \rule robust on input line ....
LaTeX Info: Redefining \rule on input line ....
@@ -520,6 +521,7 @@ Applying: [....-..-..] subscript baseline on input line ....
Already applied: [....-..-..] subscript baseline on input line ....
Already applied: [....-..-..] subscript baseline on input line ....
Skipping: [....-..-..] footnotetext tagging on input line ....
+Skipping: [....-..-..] footnotetext tagging on input line ....
Applying: [....-..-..] footnotetext tagging on input line ....
Skipping: [....-..-..] Add footref on input line ....
Applying: [....-..-..] Add footref on input line ....
diff --git a/base/testfiles/github-0479-often.tlg b/base/testfiles/github-0479-often.tlg
index 8540d1fd..2d8fe8a6 100644
--- a/base/testfiles/github-0479-often.tlg
+++ b/base/testfiles/github-0479-often.tlg
@@ -419,6 +419,7 @@ Already applied: [....-..-..] Make \parbox robust on input line ....
Applying: [....-..-..] reset \lineskiplimit on input line ....
Already applied: [....-..-..] reset \lineskiplimit on input line ....
Skipping: [....-..-..] footnotetext tagging on input line ....
+Skipping: [....-..-..] footnotetext tagging on input line ....
Applying: [....-..-..] footnotetext tagging on input line ....
Applying: [....-..-..] Make \rule robust on input line ....
LaTeX Info: Redefining \rule on input line ....
@@ -509,6 +510,7 @@ Applying: [....-..-..] subscript baseline on input line ....
Already applied: [....-..-..] subscript baseline on input line ....
Already applied: [....-..-..] subscript baseline on input line ....
Skipping: [....-..-..] footnotetext tagging on input line ....
+Skipping: [....-..-..] footnotetext tagging on input line ....
Applying: [....-..-..] footnotetext tagging on input line ....
Skipping: [....-..-..] Add footref on input line ....
Applying: [....-..-..] Add footref on input line ....
diff --git a/base/testfiles/github-0479-often.xetex.tlg b/base/testfiles/github-0479-often.xetex.tlg
index 6b8e509f..7980339f 100644
--- a/base/testfiles/github-0479-often.xetex.tlg
+++ b/base/testfiles/github-0479-often.xetex.tlg
@@ -420,6 +420,7 @@ Already applied: [....-..-..] Make \parbox robust on input line ....
Applying: [....-..-..] reset \lineskiplimit on input line ....
Already applied: [....-..-..] reset \lineskiplimit on input line ....
Skipping: [....-..-..] footnotetext tagging on input line ....
+Skipping: [....-..-..] footnotetext tagging on input line ....
Applying: [....-..-..] footnotetext tagging on input line ....
Applying: [....-..-..] Make \rule robust on input line ....
LaTeX Info: Redefining \rule on input line ....
@@ -510,6 +511,7 @@ Applying: [....-..-..] subscript baseline on input line ....
Already applied: [....-..-..] subscript baseline on input line ....
Already applied: [....-..-..] subscript baseline on input line ....
Skipping: [....-..-..] footnotetext tagging on input line ....
+Skipping: [....-..-..] footnotetext tagging on input line ....
Applying: [....-..-..] footnotetext tagging on input line ....
Skipping: [....-..-..] Add footref on input line ....
Applying: [....-..-..] Add footref on input line ....
diff --git a/base/testfiles/github-0687.lvt b/base/testfiles/github-0687.lvt
new file mode 100644
index 00000000..423d4c72
--- /dev/null
+++ b/base/testfiles/github-0687.lvt
@@ -0,0 +1,32 @@
+\documentclass{article}
+\input{test2e}
+
+
+\makeatletter
+\newcommand\mycurrentlabel{\@currentlabel}
+\newcommand\mycurrentcounter{\@currentcounter}
+\makeatother
+
+\showoutput
+
+\begin{document}
+
+\START
+
+\section{Section 1}
+
+Foo.\footnote{Bar.}
+
+Baz.\footnote{\mycurrentlabel{} \mycurrentcounter}
+
+Bar.\footnote[7]{\mycurrentlabel{} \mycurrentcounter}
+
+\begin{minipage}{.6\textwidth}
+ Foo.\footnotemark
+
+ Baz.\footnote{\mycurrentlabel{} \mycurrentcounter}
+
+ Bar.\footnote[7]{\mycurrentlabel{} \mycurrentcounter}
+\end{minipage}\footnotetext{Foo: \mycurrentlabel{} \mycurrentcounter}
+
+\end{document}
diff --git a/base/testfiles/github-0687.tlg b/base/testfiles/github-0687.tlg
new file mode 100644
index 00000000..0dd33b1e
--- /dev/null
+++ b/base/testfiles/github-0687.tlg
@@ -0,0 +1,356 @@
+This is a generated file for the LaTeX2e validation system.
+Don't change this file in any respect.
+LaTeX Font Info: External font `cmex10' loaded for size
+(Font) <7> on input line ....
+LaTeX Font Info: External font `cmex10' loaded for size
+(Font) <5> on input line ....
+LaTeX Font Info: External font `cmex10' loaded for size
+(Font) <8> on input line ....
+LaTeX Font Info: External font `cmex10' loaded for size
+(Font) <6> on input line ....
+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 393.60513fil
+...\write-{}
+...\glue(\topskip) 0.00002
+...\hbox(9.99998+0.0)x345.0, glue set 255.70845fil
+....\hbox(9.27998+0.0)x24.29997
+.....\glue 0.0
+.....\OT1/cmr/bx/n/14.4 1
+.....\glue 16.19998
+....\OT1/cmr/bx/n/14.4 S
+....\OT1/cmr/bx/n/14.4 e
+....\OT1/cmr/bx/n/14.4 c
+....\OT1/cmr/bx/n/14.4 t
+....\OT1/cmr/bx/n/14.4 i
+....\OT1/cmr/bx/n/14.4 o
+....\OT1/cmr/bx/n/14.4 n
+....\glue 5.4 plus 2.7 minus 1.79999
+....\OT1/cmr/bx/n/14.4 1
+....\penalty 10000
+....\glue(\parfillskip) 0.0 plus 1.0fil
+....\glue(\rightskip) 0.0
+...\write1{\@writefile{toc}{\protect \contentsline {section}{\protect \numberline {1}Section 1}{\thepage }{}\protected at file@percent }}
+...\penalty 10000
+...\glue 9.90276 plus 0.86108
+...\glue(\parskip) 0.0 plus 1.0
+...\glue(\parskip) 0.0
+...\glue(\baselineskip) 3.85997
+...\hbox(8.14003+0.0)x345.0, glue set 321.76381fil
+....\OT1/cmr/m/n/10 F
+....\kern-0.83334
+....\OT1/cmr/m/n/10 o
+....\kern0.27779
+....\OT1/cmr/m/n/10 o
+....\OT1/cmr/m/n/10 .
+....\penalty 10000
+....\hbox(8.14003+0.0)x4.48613
+.....\mathon
+.....\hbox(4.51111+0.0)x4.48613, shifted -3.62892
+......\OT1/cmr/m/n/7 1
+.....\mathoff
+....\kern 0.0
+....\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) 3.85997
+...\hbox(8.14003+0.0)x345.0, glue set 306.20827fil
+....\hbox(0.0+0.0)x15.0
+....\OT1/cmr/m/n/10 B
+....\OT1/cmr/m/n/10 a
+....\OT1/cmr/m/n/10 z
+....\OT1/cmr/m/n/10 .
+....\penalty 10000
+....\hbox(8.14003+0.0)x4.48613
+.....\mathon
+.....\hbox(4.51111+0.0)x4.48613, shifted -3.62892
+......\OT1/cmr/m/n/7 2
+.....\mathoff
+....\kern 0.0
+....\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) 3.85997
+...\hbox(8.14003+0.0)x345.0, glue set 306.73604fil
+....\hbox(0.0+0.0)x15.0
+....\OT1/cmr/m/n/10 B
+....\OT1/cmr/m/n/10 a
+....\OT1/cmr/m/n/10 r
+....\OT1/cmr/m/n/10 .
+....\penalty 10000
+....\hbox(8.14003+0.0)x4.48613
+.....\mathon
+.....\hbox(4.51111+0.0)x4.48613, shifted -3.62892
+......\OT1/cmr/m/n/7 7
+.....\mathoff
+....\kern 0.0
+....\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(\lineskip) 1.0
+...\hbox(32.57004+27.57002)x345.0, glue set 122.9979fil
+....\hbox(0.0+0.0)x15.0
+....\mathon
+....\vbox(32.57004+27.57002)x207.0021
+.....\hbox(8.14003+0.0)x207.0021, glue set 183.76591fil
+......\hbox(0.0+0.0)x0.0
+......\OT1/cmr/m/n/10 F
+......\kern-0.83334
+......\OT1/cmr/m/n/10 o
+......\kern0.27779
+......\OT1/cmr/m/n/10 o
+......\OT1/cmr/m/n/10 .
+......\penalty 10000
+......\hbox(8.14003+0.0)x4.48613
+.......\mathon
+.......\hbox(4.51111+0.0)x4.48613, shifted -3.62892
+........\OT1/cmr/m/n/7 3
+.......\mathoff
+......\kern 0.0
+......\penalty 10000
+......\glue(\parfillskip) 0.0 plus 1.0fil
+......\glue(\rightskip) 0.0
+.....\glue(\parskip) 0.0
+.....\glue(\parskip) 0.0
+.....\glue(\baselineskip) 5.16669
+.....\hbox(6.83331+0.0)x207.0021, glue set 182.97424fil
+......\hbox(0.0+0.0)x0.0
+......\OT1/cmr/m/n/10 B
+......\OT1/cmr/m/n/10 a
+......\OT1/cmr/m/n/10 z
+......\OT1/cmr/m/n/10 .
+......\penalty 10000
+......\hbox(6.6428+0.0)x4.72226
+.......\mathon
+.......\hbox(3.01389+0.0)x4.72226, shifted -3.62892
+........\OT1/cmr/m/it/7 a
+.......\mathoff
+......\kern 0.0
+......\penalty 10000
+......\glue(\parfillskip) 0.0 plus 1.0fil
+......\glue(\rightskip) 0.0
+.....\glue(\parskip) 0.0
+.....\glue(\parskip) 0.0
+.....\glue(\baselineskip) 5.16669
+.....\hbox(6.83331+0.0)x207.0021, glue set 183.91313fil
+......\hbox(0.0+0.0)x0.0
+......\OT1/cmr/m/n/10 B
+......\OT1/cmr/m/n/10 a
+......\OT1/cmr/m/n/10 r
+......\OT1/cmr/m/n/10 .
+......\penalty 10000
+......\hbox(6.6428+0.0)x4.31114
+.......\mathon
+.......\hbox(3.01389+1.3611)x4.31114, shifted -3.62892
+........\OT1/cmr/m/it/7 g
+.......\mathoff
+......\kern 0.0
+......\penalty 10000
+......\glue(\parfillskip) 0.0 plus 1.0fil
+......\glue(\rightskip) 0.0
+.....\glue 9.0 plus 4.0 minus 2.0
+.....\kern -3.0
+.....\rule(0.4+0.0)x82.79958
+.....\kern 2.6
+.....\hbox(6.65+2.85002)x207.0021, glue set 141.97899fil
+......\hbox(5.40666+0.0)x15.30023, glue set 11.18115fil
+.......\glue 0.0 plus 1.0fil minus 1.0fil
+.......\hbox(5.40666+0.0)x4.11908
+........\mathon
+........\hbox(2.58333+0.0)x4.11908, shifted -2.82333
+.........\OT1/cmr/m/it/6 a
+........\mathoff
+......\hbox(6.65+0.0)x0.0
+.......\rule(6.65+0.0)x0.0
+......\OT1/cmr/m/it/8 a
+......\glue 2.83337 plus 1.41669 minus 0.94446
+......\OT1/cmr/m/n/8 m
+......\OT1/cmr/m/n/8 p
+......\OT1/cmr/m/n/8 f
+......\OT1/cmr/m/n/8 o
+......\kern0.23611
+......\OT1/cmr/m/n/8 o
+......\OT1/cmr/m/n/8 t
+......\OT1/cmr/m/n/8 n
+......\OT1/cmr/m/n/8 o
+......\OT1/cmr/m/n/8 t
+......\OT1/cmr/m/n/8 e
+......\penalty 10000
+......\rule(0.0+2.85002)x0.0
+......\kern 0.0
+......\penalty 10000
+......\glue(\parfillskip) 0.0 plus 1.0fil
+......\glue(\rightskip) 0.0
+.....\glue(\parskip) 0.0
+.....\glue(\parskip) 0.0
+.....\hbox(6.65+2.85002)x207.0021, glue set 142.41788fil
+......\hbox(5.40666+0.0)x15.30023, glue set 11.53354fil
+.......\glue 0.0 plus 1.0fil minus 1.0fil
+.......\hbox(5.40666+0.0)x3.7667
+........\mathon
+........\hbox(2.58333+1.16666)x3.7667, shifted -2.82333
+.........\OT1/cmr/m/it/6 g
+........\mathoff
+......\hbox(6.65+0.0)x0.0
+.......\rule(6.65+0.0)x0.0
+......\OT1/cmr/m/it/8 g
+......\glue 2.83337 plus 1.41669 minus 0.94446
+......\OT1/cmr/m/n/8 m
+......\OT1/cmr/m/n/8 p
+......\OT1/cmr/m/n/8 f
+......\OT1/cmr/m/n/8 o
+......\kern0.23611
+......\OT1/cmr/m/n/8 o
+......\OT1/cmr/m/n/8 t
+......\OT1/cmr/m/n/8 n
+......\OT1/cmr/m/n/8 o
+......\OT1/cmr/m/n/8 t
+......\OT1/cmr/m/n/8 e
+......\penalty 10000
+......\rule(0.0+2.85002)x0.0
+......\kern 0.0
+......\penalty 10000
+......\glue(\parfillskip) 0.0 plus 1.0fil
+......\glue(\rightskip) 0.0
+....\mathoff
+....\kern 0.0
+....\penalty 10000
+....\glue(\parfillskip) 0.0 plus 1.0fil
+....\glue(\rightskip) 0.0
+...\glue -5.0
+...\glue 0.0 plus 1.0fil
+...\glue 9.0 plus 4.0 minus 2.0
+...\kern -3.0
+...\rule(0.4+0.0)x137.9979
+...\kern 2.6
+...\hbox(6.68999+2.85002)x345.0, glue set 313.75926fil
+....\hbox(6.68999+0.0)x15.30023, glue set 11.13362fil
+.....\glue 0.0 plus 1.0fil minus 1.0fil
+.....\hbox(6.68999+0.0)x4.16661
+......\mathon
+......\hbox(3.86665+0.0)x4.16661, shifted -2.82333
+.......\OT1/cmr/m/n/6 1
+......\mathoff
+....\hbox(6.65+0.0)x0.0
+.....\rule(6.65+0.0)x0.0
+....\OT1/cmr/m/n/8 B
+....\OT1/cmr/m/n/8 a
+....\OT1/cmr/m/n/8 r
+....\OT1/cmr/m/n/8 .
+....\penalty 10000
+....\rule(0.0+2.85002)x0.0
+....\kern 0.0
+....\penalty 10000
+....\glue(\parfillskip) 0.0 plus 1.0fil
+....\glue(\rightskip) 0.0
+...\hbox(6.68999+2.85002)x345.0, glue set 291.92145fil
+....\hbox(6.68999+0.0)x15.30023, glue set 11.13362fil
+.....\glue 0.0 plus 1.0fil minus 1.0fil
+.....\hbox(6.68999+0.0)x4.16661
+......\mathon
+......\hbox(3.86665+0.0)x4.16661, shifted -2.82333
+.......\OT1/cmr/m/n/6 2
+......\mathoff
+....\hbox(6.65+0.0)x0.0
+.....\rule(6.65+0.0)x0.0
+....\OT1/cmr/m/n/8 2
+....\glue 2.83337 plus 1.41669 minus 0.94446
+....\OT1/cmr/m/n/8 f
+....\OT1/cmr/m/n/8 o
+....\kern0.23611
+....\OT1/cmr/m/n/8 o
+....\OT1/cmr/m/n/8 t
+....\OT1/cmr/m/n/8 n
+....\OT1/cmr/m/n/8 o
+....\OT1/cmr/m/n/8 t
+....\OT1/cmr/m/n/8 e
+....\penalty 10000
+....\rule(0.0+2.85002)x0.0
+....\kern 0.0
+....\penalty 10000
+....\glue(\parfillskip) 0.0 plus 1.0fil
+....\glue(\rightskip) 0.0
+...\hbox(6.68999+2.85002)x345.0, glue set 291.92145fil
+....\hbox(6.68999+0.0)x15.30023, glue set 11.13362fil
+.....\glue 0.0 plus 1.0fil minus 1.0fil
+.....\hbox(6.68999+0.0)x4.16661
+......\mathon
+......\hbox(3.86665+0.0)x4.16661, shifted -2.82333
+.......\OT1/cmr/m/n/6 7
+......\mathoff
+....\hbox(6.65+0.0)x0.0
+.....\rule(6.65+0.0)x0.0
+....\OT1/cmr/m/n/8 7
+....\glue 2.83337 plus 1.41669 minus 0.94446
+....\OT1/cmr/m/n/8 f
+....\OT1/cmr/m/n/8 o
+....\kern0.23611
+....\OT1/cmr/m/n/8 o
+....\OT1/cmr/m/n/8 t
+....\OT1/cmr/m/n/8 n
+....\OT1/cmr/m/n/8 o
+....\OT1/cmr/m/n/8 t
+....\OT1/cmr/m/n/8 e
+....\penalty 10000
+....\rule(0.0+2.85002)x0.0
+....\kern 0.0
+....\penalty 10000
+....\glue(\parfillskip) 0.0 plus 1.0fil
+....\glue(\rightskip) 0.0
+...\hbox(6.68999+2.85002)x345.0, glue set 272.21005fil
+....\hbox(6.68999+0.0)x15.30023, glue set 11.13362fil
+.....\glue 0.0 plus 1.0fil minus 1.0fil
+.....\hbox(6.68999+0.0)x4.16661
+......\mathon
+......\hbox(3.86665+0.0)x4.16661, shifted -2.82333
+.......\OT1/cmr/m/n/6 3
+......\mathoff
+....\hbox(6.65+0.0)x0.0
+.....\rule(6.65+0.0)x0.0
+....\OT1/cmr/m/n/8 F
+....\kern-0.70834
+....\OT1/cmr/m/n/8 o
+....\kern0.23611
+....\OT1/cmr/m/n/8 o
+....\OT1/cmr/m/n/8 :
+....\glue 3.77783 plus 2.83337 minus 0.47223
+....\OT1/cmr/m/n/8 3
+....\glue 2.83337 plus 1.41669 minus 0.94446
+....\OT1/cmr/m/n/8 f
+....\OT1/cmr/m/n/8 o
+....\kern0.23611
+....\OT1/cmr/m/n/8 o
+....\OT1/cmr/m/n/8 t
+....\OT1/cmr/m/n/8 n
+....\OT1/cmr/m/n/8 o
+....\OT1/cmr/m/n/8 t
+....\OT1/cmr/m/n/8 e
+....\penalty 10000
+....\rule(0.0+2.85002)x0.0
+....\kern 0.0
+....\penalty 10000
+....\glue(\parfillskip) 0.0 plus 1.0fil
+....\glue(\rightskip) 0.0
+...\glue -2.85002
+...\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-0687.aux)
diff --git a/base/testfiles/tlb-latexrelease-rollback-003-often.luatex.tlg b/base/testfiles/tlb-latexrelease-rollback-003-often.luatex.tlg
index 0907d3bf..02c37c53 100644
--- a/base/testfiles/tlb-latexrelease-rollback-003-often.luatex.tlg
+++ b/base/testfiles/tlb-latexrelease-rollback-003-often.luatex.tlg
@@ -366,6 +366,7 @@ Applying: [....-..-..] Make \parbox robust on input line ....
Skipping: [....-..-..] reset \lineskiplimit on input line ....
Applying: [....-..-..] reset \lineskiplimit on input line ....
Skipping: [....-..-..] footnotetext tagging on input line ....
+Skipping: [....-..-..] footnotetext tagging on input line ....
Applying: [....-..-..] footnotetext tagging on input line ....
Skipping: [....-..-..] Make \rule robust on input line ....
Applying: [....-..-..] Make \rule robust on input line ....
@@ -437,6 +438,7 @@ Skipping: [....-..-..] subscript baseline on input line ....
Skipping: [....-..-..] subscript baseline on input line ....
Applying: [....-..-..] subscript baseline on input line ....
Skipping: [....-..-..] footnotetext tagging on input line ....
+Skipping: [....-..-..] footnotetext tagging on input line ....
Applying: [....-..-..] footnotetext tagging on input line ....
Skipping: [....-..-..] Add footref on input line ....
Applying: [....-..-..] Add footref on input line ....
@@ -979,6 +981,7 @@ Already applied: [....-..-..] Make \parbox robust on input line ....
Applying: [....-..-..] reset \lineskiplimit on input line ....
Already applied: [....-..-..] reset \lineskiplimit on input line ....
Skipping: [....-..-..] footnotetext tagging on input line ....
+Skipping: [....-..-..] footnotetext tagging on input line ....
Applying: [....-..-..] footnotetext tagging on input line ....
Applying: [....-..-..] Make \rule robust on input line ....
LaTeX Info: Redefining \rule on input line ....
@@ -1060,6 +1063,7 @@ Skipping: [....-..-..] subscript baseline on input line ....
Applying: [....-..-..] subscript baseline on input line ....
Already applied: [....-..-..] subscript baseline on input line ....
Skipping: [....-..-..] footnotetext tagging on input line ....
+Skipping: [....-..-..] footnotetext tagging on input line ....
Applying: [....-..-..] footnotetext tagging on input line ....
Skipping: [....-..-..] Add footref on input line ....
Applying: [....-..-..] Add footref on input line ....
diff --git a/base/testfiles/tlb-latexrelease-rollback-003-often.tlg b/base/testfiles/tlb-latexrelease-rollback-003-often.tlg
index e7d97bef..2a77a244 100644
--- a/base/testfiles/tlb-latexrelease-rollback-003-often.tlg
+++ b/base/testfiles/tlb-latexrelease-rollback-003-often.tlg
@@ -360,6 +360,7 @@ Applying: [....-..-..] Make \parbox robust on input line ....
Skipping: [....-..-..] reset \lineskiplimit on input line ....
Applying: [....-..-..] reset \lineskiplimit on input line ....
Skipping: [....-..-..] footnotetext tagging on input line ....
+Skipping: [....-..-..] footnotetext tagging on input line ....
Applying: [....-..-..] footnotetext tagging on input line ....
Skipping: [....-..-..] Make \rule robust on input line ....
Applying: [....-..-..] Make \rule robust on input line ....
@@ -431,6 +432,7 @@ Skipping: [....-..-..] subscript baseline on input line ....
Skipping: [....-..-..] subscript baseline on input line ....
Applying: [....-..-..] subscript baseline on input line ....
Skipping: [....-..-..] footnotetext tagging on input line ....
+Skipping: [....-..-..] footnotetext tagging on input line ....
Applying: [....-..-..] footnotetext tagging on input line ....
Skipping: [....-..-..] Add footref on input line ....
Applying: [....-..-..] Add footref on input line ....
@@ -963,6 +965,7 @@ Already applied: [....-..-..] Make \parbox robust on input line ....
Applying: [....-..-..] reset \lineskiplimit on input line ....
Already applied: [....-..-..] reset \lineskiplimit on input line ....
Skipping: [....-..-..] footnotetext tagging on input line ....
+Skipping: [....-..-..] footnotetext tagging on input line ....
Applying: [....-..-..] footnotetext tagging on input line ....
Applying: [....-..-..] Make \rule robust on input line ....
LaTeX Info: Redefining \rule on input line ....
@@ -1044,6 +1047,7 @@ Skipping: [....-..-..] subscript baseline on input line ....
Applying: [....-..-..] subscript baseline on input line ....
Already applied: [....-..-..] subscript baseline on input line ....
Skipping: [....-..-..] footnotetext tagging on input line ....
+Skipping: [....-..-..] footnotetext tagging on input line ....
Applying: [....-..-..] footnotetext tagging on input line ....
Skipping: [....-..-..] Add footref on input line ....
Applying: [....-..-..] Add footref on input line ....
diff --git a/base/testfiles/tlb-latexrelease-rollback-003-often.xetex.tlg b/base/testfiles/tlb-latexrelease-rollback-003-often.xetex.tlg
index ceb990c1..d6b414ba 100644
--- a/base/testfiles/tlb-latexrelease-rollback-003-often.xetex.tlg
+++ b/base/testfiles/tlb-latexrelease-rollback-003-often.xetex.tlg
@@ -360,6 +360,7 @@ Applying: [....-..-..] Make \parbox robust on input line ....
Skipping: [....-..-..] reset \lineskiplimit on input line ....
Applying: [....-..-..] reset \lineskiplimit on input line ....
Skipping: [....-..-..] footnotetext tagging on input line ....
+Skipping: [....-..-..] footnotetext tagging on input line ....
Applying: [....-..-..] footnotetext tagging on input line ....
Skipping: [....-..-..] Make \rule robust on input line ....
Applying: [....-..-..] Make \rule robust on input line ....
@@ -431,6 +432,7 @@ Skipping: [....-..-..] subscript baseline on input line ....
Skipping: [....-..-..] subscript baseline on input line ....
Applying: [....-..-..] subscript baseline on input line ....
Skipping: [....-..-..] footnotetext tagging on input line ....
+Skipping: [....-..-..] footnotetext tagging on input line ....
Applying: [....-..-..] footnotetext tagging on input line ....
Skipping: [....-..-..] Add footref on input line ....
Applying: [....-..-..] Add footref on input line ....
@@ -972,6 +974,7 @@ Already applied: [....-..-..] Make \parbox robust on input line ....
Applying: [....-..-..] reset \lineskiplimit on input line ....
Already applied: [....-..-..] reset \lineskiplimit on input line ....
Skipping: [....-..-..] footnotetext tagging on input line ....
+Skipping: [....-..-..] footnotetext tagging on input line ....
Applying: [....-..-..] footnotetext tagging on input line ....
Applying: [....-..-..] Make \rule robust on input line ....
LaTeX Info: Redefining \rule on input line ....
@@ -1053,6 +1056,7 @@ Skipping: [....-..-..] subscript baseline on input line ....
Applying: [....-..-..] subscript baseline on input line ....
Already applied: [....-..-..] subscript baseline on input line ....
Skipping: [....-..-..] footnotetext tagging on input line ....
+Skipping: [....-..-..] footnotetext tagging on input line ....
Applying: [....-..-..] footnotetext tagging on input line ....
Skipping: [....-..-..] Add footref on input line ....
Applying: [....-..-..] Add footref on input line ....
diff --git a/base/testfiles/tlb-rollback-004-often.luatex.tlg b/base/testfiles/tlb-rollback-004-often.luatex.tlg
index 603f92cb..b09dfaf4 100644
--- a/base/testfiles/tlb-rollback-004-often.luatex.tlg
+++ b/base/testfiles/tlb-rollback-004-often.luatex.tlg
@@ -426,6 +426,7 @@ Already applied: [....-..-..] Make \parbox robust on input line ....
Applying: [....-..-..] reset \lineskiplimit on input line ....
Already applied: [....-..-..] reset \lineskiplimit on input line ....
Skipping: [....-..-..] footnotetext tagging on input line ....
+Skipping: [....-..-..] footnotetext tagging on input line ....
Applying: [....-..-..] footnotetext tagging on input line ....
Applying: [....-..-..] Make \rule robust on input line ....
LaTeX Info: Redefining \rule on input line ....
@@ -516,6 +517,7 @@ Skipping: [....-..-..] subscript baseline on input line ....
Applying: [....-..-..] subscript baseline on input line ....
Already applied: [....-..-..] subscript baseline on input line ....
Skipping: [....-..-..] footnotetext tagging on input line ....
+Skipping: [....-..-..] footnotetext tagging on input line ....
Applying: [....-..-..] footnotetext tagging on input line ....
Skipping: [....-..-..] Add footref on input line ....
Applying: [....-..-..] Add footref on input line ....
diff --git a/base/testfiles/tlb-rollback-004-often.tlg b/base/testfiles/tlb-rollback-004-often.tlg
index ec108828..bda83988 100644
--- a/base/testfiles/tlb-rollback-004-often.tlg
+++ b/base/testfiles/tlb-rollback-004-often.tlg
@@ -414,6 +414,7 @@ Already applied: [....-..-..] Make \parbox robust on input line ....
Applying: [....-..-..] reset \lineskiplimit on input line ....
Already applied: [....-..-..] reset \lineskiplimit on input line ....
Skipping: [....-..-..] footnotetext tagging on input line ....
+Skipping: [....-..-..] footnotetext tagging on input line ....
Applying: [....-..-..] footnotetext tagging on input line ....
Applying: [....-..-..] Make \rule robust on input line ....
LaTeX Info: Redefining \rule on input line ....
@@ -504,6 +505,7 @@ Skipping: [....-..-..] subscript baseline on input line ....
Applying: [....-..-..] subscript baseline on input line ....
Already applied: [....-..-..] subscript baseline on input line ....
Skipping: [....-..-..] footnotetext tagging on input line ....
+Skipping: [....-..-..] footnotetext tagging on input line ....
Applying: [....-..-..] footnotetext tagging on input line ....
Skipping: [....-..-..] Add footref on input line ....
Applying: [....-..-..] Add footref on input line ....
diff --git a/base/testfiles/tlb-rollback-004-often.xetex.tlg b/base/testfiles/tlb-rollback-004-often.xetex.tlg
index 497974e8..2145c35d 100644
--- a/base/testfiles/tlb-rollback-004-often.xetex.tlg
+++ b/base/testfiles/tlb-rollback-004-often.xetex.tlg
@@ -415,6 +415,7 @@ Already applied: [....-..-..] Make \parbox robust on input line ....
Applying: [....-..-..] reset \lineskiplimit on input line ....
Already applied: [....-..-..] reset \lineskiplimit on input line ....
Skipping: [....-..-..] footnotetext tagging on input line ....
+Skipping: [....-..-..] footnotetext tagging on input line ....
Applying: [....-..-..] footnotetext tagging on input line ....
Applying: [....-..-..] Make \rule robust on input line ....
LaTeX Info: Redefining \rule on input line ....
@@ -505,6 +506,7 @@ Skipping: [....-..-..] subscript baseline on input line ....
Applying: [....-..-..] subscript baseline on input line ....
Already applied: [....-..-..] subscript baseline on input line ....
Skipping: [....-..-..] footnotetext tagging on input line ....
+Skipping: [....-..-..] footnotetext tagging on input line ....
Applying: [....-..-..] footnotetext tagging on input line ....
Skipping: [....-..-..] Add footref on input line ....
Applying: [....-..-..] Add footref on input line ....
diff --git a/base/testfiles/tlb-rollback-005.luatex.tlg b/base/testfiles/tlb-rollback-005.luatex.tlg
index bf4ec8f5..fde09f8f 100644
--- a/base/testfiles/tlb-rollback-005.luatex.tlg
+++ b/base/testfiles/tlb-rollback-005.luatex.tlg
@@ -434,6 +434,7 @@ Already applied: [....-..-..] Make \parbox robust on input line ....
Applying: [....-..-..] reset \lineskiplimit on input line ....
Already applied: [....-..-..] reset \lineskiplimit on input line ....
Skipping: [....-..-..] footnotetext tagging on input line ....
+Skipping: [....-..-..] footnotetext tagging on input line ....
Applying: [....-..-..] footnotetext tagging on input line ....
Applying: [....-..-..] Make \rule robust on input line ....
LaTeX Info: Redefining \rule on input line ....
@@ -524,6 +525,7 @@ Applying: [....-..-..] subscript baseline on input line ....
Already applied: [....-..-..] subscript baseline on input line ....
Already applied: [....-..-..] subscript baseline on input line ....
Skipping: [....-..-..] footnotetext tagging on input line ....
+Skipping: [....-..-..] footnotetext tagging on input line ....
Applying: [....-..-..] footnotetext tagging on input line ....
Skipping: [....-..-..] Add footref on input line ....
Applying: [....-..-..] Add footref on input line ....
diff --git a/base/testfiles/tlb-rollback-005.tlg b/base/testfiles/tlb-rollback-005.tlg
index 3ba30dae..389b304d 100644
--- a/base/testfiles/tlb-rollback-005.tlg
+++ b/base/testfiles/tlb-rollback-005.tlg
@@ -423,6 +423,7 @@ Already applied: [....-..-..] Make \parbox robust on input line ....
Applying: [....-..-..] reset \lineskiplimit on input line ....
Already applied: [....-..-..] reset \lineskiplimit on input line ....
Skipping: [....-..-..] footnotetext tagging on input line ....
+Skipping: [....-..-..] footnotetext tagging on input line ....
Applying: [....-..-..] footnotetext tagging on input line ....
Applying: [....-..-..] Make \rule robust on input line ....
LaTeX Info: Redefining \rule on input line ....
@@ -513,6 +514,7 @@ Applying: [....-..-..] subscript baseline on input line ....
Already applied: [....-..-..] subscript baseline on input line ....
Already applied: [....-..-..] subscript baseline on input line ....
Skipping: [....-..-..] footnotetext tagging on input line ....
+Skipping: [....-..-..] footnotetext tagging on input line ....
Applying: [....-..-..] footnotetext tagging on input line ....
Skipping: [....-..-..] Add footref on input line ....
Applying: [....-..-..] Add footref on input line ....
diff --git a/base/testfiles/tlb-rollback-005.xetex.tlg b/base/testfiles/tlb-rollback-005.xetex.tlg
index b50db6d2..0c57a1ec 100644
--- a/base/testfiles/tlb-rollback-005.xetex.tlg
+++ b/base/testfiles/tlb-rollback-005.xetex.tlg
@@ -424,6 +424,7 @@ Already applied: [....-..-..] Make \parbox robust on input line ....
Applying: [....-..-..] reset \lineskiplimit on input line ....
Already applied: [....-..-..] reset \lineskiplimit on input line ....
Skipping: [....-..-..] footnotetext tagging on input line ....
+Skipping: [....-..-..] footnotetext tagging on input line ....
Applying: [....-..-..] footnotetext tagging on input line ....
Applying: [....-..-..] Make \rule robust on input line ....
LaTeX Info: Redefining \rule on input line ....
@@ -514,6 +515,7 @@ Applying: [....-..-..] subscript baseline on input line ....
Already applied: [....-..-..] subscript baseline on input line ....
Already applied: [....-..-..] subscript baseline on input line ....
Skipping: [....-..-..] footnotetext tagging on input line ....
+Skipping: [....-..-..] footnotetext tagging on input line ....
Applying: [....-..-..] footnotetext tagging on input line ....
Skipping: [....-..-..] Add footref on input line ....
Applying: [....-..-..] Add footref on input line ....
diff --git a/base/testfiles/tlb0009.lvt b/base/testfiles/tlb00009-fleqn.lvt
similarity index 71%
copy from base/testfiles/tlb0009.lvt
copy to base/testfiles/tlb00009-fleqn.lvt
index 5cd8fbaf..2d07d3cd 100644
--- a/base/testfiles/tlb0009.lvt
+++ b/base/testfiles/tlb00009-fleqn.lvt
@@ -1,21 +1,9 @@
-% \iffalse meta-comment
-%
-% Copyright (C) 1994 by Rainer Schoepf.
-% All rights reserved.
-%
-% This file is part of the validate package.
-%
-% IMPORTANT NOTICE:
-%
-% You are not allowed to change this file. In case of error
-% write to the email address mentioned in the file readme.val.
-%
-% \fi
+% tlb00009 + fleqn
%
% Test file for LaTeX2e bug report #9.
% \label not producing correct labels in eqnarray.
-\documentclass{article}
+\documentclass[fleqn]{article}
% Input the test macros for LaTeX2e
\input{test2e}
@@ -52,7 +40,6 @@ The three equations above are apparently labelled \ref{eqn-1}, \ref{eqn-2} and
\ref{eqn-3}.
\showoutput
-%\scrollmode
\end{document}
diff --git a/base/testfiles/tlb0009.tlg b/base/testfiles/tlb00009-fleqn.tlg
similarity index 94%
copy from base/testfiles/tlb0009.tlg
copy to base/testfiles/tlb00009-fleqn.tlg
index 8a48ee25..8cf2bdba 100644
--- a/base/testfiles/tlb0009.tlg
+++ b/base/testfiles/tlb00009-fleqn.tlg
@@ -25,7 +25,7 @@ Completed box being shipped out [1]
....\hbox(0.0+0.0)x345.0
..\glue 25.0
..\glue(\lineskip) 0.0
-..\vbox(550.0+0.0)x345.0, glue set 465.95023fil
+..\vbox(550.0+0.0)x345.0, glue set 469.9498fil
...\write-{}
...\glue(\topskip) 3.05556
...\hbox(6.94444+1.94444)x345.0, glue set 192.77748fil
@@ -64,10 +64,10 @@ Completed box being shipped out [1]
....\glue(\parfillskip) 0.0 plus 1.0fil
....\glue(\rightskip) 0.0
...\penalty 10000
-...\glue(\abovedisplayskip) 10.0 plus 2.0 minus 5.0
+...\glue(\abovedisplayskip) 8.0 plus 3.0 minus 4.0
...\glue(\baselineskip) 2.55556
-...\hbox(7.5+2.5)x345.0, glue set 0.14882, display
-....\glue(\tabskip) 0.0 plus 1000.0
+...\hbox(7.5+2.5)x345.0, glue set 0.27263, display
+....\glue(\tabskip) 25.00003
....\hbox(7.5+2.5)x10.2014
.....\glue 0.0 plus 1000.0
.....\mathon
@@ -109,8 +109,8 @@ Completed box being shipped out [1]
...\glue 3.0
...\glue 0.0
...\glue(\baselineskip) 2.0
-...\hbox(7.5+2.5)x345.0, glue set 0.14882, display
-....\glue(\tabskip) 0.0 plus 1000.0
+...\hbox(7.5+2.5)x345.0, glue set 0.27263, display
+....\glue(\tabskip) 25.00003
....\hbox(7.5+2.5)x10.2014
.....\glue 0.0 plus 1000.0
.....\mathon
@@ -152,8 +152,8 @@ Completed box being shipped out [1]
...\glue 3.0
...\glue 0.0
...\glue(\baselineskip) 2.0
-...\hbox(7.5+2.5)x345.0, glue set 0.14882, display
-....\glue(\tabskip) 0.0 plus 1000.0
+...\hbox(7.5+2.5)x345.0, glue set 0.27263, display
+....\glue(\tabskip) 25.00003
....\hbox(7.5+2.5)x10.2014
.....\glue 0.0 plus 1000.0
.....\mathon
@@ -191,7 +191,7 @@ Completed box being shipped out [1]
......\OT1/cmr/m/n/10 )
....\glue(\tabskip) 0.0
...\penalty 0
-...\glue(\belowdisplayskip) 10.0 plus 2.0 minus 5.0
+...\glue(\belowdisplayskip) 8.0 plus 3.0 minus 4.0
...\glue(\baselineskip) 2.55556
...\hbox(6.94444+1.94444)x345.0, glue set 75.41618fil
....\OT1/cmr/m/n/10 T
@@ -276,4 +276,4 @@ Completed box being shipped out [1]
....\glue 0.0 plus 1.0fil
....\OT1/cmr/m/n/10 1
....\glue 0.0 plus 1.0fil
-(tlb0009.aux)
+(tlb00009-fleqn.aux)
diff --git a/required/amsmath/amsmath.dtx b/required/amsmath/amsmath.dtx
index eec51f50..a5cf333e 100644
--- a/required/amsmath/amsmath.dtx
+++ b/required/amsmath/amsmath.dtx
@@ -86,7 +86,7 @@ Bug reports can be opened (category \texttt{#1}) at\\%
% \end{macrocode}
%
% \begin{macrocode}
-\ProvidesPackage{amsmath}[2021/08/28 v2.17k AMS math features]
+\ProvidesPackage{amsmath}[2021/10/15 v2.17l AMS math features]
% \end{macrocode}
%
% \section{Catcode defenses}
@@ -3012,7 +3012,13 @@ ill-advised in LaTeX.%
% the \cs{maketag@@} macro above.
% \begin{macrocode}
\let\df at tag\@empty
-\def\make at df@tag{\@ifstar\make at df@tag@@\make at df@tag@@@}
+\def\make at df@tag{%
+% \end{macrocode}
+% We set \cs{@currentcounter} here so that it applies to both branches.
+%\changes{v2.17l}{2021/10/15}{Explicitly set \cs{@currentcounter} (gh/687)}
+% \begin{macrocode}
+ \def\@currentcounter{equation}%
+ \@ifstar\make at df@tag@@\make at df@tag@@@}
% \end{macrocode}
% \cs{make at df@tag} sets \cs{@currentlabel} and defines
% \cs{df at tag} appropriately.
diff --git a/required/amsmath/changes.txt b/required/amsmath/changes.txt
index a07a5cee..bb0bc90c 100644
--- a/required/amsmath/changes.txt
+++ b/required/amsmath/changes.txt
@@ -2,10 +2,15 @@
All changes above are only part of the development branch for the next release.
================================================================================
+2021-10-15 Frank Mittelbach <Frank.Mittelbach at latex-project.org>
+
+ * amsmath.dtx (subsection{Implementing tags and labels}):
+ Explicitly set \@currentcounter (gh/687)
+
2021-08-24 Ulrike Fischer <Ulrike.Fischer at latex-project.org>
* amsmath.dtx (subsection{Implementing tags and labels}):
move \incr at eqnum inside the equation if fleqn isn't used and guard
- it with a mathopen for better compability with hyperref, issue gh/652
+ it with a mathopen for better compability with hyperref (gh/652)
#########################
# 2021-06-01 Release
More information about the latex3-commits
mailing list.