[latex3-commits] [git/LaTeX3-latex3-latex2e] OR-lab: addressing remaining comments by JAW (I hope) (d8ea996e)
Frank Mittelbach
frank.mittelbach at latex-project.org
Thu Mar 10 10:33:57 CET 2022
Repository : https://github.com/latex3/latex2e
On branch : OR-lab
Link : https://github.com/latex3/latex2e/commit/d8ea996e50e5e12f77e7588aab6d3f0bb9ff3b0c
>---------------------------------------------------------------
commit d8ea996e50e5e12f77e7588aab6d3f0bb9ff3b0c
Author: Frank Mittelbach <frank.mittelbach at latex-project.org>
Date: Thu Mar 10 10:33:57 2022 +0100
addressing remaining comments by JAW (I hope)
>---------------------------------------------------------------
d8ea996e50e5e12f77e7588aab6d3f0bb9ff3b0c
required/latex-lab/latex-lab-footnotes.dtx | 112 ++++++++++++++++-----
.../footmisc-local-aastex631.tlg | 8 +-
.../footmisc-local-uafthesis.tlg | 8 +-
.../testfiles-OR-local/footmisc-local-uwthesis.tlg | 8 +-
required/latex-lab/testfiles-OR/footmisc-002.tlg | 8 +-
required/latex-lab/testfiles-OR/footmisc-003.tlg | 8 +-
required/latex-lab/testfiles-OR/footmisc-004.tlg | 8 +-
.../testfiles-OR/footmisc-007-rollback.tlg | 8 +-
.../testfiles-OR/footmisc-009-multiple.tlg | 8 +-
.../testfiles-OR/footmisc-010-setspace.tlg | 8 +-
.../testfiles-OR/footmisc-013-scrartcl.tlg | 8 +-
.../footmisc-floats-abovefloats-flushbottom.tlg | 8 +-
.../testfiles-OR/footmisc-floats-abovefloats.tlg | 8 +-
.../footmisc-floats-belowfloats-flushbottom.tlg | 8 +-
.../testfiles-OR/footmisc-floats-latex.tlg | 8 +-
required/latex-lab/testfiles-OR/tagging-001.tlg | 8 +-
16 files changed, 147 insertions(+), 85 deletions(-)
diff --git a/required/latex-lab/latex-lab-footnotes.dtx b/required/latex-lab/latex-lab-footnotes.dtx
index 5574dfbe..41515c66 100644
--- a/required/latex-lab/latex-lab-footnotes.dtx
+++ b/required/latex-lab/latex-lab-footnotes.dtx
@@ -106,6 +106,14 @@
%
% Note: the configuration points do not have an interface mechanism
% yet and all their names are temporary right now.
+% Also note that configuration points are of interest only to very
+% few specialized packages, mainly \pkg{footmisc}, and packages
+% providing similar functionality---the current documentation is
+% therefore fairly sketchy.
+%
+% In contrast the hooks are of interest to many classes to provide
+% their layout alterations in a way that it works smoothly with
+% other packages handling aspects of foonote formatting.
%
%
% \subsection{Formatting the mark in the main text}
@@ -196,13 +204,15 @@
%
% To cater for different layout configurations there are four
% configuration points which can be set only by one package or
-% class. These are:
+% class, if two packages/classes set them they are mutually
+% incompatible.
+% These are:
% \begin{description}
% \item[\cs{@footnotetext at cfgpoint} (1 argument)]
%
% This receives all material that is to be processed (or stored)
% including color protection code and what have you. The default
-% definition is to run \cs{insert\footins}.
+% definition is to run \cs{insert}\cs{footins}.
%
% \item[\cs{@footnotetext at cfgpointii} (1 argument)]
%
@@ -563,7 +573,7 @@
% Provide the name \LaTeXe{} is used to.
-\let \@footnotemark \fnote_footnotemark:
+\cs_set_eq:NN \@footnotemark \fnote_footnotemark:
@@ -678,21 +688,21 @@
}
% default for config point (1 arg)
-\def\@footnotetext at cfgpoint { \insert\footins }
+\cs_new_protected:Npn \@footnotetext at cfgpoint { \insert\footins }
% default for config point (1 arg)
-\def\@footnotetext at cfgpointii { \@makefntext }
+\cs_new_protected:Npn \@footnotetext at cfgpointii { \@makefntext }
% default for config point (0 args)
-\def\@footnotetext at cfgpointiii { \rule\z@\footnotesep }
+\cs_new_protected:Npn \@footnotetext at cfgpointiii { \rule\z@\footnotesep }
% default for config point (0 args)
-\def\@footnotetext at cfgpointiv { \@finalstrut\strutbox }
+\cs_new_protected:Npn \@footnotetext at cfgpointiv { \@finalstrut\strutbox }
% kernel hook for tagging (2 args)
-\cs_new:Npn \@kernel at process@footnotetext {}
+\cs_new_protected:Npn \@kernel at process@footnotetext {}
% Provide the name \LaTeXe{} is used to and do this unconditionally
% (no patching of class code if any). This means that if a class provides it own
@@ -756,22 +766,58 @@
% default for config point (1 arg)
-\def \@makefntext at cfgpoint { \noindent }
+\cs_new_protected:Npn \@makefntext at cfgpoint { \noindent }
% default for config point (1 arg)
-\long \def \@makefntext at cfgpointii #1 { #1 }
-
-
-
+\cs_new_protected:Npn \@makefntext at cfgpointii #1 { #1 }
+% \end{macrocode}
+%
+%
+%
% If the definition for \cs{@makefntext} is that of the standard
% classes then replace it with \cs{fnote_makefntext:n}, otherwise
-% try to patch the definition
-
+% try to patch the definition.
+%
+% Here is the the definition the way it is in
+% \texttt{classes.dtx}. Notice that (for saving space) there is no
+% space after \texttt{em} to terminate the assignment. We need to
+% mimic that, otherwise a test would return false even if the
+% definition has not been modified.
+%
+% \begin{macrocode}
\newcommand\old at std@class at makefntext[1]{%
\parindent 1em%
\noindent
\hb at xt@1.8em{\hss\@makefnmark}#1}
+% \end{macrocode}
+% Here is the messy code for patching. Note that this is only there
+% to help classes along that aren't updated yet so it does some
+% minimal patching to hopefully add configuration points in the
+% right place.
+%
+% What it does is roughly the
+% following: It look for a definition of \cs{@makefntext} of the form
+%\begin{verbatim}
+% {AAA \hbox BBB { CCC } DDD #1 EEE }
+%\end{verbatim}
+% where ``BBB'' is something like \texttt{to 1em} or similar. It then
+% replaces that with
+%\begin{verbatim}
+% {AAA \@makefntext at cfgpoint{\hbox BBB { CCC }} DDD
+% \@makefntext at cfgpointii{#1} EEE }
+%\end{verbatim}
+% The patching is not very careful, i.e., it assumes there is only
+% one \verb=#1= in the replacement text and that a \cs{hbox} found
+% is the right one to patch. But that is enough to cater for all
+% definitions of \cs{@makefntext} out there in the TL distribution.
+%
+% If \cs{hbox} is not found it tries the same looking for
+% \cs{hb at xt@} which is what some classes use and if that is not
+% found either it assume that this is a version that uses
+% \cs{@makefnmark} without surrounding it in a box and if that
+% fails it gives up with an \cs{ERROR} (which needs to get a proper definition).
+% \begin{macrocode}
\tl_new:N \l__fnote_patch_tl
\cs_new_protected:Npn \_fnote_patch:
@@ -785,7 +831,8 @@
{
\tl_if_in:NnTF \l__fnote_patch_tl { \@makefnmark }
{ \cs_set_eq:NN \_fnote_tmp:w \_fnote_patch_ at makefnmark:w }
- { \ERROR \cs_set_eq:NN \_fnote_tmp:w \exp_stop_f: }
+ { \ERROR
+ \cs_set_eq:NN \_fnote_tmp:w \exp_stop_f: }
}
}
\tl_set:Nf \l__fnote_patch_tl
@@ -793,22 +840,38 @@
\cs_set:Npn \_fnote_tmp:w { \long \def \@makefntext ####1 }
\exp_after:wN \_fnote_tmp:w \exp_after:wN { \l__fnote_patch_tl }
}
-
-
+% \end{macrocode}
+%
+% If \cs{@makefntext} contains \cs{hbox} then grab ``AAA'' as
+% \verb=#1= and ``BBB'' (up to the open \verb={=) and return it as
+%\begin{verbatim}
+% AAA \@makefntext at processX { \hbox BBB }
+%\end{verbatim}
+% \begin{macrocode}
\cs_new:Npn \_fnote_patch_hbox:w #1 \hbox #2 #
{ \exp_stop_f: #1 \@makefntext at processX { \hbox #2 } }
+% \end{macrocode}
+% Same for the other cases.
+% \begin{macrocode}
\cs_new:Npn \_fnote_patch_hb at xt@:w #1 \hb at xt@ #2 #
{ \exp_stop_f: #1 \@makefntext at processX { \hb at xt@ #2 } }
\cs_new:Npn \_fnote_patch_ at makefnmark:w #1 \@makefnmark
{ \exp_stop_f: #1 \@makefntext at processX { \use:n } { \@makefnmark } }
-
-% The code provided by Bruno above expects 2 arguments but we need a
+% \end{macrocode}
+%
+% The code provided by Bruno above expects 2 arguments but we need a
% different structure so this is a simple reshuffling. Would be
% better if we can patch the right structure in directly, but I'm
% not a patch person, so this is the simple way out for now:
-
-\long\def\@makefntext at processX #1#2{\@makefntext at cfgpoint{#1{#2}}}
-
+%
+% \begin{macrocode}
+\cs_new:Npn \@makefntext at processX #1#2{\@makefntext at cfgpoint{#1{#2}}}
+% \end{macrocode}
+% At \verb=\begin{document}= check if the current definition is
+% that of the standard classes and if so replace it by
+% \cs{fnote_makefntext:n} otherwise try and patch the definition
+% using the approach above.
+% \begin{macrocode}
\AddToHook{begindocument}{
\cs_if_eq:NNTF \@makefntext \old at std@class at makefntext
@@ -826,8 +889,7 @@
%
% \seq_set_split:NnV \l__fnote_patch_seq { \hbox } \l__fnote_patch_tl
% \int_compare:nT { \seq_count:N \l__fnote_patch_seq } > 2 \ERROR
-
-
+%
% \end{macrocode}
%
diff --git a/required/latex-lab/testfiles-OR-local/footmisc-local-aastex631.tlg b/required/latex-lab/testfiles-OR-local/footmisc-local-aastex631.tlg
index 6ed8531d..78c645a4 100644
--- a/required/latex-lab/testfiles-OR-local/footmisc-local-aastex631.tlg
+++ b/required/latex-lab/testfiles-OR-local/footmisc-local-aastex631.tlg
@@ -8,10 +8,10 @@ l. ...\makeatletter\show\@makefntext
LaTeX Font Info: Trying to load font information for U+lasy on input line ....
LaTeX Font Info: Trying to load font information for U+msa on input line ....
LaTeX Font Info: Trying to load font information for U+msb on input line ....
-> \@footnotetext at cfgpoint=macro:->\insert \footins .
-> \@footnotetext at cfgpointii=macro:->\@makefntext .
-> \@footnotetext at cfgpointiii=macro:->\rule \z@ \footnotesep .
-> \@footnotetext at cfgpointiv=macro:->\@finalstrut \strutbox .
+> \@footnotetext at cfgpoint=\protected\long macro:->\insert \footins .
+> \@footnotetext at cfgpointii=\protected\long macro:->\@makefntext .
+> \@footnotetext at cfgpointiii=\protected\long macro:->\rule \z@ \footnotesep .
+> \@footnotetext at cfgpointiv=\protected\long macro:->\@finalstrut \strutbox .
> \@makefntext at cfgpoint=\long macro:#1->\noindent \cs_if_exist:NT
\tag_struct_begin:n {\tag_mc_end_push: }\tag at FELbl {#1}.
> \@makefntext at cfgpointii=\long macro:#1->\tag at FENote {#1}\cs_if_exist:NT
diff --git a/required/latex-lab/testfiles-OR-local/footmisc-local-uafthesis.tlg b/required/latex-lab/testfiles-OR-local/footmisc-local-uafthesis.tlg
index 809cdc25..60bb6141 100644
--- a/required/latex-lab/testfiles-OR-local/footmisc-local-uafthesis.tlg
+++ b/required/latex-lab/testfiles-OR-local/footmisc-local-uafthesis.tlg
@@ -30,10 +30,10 @@ 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 ....
-> \@footnotetext at cfgpoint=macro:->\insert \footins .
-> \@footnotetext at cfgpointii=macro:->\@makefntext .
-> \@footnotetext at cfgpointiii=macro:->\rule \z@ \footnotesep .
-> \@footnotetext at cfgpointiv=macro:->\@finalstrut \strutbox .
+> \@footnotetext at cfgpoint=\protected\long macro:->\insert \footins .
+> \@footnotetext at cfgpointii=\protected\long macro:->\@makefntext .
+> \@footnotetext at cfgpointiii=\protected\long macro:->\rule \z@ \footnotesep .
+> \@footnotetext at cfgpointiv=\protected\long macro:->\@finalstrut \strutbox .
> \@makefntext at cfgpoint=\long macro:#1->\noindent \cs_if_exist:NT
\tag_struct_begin:n {\tag_mc_end_push: }\tag at FELbl {#1}.
> \@makefntext at cfgpointii=\long macro:#1->\tag at FENote {#1}\cs_if_exist:NT
diff --git a/required/latex-lab/testfiles-OR-local/footmisc-local-uwthesis.tlg b/required/latex-lab/testfiles-OR-local/footmisc-local-uwthesis.tlg
index 3633c641..45785bc2 100644
--- a/required/latex-lab/testfiles-OR-local/footmisc-local-uwthesis.tlg
+++ b/required/latex-lab/testfiles-OR-local/footmisc-local-uwthesis.tlg
@@ -30,10 +30,10 @@ 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 ....
-> \@footnotetext at cfgpoint=macro:->\insert \footins .
-> \@footnotetext at cfgpointii=macro:->\@makefntext .
-> \@footnotetext at cfgpointiii=macro:->\rule \z@ \footnotesep .
-> \@footnotetext at cfgpointiv=macro:->\@finalstrut \strutbox .
+> \@footnotetext at cfgpoint=\protected\long macro:->\insert \footins .
+> \@footnotetext at cfgpointii=\protected\long macro:->\@makefntext .
+> \@footnotetext at cfgpointiii=\protected\long macro:->\rule \z@ \footnotesep .
+> \@footnotetext at cfgpointiv=\protected\long macro:->\@finalstrut \strutbox .
> \@makefntext at cfgpoint=\long macro:#1->\noindent \cs_if_exist:NT
\tag_struct_begin:n {\tag_mc_end_push: }\tag at FELbl {#1}.
> \@makefntext at cfgpointii=\long macro:#1->\tag at FENote {#1}\cs_if_exist:NT
diff --git a/required/latex-lab/testfiles-OR/footmisc-002.tlg b/required/latex-lab/testfiles-OR/footmisc-002.tlg
index a3473bba..deb0e984 100644
--- a/required/latex-lab/testfiles-OR/footmisc-002.tlg
+++ b/required/latex-lab/testfiles-OR/footmisc-002.tlg
@@ -23,10 +23,10 @@ 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 ....
-> \@footnotetext at cfgpoint=macro:->\insert \footins .
-> \@footnotetext at cfgpointii=macro:->\@makefntext .
-> \@footnotetext at cfgpointiii=macro:->\rule \z@ \footnotesep .
-> \@footnotetext at cfgpointiv=macro:->\@finalstrut \strutbox .
+> \@footnotetext at cfgpoint=\protected\long macro:->\insert \footins .
+> \@footnotetext at cfgpointii=\protected\long macro:->\@makefntext .
+> \@footnotetext at cfgpointiii=\protected\long macro:->\rule \z@ \footnotesep .
+> \@footnotetext at cfgpointiv=\protected\long macro:->\@finalstrut \strutbox .
> \@makefntext at cfgpoint=\long macro:#1->\noindent \cs_if_exist:NT
\tag_struct_begin:n {\tag_mc_end_push: }\tag at FELbl {#1}.
> \@makefntext at cfgpointii=\long macro:#1->\tag at FENote {#1}\cs_if_exist:NT
diff --git a/required/latex-lab/testfiles-OR/footmisc-003.tlg b/required/latex-lab/testfiles-OR/footmisc-003.tlg
index 5fee2587..3d9dff7a 100644
--- a/required/latex-lab/testfiles-OR/footmisc-003.tlg
+++ b/required/latex-lab/testfiles-OR/footmisc-003.tlg
@@ -23,10 +23,10 @@ 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 ....
-> \@footnotetext at cfgpoint=macro:->\insert \footins .
-> \@footnotetext at cfgpointii=macro:->\@makefntext .
-> \@footnotetext at cfgpointiii=macro:->\rule \z@ \footnotesep .
-> \@footnotetext at cfgpointiv=macro:->\@finalstrut \strutbox .
+> \@footnotetext at cfgpoint=\protected\long macro:->\insert \footins .
+> \@footnotetext at cfgpointii=\protected\long macro:->\@makefntext .
+> \@footnotetext at cfgpointiii=\protected\long macro:->\rule \z@ \footnotesep .
+> \@footnotetext at cfgpointiv=\protected\long macro:->\@finalstrut \strutbox .
> \@makefntext at cfgpoint=\long macro:#1->\noindent \cs_if_exist:NT
\tag_struct_begin:n {\tag_mc_end_push: }\tag at FELbl {#1}.
> \@makefntext at cfgpointii=\long macro:#1->\tag at FENote {#1}\cs_if_exist:NT
diff --git a/required/latex-lab/testfiles-OR/footmisc-004.tlg b/required/latex-lab/testfiles-OR/footmisc-004.tlg
index 5bc6e97b..2eefae49 100644
--- a/required/latex-lab/testfiles-OR/footmisc-004.tlg
+++ b/required/latex-lab/testfiles-OR/footmisc-004.tlg
@@ -23,10 +23,10 @@ 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 ....
-> \@footnotetext at cfgpoint=macro:->\insert \footins .
-> \@footnotetext at cfgpointii=macro:->\@makefntext .
-> \@footnotetext at cfgpointiii=macro:->\rule \z@ \footnotesep .
-> \@footnotetext at cfgpointiv=macro:->\@finalstrut \strutbox .
+> \@footnotetext at cfgpoint=\protected\long macro:->\insert \footins .
+> \@footnotetext at cfgpointii=\protected\long macro:->\@makefntext .
+> \@footnotetext at cfgpointiii=\protected\long macro:->\rule \z@ \footnotesep .
+> \@footnotetext at cfgpointiv=\protected\long macro:->\@finalstrut \strutbox .
> \@makefntext at cfgpoint=\long macro:#1->\noindent \cs_if_exist:NT
\tag_struct_begin:n {\tag_mc_end_push: }\tag at FELbl {#1}.
> \@makefntext at cfgpointii=\long macro:#1->\tag at FENote {#1}\cs_if_exist:NT
diff --git a/required/latex-lab/testfiles-OR/footmisc-007-rollback.tlg b/required/latex-lab/testfiles-OR/footmisc-007-rollback.tlg
index faeeaa3d..e698b269 100644
--- a/required/latex-lab/testfiles-OR/footmisc-007-rollback.tlg
+++ b/required/latex-lab/testfiles-OR/footmisc-007-rollback.tlg
@@ -43,10 +43,10 @@ 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 ....
-> \@footnotetext at cfgpoint=macro:->\insert \footins .
-> \@footnotetext at cfgpointii=macro:->\@makefntext .
-> \@footnotetext at cfgpointiii=macro:->\rule \z@ \footnotesep .
-> \@footnotetext at cfgpointiv=macro:->\@finalstrut \strutbox .
+> \@footnotetext at cfgpoint=\protected\long macro:->\insert \footins .
+> \@footnotetext at cfgpointii=\protected\long macro:->\@makefntext .
+> \@footnotetext at cfgpointiii=\protected\long macro:->\rule \z@ \footnotesep .
+> \@footnotetext at cfgpointiv=\protected\long macro:->\@finalstrut \strutbox .
> \@makefntext at cfgpoint=\long macro:#1->\noindent \cs_if_exist:NT
\tag_struct_begin:n {\tag_mc_end_push: }\tag at FELbl {#1}.
> \@makefntext at cfgpointii=\long macro:#1->\tag at FENote {#1}\cs_if_exist:NT
diff --git a/required/latex-lab/testfiles-OR/footmisc-009-multiple.tlg b/required/latex-lab/testfiles-OR/footmisc-009-multiple.tlg
index 51348f1e..dd71d965 100644
--- a/required/latex-lab/testfiles-OR/footmisc-009-multiple.tlg
+++ b/required/latex-lab/testfiles-OR/footmisc-009-multiple.tlg
@@ -41,10 +41,10 @@ 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 ....
-> \@footnotetext at cfgpoint=macro:->\insert \footins .
-> \@footnotetext at cfgpointii=macro:->\@makefntext .
-> \@footnotetext at cfgpointiii=macro:->\rule \z@ \footnotesep .
-> \@footnotetext at cfgpointiv=macro:->\@finalstrut \strutbox .
+> \@footnotetext at cfgpoint=\protected\long macro:->\insert \footins .
+> \@footnotetext at cfgpointii=\protected\long macro:->\@makefntext .
+> \@footnotetext at cfgpointiii=\protected\long macro:->\rule \z@ \footnotesep .
+> \@footnotetext at cfgpointiv=\protected\long macro:->\@finalstrut \strutbox .
> \@makefntext at cfgpoint=\long macro:#1->\noindent \cs_if_exist:NT
\tag_struct_begin:n {\tag_mc_end_push: }\tag at FELbl {#1}.
> \@makefntext at cfgpointii=\long macro:#1->\tag at FENote {#1}\cs_if_exist:NT
diff --git a/required/latex-lab/testfiles-OR/footmisc-010-setspace.tlg b/required/latex-lab/testfiles-OR/footmisc-010-setspace.tlg
index b3583ad3..f0c33680 100644
--- a/required/latex-lab/testfiles-OR/footmisc-010-setspace.tlg
+++ b/required/latex-lab/testfiles-OR/footmisc-010-setspace.tlg
@@ -36,10 +36,10 @@ 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 ....
-> \@footnotetext at cfgpoint=macro:->\insert \footins .
-> \@footnotetext at cfgpointii=macro:->\@makefntext .
-> \@footnotetext at cfgpointiii=macro:->\rule \z@ \footnotesep .
-> \@footnotetext at cfgpointiv=macro:->\@finalstrut \strutbox .
+> \@footnotetext at cfgpoint=\protected\long macro:->\insert \footins .
+> \@footnotetext at cfgpointii=\protected\long macro:->\@makefntext .
+> \@footnotetext at cfgpointiii=\protected\long macro:->\rule \z@ \footnotesep .
+> \@footnotetext at cfgpointiv=\protected\long macro:->\@finalstrut \strutbox .
> \@makefntext at cfgpoint=\long macro:#1->\noindent \cs_if_exist:NT
\tag_struct_begin:n {\tag_mc_end_push: }\tag at FELbl {#1}.
> \@makefntext at cfgpointii=\long macro:#1->\tag at FENote {#1}\cs_if_exist:NT
diff --git a/required/latex-lab/testfiles-OR/footmisc-013-scrartcl.tlg b/required/latex-lab/testfiles-OR/footmisc-013-scrartcl.tlg
index 8e4dd103..96804b33 100644
--- a/required/latex-lab/testfiles-OR/footmisc-013-scrartcl.tlg
+++ b/required/latex-lab/testfiles-OR/footmisc-013-scrartcl.tlg
@@ -30,10 +30,10 @@ 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 ....
-> \@footnotetext at cfgpoint=macro:->\insert \footins .
-> \@footnotetext at cfgpointii=macro:->\@makefntext .
-> \@footnotetext at cfgpointiii=macro:->\rule \z@ \footnotesep .
-> \@footnotetext at cfgpointiv=macro:->\@finalstrut \strutbox .
+> \@footnotetext at cfgpoint=\protected\long macro:->\insert \footins .
+> \@footnotetext at cfgpointii=\protected\long macro:->\@makefntext .
+> \@footnotetext at cfgpointiii=\protected\long macro:->\rule \z@ \footnotesep .
+> \@footnotetext at cfgpointiv=\protected\long macro:->\@finalstrut \strutbox .
> \@makefntext at cfgpoint=\long macro:#1->\noindent \cs_if_exist:NT
\tag_struct_begin:n {\tag_mc_end_push: }\tag at FELbl {#1}.
> \@makefntext at cfgpointii=\long macro:#1->\tag at FENote {#1}\cs_if_exist:NT
diff --git a/required/latex-lab/testfiles-OR/footmisc-floats-abovefloats-flushbottom.tlg b/required/latex-lab/testfiles-OR/footmisc-floats-abovefloats-flushbottom.tlg
index 7083e010..c42af1fc 100644
--- a/required/latex-lab/testfiles-OR/footmisc-floats-abovefloats-flushbottom.tlg
+++ b/required/latex-lab/testfiles-OR/footmisc-floats-abovefloats-flushbottom.tlg
@@ -23,10 +23,10 @@ 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 ....
-> \@footnotetext at cfgpoint=macro:->\insert \footins .
-> \@footnotetext at cfgpointii=macro:->\@makefntext .
-> \@footnotetext at cfgpointiii=macro:->\rule \z@ \footnotesep .
-> \@footnotetext at cfgpointiv=macro:->\@finalstrut \strutbox .
+> \@footnotetext at cfgpoint=\protected\long macro:->\insert \footins .
+> \@footnotetext at cfgpointii=\protected\long macro:->\@makefntext .
+> \@footnotetext at cfgpointiii=\protected\long macro:->\rule \z@ \footnotesep .
+> \@footnotetext at cfgpointiv=\protected\long macro:->\@finalstrut \strutbox .
> \@makefntext at cfgpoint=\long macro:#1->\noindent \cs_if_exist:NT
\tag_struct_begin:n {\tag_mc_end_push: }\tag at FELbl {#1}.
> \@makefntext at cfgpointii=\long macro:#1->\tag at FENote {#1}\cs_if_exist:NT
diff --git a/required/latex-lab/testfiles-OR/footmisc-floats-abovefloats.tlg b/required/latex-lab/testfiles-OR/footmisc-floats-abovefloats.tlg
index d02dd2ce..06c963b8 100644
--- a/required/latex-lab/testfiles-OR/footmisc-floats-abovefloats.tlg
+++ b/required/latex-lab/testfiles-OR/footmisc-floats-abovefloats.tlg
@@ -23,10 +23,10 @@ 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 ....
-> \@footnotetext at cfgpoint=macro:->\insert \footins .
-> \@footnotetext at cfgpointii=macro:->\@makefntext .
-> \@footnotetext at cfgpointiii=macro:->\rule \z@ \footnotesep .
-> \@footnotetext at cfgpointiv=macro:->\@finalstrut \strutbox .
+> \@footnotetext at cfgpoint=\protected\long macro:->\insert \footins .
+> \@footnotetext at cfgpointii=\protected\long macro:->\@makefntext .
+> \@footnotetext at cfgpointiii=\protected\long macro:->\rule \z@ \footnotesep .
+> \@footnotetext at cfgpointiv=\protected\long macro:->\@finalstrut \strutbox .
> \@makefntext at cfgpoint=\long macro:#1->\noindent \cs_if_exist:NT
\tag_struct_begin:n {\tag_mc_end_push: }\tag at FELbl {#1}.
> \@makefntext at cfgpointii=\long macro:#1->\tag at FENote {#1}\cs_if_exist:NT
diff --git a/required/latex-lab/testfiles-OR/footmisc-floats-belowfloats-flushbottom.tlg b/required/latex-lab/testfiles-OR/footmisc-floats-belowfloats-flushbottom.tlg
index b444513a..9450e939 100644
--- a/required/latex-lab/testfiles-OR/footmisc-floats-belowfloats-flushbottom.tlg
+++ b/required/latex-lab/testfiles-OR/footmisc-floats-belowfloats-flushbottom.tlg
@@ -23,10 +23,10 @@ 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 ....
-> \@footnotetext at cfgpoint=macro:->\insert \footins .
-> \@footnotetext at cfgpointii=macro:->\@makefntext .
-> \@footnotetext at cfgpointiii=macro:->\rule \z@ \footnotesep .
-> \@footnotetext at cfgpointiv=macro:->\@finalstrut \strutbox .
+> \@footnotetext at cfgpoint=\protected\long macro:->\insert \footins .
+> \@footnotetext at cfgpointii=\protected\long macro:->\@makefntext .
+> \@footnotetext at cfgpointiii=\protected\long macro:->\rule \z@ \footnotesep .
+> \@footnotetext at cfgpointiv=\protected\long macro:->\@finalstrut \strutbox .
> \@makefntext at cfgpoint=\long macro:#1->\noindent \cs_if_exist:NT
\tag_struct_begin:n {\tag_mc_end_push: }\tag at FELbl {#1}.
> \@makefntext at cfgpointii=\long macro:#1->\tag at FENote {#1}\cs_if_exist:NT
diff --git a/required/latex-lab/testfiles-OR/footmisc-floats-latex.tlg b/required/latex-lab/testfiles-OR/footmisc-floats-latex.tlg
index a1270632..04ac1bae 100644
--- a/required/latex-lab/testfiles-OR/footmisc-floats-latex.tlg
+++ b/required/latex-lab/testfiles-OR/footmisc-floats-latex.tlg
@@ -25,10 +25,10 @@ LaTeX Font Info: External font `cmex10' loaded for size
> The hook is empty.
LaTeX Font Info: External font `cmex10' loaded for size
(Font) <5> on input line ....
-> \@footnotetext at cfgpoint=macro:->\insert \footins .
-> \@footnotetext at cfgpointii=macro:->\@makefntext .
-> \@footnotetext at cfgpointiii=macro:->\rule \z@ \footnotesep .
-> \@footnotetext at cfgpointiv=macro:->\@finalstrut \strutbox .
+> \@footnotetext at cfgpoint=\protected\long macro:->\insert \footins .
+> \@footnotetext at cfgpointii=\protected\long macro:->\@makefntext .
+> \@footnotetext at cfgpointiii=\protected\long macro:->\rule \z@ \footnotesep .
+> \@footnotetext at cfgpointiv=\protected\long macro:->\@finalstrut \strutbox .
> \@makefntext at cfgpoint=\long macro:#1->\noindent \cs_if_exist:NT
\tag_struct_begin:n {\tag_mc_end_push: }\tag at FELbl {#1}.
> \@makefntext at cfgpointii=\long macro:#1->\tag at FENote {#1}\cs_if_exist:NT
diff --git a/required/latex-lab/testfiles-OR/tagging-001.tlg b/required/latex-lab/testfiles-OR/tagging-001.tlg
index 53df6209..fa1b1b91 100644
--- a/required/latex-lab/testfiles-OR/tagging-001.tlg
+++ b/required/latex-lab/testfiles-OR/tagging-001.tlg
@@ -23,10 +23,10 @@ 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 ....
-> \@footnotetext at cfgpoint=macro:->\insert \footins .
-> \@footnotetext at cfgpointii=macro:->\@makefntext .
-> \@footnotetext at cfgpointiii=macro:->\rule \z@ \footnotesep .
-> \@footnotetext at cfgpointiv=macro:->\@finalstrut \strutbox .
+> \@footnotetext at cfgpoint=\protected\long macro:->\insert \footins .
+> \@footnotetext at cfgpointii=\protected\long macro:->\@makefntext .
+> \@footnotetext at cfgpointiii=\protected\long macro:->\rule \z@ \footnotesep .
+> \@footnotetext at cfgpointiv=\protected\long macro:->\@finalstrut \strutbox .
> \@makefntext at cfgpoint=\long macro:#1->\noindent \cs_if_exist:NT
\tag_struct_begin:n {\tag_mc_end_push: }\tag at FELbl {#1}.
> \@makefntext at cfgpointii=\long macro:#1->\tag at FENote {#1}\cs_if_exist:NT
More information about the latex3-commits
mailing list.