[latex3-commits] [latex3/latex2e] ltmarks-multicol: test updates (e2bad826c)
github at latex-project.org
github at latex-project.org
Sun Nov 10 22:23:34 CET 2024
Repository : https://github.com/latex3/latex2e
On branch : ltmarks-multicol
Link : https://github.com/latex3/latex2e/commit/e2bad826cdddc512c3b303056ac8530cae11fb02
>---------------------------------------------------------------
commit e2bad826cdddc512c3b303056ac8530cae11fb02
Author: Frank Mittelbach <frank.mittelbach at latex-project.org>
Date: Sun Nov 10 22:23:34 2024 +0100
test updates
>---------------------------------------------------------------
e2bad826cdddc512c3b303056ac8530cae11fb02
base/ltmarks.dtx | 6 ++-
base/testfiles-lthooks2/shipout2-006.tlg | 4 +-
required/latex-lab/testfiles-OR/github-001.tlg | 8 ++--
.../testfiles-sec/test-gh725-opt-arg.luatex.tlg | 8 ++--
.../latex-lab/testfiles-sec/test-gh725-opt-arg.tlg | 8 ++--
required/tools/multicol.dtx | 53 ++++++++++++----------
6 files changed, 49 insertions(+), 38 deletions(-)
diff --git a/base/ltmarks.dtx b/base/ltmarks.dtx
index 687004ffe..a8c764ac2 100644
--- a/base/ltmarks.dtx
+++ b/base/ltmarks.dtx
@@ -1896,6 +1896,7 @@
%
% The first argument gives some \meta{info} to help
% identifying where the command was called.
+% \changes{v1.1a}{2024/11/09}{Add a third argument}
% \begin{macrocode}
%<*trace>
\cs_new_protected:Npn \@@_class_status:nnn #1#2#3 {
@@ -1907,7 +1908,9 @@
\@@_region_status:nnn {#2}{ column~ (first) } { first-column }
\@@_region_status:nnn {#2}{ column~ (last)~ } { last-column }
% \end{macrocode}
-%
+% Display a subset of the \texttt{mcol-...} regions, by default 0
+% in the standard \LaTeX{} output routine and \cs{col at number}
+% within a \env{multicols} environment.
% \begin{macrocode}
\int_step_inline:nn {#3}
{
@@ -1948,6 +1951,7 @@
% first argument is a string to identify the output, the second
% argument is the number \texttt{mcol-...} regions to show. Outside
% of a \env{multicols} environment this is normally set to 0.
+% \changes{v1.1a}{2024/11/09}{Add a second argument}
% \begin{macrocode}
\cs_new_protected:Npn \@@_status:nn #1#2
{
diff --git a/base/testfiles-lthooks2/shipout2-006.tlg b/base/testfiles-lthooks2/shipout2-006.tlg
index c1a4ad508..1a9b10675 100644
--- a/base/testfiles-lthooks2/shipout2-006.tlg
+++ b/base/testfiles-lthooks2/shipout2-006.tlg
@@ -78,8 +78,8 @@ Completed box being shipped out [2]
...\hbox(0.0+0.0)x0.0
...\glue 0.0 plus 1.0fil
...\write1{\@writefile{toc}{\protect \contentsline {part}{I\protect \hspace {1em}A}{\thepage }{}\protected at file@percent }}
-...\marks1{\__mark_id:n {1}}
-...\marks2{\__mark_id:n {2}}
+...\marks1{\__mark_value:nn {1}{}}
+...\marks2{\__mark_value:nn {2}{}}
...\mark{{}{}}
...\glue(\parskip) 0.0 plus 1.0
...\glue(\parskip) 0.0
diff --git a/required/latex-lab/testfiles-OR/github-001.tlg b/required/latex-lab/testfiles-OR/github-001.tlg
index 998d02f9f..04b1306c8 100644
--- a/required/latex-lab/testfiles-OR/github-001.tlg
+++ b/required/latex-lab/testfiles-OR/github-001.tlg
@@ -1549,8 +1549,8 @@ Completed box being shipped out [1]
......\write-{}
......\write-{}
......\write1{\@writefile{toc}{\protect \contentsline {chapter}{\protect \numberline {1}Hello}{\thepage }{}\protected at file@percent }}
-......\marks1{\__mark_id:n {1}\MakeUppercase []{Chapter\ 1. \ Hello}}
-......\marks2{\__mark_id:n {2}}
+......\marks1{\__mark_value:nn {1}{\MakeUppercase []{Chapter\ 1. \ Hello}}}
+......\marks2{\__mark_value:nn {2}{}}
......\mark{{\MakeUppercase []{Chapter\ 1. \ Hello}}{}}
......\write1{\@writefile{lof}{\protect \addvspace {10\p@ }}}
......\write1{\@writefile{lot}{\protect \addvspace {10\p@ }}}
@@ -1572,8 +1572,8 @@ Completed box being shipped out [1]
.......\penalty 10000
.......\glue(\parfillskip) 0.0 plus 1.0fil
.......\glue(\rightskip) 0.0
-......\marks2{\__mark_id:n {3}\MakeUppercase []{1.1. \ Test 1}}
-......\marks3{\__mark_id:n {4}\MakeUppercase []{1.1. \ Test 1}}
+......\marks2{\__mark_value:nn {3}{\MakeUppercase []{1.1. \ Test 1}}}
+......\marks3{\__mark_value:nn {4}{\MakeUppercase []{1.1. \ Test 1}}}
......\mark{{\MakeUppercase []{Chapter\ 1. \ Hello}}{\MakeUppercase []{1.1. \ Test 1}}}
......\write1{\@writefile{toc}{\protect \contentsline {section}{\protect \numberline {1.1}Test 1}{\thepage }{}\protected at file@percent }}
......\penalty 10000
diff --git a/required/latex-lab/testfiles-sec/test-gh725-opt-arg.luatex.tlg b/required/latex-lab/testfiles-sec/test-gh725-opt-arg.luatex.tlg
index 3536fc5b6..78f009c01 100644
--- a/required/latex-lab/testfiles-sec/test-gh725-opt-arg.luatex.tlg
+++ b/required/latex-lab/testfiles-sec/test-gh725-opt-arg.luatex.tlg
@@ -30,8 +30,8 @@ Completed box being shipped out [1]
...\hbox(0.0+0.0)x0.0, direction TLT
...\glue 0.0 plus 1.0fil
...\write1{\@writefile{toc}{\protect \contentsline {part}{I\protect \hspace {1em}Part ]}{\thepage }{part.1}\protected at file@percent }}
-...\marks1{\__mark_id:n {1}}
-...\marks2{\__mark_id:n {2}}
+...\marks1{\__mark_value:nn {1}{}}
+...\marks2{\__mark_value:nn {2}{}}
...\mark{{}{}}
...\glue(\parskip) 0.0 plus 1.0
...\glue(\parskip) 0.0
@@ -161,8 +161,8 @@ Completed box being shipped out [3]
..\vbox(550.0+0.0)x345.0, glue set 360.83557fil, direction TLT
...\write-{}
...\write1{\@writefile{toc}{\protect \contentsline {chapter}{\protect \numberline {1} Chapter ] }{\thepage }{chapter.1}\protected at file@percent }}
-...\marks1{\__mark_id:n {3}\MakeUppercase []{Chapter\ 1. \ Chapter ] }}
-...\marks2{\__mark_id:n {4}}
+...\marks1{\__mark_value:nn {3}{\MakeUppercase []{Chapter\ 1. \ Chapter ] }}}
+...\marks2{\__mark_value:nn {4}{}}
...\mark{{\MakeUppercase []{Chapter\ 1. \ Chapter ] }}{}}
...\write1{\@writefile{lof}{\protect \addvspace {10\p@ }}}
...\write1{\@writefile{lot}{\protect \addvspace {10\p@ }}}
diff --git a/required/latex-lab/testfiles-sec/test-gh725-opt-arg.tlg b/required/latex-lab/testfiles-sec/test-gh725-opt-arg.tlg
index 4077e5cec..ed7023787 100644
--- a/required/latex-lab/testfiles-sec/test-gh725-opt-arg.tlg
+++ b/required/latex-lab/testfiles-sec/test-gh725-opt-arg.tlg
@@ -35,8 +35,8 @@ Completed box being shipped out [1]
...\hbox(0.0+0.0)x0.0
...\glue 0.0 plus 1.0fil
...\write1{\@writefile{toc}{\protect \contentsline {part}{I\protect \hspace {1em}Part ]}{\thepage }{part.1}\protected at file@percent }}
-...\marks1{\__mark_id:n {1}}
-...\marks2{\__mark_id:n {2}}
+...\marks1{\__mark_value:nn {1}{}}
+...\marks2{\__mark_value:nn {2}{}}
...\mark{{}{}}
...\glue(\parskip) 0.0 plus 1.0
...\glue(\parskip) 0.0
@@ -183,8 +183,8 @@ Completed box being shipped out [3]
...\hbox(0.0+0.0)x0.0
...\write-{}
...\write1{\@writefile{toc}{\protect \contentsline {chapter}{\protect \numberline {1} Chapter ] }{\thepage }{chapter.1}\protected at file@percent }}
-...\marks1{\__mark_id:n {3}\MakeUppercase []{Chapter\ 1. \ Chapter ] }}
-...\marks2{\__mark_id:n {4}}
+...\marks1{\__mark_value:nn {3}{\MakeUppercase []{Chapter\ 1. \ Chapter ] }}}
+...\marks2{\__mark_value:nn {4}{}}
...\mark{{\MakeUppercase []{Chapter\ 1. \ Chapter ] }}{}}
...\write1{\@writefile{lof}{\protect \addvspace {10\p@ }}}
...\write1{\@writefile{lot}{\protect \addvspace {10\p@ }}}
diff --git a/required/tools/multicol.dtx b/required/tools/multicol.dtx
index ba19ba0b0..cfccead4b 100644
--- a/required/tools/multicol.dtx
+++ b/required/tools/multicol.dtx
@@ -992,6 +992,10 @@
{\c at tracingmulticols\@ne}
\DeclareOption{balancingshow}
{\c at tracingmulticols\tw@}
+% \end{macrocode}
+%
+% \changes{v2.0a}{2024/11/10}{}
+% \begin{macrocode}
\DeclareOption{markshow}
{\c at tracingmulticols\thr@@
\DebugMarksOn
@@ -1760,6 +1764,10 @@
% \changes{v1.9e}{2023/02/25}{Delay returning boxed multicols (gh/1002)}
% \begin{macrocode}
\global\setbox\mc at boxedresult\vbox{%
+% \end{macrocode}
+%
+% \changes{v2.0a}{2024/11/10}{}
+% \begin{macrocode}
\mc at handle@marks at and@reinserts
{endmulticols}%
{multicol~ (boxed)}%
@@ -2405,15 +2413,6 @@
\fi
% \end{macrocode}
%
-% \begin{macrocode}
-%fmi \ifx\@empty\kept at firstmark
-%fmi \let\firstmark\kept at topmark
-%fmi \let\botmark\kept at topmark
-%fmi \else
-%fmi \let\firstmark\kept at firstmark
-%fmi \let\botmark\kept at botmark
-%fmi \fi
-% \end{macrocode}
% If the `\textsf{tracingmulticols}' counter is 4 or higher we also
% add a rule.
% \begin{macrocode}
@@ -2442,11 +2441,17 @@
% \begin{macrocode}
\boxmaxdepth\maxdimen
\setbox\@cclv\vbox
- {\mc at handle@col at andpage@marks
- {multicolout}%
- {multicol (full page)}%
+ {%
+% \end{macrocode}
+%
+% \changes{v2.0a}{2024/11/10}{}
+% \begin{macrocode}
+ \mc at handle@col at andpage@marks
+ {multicolout}%
+ {multicol (full page)}%
\unvbox\partial at page
- \page at sofar}%
+ \page at sofar
+ }%
% \end{macrocode}
% The macro |\@makecol| adds all floats assigned for the current
% page to this page. |\@outputpage| ships out the resulting box.
@@ -2815,6 +2820,7 @@
% \end{macrocode}
% Then we return the gathered
% material to the main vertical list.
+% \changes{v2.0a}{2024/11/10}{}
% \begin{macrocode}
\mc at handle@marks at and@reinserts
{balancecolumnout}%
@@ -4303,9 +4309,10 @@
% \end{macro}
%
%
-% \subsection{Supporting the new mark mechanism}
+% \subsection{Using the new mark mechanism}
%
%
+% \changes{v2.0a}{2024/11/10}{}
% \begin{macrocode}
\ExplSyntaxOn
%<@@=mark>
@@ -4313,10 +4320,10 @@
%
%
%
-% \begin{macro}{\g_@@_curr_col_int}
+% \begin{macro}{\g_mc_curr_col_int}
%
% \begin{macrocode}
-\int_new:N \g_@@_curr_col_int
+\int_new:N \g_mc_curr_col_int
% \end{macrocode}
% \end{macro}
%
@@ -4330,13 +4337,13 @@
{
\typeout{--->>>~ multicol~ update~ col~ structure}
}
- \int_while_do:nNnn \g_@@_curr_col_int > 2
+ \int_while_do:nNnn \g_mc_curr_col_int > 2
{
\@@_update_structure_to_err:n
- { mcol - \int_use:N\g_@@_curr_col_int }
- \int_gdecr:N \g_@@_curr_col_int
+ { mcol - \int_use:N\g_mc_curr_col_int }
+ \int_gdecr:N \g_mc_curr_col_int
}%
- \int_gset:Nn \g_@@_curr_col_int {1}
+ \int_gset:Nn \g_mc_curr_col_int {1}
% \end{macrocode}
%
% \begin{macrocode}
@@ -4347,17 +4354,17 @@
{column}
{\unvcopy\count@}
\@@_update_alias_structure:nn
- {mcol - \int_use:N\g_@@_curr_col_int}
+ {mcol - \int_use:N\g_mc_curr_col_int}
%fmi {mcol}
{column}
- \int_gincr:N \g_@@_curr_col_int
+ \int_gincr:N \g_mc_curr_col_int
}
\@@_update_structure_from_material:nn
%fmi {mcol}
{column}
{\unvcopy\mult at rightbox}
\@@_update_alias_structure:nn
- { mcol - \int_use:N\g_@@_curr_col_int }
+ { mcol - \int_use:N\g_mc_curr_col_int }
%fmi {mcol}
{column}
\@@_update_alias_structure:nn{first-column}{mcol-1}
More information about the latex3-commits
mailing list.