[latex3-commits] [git/LaTeX3-latex3-latex2e] gh633: fix for #633 (c109ca40)
Frank Mittelbach
frank.mittelbach at latex-project.org
Wed Jul 28 17:49:43 CEST 2021
Repository : https://github.com/latex3/latex2e
On branch : gh633
Link : https://github.com/latex3/latex2e/commit/c109ca40505b81dc5b1a225a1dbe18d0a7aa39bd
>---------------------------------------------------------------
commit c109ca40505b81dc5b1a225a1dbe18d0a7aa39bd
Author: Frank Mittelbach <frank.mittelbach at latex-project.org>
Date: Wed Jul 28 17:49:43 2021 +0200
fix for #633
>---------------------------------------------------------------
c109ca40505b81dc5b1a225a1dbe18d0a7aa39bd
base/changes.txt | 6 +
base/doc/ltnews34.tex | 30 +++-
base/ltsect.dtx | 42 ++++-
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-0633.lvt | 24 +++
base/testfiles/github-0633.tlg | 197 +++++++++++++++++++++
.../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 +
17 files changed, 320 insertions(+), 9 deletions(-)
diff --git a/base/changes.txt b/base/changes.txt
index db41e0ac..a9537d56 100644
--- a/base/changes.txt
+++ b/base/changes.txt
@@ -6,6 +6,12 @@ completeness or accuracy and it contains some references to files that
are not part of the distribution.
================================================================================
+2021-07-28 Frank Mittelbach <Frank.Mittelbach at latex-project.org>
+
+ * ltsect.dtx (section| or |\caption|):
+ \contentsline now picks up all four arguments and doesn't rely on
+ the fourth being empty (gh/633)
+
2021-07-27 Frank Mittelbach <Frank.Mittelbach at latex-project.org>
* lthooks.dtx:
diff --git a/base/doc/ltnews34.tex b/base/doc/ltnews34.tex
index e2b190a4..32850a4c 100644
--- a/base/doc/ltnews34.tex
+++ b/base/doc/ltnews34.tex
@@ -250,11 +250,6 @@ error and should therefore be properly looked at.
\section{Code improvements}
-\subsection{???}
-
-%
-\githubissue{000}
-
\subsection{Additional Extended Latin characters predefined}
Some additional characters such as \'k (U+1E131) are now pre-defined and
@@ -262,6 +257,31 @@ will work without needing \verb|\DeclareUnicodeCharacter| declarations.
%
\githubissue{593}
+
+\subsection{Pick up all arguments to \cs{contentsline}}
+
+The \cs{contentsline} commands in the TOC file are always followed by
+four arguments, the last one being empty by default and only used by
+\pkg{hyperref}. The \cs{contentsline} command itself only used the
+first three arguments and relied on the fourth being empty (and thus
+doing no harm). But this assumption is not always correct, e.g., i you
+use \pkg{hyperref} and then remove it from the preamble.
+
+So now we pick up all four arguments save the last one away so that it
+can be used by \pkg{hyperref}.
+%
+\githubissue{633}
+
+
+\subsection{???}
+
+%
+\githubissue{000}
+
+
+
+
+
\section{Changes to packages in the \pkg{graphics} category}
diff --git a/base/ltsect.dtx b/base/ltsect.dtx
index 29ea142b..67974c73 100644
--- a/base/ltsect.dtx
+++ b/base/ltsect.dtx
@@ -31,7 +31,7 @@
%%% From File: ltsect.dtx
%<*driver>
% \fi
-\ProvidesFile{ltsect.dtx}[2020/12/05 v1.1e LaTeX Kernel (Sectioning)]
+\ProvidesFile{ltsect.dtx}[2021/07/28 v1.1f LaTeX Kernel (Sectioning)]
% \iffalse
\documentclass{ltxdoc}
\GetFileInfo{ltsect.dtx}
@@ -765,7 +765,7 @@
% The |\addcontentsline{|\meta{table}|}{|\meta{type}|}{|%
% \meta{entry}|}| command allows the user to add
% his/her own entry to a table of contents, etc. The command adds the
-% entry |\contentsline{|\meta{type}|}{|\meta{entry}|}{|\meta{page}|}|
+% entry |\contentsline{|\meta{type}|}{|\meta{entry}|}{|\meta{page}|}{}|
% to the |.|\meta{table} file.
%
% This macro is implemented as an application of |\addtocontents|.
@@ -833,7 +833,7 @@
% \end{macro}
%
% \begin{macro}{\contentsline}
-% The |\contentsline{|\meta{type}|}{|\meta{entry}|}{|\meta{page}|}|
+% The |\contentsline{|\meta{type}|}{|\meta{entry}|}{|\meta{page}|}{}|
% macro produces a \meta{type} entry in a table of contents, etc.
% It will appear in the |.toc| or other file. For example,
% The entry for subsection 1.4.3 in the table of contents for
@@ -848,10 +848,44 @@
% without expanding them.
%
% \begin{macrocode}
-\def\contentsline#1{\csname l@#1\endcsname}
+%</2ekernel>
+%<*2ekernel|latexrelease>
+%<latexrelease>\IncludeInRelease{2021/11/15}%
+%<latexrelease> {\contentsline}{Four arguments}%
+% \end{macrocode}
+%
+% In the toc file \cs{contentsline} is followed by 4 arguments
+% these days, but only the first 3 are used in the old
+% interface. The fourth was by default empty and only used when
+% \pkg{hyperref} was loaded. We now pick up all 4 arguments, save
+% the last one away in \cs{@contentsline at destination} and then call
+% the old interface. This is done to simplify the interface to
+% \pkg{hyperref} and to prepare for future changes.
+% \changes{v1.1f}{2021/07/28}{Pick up four arguments (gh/633)}
+% \begin{macrocode}
+\def\contentsline#1#2#3#4{\gdef\@contentsline at destination{#4}%
+ \csname l@#1\endcsname{#2}{#3}}
+% \end{macrocode}
+% Default definition.
+% \begin{macrocode}
+\let\@contentsline at destination\@empty
+% \end{macrocode}
+%
+% \begin{macrocode}
+%</2ekernel|latexrelease>
+%<latexrelease>\EndIncludeInRelease
+%<latexrelease>\IncludeInRelease{0000/00/00}%
+%<latexrelease> {\contentsline}{Four arguments}%
+%<latexrelease>
+%<latexrelease>\def\contentsline#1{\csname l@#1\endcsname}
+%<latexrelease>\let\@contentsline at destination\@undefined
+%<latexrelease>\EndIncludeInRelease
+%<*2ekernel>
% \end{macrocode}
% \end{macro}
%
+%
+%
% |\@dottedtocline{|\meta{level}|}{|\meta{indent}|}{|\meta{numwidth}%
% |}{|\meta{title}|}{|\meta{page}|}|:
% Macro to produce a table of contents line with the following
diff --git a/base/testfiles/github-0479-often.luatex.tlg b/base/testfiles/github-0479-often.luatex.tlg
index bafb6101..95757752 100644
--- a/base/testfiles/github-0479-often.luatex.tlg
+++ b/base/testfiles/github-0479-often.luatex.tlg
@@ -467,6 +467,8 @@ Already applied: [....-..-..] Make commands robust on input line ....
Applying: [....-..-..] fourth argument on input line ....
Already applied: [....-..-..] Mask line endings on input line ....
Already applied: [....-..-..] Mask line endings on input line ....
+Skipping: [....-..-..] Four arguments on input line ....
+Applying: [....-..-..] Four arguments on input line ....
Applying: [....-..-..] Prevent protrusion on input line ....
LaTeX Info: Redefining \noprotrusion on input line ....
Already applied: [....-..-..] Prevent protrusion on input line ....
diff --git a/base/testfiles/github-0479-often.tlg b/base/testfiles/github-0479-often.tlg
index 59a12e0b..2bfb208a 100644
--- a/base/testfiles/github-0479-often.tlg
+++ b/base/testfiles/github-0479-often.tlg
@@ -456,6 +456,8 @@ Already applied: [....-..-..] Make commands robust on input line ....
Applying: [....-..-..] fourth argument on input line ....
Already applied: [....-..-..] Mask line endings on input line ....
Already applied: [....-..-..] Mask line endings on input line ....
+Skipping: [....-..-..] Four arguments on input line ....
+Applying: [....-..-..] Four arguments on input line ....
Applying: [....-..-..] Prevent protrusion on input line ....
LaTeX Info: Redefining \noprotrusion on input line ....
Already applied: [....-..-..] Prevent protrusion on input line ....
diff --git a/base/testfiles/github-0479-often.xetex.tlg b/base/testfiles/github-0479-often.xetex.tlg
index 63a7e7d2..fe47cc4b 100644
--- a/base/testfiles/github-0479-often.xetex.tlg
+++ b/base/testfiles/github-0479-often.xetex.tlg
@@ -457,6 +457,8 @@ Already applied: [....-..-..] Make commands robust on input line ....
Applying: [....-..-..] fourth argument on input line ....
Already applied: [....-..-..] Mask line endings on input line ....
Already applied: [....-..-..] Mask line endings on input line ....
+Skipping: [....-..-..] Four arguments on input line ....
+Applying: [....-..-..] Four arguments on input line ....
Applying: [....-..-..] Prevent protrusion on input line ....
LaTeX Info: Redefining \noprotrusion on input line ....
Already applied: [....-..-..] Prevent protrusion on input line ....
diff --git a/base/testfiles/github-0633.lvt b/base/testfiles/github-0633.lvt
new file mode 100644
index 00000000..876c2ac3
--- /dev/null
+++ b/base/testfiles/github-0633.lvt
@@ -0,0 +1,24 @@
+\documentclass{article}
+
+\input{test2e}
+
+\showoutput
+
+\begin{document}
+
+\START
+
+\SHOWFILE{\jobname.toc}
+
+\tableofcontents
+
+\section{Foo}
+
+\subsection{Bar}
+
+text
+
+\addtocontents{toc}{\string\contentsline{section}{Baz}{\thepage}{destination}}
+
+
+\end{document}
diff --git a/base/testfiles/github-0633.tlg b/base/testfiles/github-0633.tlg
new file mode 100644
index 00000000..4933a898
--- /dev/null
+++ b/base/testfiles/github-0633.tlg
@@ -0,0 +1,197 @@
+This is a generated file for the LaTeX2e validation system.
+Don't change this file in any respect.
+-------- github-0633.toc (start) ---------
+(github-0633.toc) \contentsline {section}{\numberline {1}Foo}{1}{}%^^M
+\contentsline {subsection}{\numberline {1.1}Bar}{1}{}%^^M
+\contentsline {section}{Baz}{1}{destination}^^M
+-------- github-0633.toc (end) -----------
+(github-0633.toc
+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 ....
+)
+\tf at toc=\write...
+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 408.52586fil
+...\write-{}
+...\glue(\topskip) 0.12001
+...\hbox(9.87999+0.0)x345.0, glue set 281.71843fil
+....\hbox(0.0+0.0)x0.0
+.....\glue 0.0
+....\OT1/cmr/bx/n/14.4 C
+....\OT1/cmr/bx/n/14.4 o
+....\OT1/cmr/bx/n/14.4 n
+....\kern-0.45001
+....\OT1/cmr/bx/n/14.4 t
+....\OT1/cmr/bx/n/14.4 e
+....\OT1/cmr/bx/n/14.4 n
+....\kern-0.45001
+....\OT1/cmr/bx/n/14.4 t
+....\OT1/cmr/bx/n/14.4 s
+....\penalty 10000
+....\glue(\parfillskip) 0.0 plus 1.0fil
+....\glue(\rightskip) 0.0
+...\penalty 10000
+...\glue 9.90276 plus 0.86108
+...\glue -9.90276 plus -0.86108
+...\glue 10.00002 plus 1.0
+...\glue(\parskip) 0.0 plus 1.0
+...\glue(\parskip) 0.0
+...\glue(\baselineskip) 5.13889
+...\hbox(6.86111+0.0)x345.0, glue set 294.07793fil
+....\glue(\leftskip) 15.00002
+....\glue -15.00002
+....\hbox(6.44444+0.0)x15.00002, glue set 9.25005fil
+.....\OT1/cmr/bx/n/10 1
+.....\glue 0.0 plus 1.0fil
+....\OT1/cmr/bx/n/10 F
+....\kern-0.95833
+....\OT1/cmr/bx/n/10 o
+....\kern0.31944
+....\OT1/cmr/bx/n/10 o
+....\penalty 10000
+....\glue 0.0 plus 1.0fil
+....\penalty 10000
+....\hbox(6.44444+0.0)x17.82494, glue set 12.07497fil
+.....\glue 0.0 plus 1.0fil minus 1.0fil
+.....\OT1/cmr/bx/n/10 1
+.....\kern -1.0
+.....\kern 1.0
+....\kern 0.0
+....\penalty 10000
+....\glue(\parfillskip) -15.50005
+....\glue(\rightskip) 15.50005
+...\glue 0.0 plus 0.2
+...\glue(\parskip) 0.0 plus 1.0
+...\glue(\parskip) 0.0
+...\glue(\baselineskip) 5.16669
+...\hbox(6.83331+0.0)x345.0, glue set 275.49983fill
+....\glue(\leftskip) 38.00008
+....\hbox(0.0+0.0)x15.00002
+....\hbox(0.0+0.0)x0.0
+....\penalty 10000
+....\glue -38.00008
+....\hbox(6.44444+0.0)x23.00006, glue set 10.22224fil
+.....\OT1/cmr/m/n/10 1
+.....\OT1/cmr/m/n/10 .
+.....\OT1/cmr/m/n/10 1
+.....\glue 0.0 plus 1.0fil
+....\OT1/cmr/m/n/10 B
+....\OT1/cmr/m/n/10 a
+....\OT1/cmr/m/n/10 r
+....\penalty 10000
+....\leaders 0.0 plus 1.0fill
+.....\hbox(1.05554+0.0)x7.77766
+......\mathon
+......\kern 2.49994
+......\hbox(1.05554+0.0)x2.77779
+.......\OT1/cmr/m/n/10 .
+......\kern 2.49994
+......\mathoff
+....\penalty 10000
+....\hbox(6.44444+0.0)x15.50005, glue set 10.50003fil
+.....\glue 0.0 plus 1.0fil
+.....\OT1/cmr/m/n/10 1
+.....\kern -1.0
+.....\kern 1.0
+....\kern 0.0
+....\penalty 10000
+....\glue(\parfillskip) -25.50006
+....\glue(\rightskip) 25.50006
+...\penalty -300
+...\glue 10.00002 plus 1.0
+...\glue(\parskip) 0.0 plus 1.0
+...\glue(\parskip) 0.0
+...\glue(\baselineskip) 5.13889
+...\hbox(6.86111+0.0)x345.0, glue set 308.29324fil
+....\glue(\leftskip) 15.00002
+....\hbox(0.0+0.0)x0.0
+....\glue -15.00002
+....\OT1/cmr/bx/n/10 B
+....\OT1/cmr/bx/n/10 a
+....\OT1/cmr/bx/n/10 z
+....\penalty 10000
+....\glue 0.0 plus 1.0fil
+....\penalty 10000
+....\hbox(6.44444+0.0)x17.82494, glue set 12.07497fil
+.....\glue 0.0 plus 1.0fil minus 1.0fil
+.....\OT1/cmr/bx/n/10 1
+.....\kern -1.0
+.....\kern 1.0
+....\kern 0.0
+....\penalty 10000
+....\glue(\parfillskip) -15.50005
+....\glue(\rightskip) 15.50005
+...\penalty -300
+...\glue 15.0694 plus 4.30554 minus 0.86108
+...\glue(\parskip) 0.0 plus 1.0
+...\glue(\parskip) 0.0
+...\glue(\baselineskip) 8.12001
+...\hbox(9.87999+0.0)x345.0, glue set 295.21674fil
+....\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 F
+....\kern-1.35
+....\OT1/cmr/bx/n/14.4 o
+....\kern0.45
+....\OT1/cmr/bx/n/14.4 o
+....\penalty 10000
+....\glue(\parfillskip) 0.0 plus 1.0fil
+....\glue(\rightskip) 0.0
+...\write1{\@writefile{toc}{\protect \contentsline {section}{\protect \numberline {1}Foo}{\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) 5.76666
+...\hbox(8.23334+0.0)x345.0, glue set 292.57637fil
+....\hbox(7.73332+0.0)x30.75
+.....\glue 0.0
+.....\OT1/cmr/bx/n/12 1
+.....\OT1/cmr/bx/n/12 .
+.....\OT1/cmr/bx/n/12 1
+.....\glue 13.5
+....\OT1/cmr/bx/n/12 B
+....\OT1/cmr/bx/n/12 a
+....\OT1/cmr/bx/n/12 r
+....\penalty 10000
+....\glue(\parfillskip) 0.0 plus 1.0fil
+....\glue(\rightskip) 0.0
+...\write1{\@writefile{toc}{\protect \contentsline {subsection}{\protect \numberline {1.1}Bar}{\thepage }{}\protected at file@percent }}
+...\penalty 10000
+...\penalty 10000
+...\glue 6.45831 plus 0.86108
+...\glue(\parskip) 0.0 plus 1.0
+...\glue(\parskip) 0.0
+...\glue(\baselineskip) 5.84921
+...\hbox(6.15079+0.0)x345.0, glue set 327.49995fil
+....\OT1/cmr/m/n/10 t
+....\OT1/cmr/m/n/10 e
+....\OT1/cmr/m/n/10 x
+....\OT1/cmr/m/n/10 t
+....\penalty 10000
+....\glue(\parfillskip) 0.0 plus 1.0fil
+....\glue(\rightskip) 0.0
+...\write1{\@writefile{toc}{\contentsline{section}{Baz}{\thepage }{destination}}}
+...\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-0633.aux)
diff --git a/base/testfiles/tlb-latexrelease-rollback-003-often.luatex.tlg b/base/testfiles/tlb-latexrelease-rollback-003-often.luatex.tlg
index c282836d..16e45b7f 100644
--- a/base/testfiles/tlb-latexrelease-rollback-003-often.luatex.tlg
+++ b/base/testfiles/tlb-latexrelease-rollback-003-often.luatex.tlg
@@ -384,6 +384,8 @@ Applying: [....-..-..] Make commands robust on input line ....
Skipping: [....-..-..] fourth argument on input line ....
Skipping: [....-..-..] Mask line endings on input line ....
Applying: [....-..-..] Mask line endings on input line ....
+Skipping: [....-..-..] Four arguments on input line ....
+Applying: [....-..-..] Four arguments on input line ....
Skipping: [....-..-..] Prevent protrusion on input line ....
Applying: [....-..-..] Prevent protrusion on input line ....
Skipping: [....-..-..] Check float options on input line ....
@@ -968,6 +970,8 @@ Already applied: [....-..-..] Make commands robust on input line ....
Skipping: [....-..-..] fourth argument on input line ....
Applying: [....-..-..] Mask line endings on input line ....
Already applied: [....-..-..] Mask line endings on input line ....
+Skipping: [....-..-..] Four arguments on input line ....
+Applying: [....-..-..] Four arguments on input line ....
Applying: [....-..-..] Prevent protrusion on input line ....
Already applied: [....-..-..] Prevent protrusion on input line ....
Applying: [....-..-..] Check float options on input line ....
diff --git a/base/testfiles/tlb-latexrelease-rollback-003-often.tlg b/base/testfiles/tlb-latexrelease-rollback-003-often.tlg
index 8b2476db..14dfe509 100644
--- a/base/testfiles/tlb-latexrelease-rollback-003-often.tlg
+++ b/base/testfiles/tlb-latexrelease-rollback-003-often.tlg
@@ -378,6 +378,8 @@ Applying: [....-..-..] Make commands robust on input line ....
Skipping: [....-..-..] fourth argument on input line ....
Skipping: [....-..-..] Mask line endings on input line ....
Applying: [....-..-..] Mask line endings on input line ....
+Skipping: [....-..-..] Four arguments on input line ....
+Applying: [....-..-..] Four arguments on input line ....
Skipping: [....-..-..] Prevent protrusion on input line ....
Applying: [....-..-..] Prevent protrusion on input line ....
Skipping: [....-..-..] Check float options on input line ....
@@ -952,6 +954,8 @@ Already applied: [....-..-..] Make commands robust on input line ....
Skipping: [....-..-..] fourth argument on input line ....
Applying: [....-..-..] Mask line endings on input line ....
Already applied: [....-..-..] Mask line endings on input line ....
+Skipping: [....-..-..] Four arguments on input line ....
+Applying: [....-..-..] Four arguments on input line ....
Applying: [....-..-..] Prevent protrusion on input line ....
Already applied: [....-..-..] Prevent protrusion on input line ....
Applying: [....-..-..] Check float options 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 a126bb43..a756933d 100644
--- a/base/testfiles/tlb-latexrelease-rollback-003-often.xetex.tlg
+++ b/base/testfiles/tlb-latexrelease-rollback-003-often.xetex.tlg
@@ -378,6 +378,8 @@ Applying: [....-..-..] Make commands robust on input line ....
Skipping: [....-..-..] fourth argument on input line ....
Skipping: [....-..-..] Mask line endings on input line ....
Applying: [....-..-..] Mask line endings on input line ....
+Skipping: [....-..-..] Four arguments on input line ....
+Applying: [....-..-..] Four arguments on input line ....
Skipping: [....-..-..] Prevent protrusion on input line ....
Applying: [....-..-..] Prevent protrusion on input line ....
Skipping: [....-..-..] Check float options on input line ....
@@ -961,6 +963,8 @@ Already applied: [....-..-..] Make commands robust on input line ....
Skipping: [....-..-..] fourth argument on input line ....
Applying: [....-..-..] Mask line endings on input line ....
Already applied: [....-..-..] Mask line endings on input line ....
+Skipping: [....-..-..] Four arguments on input line ....
+Applying: [....-..-..] Four arguments on input line ....
Applying: [....-..-..] Prevent protrusion on input line ....
Already applied: [....-..-..] Prevent protrusion on input line ....
Applying: [....-..-..] Check float options on input line ....
diff --git a/base/testfiles/tlb-rollback-004-often.luatex.tlg b/base/testfiles/tlb-rollback-004-often.luatex.tlg
index 322116cf..be0964c4 100644
--- a/base/testfiles/tlb-rollback-004-often.luatex.tlg
+++ b/base/testfiles/tlb-rollback-004-often.luatex.tlg
@@ -463,6 +463,8 @@ Already applied: [....-..-..] Make commands robust on input line ....
Skipping: [....-..-..] fourth argument on input line ....
Applying: [....-..-..] Mask line endings on input line ....
Already applied: [....-..-..] Mask line endings on input line ....
+Skipping: [....-..-..] Four arguments on input line ....
+Applying: [....-..-..] Four arguments on input line ....
Applying: [....-..-..] Prevent protrusion on input line ....
LaTeX Info: Redefining \noprotrusion on input line ....
Already applied: [....-..-..] Prevent protrusion on input line ....
diff --git a/base/testfiles/tlb-rollback-004-often.tlg b/base/testfiles/tlb-rollback-004-often.tlg
index c211e68e..bb204910 100644
--- a/base/testfiles/tlb-rollback-004-often.tlg
+++ b/base/testfiles/tlb-rollback-004-often.tlg
@@ -451,6 +451,8 @@ Already applied: [....-..-..] Make commands robust on input line ....
Skipping: [....-..-..] fourth argument on input line ....
Applying: [....-..-..] Mask line endings on input line ....
Already applied: [....-..-..] Mask line endings on input line ....
+Skipping: [....-..-..] Four arguments on input line ....
+Applying: [....-..-..] Four arguments on input line ....
Applying: [....-..-..] Prevent protrusion on input line ....
LaTeX Info: Redefining \noprotrusion on input line ....
Already applied: [....-..-..] Prevent protrusion on input line ....
diff --git a/base/testfiles/tlb-rollback-004-often.xetex.tlg b/base/testfiles/tlb-rollback-004-often.xetex.tlg
index aa301bed..cb8f173f 100644
--- a/base/testfiles/tlb-rollback-004-often.xetex.tlg
+++ b/base/testfiles/tlb-rollback-004-often.xetex.tlg
@@ -452,6 +452,8 @@ Already applied: [....-..-..] Make commands robust on input line ....
Skipping: [....-..-..] fourth argument on input line ....
Applying: [....-..-..] Mask line endings on input line ....
Already applied: [....-..-..] Mask line endings on input line ....
+Skipping: [....-..-..] Four arguments on input line ....
+Applying: [....-..-..] Four arguments on input line ....
Applying: [....-..-..] Prevent protrusion on input line ....
LaTeX Info: Redefining \noprotrusion on input line ....
Already applied: [....-..-..] Prevent protrusion on input line ....
diff --git a/base/testfiles/tlb-rollback-005.luatex.tlg b/base/testfiles/tlb-rollback-005.luatex.tlg
index 1966fa2f..bf601f2d 100644
--- a/base/testfiles/tlb-rollback-005.luatex.tlg
+++ b/base/testfiles/tlb-rollback-005.luatex.tlg
@@ -471,6 +471,8 @@ Already applied: [....-..-..] Make commands robust on input line ....
Applying: [....-..-..] fourth argument on input line ....
Already applied: [....-..-..] Mask line endings on input line ....
Already applied: [....-..-..] Mask line endings on input line ....
+Skipping: [....-..-..] Four arguments on input line ....
+Applying: [....-..-..] Four arguments on input line ....
Applying: [....-..-..] Prevent protrusion on input line ....
LaTeX Info: Redefining \noprotrusion on input line ....
Already applied: [....-..-..] Prevent protrusion on input line ....
diff --git a/base/testfiles/tlb-rollback-005.tlg b/base/testfiles/tlb-rollback-005.tlg
index 62c9bdc5..a8438c3e 100644
--- a/base/testfiles/tlb-rollback-005.tlg
+++ b/base/testfiles/tlb-rollback-005.tlg
@@ -460,6 +460,8 @@ Already applied: [....-..-..] Make commands robust on input line ....
Applying: [....-..-..] fourth argument on input line ....
Already applied: [....-..-..] Mask line endings on input line ....
Already applied: [....-..-..] Mask line endings on input line ....
+Skipping: [....-..-..] Four arguments on input line ....
+Applying: [....-..-..] Four arguments on input line ....
Applying: [....-..-..] Prevent protrusion on input line ....
LaTeX Info: Redefining \noprotrusion on input line ....
Already applied: [....-..-..] Prevent protrusion on input line ....
diff --git a/base/testfiles/tlb-rollback-005.xetex.tlg b/base/testfiles/tlb-rollback-005.xetex.tlg
index 973fba64..6332a260 100644
--- a/base/testfiles/tlb-rollback-005.xetex.tlg
+++ b/base/testfiles/tlb-rollback-005.xetex.tlg
@@ -461,6 +461,8 @@ Already applied: [....-..-..] Make commands robust on input line ....
Applying: [....-..-..] fourth argument on input line ....
Already applied: [....-..-..] Mask line endings on input line ....
Already applied: [....-..-..] Mask line endings on input line ....
+Skipping: [....-..-..] Four arguments on input line ....
+Applying: [....-..-..] Four arguments on input line ....
Applying: [....-..-..] Prevent protrusion on input line ....
LaTeX Info: Redefining \noprotrusion on input line ....
Already applied: [....-..-..] Prevent protrusion on input line ....
More information about the latex3-commits
mailing list.