[latex3-commits] [latex3/latex2e] ltmarks-multicol: WIP (148e6be4d)

github at latex-project.org github at latex-project.org
Wed Nov 6 21:36:23 CET 2024


Repository : https://github.com/latex3/latex2e
On branch  : ltmarks-multicol
Link       : https://github.com/latex3/latex2e/commit/148e6be4dc36d32680004a0ff9724eaf1a01b0ba

>---------------------------------------------------------------

commit 148e6be4dc36d32680004a0ff9724eaf1a01b0ba
Author: Frank Mittelbach <frank.mittelbach at latex-project.org>
Date:   Wed Nov 6 21:36:23 2024 +0100

    WIP


>---------------------------------------------------------------

148e6be4dc36d32680004a0ff9724eaf1a01b0ba
 required/tools/testfiles/tlb-multicol-003.tlg     | 48 -------------------
 required/tools/testfiles/tlb-multicol-eisuke.tlg  |  6 ---
 required/tools/testfiles/tlb-multicol-marks.tlg   | 58 ++++++++---------------
 required/tools/testfiles/tlb-multicol-rowland.tlg |  6 ---
 4 files changed, 21 insertions(+), 97 deletions(-)

diff --git a/required/tools/testfiles/tlb-multicol-003.tlg b/required/tools/testfiles/tlb-multicol-003.tlg
index 967b6c389..2fb713243 100644
--- a/required/tools/testfiles/tlb-multicol-003.tlg
+++ b/required/tools/testfiles/tlb-multicol-003.tlg
@@ -7,8 +7,6 @@ Marks: 2e-left in OR (multicols):
     column (previous)=
     column (first)=
     column (last) =
-    column (1) =
-    column (2) =
 Marks: 2e-right in OR (multicols):
     page (current) =
     page (previous)=
@@ -16,8 +14,6 @@ Marks: 2e-right in OR (multicols):
     column (previous)=
     column (first)=
     column (last) =
-    column (1) =
-    column (2) =
 Marks: 2e-right-nonempty in OR (multicols):
     page (current) =
     page (previous)=
@@ -25,8 +21,6 @@ Marks: 2e-right-nonempty in OR (multicols):
     column (previous)=
     column (first)=
     column (last) =
-    column (1) =
-    column (2) =
 --> multicolout
 Completed box being shipped out [1]
 \vbox(141.0+0.0)x407.0
@@ -154,8 +148,6 @@ Marks: 2e-left in OR (multicols):
     column (previous)=
     column (first)=
     column (last) =
-    column (1) =
-    column (2) =
 Marks: 2e-right in OR (multicols):
     page (current) =
     page (previous)=
@@ -163,8 +155,6 @@ Marks: 2e-right in OR (multicols):
     column (previous)=
     column (first)=
     column (last) =
-    column (1) =
-    column (2) =
 Marks: 2e-right-nonempty in OR (multicols):
     page (current) =
     page (previous)=
@@ -172,8 +162,6 @@ Marks: 2e-right-nonempty in OR (multicols):
     column (previous)=
     column (first)=
     column (last) =
-    column (1) =
-    column (2) =
 --> multicolout
 Completed box being shipped out [2]
 \vbox(141.0+0.0)x407.0
@@ -335,8 +323,6 @@ Marks: 2e-left in OR (multicols):
     column (previous)=
     column (first)=
     column (last) =
-    column (1) =
-    column (2) =
 Marks: 2e-right in OR (multicols):
     page (current) =
     page (previous)=
@@ -344,8 +330,6 @@ Marks: 2e-right in OR (multicols):
     column (previous)=
     column (first)=
     column (last) =
-    column (1) =
-    column (2) =
 Marks: 2e-right-nonempty in OR (multicols):
     page (current) =
     page (previous)=
@@ -353,8 +337,6 @@ Marks: 2e-right-nonempty in OR (multicols):
     column (previous)=
     column (first)=
     column (last) =
-    column (1) =
-    column (2) =
 --> multicolout
 Completed box being shipped out [3]
 \vbox(141.0+0.0)x407.0
@@ -520,8 +502,6 @@ Marks: 2e-left in OR (multicols):
     column (previous)=
     column (first)=
     column (last) =
-    column (1) =
-    column (2) =
 Marks: 2e-right in OR (multicols):
     page (current) =
     page (previous)=
@@ -529,8 +509,6 @@ Marks: 2e-right in OR (multicols):
     column (previous)=
     column (first)=
     column (last) =
-    column (1) =
-    column (2) =
 Marks: 2e-right-nonempty in OR (multicols):
     page (current) =
     page (previous)=
@@ -538,8 +516,6 @@ Marks: 2e-right-nonempty in OR (multicols):
     column (previous)=
     column (first)=
     column (last) =
-    column (1) =
-    column (2) =
 --> multicolout
 Completed box being shipped out [4]
 \vbox(141.0+0.0)x407.0
@@ -787,8 +763,6 @@ Marks: 2e-left in OR (multicols):
     column (previous)=
     column (first)=
     column (last) =
-    column (1) =
-    column (2) =
 Marks: 2e-right in OR (multicols):
     page (current) =
     page (previous)=
@@ -796,8 +770,6 @@ Marks: 2e-right in OR (multicols):
     column (previous)=
     column (first)=
     column (last) =
-    column (1) =
-    column (2) =
 Marks: 2e-right-nonempty in OR (multicols):
     page (current) =
     page (previous)=
@@ -805,8 +777,6 @@ Marks: 2e-right-nonempty in OR (multicols):
     column (previous)=
     column (first)=
     column (last) =
-    column (1) =
-    column (2) =
 --> multicolout
 Completed box being shipped out [5]
 \vbox(141.0+0.0)x407.0
@@ -934,8 +904,6 @@ Marks: 2e-left in OR (multicols):
     column (previous)=
     column (first)=
     column (last) =
-    column (1) =
-    column (2) =
 Marks: 2e-right in OR (multicols):
     page (current) =
     page (previous)=
@@ -943,8 +911,6 @@ Marks: 2e-right in OR (multicols):
     column (previous)=
     column (first)=
     column (last) =
-    column (1) =
-    column (2) =
 Marks: 2e-right-nonempty in OR (multicols):
     page (current) =
     page (previous)=
@@ -952,8 +918,6 @@ Marks: 2e-right-nonempty in OR (multicols):
     column (previous)=
     column (first)=
     column (last) =
-    column (1) =
-    column (2) =
 --> multicolout
 Completed box being shipped out [6]
 \vbox(141.0+0.0)x407.0
@@ -1116,8 +1080,6 @@ Marks: 2e-left in OR (multicols):
     column (previous)=
     column (first)=
     column (last) =
-    column (1) =
-    column (2) =
 Marks: 2e-right in OR (multicols):
     page (current) =
     page (previous)=
@@ -1125,8 +1087,6 @@ Marks: 2e-right in OR (multicols):
     column (previous)=
     column (first)=
     column (last) =
-    column (1) =
-    column (2) =
 Marks: 2e-right-nonempty in OR (multicols):
     page (current) =
     page (previous)=
@@ -1134,8 +1094,6 @@ Marks: 2e-right-nonempty in OR (multicols):
     column (previous)=
     column (first)=
     column (last) =
-    column (1) =
-    column (2) =
 --> multicolout
 Completed box being shipped out [7]
 \vbox(141.0+0.0)x407.0
@@ -1303,8 +1261,6 @@ Marks: 2e-left in OR (multicols):
     column (previous)=
     column (first)=
     column (last) =
-    column (1) =
-    column (2) =
 Marks: 2e-right in OR (multicols):
     page (current) =
     page (previous)=
@@ -1312,8 +1268,6 @@ Marks: 2e-right in OR (multicols):
     column (previous)=
     column (first)=
     column (last) =
-    column (1) =
-    column (2) =
 Marks: 2e-right-nonempty in OR (multicols):
     page (current) =
     page (previous)=
@@ -1321,8 +1275,6 @@ Marks: 2e-right-nonempty in OR (multicols):
     column (previous)=
     column (first)=
     column (last) =
-    column (1) =
-    column (2) =
 --> multicolout
 Completed box being shipped out [8]
 \vbox(141.0+0.0)x407.0
diff --git a/required/tools/testfiles/tlb-multicol-eisuke.tlg b/required/tools/testfiles/tlb-multicol-eisuke.tlg
index 2636e83d3..5fe594b4a 100644
--- a/required/tools/testfiles/tlb-multicol-eisuke.tlg
+++ b/required/tools/testfiles/tlb-multicol-eisuke.tlg
@@ -235,8 +235,6 @@ Marks: 2e-left in OR (multicols):
     column (previous)=
     column (first)=
     column (last) =
-    column (1) =
-    column (2) =
 Marks: 2e-right in OR (multicols):
     page (current) =
     page (previous)=
@@ -244,8 +242,6 @@ Marks: 2e-right in OR (multicols):
     column (previous)=
     column (first)=
     column (last) =
-    column (1) =
-    column (2) =
 Marks: 2e-right-nonempty in OR (multicols):
     page (current) =
     page (previous)=
@@ -253,8 +249,6 @@ Marks: 2e-right-nonempty in OR (multicols):
     column (previous)=
     column (first)=
     column (last) =
-    column (1) =
-    column (2) =
 --> multicolout
 Completed box being shipped out [1]
 \vbox(633.0+0.0)x407.0
diff --git a/required/tools/testfiles/tlb-multicol-marks.tlg b/required/tools/testfiles/tlb-multicol-marks.tlg
index 22f2a907b..3c34fda49 100644
--- a/required/tools/testfiles/tlb-multicol-marks.tlg
+++ b/required/tools/testfiles/tlb-multicol-marks.tlg
@@ -17,8 +17,6 @@ Marks: 2e-left in OR (multicols):
     column (previous)=
     column (first)=
     column (last) =
-    column (1) =
-    column (2) =
 Marks: 2e-right in OR (multicols):
     page (current) =
     page (previous)=
@@ -26,8 +24,6 @@ Marks: 2e-right in OR (multicols):
     column (previous)=
     column (first)=
     column (last) =
-    column (1) =
-    column (2) =
 Marks: 2e-right-nonempty in OR (multicols):
     page (current) =
     page (previous)=
@@ -35,8 +31,6 @@ Marks: 2e-right-nonempty in OR (multicols):
     column (previous)=
     column (first)=
     column (last) =
-    column (1) =
-    column (2) =
 Marks: DictMark in OR (multicols):
     page (current) = | \__mark_id:n {0} | \__mark_id:n {1}a | \__mark_id:n {6}p |
     page (previous)=
@@ -44,8 +38,6 @@ Marks: DictMark in OR (multicols):
     column (previous)= | \__mark_id:n {4}n | \__mark_id:n {5}o | \__mark_id:n {5}o |
     column (first)= | \__mark_id:n {0} | \__mark_id:n {1}a | \__mark_id:n {3}m |
     column (last) = | \__mark_id:n {5}o | \__mark_id:n {6}p | \__mark_id:n {6}p |
-    column (1) =
-    column (2) =
 --> multicolout
 Marks: no marks for class '2e-left' on line ...
 Marks: no marks for class '2e-right' on line ...
@@ -67,14 +59,14 @@ Marks: no marks for class '2e-right' on line ...
 Marks: no marks for class '2e-right-nonempty' on line ...
 Marks: extract last mark for class 'DictMark' = \__mark_id:n {6}p
 Marks: extract first mark for class 'DictMark' = \__mark_id:n {6}p
-Marks: set DictMark <- '\__mark_id:n {11}m' on line ...
-Marks: set DictMark <- '\__mark_id:n {12}m' on line ...
-Marks: set DictMark <- '\__mark_id:n {13}n' on line ...
-Marks: set DictMark <- '\__mark_id:n {14}n' on line ...
-Marks: set DictMark <- '\__mark_id:n {15}o' on line ...
-Marks: set DictMark <- '\__mark_id:n {16}o' on line ...
-Marks: set DictMark <- '\__mark_id:n {17}p' on line ...
-Marks: set DictMark <- '\__mark_id:n {18}p' on line ...
+Marks: set DictMark <- '\__mark_id:n {11}\__mark_id:n {3}m' on line ...
+Marks: set DictMark <- '\__mark_id:n {12}\__mark_id:n {3}m' on line ...
+Marks: set DictMark <- '\__mark_id:n {13}\__mark_id:n {4}n' on line ...
+Marks: set DictMark <- '\__mark_id:n {14}\__mark_id:n {4}n' on line ...
+Marks: set DictMark <- '\__mark_id:n {15}\__mark_id:n {5}o' on line ...
+Marks: set DictMark <- '\__mark_id:n {16}\__mark_id:n {5}o' on line ...
+Marks: set DictMark <- '\__mark_id:n {17}\__mark_id:n {6}p' on line ...
+Marks: set DictMark <- '\__mark_id:n {18}\__mark_id:n {6}p' on line ...
 ==> Header: a--p 1
 [1
 ]
@@ -99,14 +91,14 @@ Marks: no marks for class '2e-right' on line ...
 Marks: no marks for class '2e-right-nonempty' on line ...
 Marks: extract last mark for class 'DictMark' = \__mark_id:n {10}u
 Marks: extract first mark for class 'DictMark' = \__mark_id:n {10}u
-Marks: set DictMark <- '\__mark_id:n {19}q' on line ...
-Marks: set DictMark <- '\__mark_id:n {20}q' on line ...
-Marks: set DictMark <- '\__mark_id:n {21}r' on line ...
-Marks: set DictMark <- '\__mark_id:n {22}r' on line ...
-Marks: set DictMark <- '\__mark_id:n {23}s' on line ...
-Marks: set DictMark <- '\__mark_id:n {24}s' on line ...
-Marks: set DictMark <- '\__mark_id:n {25}u' on line ...
-Marks: set DictMark <- '\__mark_id:n {26}u' on line ...
+Marks: set DictMark <- '\__mark_id:n {19}\__mark_id:n {7}q' on line ...
+Marks: set DictMark <- '\__mark_id:n {20}\__mark_id:n {7}q' on line ...
+Marks: set DictMark <- '\__mark_id:n {21}\__mark_id:n {8}r' on line ...
+Marks: set DictMark <- '\__mark_id:n {22}\__mark_id:n {8}r' on line ...
+Marks: set DictMark <- '\__mark_id:n {23}\__mark_id:n {9}s' on line ...
+Marks: set DictMark <- '\__mark_id:n {24}\__mark_id:n {9}s' on line ...
+Marks: set DictMark <- '\__mark_id:n {25}\__mark_id:n {10}u' on line ...
+Marks: set DictMark <- '\__mark_id:n {26}\__mark_id:n {10}u' on line ...
 Marks: set DictMark <- '\__mark_id:n {27}z' on line ...
 Marks: 2e-left in OR (oneside):
     page (current) =
@@ -115,8 +107,6 @@ Marks: 2e-left in OR (oneside):
     column (previous)=
     column (first)=
     column (last) =
-    column (1) =
-    column (2) =
 Marks: 2e-right in OR (oneside):
     page (current) =
     page (previous)=
@@ -124,8 +114,6 @@ Marks: 2e-right in OR (oneside):
     column (previous)=
     column (first)=
     column (last) =
-    column (1) =
-    column (2) =
 Marks: 2e-right-nonempty in OR (oneside):
     page (current) =
     page (previous)=
@@ -133,16 +121,12 @@ Marks: 2e-right-nonempty in OR (oneside):
     column (previous)=
     column (first)=
     column (last) =
-    column (1) =
-    column (2) =
 Marks: DictMark in OR (oneside):
-    page (current) = | \__mark_id:n {6}p | \__mark_id:n {19}q | \__mark_id:n {27}z |
+    page (current) = | \__mark_id:n {6}p | \__mark_id:n {19}\__mark_id:n {7}q | \__mark_id:n {27}z |
     page (previous)= | \__mark_id:n {0} | \__mark_id:n {1}a | \__mark_id:n {6}p |
-    column (current) = | \__mark_id:n {6}p | \__mark_id:n {19}q | \__mark_id:n {27}z |
+    column (current) = | \__mark_id:n {6}p | \__mark_id:n {19}\__mark_id:n {7}q | \__mark_id:n {27}z |
     column (previous)= | \__mark_id:n {0} | \__mark_id:n {1}a | \__mark_id:n {6}p |
-    column (first)= | \__mark_id:n {6}p | \__mark_id:n {19}q | \__mark_id:n {27}z |
-    column (last) = | \__mark_id:n {6}p | \__mark_id:n {19}q | \__mark_id:n {27}z |
-    column (1) =
-    column (2) =
-==> Header: q--z 2
+    column (first)= | \__mark_id:n {6}p | \__mark_id:n {19}\__mark_id:n {7}q | \__mark_id:n {27}z |
+    column (last) = | \__mark_id:n {6}p | \__mark_id:n {19}\__mark_id:n {7}q | \__mark_id:n {27}z |
+==> Header: \__mark_id:n {7}q--z 2
 [2] (tlb-multicol-marks.aux)
diff --git a/required/tools/testfiles/tlb-multicol-rowland.tlg b/required/tools/testfiles/tlb-multicol-rowland.tlg
index ac622f025..e5c425188 100644
--- a/required/tools/testfiles/tlb-multicol-rowland.tlg
+++ b/required/tools/testfiles/tlb-multicol-rowland.tlg
@@ -255,8 +255,6 @@ Marks: 2e-left in OR (multicols):
     column (previous)=
     column (first)=
     column (last) =
-    column (1) =
-    column (2) =
 Marks: 2e-right in OR (multicols):
     page (current) =
     page (previous)=
@@ -264,8 +262,6 @@ Marks: 2e-right in OR (multicols):
     column (previous)=
     column (first)=
     column (last) =
-    column (1) =
-    column (2) =
 Marks: 2e-right-nonempty in OR (multicols):
     page (current) =
     page (previous)=
@@ -273,8 +269,6 @@ Marks: 2e-right-nonempty in OR (multicols):
     column (previous)=
     column (first)=
     column (last) =
-    column (1) =
-    column (2) =
 --> multicolout
 Package multicol: Column spec: 390.0pt = indent + columns + sep =
 (multicol)        0.0pt + 2 x 190.0pt + 1 x 10.0pt on input line ....





More information about the latex3-commits mailing list.