[latex3-commits] [latex3/latex2e] ltmarks-enhance: some cleanup and many more test files showing extra lines in the log (d599d5ea)
github at latex-project.org
github at latex-project.org
Wed Nov 15 12:26:10 CET 2023
Repository : https://github.com/latex3/latex2e
On branch : ltmarks-enhance
Link : https://github.com/latex3/latex2e/commit/d599d5ea0eff8c68e6b58e077eb716e62c9cf4ba
>---------------------------------------------------------------
commit d599d5ea0eff8c68e6b58e077eb716e62c9cf4ba
Author: Frank Mittelbach <frank.mittelbach at latex-project.org>
Date: Wed Nov 15 12:26:10 2023 +0100
some cleanup and many more test files showing extra lines in the log
>---------------------------------------------------------------
d599d5ea0eff8c68e6b58e077eb716e62c9cf4ba
base/ltmarks.dtx | 183 +++++----------------
base/testfiles/github-0217-io-base.tlg | 9 +-
base/testfiles/github-0217-io-space.luatex.tlg | 9 +-
base/testfiles/github-0217-io-space.tlg | 9 +-
base/testfiles/tl2e8.tlg | 7 +-
base/testfiles/tlb-fltrace-005b.luatex.tlg | 3 +-
base/testfiles/tlb-fltrace-005b.tlg | 3 +-
base/testfiles/tlb0577a.luatex.tlg | 1 +
base/testfiles/tlb0577a.tlg | 1 +
base/testfiles/tlb0878b.luatex.tlg | 1 +
base/testfiles/tlb0878b.tlg | 1 +
base/testfiles/tlb1379.luatex.tlg | 1 +
base/testfiles/tlb1379.tlg | 1 +
base/testfiles/tlb1451.luatex.tlg | 8 +-
base/testfiles/tlb1451.tlg | 8 +-
base/testfiles/tlb1783a.tlg | 6 +-
base/testfiles/tlb1826.luatex.tlg | 1 +
base/testfiles/tlb1826.tlg | 1 +
base/testfiles/tlb2400.luatex.tlg | 3 +-
base/testfiles/tlb2400.tlg | 3 +-
base/testfiles/tlcs01a.luatex.tlg | 3 +-
base/testfiles/tlcs01a.tlg | 3 +-
base/testfiles/tlcs01b.luatex.tlg | 3 +-
base/testfiles/tlcs01b.tlg | 3 +-
base/testfiles/tlcs01r.luatex.tlg | 3 +-
base/testfiles/tlcs01r.tlg | 3 +-
base/testfiles/tlcs02.luatex.tlg | 1 +
base/testfiles/tlcs02.tlg | 1 +
base/testfiles/tlcs04a.luatex.tlg | 4 +-
base/testfiles/tlcs04a.tlg | 4 +-
base/testfiles/tlcs04b.luatex.tlg | 4 +-
base/testfiles/tlcs04b.tlg | 4 +-
base/testfiles/tlcs04r.luatex.tlg | 1 +
base/testfiles/tlcs04r.tlg | 1 +
base/testfiles/tlcs06a.tlg | 3 +-
base/testfiles/tlcs06b.tlg | 7 +-
base/testfiles/tlcs06r.tlg | 6 +-
base/testfiles/tltc001.luatex.tlg | 3 +-
base/testfiles/tltc001.tlg | 3 +-
base/testfiles/tltx001.luatex.tlg | 3 +-
base/testfiles/tltx001.tlg | 3 +-
base/testfiles/tltx001.xetex.tlg | 3 +-
base/testfiles/tltx004.tlg | 3 +-
base/testfiles/tlxs01b.luatex.tlg | 3 +-
base/testfiles/tlxs01b.tlg | 3 +-
base/testfiles/tlxs01r.luatex.tlg | 3 +-
base/testfiles/tlxs01r.tlg | 3 +-
base/testfiles/tlxs04b.tlg | 3 +-
base/testfiles/tlxs06a.tlg | 3 +-
base/testfiles/tlxs06b.tlg | 7 +-
base/testfiles/tlxs06r.tlg | 6 +-
.../firstaid/testfiles/firstaid-pgfmorepages.tlg | 3 +-
required/graphics/testfiles/braces-compat-01.tlg | 3 +-
53 files changed, 174 insertions(+), 194 deletions(-)
diff --git a/base/ltmarks.dtx b/base/ltmarks.dtx
index dc583510..970a881d 100644
--- a/base/ltmarks.dtx
+++ b/base/ltmarks.dtx
@@ -16,7 +16,7 @@
%
% \begin{macrocode}
\def\ltmarksversion{v1.0e}
-\def\ltmarksdate{2023/11/14}
+\def\ltmarksdate{2023/11/15}
% \end{macrocode}
%<*driver>
\documentclass{l3doc}
@@ -820,7 +820,7 @@
%
%
%
-% \begin{macro}{\@@_extract_and_handle_marks:nnn}
+% \begin{macro}{\@@_extract_and_handle_marks:nn}
% \changes{v1.0e}{2023/11/14}{Macro added}
%
% This is the main macro to extract and handle marks inside some
@@ -831,7 +831,7 @@
% some material and prepare for reinserting them later (e.g., out
% of a box that is placed as a box into the main galley).
% \begin{macrocode}
-\cs_new_protected:Npn \@@_extract_and_handle_marks:nnn #1#2#3 {
+\cs_new_protected:Npn \@@_extract_and_handle_marks:nn #1#2 {
% \end{macrocode}
% This macro expects a region name as its third argument and
% vertical material (not boxed) as its fourth. It attempts to
@@ -883,7 +883,7 @@
% \cs{@@_prepare_and_extract:nn}.
%
% \begin{macrocode}
- \@@_prepare_and_extract:nnn {#1} {#2} {#3}
+ \@@_prepare_and_extract:nn {#1} {#2}
% \end{macrocode}
% Once all mark classes have been processed, the data structures are
% updated and we can close the group, which undoes our local
@@ -895,38 +895,28 @@
% \end{macro}
%
%
-% \begin{macro}{@@_prepare_and_extract:nnn}
+% \begin{macro}{@@_prepare_and_extract:nn}
%
% \begin{macrocode}
-\cs_new_protected:Npn \@@_prepare_and_extract:nnn #1#2#3 {
+\cs_new_protected:Npn \@@_prepare_and_extract:nn #1#2 {
% \end{macrocode}
%
% To handle the \cs{enlargethispage} case we do an \tn{unskip} to
-% get rid of any glue that is present at the end and also check if we have then a
-% \tn{vbox} as the last item and if so unpack that too, but only
-% under certain conditions, see below. All this is temporary, just
-% for getting the marks out, so it doesn't affect the final page
-% production.
-%
-% In fact, we go one step further and set the box to a large
-% negative height and afterwards take a look at the
-% reported badness: if it is zero we know that there has still been
-% infinite shrinkage in the box so that we can't do a
-% \tn{vsplit}. If that is the case we generate an error message and
-% bypass extracting the marks. We use only half of \cs{c_max_dim}
-% because otherwise \TeX{} will report an overfull vbox despite our
-% setting of \cs{tex_vfuzz:D}. This test will not find existing
-% infinite shrinkage in all cases, e.g., if there are several glues
-% that cancel each other, but it is the best we can do.
+% get rid of any glue that is present at the end of the material
+% and also check if we have then a \tn{vbox} as the last item and
+% if so unpack that too, but only under certain conditions, see
+% below. All this is temporary done in a group, just for getting
+% the marks out, so it doesn't affect the final page production.
+%
% \begin{macrocode}
\vbox_set:Nn \l_@@_box
{
- #3
+ #2
\tex_unskip:D
\box_set_to_last:N \l_@@_box
% \end{macrocode}
% After having removed the last box from the current list (if there
-% was one) we check whether the list is now empty. If not, then the last
+% was one) we check whether the vertical list is now empty. If not, then the last
% box is definitely not the one from \tn{enlargethispage} and so we
% can, and should, leave it alone. Otherwise we check if this last
% box is a \tn{vbox}.
@@ -938,58 +928,25 @@
\box_if_vertical:NT \l_@@_box
{
% \end{macrocode}
-% If it is, we do a further test and retypeset the \cs{l_@@_box} to
-% check whether it contains infinitely shrinkable glue, using the
-% same trick as before.
-% \begin{macrocode}
-% \vbox_set_to_ht:Nnn \l_@@_box { -.5\c_max_dim }
-% {
-% \vbox_unpack:N \l_@@_box
-% \tex_kern:D \c_zero_dim % ensure that box
-% % is not empty
-% }
-% \end{macrocode}
-% If we don't detect infinite negative glue then we unpack the box. If
-% we do, we ignore it for the process of mark extraction. However, we
-% do not generate an error message because in all likelihood this
-% is an ordinary box, like a marginal, that does contain something
-% like \tn{vss}.
-% \begin{macrocode}
-% \int_compare:nNnT \tex_badness:D > 0
-% {
+% If it is, we unpack the box.
+% \begin{macrocode}
\vbox_unpack:N \l_@@_box
-% }
}
}
% \end{macrocode}
% If it wasn't a vbox, it was either an hbox or there was no box.
% Given that we are only interested in the marks we don't need put
-% it back in that case. However, we have to make sure that the
-% outer box under construction
-% is not totally empty (which it might have been from the start, or
-% now), because \TeX{} does not report a badness for empty boxes
-% and that means our test would incorrectly conclude that we have
-% infinite shrinking glue. A simple \tn{kern} is enough to avoid
-% this (the same was already done above).
-% \begin{macrocode}
-% \tex_kern:D \c_zero_dim
+% it back in that case.
}
-% \int_compare:nNnTF \tex_badness:D > 0
-% {
-% \end{macrocode}
-% If the box had no infinite shrinkage (or rather if our test
-% didn't show any) we vsplit it. Note that it
-% doesn't matter that we set it to this strange size first. If there
-% was infinite shrinkage after all, we end up with a low-level
-% \TeX{} error. Unfortunately this is something one cannot always
-% prevent. For example if there is infinite negative glue that is
-% canceled by infinite positive glue then we can't detect this case.
-% however the splitting operation will balk, because it goes through
-% the vertical material item by item and complains the moment it
-% finds any negative infinite glue, even though it is a harmless
-% one if the material is considered as a whole.
-% We therefore, change the interaction mode, so that such errors
-% appear in the log, but do not stop the processing.
+% \end{macrocode}
+% We are now ready to \cs{vsplit} the box to get at the marks. If
+% the box contains some infinite negative glue the \TeX{} will
+% produce an error complaining about it, but it will correctly find
+% the the split marks. Given that we can't prevent that error, we
+% hide it from the user and ensure that \TeX{} doesn't stop. The
+% error message still shows in the log, but even that is mitigated
+% as best as possible---see the definition of
+% \cs{@@_vbox_set_split_to_maxdimen:NN} for the tricks employed.
% \begin{macrocode}
\@@_vbox_set_split_to_maxdimen:NN \l_@@_ii_box \l_@@_box
% \end{macrocode}
@@ -1010,17 +967,10 @@
{ Marks:~ mark~ extraction~needs~ recursion~
\msg_line_context: } }
%</trace>
- \@@_prepare_and_extract:nnn {#1} {#2}
+ \@@_prepare_and_extract:nn {#1}
{ \vbox_unpack:N \l_@@_ii_box
\vbox_unpack:N \l_@@_box }
}
-% }
-% \end{macrocode}
-% If the badness was zero (we actually tested for${}>0$ but it
-% can't get negative) then we had infinite shrinkage, so we execute
-% the code that handles that case:
-% \begin{macrocode}
-% { #2 }
}
% \end{macrocode}
% \end{macro}
@@ -1045,7 +995,8 @@
% <argument> Glue shrinkage error above ignored !
% l. ... }
%\end{verbatim}
-% which hopefully makes it clear that the error is harmless and ignored.
+% which hopefully makes it clear that the error is harmless and
+% and should be ignored by the reader of the \texttt{.log}.
% \begin{macrocode}
\cs_set_eq:cN {Glue~shrinkage~error~above~ignored~!}\c_max_dim
% \end{macrocode}
@@ -1056,14 +1007,14 @@
% \begin{macrocode}
\cs_new_protected:Npx \@@_vbox_set_split_to_maxdimen:NN #1#2 {
% \end{macrocode}
-% We start by saving the current interaction and escape char setting.
+% We start by saving the current interaction and escape char settings.
% \begin{macrocode}
- \tl_set:Nn \exp_not:N \l_@@_saved_parameters_tl
+ \tl_set:Ne \exp_not:N \l_@@_saved_parameters_tl
{
\tex_interactionmode:D
- \int_use:N \tex_interactionmode:D \scan_stop:
+ \exp_not:N \int_use:N \tex_interactionmode:D \scan_stop:
\tex_escapechar:D
- \int_use:N \tex_escapechar:D \scan_stop:
+ \exp_not:N \int_use:N \tex_escapechar:D \scan_stop:
}
% \end{macrocode}
% Then we change them so that no escape char is printed in the
@@ -1073,7 +1024,7 @@
% the \texttt{.log} file and \TeX{} doesn't stop at that point.
% \begin{macrocode}
\tex_escapechar:D -1 \scan_stop:
- \nonstopmode
+ \tex_interactionmode:D 0 \scan_stop:
% \end{macrocode}
% Then we do the splitting of the box to \cs{c_max_dim} to get at
% the marks. This may generate the error we are worried about,
@@ -1106,7 +1057,8 @@
%
%
% \begin{macro}{\l_@@_saved_parameters_tl}
-%
+% The temporary variable used for resetting escape char and
+% interaction mode.
% \begin{macrocode}
\tl_new:N \l_@@_saved_parameters_tl
% \end{macrocode}
@@ -1124,17 +1076,13 @@
%
% \begin{macrocode}
\cs_new_protected:Npn \@@_update_structure_from_material:nn #1#2 {
- \@@_extract_and_handle_marks:nnn
+ \@@_extract_and_handle_marks:nn
% \end{macrocode}
%
-% If marks can be extracted we update the structure from the split
-% marks (code in \cs{@@_update_structure_from_splitmarks:n}).
-% Otherwise, we generate an error message and update it using the
-% last mark from the previous region (code in
-% \cs{@@_update_structure_when_infinite_glue:n}).
+% Once the marks can be extracted we update the structure from the
+% split marks (code in \cs{@@_update_structure_from_splitmarks:n}).
% \begin{macrocode}
- { \@@_update_structure_from_splitmarks:n {#1} }
- { \@@_update_structure_when_infinite_glue:n {#1} }
+ { \@@_update_structure_from_splitmarks:n {#1} }
{ #2 }
}
% \end{macrocode}
@@ -1223,27 +1171,6 @@
}
% \end{macrocode}
% \end{macro}
-
-
-
-
-% \begin{macro}{\@@_update_structure_when_infinite_glue:n}
-% If a region contains infinite negative glue we report this as an
-% error and then set all marks to the last mark from the previous
-% region (as we can't extract any new marks).
-% \begin{macrocode}
-\cs_new_protected:Npn \@@_update_structure_when_infinite_glue:n #1 {
- \msg_error:nnn { mark } { infinite-shrinkage-region } {#1}
- \seq_map_inline:Nn \g_@@_classes_seq
- {
- \tl_gset_eq:cc { g_@@_#1_top_ ##1_tl }
- { g_@@_#1_last_ ##1_tl }
- \tl_gset_eq:cc { g_@@_#1_first_##1_tl }
- { g_@@_#1_last_ ##1_tl }
- }
-}
-% \end{macrocode}
-% \end{macro}
%
%
%
@@ -1270,20 +1197,19 @@
% The we try to extract all marks, thereby filling the token lists
% with suitable \cs{mark_insert:nn} calls.
% \begin{macrocode}
- \@@_extract_and_handle_marks:nnn
+ \@@_extract_and_handle_marks:nn
% \end{macrocode}
% If we can extract them (i.e., if we don't detect negative infinite
% glue) then this is done with \cs{@@_get_from_splitmarks:} otherwise
% we issue a warning that mark extraction was not possible.
% \begin{macrocode}
- { \@@_get_from_splitmarks: }
- { \msg_warning:nn { mark } { infinite-shrinkage-box } }
+ \@@_get_from_splitmarks:
{ #1 }
% \end{macrocode}
% Finally we copy the updated (or not updated) temporary token lists to
% the two that have been supplied when the function was called.
% By convention they are local variables and
-% \cs{@@_extract_and_handle_marks:nnn} runs in a group, which is
+% \cs{@@_extract_and_handle_marks:nn} runs in a group, which is
% why we have to use global variables for collecting.
% \begin{macrocode}
\tl_set_eq:NN #2 \g_@@_first_marks_tl
@@ -1616,30 +1542,7 @@
}
% \end{macrocode}
%
-% \begin{macrocode}
-\msg_new:nnnn { mark } { infinite-shrinkage-region }
- { Infinite~shrinkage~found~in~'#1'~region. }
- {
- \c__msg_coding_error_text_tl
- The~mark~region~'#1'~contains~some~infinite~negative~glue~
- allowing~it~to~shrink~to~an~arbitrarily~small~size.~
- This~makes~it~impossible~to~split~the~region~apart~to~
- get~at~its~marks.~They~are~lost.
- }
-% \end{macrocode}
%
-% If some arbitrary box content to be checked for marks contains
-% some infinite negative glue, allowing it to shrink to an
-% arbitrarily small size, then we can't extract any marks. They
-% are lost, but this should not generate an error because in
-% certain places, e.g., in some \env{minipage}s, such glue might be
-% legitimate.
-% \begin{macrocode}
-\msg_new:nnn { mark } { infinite-shrinkage-box }
- { Infinite~shrinkage~found~in~box~material~--~marks~not~extracted~
- \msg_line_context:
- }
-% \end{macrocode}
%
%
%
diff --git a/base/testfiles/github-0217-io-base.tlg b/base/testfiles/github-0217-io-base.tlg
index 0b033804..ce8a6fa6 100644
--- a/base/testfiles/github-0217-io-base.tlg
+++ b/base/testfiles/github-0217-io-base.tlg
@@ -6,15 +6,18 @@ Main Class: report
(part-one.tex
First Included file
Chapter 1.
-) [1
+)
+[1
]
(part3.tex
Third Included file
Chapter 2.
-) [2
+)
+[2
]
(part4.tex
Fourth Included file
Chapter 3.
-) [3
+)
+[3
] (github-0217-io-base.aux (part-one.aux) (part-two.aux) (part3.aux) (part4.aux))
diff --git a/base/testfiles/github-0217-io-space.luatex.tlg b/base/testfiles/github-0217-io-space.luatex.tlg
index 4ace28b0..af282bc6 100644
--- a/base/testfiles/github-0217-io-space.luatex.tlg
+++ b/base/testfiles/github-0217-io-space.luatex.tlg
@@ -6,15 +6,18 @@ Main Class: report
("./part one.tex"
First Included file
Chapter 1.
-) [1
+)
+[1
]
(part3.tex
Third Included file
Chapter 3.
-) [3
+)
+[3
]
(part4.tex
Fourth Included file
Chapter 4.
-) [4
+)
+[4
]
diff --git a/base/testfiles/github-0217-io-space.tlg b/base/testfiles/github-0217-io-space.tlg
index 648e2411..f2ffc77e 100644
--- a/base/testfiles/github-0217-io-space.tlg
+++ b/base/testfiles/github-0217-io-space.tlg
@@ -6,15 +6,18 @@ Main Class: report
(part one.tex
First Included file
Chapter 1.
-) [1
+)
+[1
]
(part3.tex
Third Included file
Chapter 3.
-) [3
+)
+[3
]
(part4.tex
Fourth Included file
Chapter 4.
-) [4
+)
+[4
]
diff --git a/base/testfiles/tl2e8.tlg b/base/testfiles/tl2e8.tlg
index aed93a1b..175a32e5 100644
--- a/base/testfiles/tl2e8.tlg
+++ b/base/testfiles/tl2e8.tlg
@@ -14,7 +14,10 @@ Type H <return> for immediate help.
l. ...\begin{figure}[X]
Option `X' ignored and `p' used.
[2
-] [3
+]
+[3
Figure aaa on page 3
Figure bbb on page 3
-] [4] [5] (tl2e8.aux)
+]
+[4]
+[5] (tl2e8.aux)
diff --git a/base/testfiles/tlb-fltrace-005b.luatex.tlg b/base/testfiles/tlb-fltrace-005b.luatex.tlg
index 03c37f8b..4174e695 100644
--- a/base/testfiles/tlb-fltrace-005b.luatex.tlg
+++ b/base/testfiles/tlb-fltrace-005b.luatex.tlg
@@ -289,5 +289,6 @@ LaTeX2e: \wd\bx at 65534 = 0.0pt
l. ...\ShowFloat{65534}
% undefined in pdftex
[1
-] [2
+]
+[2
] (tlb-fltrace-005b.aux)
diff --git a/base/testfiles/tlb-fltrace-005b.tlg b/base/testfiles/tlb-fltrace-005b.tlg
index be42f097..cd5d89ad 100644
--- a/base/testfiles/tlb-fltrace-005b.tlg
+++ b/base/testfiles/tlb-fltrace-005b.tlg
@@ -250,5 +250,6 @@ l. ...\ShowFloat{32757}
LaTeX2e: ***Float 65534 details:
LaTeX2e: Not a float!
[1
-] [2
+]
+[2
] (tlb-fltrace-005b.aux)
diff --git a/base/testfiles/tlb0577a.luatex.tlg b/base/testfiles/tlb0577a.luatex.tlg
index b3252533..6191279a 100644
--- a/base/testfiles/tlb0577a.luatex.tlg
+++ b/base/testfiles/tlb0577a.luatex.tlg
@@ -10,4 +10,5 @@ LaTeX Font Info: External font `cmex10' loaded for size
LaTeX Font Info: External font `cmex10' loaded for size
(Font) <5> on input line ....
LaTeX Font Info: Trying to load font information for U+lasy on input line ....
+[1
] (tlb0577a.aux)
diff --git a/base/testfiles/tlb0577a.tlg b/base/testfiles/tlb0577a.tlg
index b3252533..6191279a 100644
--- a/base/testfiles/tlb0577a.tlg
+++ b/base/testfiles/tlb0577a.tlg
@@ -10,4 +10,5 @@ LaTeX Font Info: External font `cmex10' loaded for size
LaTeX Font Info: External font `cmex10' loaded for size
(Font) <5> on input line ....
LaTeX Font Info: Trying to load font information for U+lasy on input line ....
+[1
] (tlb0577a.aux)
diff --git a/base/testfiles/tlb0878b.luatex.tlg b/base/testfiles/tlb0878b.luatex.tlg
index c855f2ea..52328f8d 100644
--- a/base/testfiles/tlb0878b.luatex.tlg
+++ b/base/testfiles/tlb0878b.luatex.tlg
@@ -5,4 +5,5 @@ LaTeX Font Info: External font `cmex10' loaded for size
LaTeX Font Info: External font `cmex10' loaded for size
(Font) <5> on input line ....
LaTeX Font Info: Trying to load font information for U+lasy on input line ....
+[1
] (tlb0878b.aux)
diff --git a/base/testfiles/tlb0878b.tlg b/base/testfiles/tlb0878b.tlg
index c855f2ea..52328f8d 100644
--- a/base/testfiles/tlb0878b.tlg
+++ b/base/testfiles/tlb0878b.tlg
@@ -5,4 +5,5 @@ LaTeX Font Info: External font `cmex10' loaded for size
LaTeX Font Info: External font `cmex10' loaded for size
(Font) <5> on input line ....
LaTeX Font Info: Trying to load font information for U+lasy on input line ....
+[1
] (tlb0878b.aux)
diff --git a/base/testfiles/tlb1379.luatex.tlg b/base/testfiles/tlb1379.luatex.tlg
index c392e2eb..c29aa43b 100644
--- a/base/testfiles/tlb1379.luatex.tlg
+++ b/base/testfiles/tlb1379.luatex.tlg
@@ -8,4 +8,5 @@ LaTeX Font Info: External font `cmex10' loaded for size
LaTeX Font Info: External font `cmex10' loaded for size
(Font) <5> on input line ....
LaTeX Font Info: Trying to load font information for U+lasy on input line ....
+[1
] (tlb1379.aux)
diff --git a/base/testfiles/tlb1379.tlg b/base/testfiles/tlb1379.tlg
index c392e2eb..c29aa43b 100644
--- a/base/testfiles/tlb1379.tlg
+++ b/base/testfiles/tlb1379.tlg
@@ -8,4 +8,5 @@ LaTeX Font Info: External font `cmex10' loaded for size
LaTeX Font Info: External font `cmex10' loaded for size
(Font) <5> on input line ....
LaTeX Font Info: Trying to load font information for U+lasy on input line ....
+[1
] (tlb1379.aux)
diff --git a/base/testfiles/tlb1451.luatex.tlg b/base/testfiles/tlb1451.luatex.tlg
index 79c23f29..1e98337f 100644
--- a/base/testfiles/tlb1451.luatex.tlg
+++ b/base/testfiles/tlb1451.luatex.tlg
@@ -298,7 +298,9 @@ Underfull \vbox (badness 2073) has occurred while \output is active
..\OT1/cmr/m/n/10 r
..\glue(\rightskip) 0.0
.\glue -1.94444
-[3] [4] [5]
+[3]
+[4]
+[5]
Underfull \vbox (badness 10000) has occurred while \output is active
\vbox(58.0+0.0)x345.0, direction TLT
.\glue(\topskip) 2.5
@@ -420,4 +422,6 @@ Underfull \vbox (badness 10000) has occurred while \output is active
....\OT1/cmr/m/n/10 )
..\glue(\tabskip) 0.0
.\glue -2.5
-[6] [7] [8] (tlb1451.aux)
+[6]
+[7]
+[8] (tlb1451.aux)
diff --git a/base/testfiles/tlb1451.tlg b/base/testfiles/tlb1451.tlg
index 137246fd..154bd1b2 100644
--- a/base/testfiles/tlb1451.tlg
+++ b/base/testfiles/tlb1451.tlg
@@ -257,7 +257,9 @@ Underfull \vbox (badness 2073) has occurred while \output is active
..\OT1/cmr/m/n/10 r
..\glue(\rightskip) 0.0
.\glue -1.94444
-[3] [4] [5]
+[3]
+[4]
+[5]
Underfull \vbox (badness 10000) has occurred while \output is active
\vbox(58.0+0.0)x345.0
.\glue(\topskip) 2.5
@@ -379,4 +381,6 @@ Underfull \vbox (badness 10000) has occurred while \output is active
....\OT1/cmr/m/n/10 )
..\glue(\tabskip) 0.0
.\glue -2.5
-[6] [7] [8] (tlb1451.aux)
+[6]
+[7]
+[8] (tlb1451.aux)
diff --git a/base/testfiles/tlb1783a.tlg b/base/testfiles/tlb1783a.tlg
index 7183567c..966cca4d 100644
--- a/base/testfiles/tlb1783a.tlg
+++ b/base/testfiles/tlb1783a.tlg
@@ -1,10 +1,12 @@
This is a generated file for the LaTeX2e validation system.
Don't change this file in any respect.
[1
-] [2
+]
+[2
] (tlb1783a.toc)
\tf at toc=\write...
-[3] [4
+[3]
+[4
]
Chapter 1.
[5] (tlb1783a.aux)
diff --git a/base/testfiles/tlb1826.luatex.tlg b/base/testfiles/tlb1826.luatex.tlg
index f488f0fc..a60114df 100644
--- a/base/testfiles/tlb1826.luatex.tlg
+++ b/base/testfiles/tlb1826.luatex.tlg
@@ -4,4 +4,5 @@ Author: Marcin Woli\'nski
Format: LaTeX2e<1995/06/01>
Main Class: article
LaTeX Font Info: Trying to load font information for foo+cmtt on input line ....
+[1
] (tlb1826.aux)
diff --git a/base/testfiles/tlb1826.tlg b/base/testfiles/tlb1826.tlg
index f488f0fc..a60114df 100644
--- a/base/testfiles/tlb1826.tlg
+++ b/base/testfiles/tlb1826.tlg
@@ -4,4 +4,5 @@ Author: Marcin Woli\'nski
Format: LaTeX2e<1995/06/01>
Main Class: article
LaTeX Font Info: Trying to load font information for foo+cmtt on input line ....
+[1
] (tlb1826.aux)
diff --git a/base/testfiles/tlb2400.luatex.tlg b/base/testfiles/tlb2400.luatex.tlg
index fd3d5f78..a3bdac13 100644
--- a/base/testfiles/tlb2400.luatex.tlg
+++ b/base/testfiles/tlb2400.luatex.tlg
@@ -14,6 +14,7 @@ LaTeX Font Info: External font `cmex10' loaded for size
LaTeX Font Info: External font `cmex10' loaded for size
(Font) <6> on input line ....
[1
-] [2
+]
+[2
] (tlb2400.aux)
LaTeX Warning: There were undefined references.
diff --git a/base/testfiles/tlb2400.tlg b/base/testfiles/tlb2400.tlg
index fd3d5f78..a3bdac13 100644
--- a/base/testfiles/tlb2400.tlg
+++ b/base/testfiles/tlb2400.tlg
@@ -14,6 +14,7 @@ LaTeX Font Info: External font `cmex10' loaded for size
LaTeX Font Info: External font `cmex10' loaded for size
(Font) <6> on input line ....
[1
-] [2
+]
+[2
] (tlb2400.aux)
LaTeX Warning: There were undefined references.
diff --git a/base/testfiles/tlcs01a.luatex.tlg b/base/testfiles/tlcs01a.luatex.tlg
index 2557b77e..b70b24b6 100644
--- a/base/testfiles/tlcs01a.luatex.tlg
+++ b/base/testfiles/tlcs01a.luatex.tlg
@@ -47,7 +47,8 @@ Table name changed to XTable
Figure name changed to XFigure
References name changed to XReferences
[1
-] [2]
+]
+[2]
Index name changed to XIndex
[3
]
diff --git a/base/testfiles/tlcs01a.tlg b/base/testfiles/tlcs01a.tlg
index 2557b77e..b70b24b6 100644
--- a/base/testfiles/tlcs01a.tlg
+++ b/base/testfiles/tlcs01a.tlg
@@ -47,7 +47,8 @@ Table name changed to XTable
Figure name changed to XFigure
References name changed to XReferences
[1
-] [2]
+]
+[2]
Index name changed to XIndex
[3
]
diff --git a/base/testfiles/tlcs01b.luatex.tlg b/base/testfiles/tlcs01b.luatex.tlg
index 96a7959a..7d6eb1af 100644
--- a/base/testfiles/tlcs01b.luatex.tlg
+++ b/base/testfiles/tlcs01b.luatex.tlg
@@ -53,7 +53,8 @@ CONTENTS NAME CHANGED TO XCONTENTS
[6
]
Part name changed to XPart
-[7] [8]
+[7]
+[8]
\global \advance \c at chaptername 1\relax XChapter\typeout {Chapter name changed to XChapter} 1.
Chapter name changed to XChapter
Table name changed to XTable
diff --git a/base/testfiles/tlcs01b.tlg b/base/testfiles/tlcs01b.tlg
index 4c26d8f8..ff0ea0d9 100644
--- a/base/testfiles/tlcs01b.tlg
+++ b/base/testfiles/tlcs01b.tlg
@@ -53,7 +53,8 @@ CONTENTS NAME CHANGED TO XCONTENTS
[6
]
Part name changed to XPart
-[7] [8]
+[7]
+[8]
\global \advance \c at chaptername 1\relax XChapter\typeout {Chapter name changed to XChapter} 1.
Chapter name changed to XChapter
Table name changed to XTable
diff --git a/base/testfiles/tlcs01r.luatex.tlg b/base/testfiles/tlcs01r.luatex.tlg
index 0435ee8f..74acdb99 100644
--- a/base/testfiles/tlcs01r.luatex.tlg
+++ b/base/testfiles/tlcs01r.luatex.tlg
@@ -57,7 +57,8 @@ Chapter name changed to XChapter
Table name changed to XTable
Figure name changed to XFigure
[1
-] [2]
+]
+[2]
\global \advance \c at appendixname 1\relax XAppendix\typeout {Appendix name changed to XAppendix} A.
Appendix name changed to XAppendix
[3
diff --git a/base/testfiles/tlcs01r.tlg b/base/testfiles/tlcs01r.tlg
index 0435ee8f..74acdb99 100644
--- a/base/testfiles/tlcs01r.tlg
+++ b/base/testfiles/tlcs01r.tlg
@@ -57,7 +57,8 @@ Chapter name changed to XChapter
Table name changed to XTable
Figure name changed to XFigure
[1
-] [2]
+]
+[2]
\global \advance \c at appendixname 1\relax XAppendix\typeout {Appendix name changed to XAppendix} A.
Appendix name changed to XAppendix
[3
diff --git a/base/testfiles/tlcs02.luatex.tlg b/base/testfiles/tlcs02.luatex.tlg
index 4a66b246..31c506db 100644
--- a/base/testfiles/tlcs02.luatex.tlg
+++ b/base/testfiles/tlcs02.luatex.tlg
@@ -12,6 +12,7 @@ LaTeX Font Info: External font `cmex10' loaded for size
LaTeX Font Info: External font `cmex10' loaded for size
(Font) <6> on input line ....
LaTeX Font Info: Trying to load font information for U+lasy on input line ....
+[0
]
Underfull \hbox (badness 3503) in paragraph at lines 71--84
\OT1/cmr/m/n/10 Lu-cio Domi-tio Ap-pio Clau-dio con-sulibus
diff --git a/base/testfiles/tlcs02.tlg b/base/testfiles/tlcs02.tlg
index 2eb83b51..d432040a 100644
--- a/base/testfiles/tlcs02.tlg
+++ b/base/testfiles/tlcs02.tlg
@@ -12,6 +12,7 @@ LaTeX Font Info: External font `cmex10' loaded for size
LaTeX Font Info: External font `cmex10' loaded for size
(Font) <6> on input line ....
LaTeX Font Info: Trying to load font information for U+lasy on input line ....
+[0
]
Underfull \hbox (badness 3503) in paragraph at lines 71--84
\OT1/cmr/m/n/10 Lucio Domi-tio Ap-pio Clau-dio con-sulibus
diff --git a/base/testfiles/tlcs04a.luatex.tlg b/base/testfiles/tlcs04a.luatex.tlg
index 6dcd1c7e..d8c3cfdf 100644
--- a/base/testfiles/tlcs04a.luatex.tlg
+++ b/base/testfiles/tlcs04a.luatex.tlg
@@ -16,5 +16,7 @@ LaTeX Font Info: External font `cmex10' loaded for size
LaTeX Font Info: External font `cmex10' loaded for size
(Font) <6> on input line ....
LaTeX Font Info: Trying to load font information for U+lasy on input line ....
-] [1
+[0
+]
+[1
] (tlcs04a.aux)
diff --git a/base/testfiles/tlcs04a.tlg b/base/testfiles/tlcs04a.tlg
index 6dcd1c7e..d8c3cfdf 100644
--- a/base/testfiles/tlcs04a.tlg
+++ b/base/testfiles/tlcs04a.tlg
@@ -16,5 +16,7 @@ LaTeX Font Info: External font `cmex10' loaded for size
LaTeX Font Info: External font `cmex10' loaded for size
(Font) <6> on input line ....
LaTeX Font Info: Trying to load font information for U+lasy on input line ....
-] [1
+[0
+]
+[1
] (tlcs04a.aux)
diff --git a/base/testfiles/tlcs04b.luatex.tlg b/base/testfiles/tlcs04b.luatex.tlg
index 645b5e39..8609bcaa 100644
--- a/base/testfiles/tlcs04b.luatex.tlg
+++ b/base/testfiles/tlcs04b.luatex.tlg
@@ -16,8 +16,10 @@ LaTeX Font Info: External font `cmex10' loaded for size
LaTeX Font Info: External font `cmex10' loaded for size
(Font) <6> on input line ....
LaTeX Font Info: Trying to load font information for U+lasy on input line ....
+[0
]
Chapter 1.
[1
-] [2
+]
+[2
] (tlcs04b.aux)
diff --git a/base/testfiles/tlcs04b.tlg b/base/testfiles/tlcs04b.tlg
index 645b5e39..8609bcaa 100644
--- a/base/testfiles/tlcs04b.tlg
+++ b/base/testfiles/tlcs04b.tlg
@@ -16,8 +16,10 @@ LaTeX Font Info: External font `cmex10' loaded for size
LaTeX Font Info: External font `cmex10' loaded for size
(Font) <6> on input line ....
LaTeX Font Info: Trying to load font information for U+lasy on input line ....
+[0
]
Chapter 1.
[1
-] [2
+]
+[2
] (tlcs04b.aux)
diff --git a/base/testfiles/tlcs04r.luatex.tlg b/base/testfiles/tlcs04r.luatex.tlg
index 75b6e625..2947375d 100644
--- a/base/testfiles/tlcs04r.luatex.tlg
+++ b/base/testfiles/tlcs04r.luatex.tlg
@@ -16,6 +16,7 @@ LaTeX Font Info: External font `cmex10' loaded for size
LaTeX Font Info: External font `cmex10' loaded for size
(Font) <6> on input line ....
LaTeX Font Info: Trying to load font information for U+lasy on input line ....
+[0
]
Chapter 1.
[1
diff --git a/base/testfiles/tlcs04r.tlg b/base/testfiles/tlcs04r.tlg
index 75b6e625..2947375d 100644
--- a/base/testfiles/tlcs04r.tlg
+++ b/base/testfiles/tlcs04r.tlg
@@ -16,6 +16,7 @@ LaTeX Font Info: External font `cmex10' loaded for size
LaTeX Font Info: External font `cmex10' loaded for size
(Font) <6> on input line ....
LaTeX Font Info: Trying to load font information for U+lasy on input line ....
+[0
]
Chapter 1.
[1
diff --git a/base/testfiles/tlcs06a.tlg b/base/testfiles/tlcs06a.tlg
index 6f395eae..e2219550 100644
--- a/base/testfiles/tlcs06a.tlg
+++ b/base/testfiles/tlcs06a.tlg
@@ -5,4 +5,5 @@ Format: LaTeX Version 2.09 <18 March 1992>
Main Style: article <14 Jan 92>
Style Options:
[1
-] [2] (tlcs06a.aux)
+]
+[2] (tlcs06a.aux)
diff --git a/base/testfiles/tlcs06b.tlg b/base/testfiles/tlcs06b.tlg
index c5b22fea..22627352 100644
--- a/base/testfiles/tlcs06b.tlg
+++ b/base/testfiles/tlcs06b.tlg
@@ -6,5 +6,8 @@ Main Style: book <14 Jan 92>
Style Options:
Chapter 1.
[1
-] [2
-] [3] [4] (tlcs06b.aux)
+]
+[2
+]
+[3]
+[4] (tlcs06b.aux)
diff --git a/base/testfiles/tlcs06r.tlg b/base/testfiles/tlcs06r.tlg
index 59c40b6e..157c213f 100644
--- a/base/testfiles/tlcs06r.tlg
+++ b/base/testfiles/tlcs06r.tlg
@@ -6,5 +6,7 @@ Main Style: report <14 Jan 92>
Style Options:
Chapter 1.
[1
-] [2
-] [3] (tlcs06r.aux)
+]
+[2
+]
+[3] (tlcs06r.aux)
diff --git a/base/testfiles/tltc001.luatex.tlg b/base/testfiles/tltc001.luatex.tlg
index ca009df6..6003a837 100644
--- a/base/testfiles/tltc001.luatex.tlg
+++ b/base/testfiles/tltc001.luatex.tlg
@@ -750,7 +750,8 @@ If that doesn't work, type X <return> to quit.
LaTeX Warning: Reference `notfound' on page 5 undefined on input line ....
LaTeX Warning: Reference `notfound' on page 5 undefined on input line ....
LaTeX Warning: Citation `notfound' on page 5 undefined on input line ....
-[5] [6]
+[5]
+[6]
Completed box being shipped out [7]
\vbox(357.0+0.0)x408.0, direction TLT
.\glue 27.0
diff --git a/base/testfiles/tltc001.tlg b/base/testfiles/tltc001.tlg
index 8739908f..d99a5e93 100644
--- a/base/testfiles/tltc001.tlg
+++ b/base/testfiles/tltc001.tlg
@@ -616,7 +616,8 @@ If that doesn't work, type X <return> to quit.
LaTeX Warning: Reference `notfound' on page 5 undefined on input line ....
LaTeX Warning: Reference `notfound' on page 5 undefined on input line ....
LaTeX Warning: Citation `notfound' on page 5 undefined on input line ....
-[5] [6]
+[5]
+[6]
Completed box being shipped out [7]
\vbox(357.0+0.0)x408.0
.\glue 27.0
diff --git a/base/testfiles/tltx001.luatex.tlg b/base/testfiles/tltx001.luatex.tlg
index f561295a..fa79ed14 100644
--- a/base/testfiles/tltx001.luatex.tlg
+++ b/base/testfiles/tltx001.luatex.tlg
@@ -705,7 +705,8 @@ If that doesn't work, type X <return> to quit.
LaTeX Warning: Reference `notfound' on page 5 undefined on input line ....
LaTeX Warning: Reference `notfound' on page 5 undefined on input line ....
LaTeX Warning: Citation `notfound' on page 5 undefined on input line ....
-[5] [6]
+[5]
+[6]
Completed box being shipped out [7]
\vbox(358.0+0.0)x407.0, direction TLT
.\glue 16.0
diff --git a/base/testfiles/tltx001.tlg b/base/testfiles/tltx001.tlg
index 4490d661..16ac541e 100644
--- a/base/testfiles/tltx001.tlg
+++ b/base/testfiles/tltx001.tlg
@@ -571,7 +571,8 @@ If that doesn't work, type X <return> to quit.
LaTeX Warning: Reference `notfound' on page 5 undefined on input line ....
LaTeX Warning: Reference `notfound' on page 5 undefined on input line ....
LaTeX Warning: Citation `notfound' on page 5 undefined on input line ....
-[5] [6]
+[5]
+[6]
Completed box being shipped out [7]
\vbox(358.0+0.0)x407.0
.\glue 16.0
diff --git a/base/testfiles/tltx001.xetex.tlg b/base/testfiles/tltx001.xetex.tlg
index 20c4cba2..646e9962 100644
--- a/base/testfiles/tltx001.xetex.tlg
+++ b/base/testfiles/tltx001.xetex.tlg
@@ -571,7 +571,8 @@ If that doesn't work, type X <return> to quit.
LaTeX Warning: Reference `notfound' on page 5 undefined on input line ....
LaTeX Warning: Reference `notfound' on page 5 undefined on input line ....
LaTeX Warning: Citation `notfound' on page 5 undefined on input line ....
-[5] [6]
+[5]
+[6]
Completed box being shipped out [7]
\vbox(358.0+0.0)x407.0
.\glue 16.0
diff --git a/base/testfiles/tltx004.tlg b/base/testfiles/tltx004.tlg
index 9dc451a8..c0c05c85 100644
--- a/base/testfiles/tltx004.tlg
+++ b/base/testfiles/tltx004.tlg
@@ -80,7 +80,8 @@ Defined \whiledo
\isodd {\A }
yes: no !! (wrong value)
\isodd {\pageref {foo}}
- yes: yes [1
+ yes: yes
+[1
]
\isodd {\pageref {bar}}
no : no
diff --git a/base/testfiles/tlxs01b.luatex.tlg b/base/testfiles/tlxs01b.luatex.tlg
index aa596bc8..83197ce4 100644
--- a/base/testfiles/tlxs01b.luatex.tlg
+++ b/base/testfiles/tlxs01b.luatex.tlg
@@ -41,7 +41,8 @@ CONTENTS NAME CHANGED TO XCONTENTS
[6
]
Part name changed to XPart
-[7] [8]
+[7]
+[8]
\global \advance \c at chaptername 1\relax XChapter\typeout {Chapter name changed to XChapter} 1.
Chapter name changed to XChapter
Table name changed to XTable
diff --git a/base/testfiles/tlxs01b.tlg b/base/testfiles/tlxs01b.tlg
index aa596bc8..83197ce4 100644
--- a/base/testfiles/tlxs01b.tlg
+++ b/base/testfiles/tlxs01b.tlg
@@ -41,7 +41,8 @@ CONTENTS NAME CHANGED TO XCONTENTS
[6
]
Part name changed to XPart
-[7] [8]
+[7]
+[8]
\global \advance \c at chaptername 1\relax XChapter\typeout {Chapter name changed to XChapter} 1.
Chapter name changed to XChapter
Table name changed to XTable
diff --git a/base/testfiles/tlxs01r.luatex.tlg b/base/testfiles/tlxs01r.luatex.tlg
index d6037530..d7a8168d 100644
--- a/base/testfiles/tlxs01r.luatex.tlg
+++ b/base/testfiles/tlxs01r.luatex.tlg
@@ -44,7 +44,8 @@ Chapter name changed to XChapter
Table name changed to XTable
Figure name changed to XFigure
[1
-] [2]
+]
+[2]
\global \advance \c at appendixname 1\relax XAppendix\typeout {Appendix name changed to XAppendix} A.
Appendix name changed to XAppendix
[3
diff --git a/base/testfiles/tlxs01r.tlg b/base/testfiles/tlxs01r.tlg
index d6037530..d7a8168d 100644
--- a/base/testfiles/tlxs01r.tlg
+++ b/base/testfiles/tlxs01r.tlg
@@ -44,7 +44,8 @@ Chapter name changed to XChapter
Table name changed to XTable
Figure name changed to XFigure
[1
-] [2]
+]
+[2]
\global \advance \c at appendixname 1\relax XAppendix\typeout {Appendix name changed to XAppendix} A.
Appendix name changed to XAppendix
[3
diff --git a/base/testfiles/tlxs04b.tlg b/base/testfiles/tlxs04b.tlg
index dc19411d..c1d585c5 100644
--- a/base/testfiles/tlxs04b.tlg
+++ b/base/testfiles/tlxs04b.tlg
@@ -15,7 +15,8 @@ LaTeX Font Info: External font `cmex10' loaded for size
LaTeX Font Info: External font `cmex10' loaded for size
(Font) <6> on input line ....
[1
-] [2
+]
+[2
]
Chapter 1.
[3] (tlxs04b.aux)
diff --git a/base/testfiles/tlxs06a.tlg b/base/testfiles/tlxs06a.tlg
index 0788f251..e38a9ba0 100644
--- a/base/testfiles/tlxs06a.tlg
+++ b/base/testfiles/tlxs06a.tlg
@@ -4,4 +4,5 @@ Author: Chris Martin
Format: LaTeX2e<1993/12/24>
Main Class: article
[1
-] [2] (tlxs06a.aux)
+]
+[2] (tlxs06a.aux)
diff --git a/base/testfiles/tlxs06b.tlg b/base/testfiles/tlxs06b.tlg
index 9715b4b6..98739c03 100644
--- a/base/testfiles/tlxs06b.tlg
+++ b/base/testfiles/tlxs06b.tlg
@@ -5,5 +5,8 @@ Format: LaTeX2e<1993/12/24>
Main Class: book
Chapter 1.
[1
-] [2
-] [3] [4] (tlxs06b.aux)
+]
+[2
+]
+[3]
+[4] (tlxs06b.aux)
diff --git a/base/testfiles/tlxs06r.tlg b/base/testfiles/tlxs06r.tlg
index ada6a8b3..441f8c89 100644
--- a/base/testfiles/tlxs06r.tlg
+++ b/base/testfiles/tlxs06r.tlg
@@ -5,5 +5,7 @@ Format: LaTeX2e<1993/12/24>
Main Class: report
Chapter 1.
[1
-] [2
-] [3] (tlxs06r.aux)
+]
+[2
+]
+[3] (tlxs06r.aux)
diff --git a/required/firstaid/testfiles/firstaid-pgfmorepages.tlg b/required/firstaid/testfiles/firstaid-pgfmorepages.tlg
index 77e1becf..5e4e81eb 100644
--- a/required/firstaid/testfiles/firstaid-pgfmorepages.tlg
+++ b/required/firstaid/testfiles/firstaid-pgfmorepages.tlg
@@ -33,5 +33,6 @@ Package: epstopdf-base ....-..-.. v... Base part for package epstopdf
Package epstopdf-base Info: Redefining graphics rule for `.eps' on input line ....
(../epstopdf-sys.cfg
File: epstopdf-sys.cfg ....-..-.. v... Configuration of (r)epstopdf for TeX Live
-)) [1
+))
+[1
] (firstaid-pgfmorepages.aux)
diff --git a/required/graphics/testfiles/braces-compat-01.tlg b/required/graphics/testfiles/braces-compat-01.tlg
index 063ac93a..d7482499 100644
--- a/required/graphics/testfiles/braces-compat-01.tlg
+++ b/required/graphics/testfiles/braces-compat-01.tlg
@@ -5,7 +5,8 @@ File: foo.bar.eps Graphic file (type eps)
File: foo.bar.eps Graphic file (type eps)
<foo.bar.eps>
File: foo.bar.eps Graphic file (type eps)
- <foo.bar.eps> [1
+ <foo.bar.eps>
+[1
] (braces-compat-01.aux)
*File List*
article.cls ....-..-.. v... Standard LaTeX document class
More information about the latex3-commits
mailing list.