[latex3-commits] [latex3/latex2e] ltmarks-multicol: use column not mcol (0479847cd)
github at latex-project.org
github at latex-project.org
Sat Nov 9 23:11:34 CET 2024
Repository : https://github.com/latex3/latex2e
On branch : ltmarks-multicol
Link : https://github.com/latex3/latex2e/commit/0479847cd731a929b37bc1ed47a955e177a90ec1
>---------------------------------------------------------------
commit 0479847cd731a929b37bc1ed47a955e177a90ec1
Author: Frank Mittelbach <frank.mittelbach at latex-project.org>
Date: Sat Nov 9 23:11:34 2024 +0100
use column not mcol
>---------------------------------------------------------------
0479847cd731a929b37bc1ed47a955e177a90ec1
base/ltmarks.dtx | 30 ++-
required/tools/multicol.dtx | 27 ++-
required/tools/testfiles/tlb-multicol-007.tlg | 2 +-
required/tools/testfiles/tlb-multicol-marks.lvt | 19 +-
required/tools/testfiles/tlb-multicol-marks.tlg | 243 ++++++++++++++++--------
5 files changed, 228 insertions(+), 93 deletions(-)
diff --git a/base/ltmarks.dtx b/base/ltmarks.dtx
index 81d369b06..ec1fe58f3 100644
--- a/base/ltmarks.dtx
+++ b/base/ltmarks.dtx
@@ -806,10 +806,28 @@
\@@_init_region:nn {last-column}{#1}
% \end{macrocode}
% \begin{macrocode}
- \@@_init_region:nn {mcol}{#1}
- \@@_init_region:nn {previous-mcol}{#1}
-% \@@_init_region:nn {mcol-1}{#1}
-% \@@_init_region:nn {mcol-2}{#1}
+%fmi \@@_init_region:nn {mcol}{#1}
+%fmi \@@_init_region:nn {previous-mcol}{#1}
+ \@@_init_region:nn {mcol-1}{#1}
+ \@@_init_region:nn {mcol-2}{#1}
+ \@@_init_region:nn {mcol-3}{#1}
+ \@@_init_region:nn {mcol-4}{#1}
+ \@@_init_region:nn {mcol-5}{#1}
+ \@@_init_region:nn {mcol-6}{#1}
+ \@@_init_region:nn {mcol-7}{#1}
+ \@@_init_region:nn {mcol-8}{#1}
+ \@@_init_region:nn {mcol-9}{#1}
+ \@@_init_region:nn {mcol-10}{#1}
+ \@@_init_region:nn {mcol-11}{#1}
+ \@@_init_region:nn {mcol-12}{#1}
+ \@@_init_region:nn {mcol-13}{#1}
+ \@@_init_region:nn {mcol-14}{#1}
+ \@@_init_region:nn {mcol-15}{#1}
+ \@@_init_region:nn {mcol-16}{#1}
+ \@@_init_region:nn {mcol-17}{#1}
+ \@@_init_region:nn {mcol-18}{#1}
+ \@@_init_region:nn {mcol-19}{#1}
+ \@@_init_region:nn {mcol-20}{#1}
}
% \end{macrocode}
% \end{macro}
@@ -1747,10 +1765,10 @@
%<*trace>
\cs_new_protected:Npn \@@_class_status:nn #1#2 {
\typeout{ Marks:~#2~ #1:}
+ \@@_region_status:nnn {#2}{ page~ (previous) } { previous-page }
\@@_region_status:nnn {#2}{ page~ (current)~ } { page }
- \@@_region_status:nnn {#2}{ page~ (previous) } { previous-page }
- \@@_region_status:nnn {#2}{ column~ (current)~ }{ column }
\@@_region_status:nnn {#2}{ column~ (previous) }{ previous-column }
+ \@@_region_status:nnn {#2}{ column~ (current)~ }{ column }
\@@_region_status:nnn {#2}{ column~ (first) } { first-column }
\@@_region_status:nnn {#2}{ column~ (last)~ } { last-column }
\@@_region_status:nnn {#2}{ column~ (1)~ } { mcol-1 }
diff --git a/required/tools/multicol.dtx b/required/tools/multicol.dtx
index 713e5a868..7bfe2254b 100644
--- a/required/tools/multicol.dtx
+++ b/required/tools/multicol.dtx
@@ -4333,21 +4333,26 @@
\process at cols\mult at firstbox
{
\@@_update_structure_from_material:nn
- {mcol}
+%fmi {mcol}
+ {column}
{\unvcopy\count@}
\@@_update_alias_structure:nn
{mcol - \int_use:N\g_@@_curr_col_int}
- {mcol}
+%fmi {mcol}
+ {column}
\int_gincr:N \g_@@_curr_col_int
}
\@@_update_structure_from_material:nn
- {mcol}
+%fmi {mcol}
+ {column}
{\unvcopy\mult at rightbox}
\@@_update_alias_structure:nn
{ mcol - \int_use:N\g_@@_curr_col_int }
- {mcol}
+%fmi {mcol}
+ {column}
\@@_update_alias_structure:nn{first-column}{mcol-1}
- \@@_update_alias_structure:nn{last-column} {mcol}
+%fmi \@@_update_alias_structure:nn{last-column} {mcol}
+ \@@_update_alias_structure:nn{last-column} {column}
}
% \end{macrocode}
% \end{macro}
@@ -4369,6 +4374,12 @@
\process at cols \mult at firstbox { \unvcopy\count@ }
\unvcopy\mult at rightbox
}
+% \end{macrocode}
+%
+% \begin{macrocode}
+% \@@_update_alias_structure:nn {column}{page}
+% \@@_update_alias_structure:nn {first-column}{page}
+% \@@_update_alias_structure:nn {last-column}{page}
}
% \end{macrocode}
% \end{macro}
@@ -4434,8 +4445,10 @@
%
% \begin{macrocode}
\def \mc at prepar@mark at collection {
- \@@_debug:n { \typeout{--->>>~ multicol~ empty~ mcol} }
- \@@_update_structure_to_empty:n {mcol}
+%fmi \@@_debug:n { \typeout{--->>>~ multicol~ empty~ mcol} }
+%fmi \@@_update_structure_to_empty:n {mcol}
+ \@@_debug:n { \typeout{--->>>~ multicol~ empty~ column~ region} }
+ \@@_update_structure_to_empty:n {column}
}
% \end{macrocode}
% \end{macro}
diff --git a/required/tools/testfiles/tlb-multicol-007.tlg b/required/tools/testfiles/tlb-multicol-007.tlg
index 4ab83757e..011da39a1 100644
--- a/required/tools/testfiles/tlb-multicol-007.tlg
+++ b/required/tools/testfiles/tlb-multicol-007.tlg
@@ -4,7 +4,7 @@ Package multicol: Starting environment with 2 columns on input line ....
Package multicol: Current page:
(multicol) height=16383.99998pt: used 0.0pt -> free=16383.99998pt
(multicol) needed 50.0pt (for \premulticols ) on input line ....
---->>> multicol empty mcol
+--->>> multicol empty column region
Package multicol: Forced column break seen on input line ....
Package multicol: End penalty of multicols seen on input line ....
Package multicol: Re-adding forced break(s) in balancing on input line ....
diff --git a/required/tools/testfiles/tlb-multicol-marks.lvt b/required/tools/testfiles/tlb-multicol-marks.lvt
index 9d4b16fe5..a5267e6a7 100644
--- a/required/tools/testfiles/tlb-multicol-marks.lvt
+++ b/required/tools/testfiles/tlb-multicol-marks.lvt
@@ -7,10 +7,12 @@
\NewMarkClass{DictMark}
\DebugMarksOn
+\pagestyle{headings} % to get section marks
+
\makeatletter
-\def\@oddhead{Header: \FirstMark{DictMark}--\LastMark{DictMark} \hfill\thepage
+\def\@oddfoot{Header: \FirstMark{DictMark}--\LastMark{DictMark} \hfill\thepage
\typeout{==> Header: \FirstMark{DictMark}--\LastMark{DictMark} \thepage}}
-\let\@evenhead=\@oddhead
+\let\@evenfoot=\@oddfoot
\makeatother
%\scrollmode
@@ -19,6 +21,12 @@
\START
+\section{A}
+
+abc
+
+\newpage
+
\InsertMark{DictMark}{a}a \InsertMark{DictMark}{b}b
\begin{multicols}{4}
@@ -76,6 +84,13 @@
\columnbreak
\InsertMark{DictMark}{q2}q2
+\columnbreak
+
+\InsertMark{DictMark}{r2}r2
+
+\columnbreak
+
+\InsertMark{DictMark}{s2}s2
\end{multicols}
diff --git a/required/tools/testfiles/tlb-multicol-marks.tlg b/required/tools/testfiles/tlb-multicol-marks.tlg
index a7816d17e..c09ece152 100644
--- a/required/tools/testfiles/tlb-multicol-marks.tlg
+++ b/required/tools/testfiles/tlb-multicol-marks.tlg
@@ -1,61 +1,91 @@
This is a generated file for the LaTeX2e validation system.
Don't change this file in any respect.
-Marks: set DictMark <- '\__mark_id:n {1}a' on line ...
-Marks: set DictMark <- '\__mark_id:n {2}b' on line ...
---->>> multicol empty mcol
-Marks: set DictMark <- '\__mark_id:n {3}m1' on line ...
-Marks: set DictMark <- '\__mark_id:n {4}n1' on line ...
-Marks: set DictMark <- '\__mark_id:n {5}o1' on line ...
-Marks: set DictMark <- '\__mark_id:n {6}p1' on line ...
-Marks: set DictMark <- '\__mark_id:n {7}q1' on line ...
-Marks: set DictMark <- '\__mark_id:n {8}r1' on line ...
-Marks: set DictMark <- '\__mark_id:n {9}s1' on line ...
-Marks: set DictMark <- '\__mark_id:n {10}t1' on line ...
+Marks: set 2e-right <- '\__mark_id:n {1}\MakeUppercase []{1\hskip 1em\relax A}' on line ...
+Marks: set 2e-right-nonempty <- '\__mark_id:n {2}\MakeUppercase []{1\hskip 1em\relax A}' on line ...
+Marks: 2e-left in OR (oneside):
+Marks: 2e-right in OR (oneside):
+ page (current) =| \__mark_id:n {0} | \__mark_id:n {1}\MakeUppercase []{1\hskip 1em\relax A} | \__mark_id:n {1}\MakeUppercase []{1\hskip 1em\relax A} |
+ column (current) =| \__mark_id:n {0} | \__mark_id:n {1}\MakeUppercase []{1\hskip 1em\relax A} | \__mark_id:n {1}\MakeUppercase []{1\hskip 1em\relax A} |
+ column (first)=| \__mark_id:n {0} | \__mark_id:n {1}\MakeUppercase []{1\hskip 1em\relax A} | \__mark_id:n {1}\MakeUppercase []{1\hskip 1em\relax A} |
+ column (last) =| \__mark_id:n {0} | \__mark_id:n {1}\MakeUppercase []{1\hskip 1em\relax A} | \__mark_id:n {1}\MakeUppercase []{1\hskip 1em\relax A} |
+Marks: 2e-right-nonempty in OR (oneside):
+ page (current) =| \__mark_id:n {0} | \__mark_id:n {2}\MakeUppercase []{1\hskip 1em\relax A} | \__mark_id:n {2}\MakeUppercase []{1\hskip 1em\relax A} |
+ column (current) =| \__mark_id:n {0} | \__mark_id:n {2}\MakeUppercase []{1\hskip 1em\relax A} | \__mark_id:n {2}\MakeUppercase []{1\hskip 1em\relax A} |
+ column (first)=| \__mark_id:n {0} | \__mark_id:n {2}\MakeUppercase []{1\hskip 1em\relax A} | \__mark_id:n {2}\MakeUppercase []{1\hskip 1em\relax A} |
+ column (last) =| \__mark_id:n {0} | \__mark_id:n {2}\MakeUppercase []{1\hskip 1em\relax A} | \__mark_id:n {2}\MakeUppercase []{1\hskip 1em\relax A} |
+Marks: DictMark in OR (oneside):
+==> Header: -- 1
+[1
+]
+Marks: set DictMark <- '\__mark_id:n {3}a' on line ...
+Marks: set DictMark <- '\__mark_id:n {4}b' on line ...
+--->>> multicol empty column region
+Marks: set DictMark <- '\__mark_id:n {5}m1' on line ...
+Marks: set DictMark <- '\__mark_id:n {6}n1' on line ...
+Marks: set DictMark <- '\__mark_id:n {7}o1' on line ...
+Marks: set DictMark <- '\__mark_id:n {8}p1' on line ...
+Marks: set DictMark <- '\__mark_id:n {9}q1' on line ...
+Marks: set DictMark <- '\__mark_id:n {10}r1' on line ...
+Marks: set DictMark <- '\__mark_id:n {11}s1' on line ...
+Marks: set DictMark <- '\__mark_id:n {12}t1' on line ...
--> multicolout
--->>> multicol update col structure
--->>> multicol update page structure
Marks: 2e-left multicol (full page):
Marks: 2e-right multicol (full page):
+ page (previous)=| \__mark_id:n {0} | \__mark_id:n {1}\MakeUppercase []{1\hskip 1em\relax A} | \__mark_id:n {1}\MakeUppercase []{1\hskip 1em\relax A} |
+ page (current) =| \__mark_id:n {1}\MakeUppercase []{1\hskip 1em\relax A} | \__mark_id:n {1}\MakeUppercase []{1\hskip 1em\relax A} | \__mark_id:n {1}\MakeUppercase []{1\hskip 1em\relax A} |
Marks: 2e-right-nonempty multicol (full page):
+ page (previous)=| \__mark_id:n {0} | \__mark_id:n {2}\MakeUppercase []{1\hskip 1em\relax A} | \__mark_id:n {2}\MakeUppercase []{1\hskip 1em\relax A} |
+ page (current) =| \__mark_id:n {2}\MakeUppercase []{1\hskip 1em\relax A} | \__mark_id:n {2}\MakeUppercase []{1\hskip 1em\relax A} | \__mark_id:n {2}\MakeUppercase []{1\hskip 1em\relax A} |
Marks: DictMark multicol (full page):
- page (current) =| \__mark_id:n {0} | \__mark_id:n {1}a | \__mark_id:n {6}p1 |
- column (first)=| \__mark_id:n {0} | \__mark_id:n {3}m1 | \__mark_id:n {3}m1 |
- column (last) =| \__mark_id:n {5}o1 | \__mark_id:n {6}p1 | \__mark_id:n {6}p1 |
- column (1) =| \__mark_id:n {0} | \__mark_id:n {3}m1 | \__mark_id:n {3}m1 |
- column (2) =| \__mark_id:n {3}m1 | \__mark_id:n {4}n1 | \__mark_id:n {4}n1 |
- column (3) =| \__mark_id:n {4}n1 | \__mark_id:n {5}o1 | \__mark_id:n {5}o1 |
- column (4) =| \__mark_id:n {5}o1 | \__mark_id:n {6}p1 | \__mark_id:n {6}p1 |
-==> Header: a--p1 1
-[1
-]
+ page (current) =| \__mark_id:n {0} | \__mark_id:n {3}a | \__mark_id:n {8}p1 |
+ column (previous)=| \__mark_id:n {6}n1 | \__mark_id:n {7}o1 | \__mark_id:n {7}o1 |
+ column (current) =| \__mark_id:n {7}o1 | \__mark_id:n {8}p1 | \__mark_id:n {8}p1 |
+ column (first)=| \__mark_id:n {0} | \__mark_id:n {5}m1 | \__mark_id:n {5}m1 |
+ column (last) =| \__mark_id:n {7}o1 | \__mark_id:n {8}p1 | \__mark_id:n {8}p1 |
+ column (1) =| \__mark_id:n {0} | \__mark_id:n {5}m1 | \__mark_id:n {5}m1 |
+ column (2) =| \__mark_id:n {5}m1 | \__mark_id:n {6}n1 | \__mark_id:n {6}n1 |
+ column (3) =| \__mark_id:n {6}n1 | \__mark_id:n {7}o1 | \__mark_id:n {7}o1 |
+ column (4) =| \__mark_id:n {7}o1 | \__mark_id:n {8}p1 | \__mark_id:n {8}p1 |
+==> Header: a--p1 2
+[2]
--> balancecolumnout
--->>> multicol update col structure
Marks: 2e-left multicol (finish):
Marks: 2e-right multicol (finish):
+ page (previous)=| \__mark_id:n {0} | \__mark_id:n {1}\MakeUppercase []{1\hskip 1em\relax A} | \__mark_id:n {1}\MakeUppercase []{1\hskip 1em\relax A} |
+ page (current) =| \__mark_id:n {1}\MakeUppercase []{1\hskip 1em\relax A} | \__mark_id:n {1}\MakeUppercase []{1\hskip 1em\relax A} | \__mark_id:n {1}\MakeUppercase []{1\hskip 1em\relax A} |
Marks: 2e-right-nonempty multicol (finish):
+ page (previous)=| \__mark_id:n {0} | \__mark_id:n {2}\MakeUppercase []{1\hskip 1em\relax A} | \__mark_id:n {2}\MakeUppercase []{1\hskip 1em\relax A} |
+ page (current) =| \__mark_id:n {2}\MakeUppercase []{1\hskip 1em\relax A} | \__mark_id:n {2}\MakeUppercase []{1\hskip 1em\relax A} | \__mark_id:n {2}\MakeUppercase []{1\hskip 1em\relax A} |
Marks: DictMark multicol (finish):
- page (current) =| \__mark_id:n {0} | \__mark_id:n {1}a | \__mark_id:n {6}p1 |
- column (first)=| \__mark_id:n {6}p1 | \__mark_id:n {7}q1 | \__mark_id:n {7}q1 |
- column (last) =| \__mark_id:n {9}s1 | \__mark_id:n {10}t1 | \__mark_id:n {10}t1 |
- column (1) =| \__mark_id:n {6}p1 | \__mark_id:n {7}q1 | \__mark_id:n {7}q1 |
- column (2) =| \__mark_id:n {7}q1 | \__mark_id:n {8}r1 | \__mark_id:n {8}r1 |
- column (3) =| \__mark_id:n {8}r1 | \__mark_id:n {9}s1 | \__mark_id:n {9}s1 |
- column (4) =| \__mark_id:n {9}s1 | \__mark_id:n {10}t1 | \__mark_id:n {10}t1 |
+ page (current) =| \__mark_id:n {0} | \__mark_id:n {3}a | \__mark_id:n {8}p1 |
+ column (previous)=| \__mark_id:n {10}r1 | \__mark_id:n {11}s1 | \__mark_id:n {11}s1 |
+ column (current) =| \__mark_id:n {11}s1 | \__mark_id:n {12}t1 | \__mark_id:n {12}t1 |
+ column (first)=| \__mark_id:n {8}p1 | \__mark_id:n {9}q1 | \__mark_id:n {9}q1 |
+ column (last) =| \__mark_id:n {11}s1 | \__mark_id:n {12}t1 | \__mark_id:n {12}t1 |
+ column (1) =| \__mark_id:n {8}p1 | \__mark_id:n {9}q1 | \__mark_id:n {9}q1 |
+ column (2) =| \__mark_id:n {9}q1 | \__mark_id:n {10}r1 | \__mark_id:n {10}r1 |
+ column (3) =| \__mark_id:n {10}r1 | \__mark_id:n {11}s1 | \__mark_id:n {11}s1 |
+ column (4) =| \__mark_id:n {11}s1 | \__mark_id:n {12}t1 | \__mark_id:n {12}t1 |
--->>> 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 ...
-Marks: extract last mark for class 'DictMark' = \__mark_id:n {10}t1
-Marks: extract first mark for class 'DictMark' = \__mark_id:n {7}q1
-Marks: set DictMark <- '\__mark_id:n {11}q1' on line ...
-Marks: set DictMark <- '\__mark_id:n {12}t1' on line ...
-Marks: set DictMark <- '\__mark_id:n {13}z1' on line ...
---->>> multicol empty mcol
-Marks: set DictMark <- '\__mark_id:n {14}m2' on line ...
-Marks: set DictMark <- '\__mark_id:n {15}n2' on line ...
-Marks: set DictMark <- '\__mark_id:n {16}o2' on line ...
-Marks: set DictMark <- '\__mark_id:n {17}p2' on line ...
-Marks: set DictMark <- '\__mark_id:n {18}q2' on line ...
+Marks: extract last mark for class 'DictMark' = \__mark_id:n {12}t1
+Marks: extract first mark for class 'DictMark' = \__mark_id:n {9}q1
+Marks: set DictMark <- '\__mark_id:n {13}q1' on line ...
+Marks: set DictMark <- '\__mark_id:n {14}t1' on line ...
+Marks: set DictMark <- '\__mark_id:n {15}z1' on line ...
+--->>> multicol empty column region
+Marks: set DictMark <- '\__mark_id:n {16}m2' on line ...
+Marks: set DictMark <- '\__mark_id:n {17}n2' on line ...
+Marks: set DictMark <- '\__mark_id:n {18}o2' on line ...
+Marks: set DictMark <- '\__mark_id:n {19}p2' on line ...
+Marks: set DictMark <- '\__mark_id:n {20}q2' on line ...
+Marks: set DictMark <- '\__mark_id:n {21}r2' on line ...
+Marks: set DictMark <- '\__mark_id:n {22}s2' on line ...
--> multicolout
--->>> multicol update col structure
--->>> multicol update page structure
@@ -63,22 +93,28 @@ Marks: 2e-left multicol (full page):
column (3) =| \__mark_id:n {?}\__mark_error:n {mcol-3} | \__mark_id:n {?}\__mark_error:n {mcol-3} | \__mark_id:n {?}\__mark_error:n {mcol-3} |
column (4) =| \__mark_id:n {?}\__mark_error:n {mcol-4} | \__mark_id:n {?}\__mark_error:n {mcol-4} | \__mark_id:n {?}\__mark_error:n {mcol-4} |
Marks: 2e-right multicol (full page):
+ page (previous)=| \__mark_id:n {1}\MakeUppercase []{1\hskip 1em\relax A} | \__mark_id:n {1}\MakeUppercase []{1\hskip 1em\relax A} | \__mark_id:n {1}\MakeUppercase []{1\hskip 1em\relax A} |
+ page (current) =| \__mark_id:n {1}\MakeUppercase []{1\hskip 1em\relax A} | \__mark_id:n {1}\MakeUppercase []{1\hskip 1em\relax A} | \__mark_id:n {1}\MakeUppercase []{1\hskip 1em\relax A} |
column (3) =| \__mark_id:n {?}\__mark_error:n {mcol-3} | \__mark_id:n {?}\__mark_error:n {mcol-3} | \__mark_id:n {?}\__mark_error:n {mcol-3} |
column (4) =| \__mark_id:n {?}\__mark_error:n {mcol-4} | \__mark_id:n {?}\__mark_error:n {mcol-4} | \__mark_id:n {?}\__mark_error:n {mcol-4} |
Marks: 2e-right-nonempty multicol (full page):
+ page (previous)=| \__mark_id:n {2}\MakeUppercase []{1\hskip 1em\relax A} | \__mark_id:n {2}\MakeUppercase []{1\hskip 1em\relax A} | \__mark_id:n {2}\MakeUppercase []{1\hskip 1em\relax A} |
+ page (current) =| \__mark_id:n {2}\MakeUppercase []{1\hskip 1em\relax A} | \__mark_id:n {2}\MakeUppercase []{1\hskip 1em\relax A} | \__mark_id:n {2}\MakeUppercase []{1\hskip 1em\relax A} |
column (3) =| \__mark_id:n {?}\__mark_error:n {mcol-3} | \__mark_id:n {?}\__mark_error:n {mcol-3} | \__mark_id:n {?}\__mark_error:n {mcol-3} |
column (4) =| \__mark_id:n {?}\__mark_error:n {mcol-4} | \__mark_id:n {?}\__mark_error:n {mcol-4} | \__mark_id:n {?}\__mark_error:n {mcol-4} |
Marks: DictMark multicol (full page):
- page (current) =| \__mark_id:n {6}p1 | \__mark_id:n {11}q1 | \__mark_id:n {15}n2 |
- page (previous)=| \__mark_id:n {0} | \__mark_id:n {1}a | \__mark_id:n {6}p1 |
- column (first)=| \__mark_id:n {0} | \__mark_id:n {14}m2 | \__mark_id:n {14}m2 |
- column (last) =| \__mark_id:n {14}m2 | \__mark_id:n {15}n2 | \__mark_id:n {15}n2 |
- column (1) =| \__mark_id:n {0} | \__mark_id:n {14}m2 | \__mark_id:n {14}m2 |
- column (2) =| \__mark_id:n {14}m2 | \__mark_id:n {15}n2 | \__mark_id:n {15}n2 |
+ page (previous)=| \__mark_id:n {0} | \__mark_id:n {3}a | \__mark_id:n {8}p1 |
+ page (current) =| \__mark_id:n {8}p1 | \__mark_id:n {13}q1 | \__mark_id:n {17}n2 |
+ column (previous)=| \__mark_id:n {0} | \__mark_id:n {16}m2 | \__mark_id:n {16}m2 |
+ column (current) =| \__mark_id:n {16}m2 | \__mark_id:n {17}n2 | \__mark_id:n {17}n2 |
+ column (first)=| \__mark_id:n {0} | \__mark_id:n {16}m2 | \__mark_id:n {16}m2 |
+ column (last) =| \__mark_id:n {16}m2 | \__mark_id:n {17}n2 | \__mark_id:n {17}n2 |
+ column (1) =| \__mark_id:n {0} | \__mark_id:n {16}m2 | \__mark_id:n {16}m2 |
+ column (2) =| \__mark_id:n {16}m2 | \__mark_id:n {17}n2 | \__mark_id:n {17}n2 |
column (3) =| \__mark_id:n {?}\__mark_error:n {mcol-3} | \__mark_id:n {?}\__mark_error:n {mcol-3} | \__mark_id:n {?}\__mark_error:n {mcol-3} |
column (4) =| \__mark_id:n {?}\__mark_error:n {mcol-4} | \__mark_id:n {?}\__mark_error:n {mcol-4} | \__mark_id:n {?}\__mark_error:n {mcol-4} |
-==> Header: q1--n2 2
-[2]
+==> Header: q1--n2 3
+[3]
--> multicolout
--->>> multicol update col structure
--->>> multicol update page structure
@@ -86,50 +122,91 @@ Marks: 2e-left multicol (full page):
column (3) =| \__mark_id:n {?}\__mark_error:n {mcol-3} | \__mark_id:n {?}\__mark_error:n {mcol-3} | \__mark_id:n {?}\__mark_error:n {mcol-3} |
column (4) =| \__mark_id:n {?}\__mark_error:n {mcol-4} | \__mark_id:n {?}\__mark_error:n {mcol-4} | \__mark_id:n {?}\__mark_error:n {mcol-4} |
Marks: 2e-right multicol (full page):
+ page (previous)=| \__mark_id:n {1}\MakeUppercase []{1\hskip 1em\relax A} | \__mark_id:n {1}\MakeUppercase []{1\hskip 1em\relax A} | \__mark_id:n {1}\MakeUppercase []{1\hskip 1em\relax A} |
+ page (current) =| \__mark_id:n {1}\MakeUppercase []{1\hskip 1em\relax A} | \__mark_id:n {1}\MakeUppercase []{1\hskip 1em\relax A} | \__mark_id:n {1}\MakeUppercase []{1\hskip 1em\relax A} |
column (3) =| \__mark_id:n {?}\__mark_error:n {mcol-3} | \__mark_id:n {?}\__mark_error:n {mcol-3} | \__mark_id:n {?}\__mark_error:n {mcol-3} |
column (4) =| \__mark_id:n {?}\__mark_error:n {mcol-4} | \__mark_id:n {?}\__mark_error:n {mcol-4} | \__mark_id:n {?}\__mark_error:n {mcol-4} |
Marks: 2e-right-nonempty multicol (full page):
+ page (previous)=| \__mark_id:n {2}\MakeUppercase []{1\hskip 1em\relax A} | \__mark_id:n {2}\MakeUppercase []{1\hskip 1em\relax A} | \__mark_id:n {2}\MakeUppercase []{1\hskip 1em\relax A} |
+ page (current) =| \__mark_id:n {2}\MakeUppercase []{1\hskip 1em\relax A} | \__mark_id:n {2}\MakeUppercase []{1\hskip 1em\relax A} | \__mark_id:n {2}\MakeUppercase []{1\hskip 1em\relax A} |
column (3) =| \__mark_id:n {?}\__mark_error:n {mcol-3} | \__mark_id:n {?}\__mark_error:n {mcol-3} | \__mark_id:n {?}\__mark_error:n {mcol-3} |
column (4) =| \__mark_id:n {?}\__mark_error:n {mcol-4} | \__mark_id:n {?}\__mark_error:n {mcol-4} | \__mark_id:n {?}\__mark_error:n {mcol-4} |
Marks: DictMark multicol (full page):
- page (current) =| \__mark_id:n {15}n2 | \__mark_id:n {16}o2 | \__mark_id:n {17}p2 |
- page (previous)=| \__mark_id:n {6}p1 | \__mark_id:n {11}q1 | \__mark_id:n {15}n2 |
- column (first)=| \__mark_id:n {15}n2 | \__mark_id:n {16}o2 | \__mark_id:n {16}o2 |
- column (last) =| \__mark_id:n {16}o2 | \__mark_id:n {17}p2 | \__mark_id:n {17}p2 |
- column (1) =| \__mark_id:n {15}n2 | \__mark_id:n {16}o2 | \__mark_id:n {16}o2 |
- column (2) =| \__mark_id:n {16}o2 | \__mark_id:n {17}p2 | \__mark_id:n {17}p2 |
+ page (previous)=| \__mark_id:n {8}p1 | \__mark_id:n {13}q1 | \__mark_id:n {17}n2 |
+ page (current) =| \__mark_id:n {17}n2 | \__mark_id:n {18}o2 | \__mark_id:n {19}p2 |
+ column (previous)=| \__mark_id:n {17}n2 | \__mark_id:n {18}o2 | \__mark_id:n {18}o2 |
+ column (current) =| \__mark_id:n {18}o2 | \__mark_id:n {19}p2 | \__mark_id:n {19}p2 |
+ column (first)=| \__mark_id:n {17}n2 | \__mark_id:n {18}o2 | \__mark_id:n {18}o2 |
+ column (last) =| \__mark_id:n {18}o2 | \__mark_id:n {19}p2 | \__mark_id:n {19}p2 |
+ column (1) =| \__mark_id:n {17}n2 | \__mark_id:n {18}o2 | \__mark_id:n {18}o2 |
+ column (2) =| \__mark_id:n {18}o2 | \__mark_id:n {19}p2 | \__mark_id:n {19}p2 |
column (3) =| \__mark_id:n {?}\__mark_error:n {mcol-3} | \__mark_id:n {?}\__mark_error:n {mcol-3} | \__mark_id:n {?}\__mark_error:n {mcol-3} |
column (4) =| \__mark_id:n {?}\__mark_error:n {mcol-4} | \__mark_id:n {?}\__mark_error:n {mcol-4} | \__mark_id:n {?}\__mark_error:n {mcol-4} |
-==> Header: o2--p2 3
-[3]
+==> Header: o2--p2 4
+[4]
+--> multicolout
+--->>> multicol update col structure
+--->>> multicol update page structure
+Marks: 2e-left multicol (full page):
+ column (3) =| \__mark_id:n {?}\__mark_error:n {mcol-3} | \__mark_id:n {?}\__mark_error:n {mcol-3} | \__mark_id:n {?}\__mark_error:n {mcol-3} |
+ column (4) =| \__mark_id:n {?}\__mark_error:n {mcol-4} | \__mark_id:n {?}\__mark_error:n {mcol-4} | \__mark_id:n {?}\__mark_error:n {mcol-4} |
+Marks: 2e-right multicol (full page):
+ page (previous)=| \__mark_id:n {1}\MakeUppercase []{1\hskip 1em\relax A} | \__mark_id:n {1}\MakeUppercase []{1\hskip 1em\relax A} | \__mark_id:n {1}\MakeUppercase []{1\hskip 1em\relax A} |
+ page (current) =| \__mark_id:n {1}\MakeUppercase []{1\hskip 1em\relax A} | \__mark_id:n {1}\MakeUppercase []{1\hskip 1em\relax A} | \__mark_id:n {1}\MakeUppercase []{1\hskip 1em\relax A} |
+ column (3) =| \__mark_id:n {?}\__mark_error:n {mcol-3} | \__mark_id:n {?}\__mark_error:n {mcol-3} | \__mark_id:n {?}\__mark_error:n {mcol-3} |
+ column (4) =| \__mark_id:n {?}\__mark_error:n {mcol-4} | \__mark_id:n {?}\__mark_error:n {mcol-4} | \__mark_id:n {?}\__mark_error:n {mcol-4} |
+Marks: 2e-right-nonempty multicol (full page):
+ page (previous)=| \__mark_id:n {2}\MakeUppercase []{1\hskip 1em\relax A} | \__mark_id:n {2}\MakeUppercase []{1\hskip 1em\relax A} | \__mark_id:n {2}\MakeUppercase []{1\hskip 1em\relax A} |
+ page (current) =| \__mark_id:n {2}\MakeUppercase []{1\hskip 1em\relax A} | \__mark_id:n {2}\MakeUppercase []{1\hskip 1em\relax A} | \__mark_id:n {2}\MakeUppercase []{1\hskip 1em\relax A} |
+ column (3) =| \__mark_id:n {?}\__mark_error:n {mcol-3} | \__mark_id:n {?}\__mark_error:n {mcol-3} | \__mark_id:n {?}\__mark_error:n {mcol-3} |
+ column (4) =| \__mark_id:n {?}\__mark_error:n {mcol-4} | \__mark_id:n {?}\__mark_error:n {mcol-4} | \__mark_id:n {?}\__mark_error:n {mcol-4} |
+Marks: DictMark multicol (full page):
+ page (previous)=| \__mark_id:n {17}n2 | \__mark_id:n {18}o2 | \__mark_id:n {19}p2 |
+ page (current) =| \__mark_id:n {19}p2 | \__mark_id:n {20}q2 | \__mark_id:n {21}r2 |
+ column (previous)=| \__mark_id:n {19}p2 | \__mark_id:n {20}q2 | \__mark_id:n {20}q2 |
+ column (current) =| \__mark_id:n {20}q2 | \__mark_id:n {21}r2 | \__mark_id:n {21}r2 |
+ column (first)=| \__mark_id:n {19}p2 | \__mark_id:n {20}q2 | \__mark_id:n {20}q2 |
+ column (last) =| \__mark_id:n {20}q2 | \__mark_id:n {21}r2 | \__mark_id:n {21}r2 |
+ column (1) =| \__mark_id:n {19}p2 | \__mark_id:n {20}q2 | \__mark_id:n {20}q2 |
+ column (2) =| \__mark_id:n {20}q2 | \__mark_id:n {21}r2 | \__mark_id:n {21}r2 |
+ column (3) =| \__mark_id:n {?}\__mark_error:n {mcol-3} | \__mark_id:n {?}\__mark_error:n {mcol-3} | \__mark_id:n {?}\__mark_error:n {mcol-3} |
+ column (4) =| \__mark_id:n {?}\__mark_error:n {mcol-4} | \__mark_id:n {?}\__mark_error:n {mcol-4} | \__mark_id:n {?}\__mark_error:n {mcol-4} |
+==> Header: q2--r2 5
+[5]
--> balancecolumnout
--->>> multicol update col structure
Marks: 2e-left multicol (finish):
column (3) =| \__mark_id:n {?}\__mark_error:n {mcol-3} | \__mark_id:n {?}\__mark_error:n {mcol-3} | \__mark_id:n {?}\__mark_error:n {mcol-3} |
column (4) =| \__mark_id:n {?}\__mark_error:n {mcol-4} | \__mark_id:n {?}\__mark_error:n {mcol-4} | \__mark_id:n {?}\__mark_error:n {mcol-4} |
Marks: 2e-right multicol (finish):
+ page (previous)=| \__mark_id:n {1}\MakeUppercase []{1\hskip 1em\relax A} | \__mark_id:n {1}\MakeUppercase []{1\hskip 1em\relax A} | \__mark_id:n {1}\MakeUppercase []{1\hskip 1em\relax A} |
+ page (current) =| \__mark_id:n {1}\MakeUppercase []{1\hskip 1em\relax A} | \__mark_id:n {1}\MakeUppercase []{1\hskip 1em\relax A} | \__mark_id:n {1}\MakeUppercase []{1\hskip 1em\relax A} |
column (3) =| \__mark_id:n {?}\__mark_error:n {mcol-3} | \__mark_id:n {?}\__mark_error:n {mcol-3} | \__mark_id:n {?}\__mark_error:n {mcol-3} |
column (4) =| \__mark_id:n {?}\__mark_error:n {mcol-4} | \__mark_id:n {?}\__mark_error:n {mcol-4} | \__mark_id:n {?}\__mark_error:n {mcol-4} |
Marks: 2e-right-nonempty multicol (finish):
+ page (previous)=| \__mark_id:n {2}\MakeUppercase []{1\hskip 1em\relax A} | \__mark_id:n {2}\MakeUppercase []{1\hskip 1em\relax A} | \__mark_id:n {2}\MakeUppercase []{1\hskip 1em\relax A} |
+ page (current) =| \__mark_id:n {2}\MakeUppercase []{1\hskip 1em\relax A} | \__mark_id:n {2}\MakeUppercase []{1\hskip 1em\relax A} | \__mark_id:n {2}\MakeUppercase []{1\hskip 1em\relax A} |
column (3) =| \__mark_id:n {?}\__mark_error:n {mcol-3} | \__mark_id:n {?}\__mark_error:n {mcol-3} | \__mark_id:n {?}\__mark_error:n {mcol-3} |
column (4) =| \__mark_id:n {?}\__mark_error:n {mcol-4} | \__mark_id:n {?}\__mark_error:n {mcol-4} | \__mark_id:n {?}\__mark_error:n {mcol-4} |
Marks: DictMark multicol (finish):
- page (current) =| \__mark_id:n {15}n2 | \__mark_id:n {16}o2 | \__mark_id:n {17}p2 |
- page (previous)=| \__mark_id:n {6}p1 | \__mark_id:n {11}q1 | \__mark_id:n {15}n2 |
- column (first)=| \__mark_id:n {17}p2 | \__mark_id:n {18}q2 | \__mark_id:n {18}q2 |
- column (last) =| \__mark_id:n {18}q2 | \__mark_id:n {18}q2 | \__mark_id:n {18}q2 |
- column (1) =| \__mark_id:n {17}p2 | \__mark_id:n {18}q2 | \__mark_id:n {18}q2 |
- column (2) =| \__mark_id:n {18}q2 | \__mark_id:n {18}q2 | \__mark_id:n {18}q2 |
+ page (previous)=| \__mark_id:n {17}n2 | \__mark_id:n {18}o2 | \__mark_id:n {19}p2 |
+ page (current) =| \__mark_id:n {19}p2 | \__mark_id:n {20}q2 | \__mark_id:n {21}r2 |
+ column (previous)=| \__mark_id:n {21}r2 | \__mark_id:n {22}s2 | \__mark_id:n {22}s2 |
+ column (current) =| \__mark_id:n {22}s2 | \__mark_id:n {22}s2 | \__mark_id:n {22}s2 |
+ column (first)=| \__mark_id:n {21}r2 | \__mark_id:n {22}s2 | \__mark_id:n {22}s2 |
+ column (last) =| \__mark_id:n {22}s2 | \__mark_id:n {22}s2 | \__mark_id:n {22}s2 |
+ column (1) =| \__mark_id:n {21}r2 | \__mark_id:n {22}s2 | \__mark_id:n {22}s2 |
+ column (2) =| \__mark_id:n {22}s2 | \__mark_id:n {22}s2 | \__mark_id:n {22}s2 |
column (3) =| \__mark_id:n {?}\__mark_error:n {mcol-3} | \__mark_id:n {?}\__mark_error:n {mcol-3} | \__mark_id:n {?}\__mark_error:n {mcol-3} |
column (4) =| \__mark_id:n {?}\__mark_error:n {mcol-4} | \__mark_id:n {?}\__mark_error:n {mcol-4} | \__mark_id:n {?}\__mark_error:n {mcol-4} |
--->>> 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 ...
-Marks: extract last mark for class 'DictMark' = \__mark_id:n {18}q2
-Marks: extract first mark for class 'DictMark' = \__mark_id:n {18}q2
-Marks: set DictMark <- '\__mark_id:n {19}q2' on line ...
-Marks: set DictMark <- '\__mark_id:n {20}q2' on line ...
+Marks: extract last mark for class 'DictMark' = \__mark_id:n {22}s2
+Marks: extract first mark for class 'DictMark' = \__mark_id:n {22}s2
+Marks: set DictMark <- '\__mark_id:n {23}s2' on line ...
+Marks: set DictMark <- '\__mark_id:n {24}s2' on line ...
! LaTeX mark Error: Mark region 'column-3' not usable or class unknown
For immediate help type H <return>.
...
@@ -158,21 +235,33 @@ Marks: 2e-left in OR (oneside):
column (3) =| \__mark_id:n {?}\__mark_error:n {mcol-3} | \__mark_id:n {?}\__mark_error:n {mcol-3} | \__mark_id:n {?}\__mark_error:n {mcol-3} |
column (4) =| \__mark_id:n {?}\__mark_error:n {mcol-4} | \__mark_id:n {?}\__mark_error:n {mcol-4} | \__mark_id:n {?}\__mark_error:n {mcol-4} |
Marks: 2e-right in OR (oneside):
+ page (previous)=| \__mark_id:n {1}\MakeUppercase []{1\hskip 1em\relax A} | \__mark_id:n {1}\MakeUppercase []{1\hskip 1em\relax A} | \__mark_id:n {1}\MakeUppercase []{1\hskip 1em\relax A} |
+ page (current) =| \__mark_id:n {1}\MakeUppercase []{1\hskip 1em\relax A} | \__mark_id:n {1}\MakeUppercase []{1\hskip 1em\relax A} | \__mark_id:n {1}\MakeUppercase []{1\hskip 1em\relax A} |
+ column (previous)=| \__mark_id:n {1}\MakeUppercase []{1\hskip 1em\relax A} | \__mark_id:n {1}\MakeUppercase []{1\hskip 1em\relax A} | \__mark_id:n {1}\MakeUppercase []{1\hskip 1em\relax A} |
+ column (current) =| \__mark_id:n {1}\MakeUppercase []{1\hskip 1em\relax A} | \__mark_id:n {1}\MakeUppercase []{1\hskip 1em\relax A} | \__mark_id:n {1}\MakeUppercase []{1\hskip 1em\relax A} |
+ column (first)=| \__mark_id:n {1}\MakeUppercase []{1\hskip 1em\relax A} | \__mark_id:n {1}\MakeUppercase []{1\hskip 1em\relax A} | \__mark_id:n {1}\MakeUppercase []{1\hskip 1em\relax A} |
+ column (last) =| \__mark_id:n {1}\MakeUppercase []{1\hskip 1em\relax A} | \__mark_id:n {1}\MakeUppercase []{1\hskip 1em\relax A} | \__mark_id:n {1}\MakeUppercase []{1\hskip 1em\relax A} |
column (3) =| \__mark_id:n {?}\__mark_error:n {mcol-3} | \__mark_id:n {?}\__mark_error:n {mcol-3} | \__mark_id:n {?}\__mark_error:n {mcol-3} |
column (4) =| \__mark_id:n {?}\__mark_error:n {mcol-4} | \__mark_id:n {?}\__mark_error:n {mcol-4} | \__mark_id:n {?}\__mark_error:n {mcol-4} |
Marks: 2e-right-nonempty in OR (oneside):
+ page (previous)=| \__mark_id:n {2}\MakeUppercase []{1\hskip 1em\relax A} | \__mark_id:n {2}\MakeUppercase []{1\hskip 1em\relax A} | \__mark_id:n {2}\MakeUppercase []{1\hskip 1em\relax A} |
+ page (current) =| \__mark_id:n {2}\MakeUppercase []{1\hskip 1em\relax A} | \__mark_id:n {2}\MakeUppercase []{1\hskip 1em\relax A} | \__mark_id:n {2}\MakeUppercase []{1\hskip 1em\relax A} |
+ column (previous)=| \__mark_id:n {2}\MakeUppercase []{1\hskip 1em\relax A} | \__mark_id:n {2}\MakeUppercase []{1\hskip 1em\relax A} | \__mark_id:n {2}\MakeUppercase []{1\hskip 1em\relax A} |
+ column (current) =| \__mark_id:n {2}\MakeUppercase []{1\hskip 1em\relax A} | \__mark_id:n {2}\MakeUppercase []{1\hskip 1em\relax A} | \__mark_id:n {2}\MakeUppercase []{1\hskip 1em\relax A} |
+ column (first)=| \__mark_id:n {2}\MakeUppercase []{1\hskip 1em\relax A} | \__mark_id:n {2}\MakeUppercase []{1\hskip 1em\relax A} | \__mark_id:n {2}\MakeUppercase []{1\hskip 1em\relax A} |
+ column (last) =| \__mark_id:n {2}\MakeUppercase []{1\hskip 1em\relax A} | \__mark_id:n {2}\MakeUppercase []{1\hskip 1em\relax A} | \__mark_id:n {2}\MakeUppercase []{1\hskip 1em\relax A} |
column (3) =| \__mark_id:n {?}\__mark_error:n {mcol-3} | \__mark_id:n {?}\__mark_error:n {mcol-3} | \__mark_id:n {?}\__mark_error:n {mcol-3} |
column (4) =| \__mark_id:n {?}\__mark_error:n {mcol-4} | \__mark_id:n {?}\__mark_error:n {mcol-4} | \__mark_id:n {?}\__mark_error:n {mcol-4} |
Marks: DictMark in OR (oneside):
- page (current) =| \__mark_id:n {17}p2 | \__mark_id:n {19}q2 | \__mark_id:n {20}q2 |
- page (previous)=| \__mark_id:n {15}n2 | \__mark_id:n {16}o2 | \__mark_id:n {17}p2 |
- column (current) =| \__mark_id:n {17}p2 | \__mark_id:n {19}q2 | \__mark_id:n {20}q2 |
- column (previous)=| \__mark_id:n {15}n2 | \__mark_id:n {16}o2 | \__mark_id:n {17}p2 |
- column (first)=| \__mark_id:n {17}p2 | \__mark_id:n {19}q2 | \__mark_id:n {20}q2 |
- column (last) =| \__mark_id:n {17}p2 | \__mark_id:n {19}q2 | \__mark_id:n {20}q2 |
- column (1) =| \__mark_id:n {17}p2 | \__mark_id:n {18}q2 | \__mark_id:n {18}q2 |
- column (2) =| \__mark_id:n {18}q2 | \__mark_id:n {18}q2 | \__mark_id:n {18}q2 |
- column (3) =| \__mark_id:n {?}\__mark_error:n {mcol-3} | \__mark_id:n {?}\__mark_error:n {mcol-3} | \__mark_id:n {?}\__mark_error:n {mcol-3} |
- column (4) =| \__mark_id:n {?}\__mark_error:n {mcol-4} | \__mark_id:n {?}\__mark_error:n {mcol-4} | \__mark_id:n {?}\__mark_error:n {mcol-4} |
-==> Header: q2--q2 4
-[4] (tlb-multicol-marks.aux)
+ page (previous)=| \__mark_id:n {19}p2 | \__mark_id:n {20}q2 | \__mark_id:n {21}r2 |
+ page (current) =| \__mark_id:n {21}r2 | \__mark_id:n {23}s2 | \__mark_id:n {24}s2 |
+ column (previous)=| \__mark_id:n {19}p2 | \__mark_id:n {20}q2 | \__mark_id:n {21}r2 |
+ column (current) =| \__mark_id:n {21}r2 | \__mark_id:n {23}s2 | \__mark_id:n {24}s2 |
+ column (first)=| \__mark_id:n {21}r2 | \__mark_id:n {23}s2 | \__mark_id:n {24}s2 |
+ column (last) =| \__mark_id:n {21}r2 | \__mark_id:n {23}s2 | \__mark_id:n {24}s2 |
+ column (1) =| \__mark_id:n {21}r2 | \__mark_id:n {22}s2 | \__mark_id:n {22}s2 |
+ column (2) =| \__mark_id:n {22}s2 | \__mark_id:n {22}s2 | \__mark_id:n {22}s2 |
+ column (3) =| \__mark_id:n {?}\__mark_error:n {mcol-3} | \__mark_id:n {?}\__mark_error:n {mcol-3} | \__mark_id:n {?}\__mark_error:n {mcol-3} |
+ column (4) =| \__mark_id:n {?}\__mark_error:n {mcol-4} | \__mark_id:n {?}\__mark_error:n {mcol-4} | \__mark_id:n {?}\__mark_error:n {mcol-4} |
+==> Header: s2--s2 6
+[6] (tlb-multicol-marks.aux)
More information about the latex3-commits
mailing list.