[latex3-commits] [latex3/latex2e] ltmarks-multicol: test and docu updates (5ed52d0b9)
github at latex-project.org
github at latex-project.org
Sat Nov 9 15:22:11 CET 2024
Repository : https://github.com/latex3/latex2e
On branch : ltmarks-multicol
Link : https://github.com/latex3/latex2e/commit/5ed52d0b93b89c9b81f8d3bde2439e1d34a62990
>---------------------------------------------------------------
commit 5ed52d0b93b89c9b81f8d3bde2439e1d34a62990
Author: Frank Mittelbach <frank.mittelbach at latex-project.org>
Date: Sat Nov 9 15:22:11 2024 +0100
test and docu updates
>---------------------------------------------------------------
5ed52d0b93b89c9b81f8d3bde2439e1d34a62990
required/tools/multicol.dtx | 1 -
required/tools/testfiles/github-0190.tlg | 4 +++-
required/tools/testfiles/github-0682.tlg | 6 ++++--
required/tools/testfiles/github-0822.tlg | 1 +
required/tools/testfiles/sx411758.luatex.tlg | 31 ++++++++++++++++------------
required/tools/testfiles/sx411758.tlg | 31 ++++++++++++++++------------
6 files changed, 44 insertions(+), 30 deletions(-)
diff --git a/required/tools/multicol.dtx b/required/tools/multicol.dtx
index 18ed53d44..74402d9bf 100644
--- a/required/tools/multicol.dtx
+++ b/required/tools/multicol.dtx
@@ -3549,7 +3549,6 @@
% \end{macrocode}
% \end{macro}
%
-% \end{multicols}
%
%
% \begin{macro}{\remove at discardable@items}
diff --git a/required/tools/testfiles/github-0190.tlg b/required/tools/testfiles/github-0190.tlg
index 7db254e20..97432746f 100644
--- a/required/tools/testfiles/github-0190.tlg
+++ b/required/tools/testfiles/github-0190.tlg
@@ -4,5 +4,7 @@ Box Height=34.0pt
[1
]
Box Height=34.0pt
-[2] [3] [4]
+[2]
+[3]
+[4]
[5] (github-0190.aux)
diff --git a/required/tools/testfiles/github-0682.tlg b/required/tools/testfiles/github-0682.tlg
index 5421ca7c6..cfceb394d 100644
--- a/required/tools/testfiles/github-0682.tlg
+++ b/required/tools/testfiles/github-0682.tlg
@@ -7,9 +7,11 @@ Don't change this file in any respect.
2: 0.0pt
[3]
3: 70.0pt
-[4] [5]
+[4]
+[5]
4: 82.0pt
-[6] [7]
+[6]
+[7]
5: 82.0pt
[8]
[9]
diff --git a/required/tools/testfiles/github-0822.tlg b/required/tools/testfiles/github-0822.tlg
index d074b0880..ba8c5ed75 100644
--- a/required/tools/testfiles/github-0822.tlg
+++ b/required/tools/testfiles/github-0822.tlg
@@ -104,6 +104,7 @@ Package: multicol ....-..-.. v... multicolumn formatting (FMi)
\mult at nat@firstbox=\box...
\colbreak at box=\box...
\mc at col@check at num=\count...
+\g__mark_curr_col_int=\count...
)
\IndexMin=\dimen...
\c at IndexColumns=\count...
diff --git a/required/tools/testfiles/sx411758.luatex.tlg b/required/tools/testfiles/sx411758.luatex.tlg
index 81fb8796e..d5fabacb1 100644
--- a/required/tools/testfiles/sx411758.luatex.tlg
+++ b/required/tools/testfiles/sx411758.luatex.tlg
@@ -1446,16 +1446,12 @@ Column 1 badness: 10000
First column = 654.0pt (178.0pt) <> last column = 654.0pt
Failed: columns too large with unprocessed forced break(s)!
Package multicol: Balancing failed ... cut a normal page on input line ....
-Package multicol: Use kept top mark:
-(multicol) \firstmark:
-(multicol) Use kept first mark:
-(multicol) macro:->
-(multicol) Use kept bot mark:
-(multicol) macro:->
-(multicol) Produce first mark:
-(multicol) \firstmark:
-(multicol) Produce bot mark:
-(multicol) \firstmark:
+--> multicolout
+--->>> multicol update col structure
+--->>> multicol update page structure
+Marks: 2e-left multicol (full page):
+Marks: 2e-right multicol (full page):
+Marks: 2e-right-nonempty multicol (full page):
Package multicol: Column spec: 345.0pt = indent + columns + sep =
(multicol) 0.0pt + 2 x 154.4325pt + 1 x 36.135pt on input line ....
Completed box being shipped out [1]
@@ -2803,8 +2799,6 @@ Completed box being shipped out [1]
....\glue 0.0 plus 1.0fil
....\OT1/cmr/m/n/10 1
....\glue 0.0 plus 1.0fil
-Package multicol: (Re)Init top mark:
-(multicol) \firstmark:
Package multicol: Colroom:
(multicol) 550.0pt after float space removed = 550.0pt.
Package multicol: Forced column break seen on input line ....
@@ -3029,13 +3023,24 @@ Rejected: unprocessed forced break(s) in last column!
Column 1 badness: 0
First column = 298.0pt (298.0pt) <> last column = 178.0pt
Final badness: 10000 setting natural (> 9999)
+--> balancecolumnout
+--->>> multicol update col structure
+Marks: 2e-left multicol (finish):
+Marks: 2e-right multicol (finish):
+Marks: 2e-right-nonempty multicol (finish):
+--->>> multicol prepare reinsert marks
+Marks: no marks for class '2e-left' on line ...
+Marks: no marks for class '2e-right' on line ...
+Marks: no marks for class '2e-right-nonempty' on line ...
Package multicol: Column spec: 345.0pt = indent + columns + sep =
(multicol) 0.0pt + 2 x 154.4325pt + 1 x 36.135pt on input line ....
-Package multicol: Make kept marks empty on input line ....
Package multicol: Current page:
(multicol) height=550.0pt: used 298.4pt -> free=251.6pt
(multicol) needed 20.0pt (for \postmulticols ) on input line ....
Package multicol: Ending environment on input line ....
+Marks: 2e-left in OR (oneside):
+Marks: 2e-right in OR (oneside):
+Marks: 2e-right-nonempty in OR (oneside):
Completed box being shipped out [2]
\vbox(633.0+0.0)x407.0, direction TLT
.\glue 16.0
diff --git a/required/tools/testfiles/sx411758.tlg b/required/tools/testfiles/sx411758.tlg
index bde77eb52..ec6cbb645 100644
--- a/required/tools/testfiles/sx411758.tlg
+++ b/required/tools/testfiles/sx411758.tlg
@@ -1446,16 +1446,12 @@ Column 1 badness: 10000
First column = 654.0pt (178.0pt) <> last column = 654.0pt
Failed: columns too large with unprocessed forced break(s)!
Package multicol: Balancing failed ... cut a normal page on input line ....
-Package multicol: Use kept top mark:
-(multicol) \firstmark:
-(multicol) Use kept first mark:
-(multicol) macro:->
-(multicol) Use kept bot mark:
-(multicol) macro:->
-(multicol) Produce first mark:
-(multicol) \firstmark:
-(multicol) Produce bot mark:
-(multicol) \firstmark:
+--> multicolout
+--->>> multicol update col structure
+--->>> multicol update page structure
+Marks: 2e-left multicol (full page):
+Marks: 2e-right multicol (full page):
+Marks: 2e-right-nonempty multicol (full page):
Package multicol: Column spec: 345.0pt = indent + columns + sep =
(multicol) 0.0pt + 2 x 154.4325pt + 1 x 36.135pt on input line ....
Completed box being shipped out [1]
@@ -2799,8 +2795,6 @@ Completed box being shipped out [1]
....\glue 0.0 plus 1.0fil
....\OT1/cmr/m/n/10 1
....\glue 0.0 plus 1.0fil
-Package multicol: (Re)Init top mark:
-(multicol) \firstmark:
Package multicol: Colroom:
(multicol) 550.0pt after float space removed = 550.0pt.
Package multicol: Forced column break seen on input line ....
@@ -3025,13 +3019,24 @@ Rejected: unprocessed forced break(s) in last column!
Column 1 badness: 0
First column = 298.0pt (298.0pt) <> last column = 178.0pt
Final badness: 10000 setting natural (> 9999)
+--> balancecolumnout
+--->>> multicol update col structure
+Marks: 2e-left multicol (finish):
+Marks: 2e-right multicol (finish):
+Marks: 2e-right-nonempty multicol (finish):
+--->>> multicol prepare reinsert marks
+Marks: no marks for class '2e-left' on line ...
+Marks: no marks for class '2e-right' on line ...
+Marks: no marks for class '2e-right-nonempty' on line ...
Package multicol: Column spec: 345.0pt = indent + columns + sep =
(multicol) 0.0pt + 2 x 154.4325pt + 1 x 36.135pt on input line ....
-Package multicol: Make kept marks empty on input line ....
Package multicol: Current page:
(multicol) height=550.0pt: used 298.4pt -> free=251.6pt
(multicol) needed 20.0pt (for \postmulticols ) on input line ....
Package multicol: Ending environment on input line ....
+Marks: 2e-left in OR (oneside):
+Marks: 2e-right in OR (oneside):
+Marks: 2e-right-nonempty in OR (oneside):
Completed box being shipped out [2]
\vbox(633.0+0.0)x407.0
.\glue 16.0
More information about the latex3-commits
mailing list.