[latex3-commits] [git/LaTeX3-latex3-latex2e] master: provide \docolaction* (test before action case) (2906d1c)
Frank Mittelbach
frank.mittelbach at latex-project.org
Fri Nov 9 16:46:09 CET 2018
Repository : https://github.com/latex3/latex2e
On branch : master
Link : https://github.com/latex3/latex2e/commit/2906d1c83779dd3e86d92429d6087c75f7e91f62
>---------------------------------------------------------------
commit 2906d1c83779dd3e86d92429d6087c75f7e91f62
Author: Frank Mittelbach <frank.mittelbach at latex-project.org>
Date: Fri Nov 9 16:46:09 2018 +0100
provide \docolaction* (test before action case)
>---------------------------------------------------------------
2906d1c83779dd3e86d92429d6087c75f7e91f62
doc/ltnews29.tex | 12 +
required/tools/changes.txt | 14 +-
required/tools/multicol.dtx | 61 ++++-
...-002.luatex.tlg => tlb-multicol-004.luatex.tlg} | 254 ++++++++++++++------
.../{tlb-multicol-002.lvt => tlb-multicol-004.lvt} | 3 +-
.../{tlb-multicol-002.tlg => tlb-multicol-004.tlg} | 254 ++++++++++++++------
6 files changed, 424 insertions(+), 174 deletions(-)
diff --git a/doc/ltnews29.tex b/doc/ltnews29.tex
index e77c889..37b9d4d 100644
--- a/doc/ltnews29.tex
+++ b/doc/ltnews29.tex
@@ -361,6 +361,18 @@ explicitly reinserting that penalty if necessary.
%
\githubissue{53}
+\subsection{Extension to \cs{docolaction}}
+
+The \cs{docolaction} command can be used used to carry out actions
+depending on the column you are currently in, i.e., the first, andy
+middle one (if more than two) or the last. However, if the action
+generates text then there is the question which point to use to
+determine the current column, before or after that generated
+text. This is now resolved as follows: if you use \cs{docolaction*}
+the test comes first and then the action is executed. But if you use
+the command without the star then all material it generates will be
+before the test point to determine the current column.
+
\subsection{Prevent color leak in \pkg{array}}
diff --git a/required/tools/changes.txt b/required/tools/changes.txt
index 36677f5..12051d0 100644
--- a/required/tools/changes.txt
+++ b/required/tools/changes.txt
@@ -5,6 +5,11 @@ completeness or accuracy and it contains some references to files that
are not part of the distribution.
=======================================================================
+2018-11-09 Frank Mittelbach <Frank.Mittelbach at latex-project.org>
+
+ * multicol.dtx:
+ Support star with \docolaction (test first then execute)
+
2018-10-13 Frank Mittelbach <Frank.Mittelbach at latex-project.org>
* trace.dtx (section{Implementation}):
@@ -231,9 +236,10 @@ are not part of the distribution.
2014-06-19 Frank Mittelbach <latex-bugs at latex-project.org>
- * multicol.dtx: color-leak fix introduced a spacing problem in boxed mode
- as the added color commands were hiding any space at the bottom of the box
- material (which thus didn't get discarded)
+ * multicol.dtx: color-leak fix introduced a spacing problem in
+ boxed mode as the added color commands were hiding any space
+ at the bottom of the box material (which thus didn't get
+ discarded)
2014-05-14 David Carlisle <latex-bugs at latex-project.org>
@@ -499,7 +505,7 @@ are not part of the distribution.
2003-04-08 Frank Mittelbach <latex-bugs at latex-project.org>
- * multicol.dtx: Collect one addition line per column to account
+ * multicol.dtx: Collect one additional line per column to account
for vanishing space at column breaks
2003-03-29 Frank Mittelbach <latex-bugs at latex-project.org>
diff --git a/required/tools/multicol.dtx b/required/tools/multicol.dtx
index 0b72a3f..1962ec2 100644
--- a/required/tools/multicol.dtx
+++ b/required/tools/multicol.dtx
@@ -98,7 +98,7 @@
%<driver> \ProvidesFile{multicol.drv}
% \fi
% \ProvidesFile{multicol.dtx}
- [2018/06/26 v1.8t multicolumn formatting (FMi)]
+ [2018/11/09 v1.8u multicolumn formatting (FMi)]
%
%
%%
@@ -4233,8 +4233,16 @@
% \begin{macro}{\docolaction}
%
+% The \verb=\docolaction= scans for a star and optional argument
+% and 3 mandatory ones, but we do this in chunks (not having xparse
+% available).
+%
+% \changes{v1.8u}{2018/11/09}{Support star with \cs{docolaction}}
+% \begin{macrocode}
+\newcommand\docolaction{%
+% \end{macrocode}
+% First check is the support is enabled.
% \begin{macrocode}
-\newcommand\docolaction[4][1]{%
\ifx\mc at col@status at write\relax
\PackageError{multicol}%
{Option 'colaction' not selected}%
@@ -4242,6 +4250,9 @@
requires the use of the 'colaction'
option on the package}%
\fi
+% \end{macrocode}
+% Then prepare \verb=\mc at col@type=.
+% \begin{macrocode}
\global\advance\mc at col@check at num\@ne
\edef\mc at col@type{\expandafter\ifx
\csname mc at col-\the\mc at col@check at num
@@ -4249,7 +4260,36 @@
0\else
\csname mc at col-\the\mc at col@check at num
\endcsname
- \fi}%
+ \fi}%
+% \end{macrocode}
+% Finally check for a star, record this information and then call
+% \verb=\@docolaction= to do the rest.
+% \begin{macrocode}
+ \@ifstar
+ {\@docolactionstartrue \@docolaction}%
+ {\@docolactionstarfalse\@docolaction}%
+}
+% \end{macrocode}
+%
+% \begin{macrocode}
+\newcommand\@docolaction[4][1]{%
+% \end{macrocode}
+%
+% How does the column number get associated with our label? We
+% do do this by writing another line into the aux file. Here are the
+% preparations.
+% \begin{macrocode}
+ \edef\@docolactioncheck{\write\@auxout
+ {\string\mc at set@col at status
+ {mc at col-\the\mc at col@check at num}%
+ {\mc at col@type}}}%
+% \end{macrocode}
+% Where we do the actual \verb=\write= depends on the whether or
+% not we gave seen a \texttt{*}. If yes, we do it first and then
+% execute the code argument, otherwise we execute that code first
+% and check at the point after that.
+% \begin{macrocode}
+ \if at docolactionstar \@docolactioncheck \fi
% \end{macrocode}
% We prefix with 0 so that an unknown label (that returns
% \verb=\relax=) will result in case 0
@@ -4272,21 +4312,20 @@
\or
#4% % 3 last col
\else
- \ERROR
+ \ERRORwrongdefaultgiven
\fi
% \end{macrocode}
-% But how does the column number get associated with our label? We
-% do do this by writing another line into the aux file at this point:
% \begin{macrocode}
- \edef\next{\write\@auxout
- {\string\mc at set@col at status
- {mc at col-\the\mc at col@check at num}%
- {\mc at col@type}}}%
- \next
+ \if at docolactionstar \else \@docolactioncheck \fi
}
% \end{macrocode}
% \end{macro}
%
+% Here is the if used above:
+% \begin{macrocode}
+\newif\if at docolactionstar
+% \end{macrocode}
+%
% Because of extra data writing to the aux file the aux file will
% now contain something like the following after the document is
% processed the first time:
diff --git a/required/tools/testfiles/tlb-multicol-002.luatex.tlg b/required/tools/testfiles/tlb-multicol-004.luatex.tlg
similarity index 87%
copy from required/tools/testfiles/tlb-multicol-002.luatex.tlg
copy to required/tools/testfiles/tlb-multicol-004.luatex.tlg
index 349415c..c6f5085 100644
--- a/required/tools/testfiles/tlb-multicol-002.luatex.tlg
+++ b/required/tools/testfiles/tlb-multicol-004.luatex.tlg
@@ -9,12 +9,12 @@ Completed box being shipped out [1]
...\hbox(0.0+0.0)x345.0, direction TLT
..\glue 25.0
..\glue(\lineskip) 0.0
-..\vbox(550.0+0.0)x345.0, glue set 335.96411fil, direction TLT
+..\vbox(550.0+0.0)x345.0, glue set 311.96667fil, direction TLT
...\write-{}
...\glue(\topskip) 0.0
-...\hbox(34.0+1.94444)x345.0, glue set 4.65001fil, direction TLT
+...\hbox(46.0+1.94444)x345.0, glue set 4.65001fil, direction TLT
....\write1{\mc at col@status{1}}
-....\vbox(34.0+0.0)x108.33333, direction TLT
+....\vbox(46.0+0.0)x108.33333, direction TLT
.....\glue 0.0 plus -2.0
.....\glue(\splittopskip) 3.05556 plus 2.0
.....\hbox(6.94444+0.0)x108.33333, glue set - 0.32503, direction TLT
@@ -80,7 +80,7 @@ Completed box being shipped out [1]
......\glue(\rightskip) 0.0
.....\penalty 150
.....\glue(\baselineskip) 5.05556
-.....\hbox(6.94444+0.0)x108.33333, glue set 52.36098fil, direction TLT
+.....\hbox(6.94444+0.0)x108.33333, glue set 58.88878fil, direction TLT
......\OT1/cmr/m/n/10 i
......\OT1/cmr/m/n/10 n
......\glue(\spaceskip) 3.33333 plus 1.66666 minus 1.11111
@@ -93,26 +93,69 @@ Completed box being shipped out [1]
......\OT1/cmr/m/n/10 m
......\OT1/cmr/m/n/10 n
......\glue(\spaceskip) 3.33333 plus 1.66666 minus 1.11111
-......\OT1/cmr/m/n/10 F
......\write1{\mc at set@col at status{mc at col-1}{1}}
......\OT1/cmr/m/n/10 .
......\penalty 10000
......\glue(\parfillskip) 0.0 plus 1.0fil
......\glue(\rightskip) 0.0
+.....\kern0.0
....\glue 0.0 plus 1.0fil minus 1.0fil
....\rule(*+*)x0.7
....\glue 0.0 plus 1.0fil minus 1.0fil
....\write1{\mc at col@status{2}}
-....\vbox(34.0+0.0)x108.33333, direction TLT
+....\vbox(46.0+0.0)x108.33333, direction TLT
.....\glue 0.0 plus -2.0
.....\glue(\splittopskip) 3.05556 plus 2.0
-.....\hbox(6.94444+0.0)x108.33333, glue set - 0.32503, direction TLT
+.....\hbox(6.94444+0.0)x108.33333, glue set - 0.94379, direction TLT
......\localpar
.......\localinterlinepenalty=0
.......\localbrokenpenalty=0
.......\localleftbox=null
.......\localrightbox=null
......\hbox(0.0+0.0)x15.0, direction TLT
+......\OT1/cmr/m/n/10 O
+......\OT1/cmr/m/n/10 n
+......\OT1/cmr/m/n/10 e
+......\glue(\spaceskip) 3.33333 plus 1.66666 minus 1.11111
+......\OT1/cmr/m/n/10 e
+......\OT1/cmr/m/n/10 x
+......\discretionary (penalty 50)
+.......< \OT1/cmr/m/n/10 -
+......\OT1/cmr/m/n/10 t
+......\OT1/cmr/m/n/10 r
+......\OT1/cmr/m/n/10 a
+......\glue(\spaceskip) 3.33333 plus 1.66666 minus 1.11111
+......\OT1/cmr/m/n/10 l
+......\OT1/cmr/m/n/10 i
+......\OT1/cmr/m/n/10 n
+......\OT1/cmr/m/n/10 e
+......\glue(\spaceskip) 3.33333 plus 1.66666 minus 1.11111
+......\OT1/cmr/m/n/10 i
+......\OT1/cmr/m/n/10 n
+......\glue(\spaceskip) 3.33333 plus 1.66666 minus 1.11111
+......\OT1/cmr/m/n/10 m
+......\OT1/cmr/m/n/10 i
+......\OT1/cmr/m/n/10 d
+......\OT1/cmr/m/n/10 -
+......\discretionary (penalty 50)
+......\glue(\rightskip) 0.0
+.....\penalty 250
+.....\glue(\baselineskip) 5.05556
+.....\hbox(6.94444+0.0)x108.33333, glue set - 0.82506, direction TLT
+......\OT1/cmr/m/n/10 d
+......\OT1/cmr/m/n/10 l
+......\OT1/cmr/m/n/10 e
+......\glue(\spaceskip) 3.33333 plus 1.66666 minus 1.11111
+......\OT1/cmr/m/n/10 c
+......\OT1/cmr/m/n/10 o
+......\OT1/cmr/m/n/10 l
+......\discretionary (penalty 50)
+.......< \OT1/cmr/m/n/10 -
+......\OT1/cmr/m/n/10 u
+......\OT1/cmr/m/n/10 m
+......\OT1/cmr/m/n/10 n
+......\OT1/cmr/m/n/10 .
+......\glue(\spaceskip) 4.44444 plus 4.99997 minus 0.37036
......\OT1/cmr/m/n/10 S
......\OT1/cmr/m/n/10 o
......\OT1/cmr/m/n/10 m
@@ -125,7 +168,9 @@ Completed box being shipped out [1]
......\glue(\spaceskip) 3.33333 plus 1.66666 minus 1.11111
......\OT1/cmr/m/n/10 t
......\OT1/cmr/m/n/10 o
-......\glue(\spaceskip) 3.33333 plus 1.66666 minus 1.11111
+......\glue(\rightskip) 0.0
+.....\glue(\baselineskip) 5.05556
+.....\hbox(6.94444+0.0)x108.33333, glue set 1.19997, direction TLT
......\OT1/cmr/m/n/10 t
......\OT1/cmr/m/n/10 e
......\OT1/cmr/m/n/10 s
@@ -134,12 +179,8 @@ Completed box being shipped out [1]
......\OT1/cmr/m/n/10 c
......\OT1/cmr/m/n/10 o
......\OT1/cmr/m/n/10 l
-......\OT1/cmr/m/n/10 -
......\discretionary (penalty 50)
-......\glue(\rightskip) 0.0
-.....\penalty 250
-.....\glue(\baselineskip) 5.16669
-.....\hbox(6.83331+0.0)x108.33333, glue set 0.02914, direction TLT
+.......< \OT1/cmr/m/n/10 -
......\OT1/cmr/m/n/10 u
......\OT1/cmr/m/n/10 m
......\OT1/cmr/m/n/10 n
@@ -157,7 +198,10 @@ Completed box being shipped out [1]
......\OT1/cmr/m/n/10 W
......\kern-0.83334 (font)
......\OT1/cmr/m/n/10 e
-......\glue(\spaceskip) 3.33333 plus 1.66666 minus 1.11111
+......\glue(\rightskip) 0.0
+.....\penalty 150
+.....\glue(\baselineskip) 5.05556
+.....\hbox(6.94444+0.0)x108.33333, glue set 21.36096fil, direction TLT
......\OT1/cmr/m/n/10 a
......\OT1/cmr/m/n/10 r
......\OT1/cmr/m/n/10 e
@@ -166,10 +210,7 @@ Completed box being shipped out [1]
......\OT1/cmr/m/n/10 o
......\kern-0.27779 (font)
......\OT1/cmr/m/n/10 w
-......\glue(\rightskip) 0.0
-.....\penalty 150
-.....\glue(\baselineskip) 5.05556
-.....\hbox(6.94444+0.0)x108.33333, glue set 49.72209fil, direction TLT
+......\glue(\spaceskip) 3.33333 plus 1.66666 minus 1.11111
......\OT1/cmr/m/n/10 i
......\OT1/cmr/m/n/10 n
......\glue(\spaceskip) 3.33333 plus 1.66666 minus 1.11111
@@ -182,17 +223,17 @@ Completed box being shipped out [1]
......\OT1/cmr/m/n/10 m
......\OT1/cmr/m/n/10 n
......\glue(\spaceskip) 3.33333 plus 1.66666 minus 1.11111
-......\OT1/cmr/m/n/10 M
......\write1{\mc at set@col at status{mc at col-2}{2}}
......\OT1/cmr/m/n/10 .
......\penalty 10000
......\glue(\parfillskip) 0.0 plus 1.0fil
......\glue(\rightskip) 0.0
+.....\kern0.0
....\glue 0.0 plus 1.0fil minus 1.0fil
....\rule(*+*)x0.7
....\glue 0.0 plus 1.0fil minus 1.0fil
....\write1{\mc at col@status{3}}
-....\vbox(34.0+0.0)x108.33333, direction TLT
+....\vbox(46.0+0.0)x108.33333, glue set 9.5fil, direction TLT
.....\glue 0.0 plus -2.0
.....\glue(\splittopskip) 3.05556 plus 2.0
.....\hbox(6.94444+0.0)x108.33333, glue set - 0.32503, direction TLT
@@ -257,8 +298,8 @@ Completed box being shipped out [1]
......\OT1/cmr/m/n/10 w
......\glue(\rightskip) 0.0
.....\penalty 150
-.....\glue(\baselineskip) 5.05556
-.....\hbox(6.94444+0.0)x108.33333, glue set 52.63876fil, direction TLT
+.....\glue(\baselineskip) 4.5
+.....\hbox(7.5+2.5)x108.33333, glue set 19.94426fil, direction TLT
......\OT1/cmr/m/n/10 i
......\OT1/cmr/m/n/10 n
......\glue(\spaceskip) 3.33333 plus 1.66666 minus 1.11111
@@ -271,12 +312,22 @@ Completed box being shipped out [1]
......\OT1/cmr/m/n/10 m
......\OT1/cmr/m/n/10 n
......\glue(\spaceskip) 3.33333 plus 1.66666 minus 1.11111
-......\OT1/cmr/m/n/10 L
......\write1{\mc at set@col at status{mc at col-3}{3}}
+......\OT1/cmr/m/n/10 (
+......\OT1/cmr/m/n/10 l
+......\OT1/cmr/m/n/10 a
+......\OT1/cmr/m/n/10 s
+......\OT1/cmr/m/n/10 t
+......\glue(\spaceskip) 3.33333 plus 1.66666 minus 1.11111
+......\OT1/cmr/m/n/10 c
+......\OT1/cmr/m/n/10 o
+......\OT1/cmr/m/n/10 l
+......\OT1/cmr/m/n/10 )
......\OT1/cmr/m/n/10 .
......\penalty 10000
......\glue(\parfillskip) 0.0 plus 1.0fil
......\glue(\rightskip) 0.0
+.....\glue 0.0 plus 1.0fil
....\hbox(4.30554+1.94444)x0.0, glue set - 5.55557fil, direction TLT
.....\hbox(4.30554+1.94444)x5.55557, direction TLT
.....\glue 0.0 plus 1.0fil minus 1.0fil
@@ -289,9 +340,9 @@ Completed box being shipped out [1]
...\penalty 0
...\glue 12.0 plus 4.0 minus 3.0
...\kern2.0
-...\hbox(34.0+1.94444)x345.0, glue set 4.65001fil, direction TLT
+...\hbox(46.0+2.5)x345.0, glue set 4.65001fil, direction TLT
....\write1{\mc at col@status{1}}
-....\vbox(34.0+0.0)x167.5, direction TLT
+....\vbox(46.0+0.0)x167.5, direction TLT
.....\glue 0.0 plus -2.0
.....\glue(\splittopskip) 3.05556 plus 2.0
.....\hbox(6.94444+0.0)x167.5, glue set 0.91997, direction TLT
@@ -340,7 +391,7 @@ Completed box being shipped out [1]
......\glue(\rightskip) 0.0
.....\penalty 300
.....\glue(\baselineskip) 5.05556
-.....\hbox(6.94444+0.0)x167.5, glue set 56.7776fil, direction TLT
+.....\hbox(6.94444+0.0)x167.5, glue set 63.3054fil, direction TLT
......\OT1/cmr/m/n/10 W
......\kern-0.83334 (font)
......\OT1/cmr/m/n/10 e
@@ -366,14 +417,19 @@ Completed box being shipped out [1]
......\OT1/cmr/m/n/10 m
......\OT1/cmr/m/n/10 n
......\glue(\spaceskip) 3.33333 plus 1.66666 minus 1.11111
-......\OT1/cmr/m/n/10 F
......\write1{\mc at set@col at status{mc at col-4}{1}}
......\OT1/cmr/m/n/10 .
......\penalty 10000
......\glue(\parfillskip) 0.0 plus 1.0fil
......\glue(\rightskip) 0.0
-.....\glue(\parskip) 0.0 plus 1.0
-.....\glue(\baselineskip) 5.05556
+.....\kern0.0
+....\glue 0.0 plus 1.0fil minus 1.0fil
+....\rule(*+*)x0.7
+....\glue 0.0 plus 1.0fil minus 1.0fil
+....\write1{\mc at col@status{3}}
+....\vbox(46.0+2.5)x167.5, direction TLT
+.....\glue 0.0 plus -2.0
+.....\glue(\splittopskip) 3.05556 plus 2.0
.....\hbox(6.94444+0.0)x167.5, glue set 0.91997, direction TLT
......\localpar
.......\localinterlinepenalty=0
@@ -418,14 +474,9 @@ Completed box being shipped out [1]
......\OT1/cmr/m/n/10 n
......\OT1/cmr/m/n/10 s
......\glue(\rightskip) 0.0
-....\glue 0.0 plus 1.0fil minus 1.0fil
-....\rule(*+*)x0.7
-....\glue 0.0 plus 1.0fil minus 1.0fil
-....\write1{\mc at col@status{3}}
-....\vbox(34.0+0.0)x167.5, direction TLT
-.....\glue 0.0 plus -2.0
-.....\glue(\splittopskip) 3.05556 plus 2.0
-.....\hbox(6.94444+0.0)x167.5, glue set 57.05539fil, direction TLT
+.....\penalty 300
+.....\glue(\baselineskip) 4.5
+.....\hbox(7.5+2.5)x167.5, glue set 24.36089fil, direction TLT
......\OT1/cmr/m/n/10 W
......\kern-0.83334 (font)
......\OT1/cmr/m/n/10 e
@@ -451,14 +502,23 @@ Completed box being shipped out [1]
......\OT1/cmr/m/n/10 m
......\OT1/cmr/m/n/10 n
......\glue(\spaceskip) 3.33333 plus 1.66666 minus 1.11111
-......\OT1/cmr/m/n/10 L
......\write1{\mc at set@col at status{mc at col-5}{3}}
+......\OT1/cmr/m/n/10 (
+......\OT1/cmr/m/n/10 l
+......\OT1/cmr/m/n/10 a
+......\OT1/cmr/m/n/10 s
+......\OT1/cmr/m/n/10 t
+......\glue(\spaceskip) 3.33333 plus 1.66666 minus 1.11111
+......\OT1/cmr/m/n/10 c
+......\OT1/cmr/m/n/10 o
+......\OT1/cmr/m/n/10 l
+......\OT1/cmr/m/n/10 )
......\OT1/cmr/m/n/10 .
......\penalty 10000
......\glue(\parfillskip) 0.0 plus 1.0fil
......\glue(\rightskip) 0.0
.....\glue(\parskip) 0.0 plus 1.0
-.....\glue(\baselineskip) 5.05556
+.....\glue(\baselineskip) 2.55556
.....\hbox(6.94444+0.0)x167.5, glue set 0.91997, direction TLT
......\localpar
.......\localinterlinepenalty=0
@@ -504,8 +564,8 @@ Completed box being shipped out [1]
......\OT1/cmr/m/n/10 s
......\glue(\rightskip) 0.0
.....\penalty 300
-.....\glue(\baselineskip) 5.05556
-.....\hbox(6.94444+0.0)x167.5, glue set 57.05539fil, direction TLT
+.....\glue(\baselineskip) 4.5
+.....\hbox(7.5+2.5)x167.5, glue set 24.36089fil, direction TLT
......\OT1/cmr/m/n/10 W
......\kern-0.83334 (font)
......\OT1/cmr/m/n/10 e
@@ -531,8 +591,17 @@ Completed box being shipped out [1]
......\OT1/cmr/m/n/10 m
......\OT1/cmr/m/n/10 n
......\glue(\spaceskip) 3.33333 plus 1.66666 minus 1.11111
-......\OT1/cmr/m/n/10 L
......\write1{\mc at set@col at status{mc at col-6}{3}}
+......\OT1/cmr/m/n/10 (
+......\OT1/cmr/m/n/10 l
+......\OT1/cmr/m/n/10 a
+......\OT1/cmr/m/n/10 s
+......\OT1/cmr/m/n/10 t
+......\glue(\spaceskip) 3.33333 plus 1.66666 minus 1.11111
+......\OT1/cmr/m/n/10 c
+......\OT1/cmr/m/n/10 o
+......\OT1/cmr/m/n/10 l
+......\OT1/cmr/m/n/10 )
......\OT1/cmr/m/n/10 .
......\penalty 10000
......\glue(\parfillskip) 0.0 plus 1.0fil
@@ -540,7 +609,7 @@ Completed box being shipped out [1]
....\hbox(4.30554+1.94444)x0.0, glue set - 5.55557fil, direction TLT
.....\hbox(4.30554+1.94444)x5.55557, direction TLT
.....\glue 0.0 plus 1.0fil minus 1.0fil
-...\kern-1.94444
+...\kern-2.5
...\penalty 0
...\penalty 10000
...\penalty 0
@@ -656,7 +725,7 @@ Completed box being shipped out [1]
......\glue(\rightskip) 0.0
.....\penalty 150
.....\glue(\baselineskip) 5.05556
-.....\hbox(6.94444+0.0)x108.33333, glue set 31.52762fil, direction TLT
+.....\hbox(6.94444+0.0)x108.33333, glue set 38.05542fil, direction TLT
......\OT1/cmr/m/n/10 n
......\OT1/cmr/m/n/10 o
......\kern-0.27779 (font)
@@ -674,12 +743,12 @@ Completed box being shipped out [1]
......\OT1/cmr/m/n/10 m
......\OT1/cmr/m/n/10 n
......\glue(\spaceskip) 3.33333 plus 1.66666 minus 1.11111
-......\OT1/cmr/m/n/10 F
......\write1{\mc at set@col at status{mc at col-7}{1}}
......\OT1/cmr/m/n/10 .
......\penalty 10000
......\glue(\parfillskip) 0.0 plus 1.0fil
......\glue(\rightskip) 0.0
+.....\kern0.0
....\glue -108.33333
....\glue -10.0
....\glue -108.33333
@@ -750,7 +819,7 @@ Completed box being shipped out [1]
......\glue(\rightskip) 0.0
.....\penalty 150
.....\glue(\baselineskip) 5.05556
-.....\hbox(6.94444+0.0)x108.33333, glue set 49.72209fil, direction TLT
+.....\hbox(6.94444+0.0)x108.33333, glue set 58.88878fil, direction TLT
......\OT1/cmr/m/n/10 i
......\OT1/cmr/m/n/10 n
......\glue(\spaceskip) 3.33333 plus 1.66666 minus 1.11111
@@ -763,14 +832,19 @@ Completed box being shipped out [1]
......\OT1/cmr/m/n/10 m
......\OT1/cmr/m/n/10 n
......\glue(\spaceskip) 3.33333 plus 1.66666 minus 1.11111
-......\OT1/cmr/m/n/10 M
......\write1{\mc at set@col at status{mc at col-8}{2}}
......\OT1/cmr/m/n/10 .
......\penalty 10000
......\glue(\parfillskip) 0.0 plus 1.0fil
......\glue(\rightskip) 0.0
-.....\glue(\parskip) 0.0 plus 1.0
-.....\glue(\baselineskip) 5.05556
+.....\kern0.0
+....\glue -108.33333
+....\glue -10.0
+....\glue -108.33333
+....\write1{\mc at col@status{3}}
+....\vbox(46.0+0.0)x108.33333, glue set 9.5fil, direction TLT
+.....\glue 0.0 plus -2.0
+.....\glue(\splittopskip) 3.05556 plus 2.0
.....\hbox(6.94444+0.0)x108.33333, glue set - 0.32503, direction TLT
......\localpar
.......\localinterlinepenalty=0
@@ -802,13 +876,8 @@ Completed box being shipped out [1]
......\OT1/cmr/m/n/10 -
......\discretionary (penalty 50)
......\glue(\rightskip) 0.0
-....\glue -108.33333
-....\glue -10.0
-....\glue -108.33333
-....\write1{\mc at col@status{3}}
-....\vbox(46.0+0.0)x108.33333, glue set 24.0fil, direction TLT
-.....\glue 0.0 plus -2.0
-.....\glue(\splittopskip) 3.16669 plus 2.0
+.....\penalty 250
+.....\glue(\baselineskip) 5.16669
.....\hbox(6.83331+0.0)x108.33333, glue set 0.02914, direction TLT
......\OT1/cmr/m/n/10 u
......\OT1/cmr/m/n/10 m
@@ -838,8 +907,8 @@ Completed box being shipped out [1]
......\OT1/cmr/m/n/10 w
......\glue(\rightskip) 0.0
.....\penalty 150
-.....\glue(\baselineskip) 5.05556
-.....\hbox(6.94444+0.0)x108.33333, glue set 52.63876fil, direction TLT
+.....\glue(\baselineskip) 4.5
+.....\hbox(7.5+2.5)x108.33333, glue set 19.94426fil, direction TLT
......\OT1/cmr/m/n/10 i
......\OT1/cmr/m/n/10 n
......\glue(\spaceskip) 3.33333 plus 1.66666 minus 1.11111
@@ -852,8 +921,17 @@ Completed box being shipped out [1]
......\OT1/cmr/m/n/10 m
......\OT1/cmr/m/n/10 n
......\glue(\spaceskip) 3.33333 plus 1.66666 minus 1.11111
-......\OT1/cmr/m/n/10 L
......\write1{\mc at set@col at status{mc at col-9}{3}}
+......\OT1/cmr/m/n/10 (
+......\OT1/cmr/m/n/10 l
+......\OT1/cmr/m/n/10 a
+......\OT1/cmr/m/n/10 s
+......\OT1/cmr/m/n/10 t
+......\glue(\spaceskip) 3.33333 plus 1.66666 minus 1.11111
+......\OT1/cmr/m/n/10 c
+......\OT1/cmr/m/n/10 o
+......\OT1/cmr/m/n/10 l
+......\OT1/cmr/m/n/10 )
......\OT1/cmr/m/n/10 .
......\penalty 10000
......\glue(\parfillskip) 0.0 plus 1.0fil
@@ -873,7 +951,7 @@ Completed box being shipped out [1]
...\penalty 0
...\glue 12.0 plus 4.0 minus 3.0
...\kern2.0
-...\hbox(46.0+1.94444)x345.0, glue set 4.65001fil, direction TLT
+...\hbox(46.0+2.5)x345.0, glue set 4.65001fil, direction TLT
....\glue 167.5
....\glue 0.0 plus 1.0fil minus 1.0fil
....\rule(*+*)x0.7
@@ -979,7 +1057,7 @@ Completed box being shipped out [1]
......\glue(\rightskip) 0.0
.....\penalty 150
.....\glue(\baselineskip) 5.05556
-.....\hbox(6.94444+0.0)x167.5, glue set 111.52765fil, direction TLT
+.....\hbox(6.94444+0.0)x167.5, glue set 118.05545fil, direction TLT
......\OT1/cmr/m/n/10 i
......\OT1/cmr/m/n/10 n
......\glue(\spaceskip) 3.33333 plus 1.66666 minus 1.11111
@@ -992,14 +1070,19 @@ Completed box being shipped out [1]
......\OT1/cmr/m/n/10 m
......\OT1/cmr/m/n/10 n
......\glue(\spaceskip) 3.33333 plus 1.66666 minus 1.11111
-......\OT1/cmr/m/n/10 F
......\write1{\mc at set@col at status{mc at col-10}{1}}
......\OT1/cmr/m/n/10 .
......\penalty 10000
......\glue(\parfillskip) 0.0 plus 1.0fil
......\glue(\rightskip) 0.0
-.....\glue(\parskip) 0.0 plus 1.0
-.....\glue(\baselineskip) 5.05556
+.....\kern0.0
+....\glue -167.5
+....\glue -10.0
+....\glue -167.5
+....\write1{\mc at col@status{3}}
+....\vbox(46.0+2.5)x167.5, direction TLT
+.....\glue 0.0 plus -2.0
+.....\glue(\splittopskip) 3.05556 plus 2.0
.....\hbox(6.94444+0.0)x167.5, glue set 0.91997, direction TLT
......\localpar
.......\localinterlinepenalty=0
@@ -1044,14 +1127,9 @@ Completed box being shipped out [1]
......\OT1/cmr/m/n/10 n
......\OT1/cmr/m/n/10 s
......\glue(\rightskip) 0.0
-....\glue -167.5
-....\glue -10.0
-....\glue -167.5
-....\write1{\mc at col@status{3}}
-....\vbox(46.0+0.0)x167.5, glue set 12.0, direction TLT
-.....\glue 0.0 plus -2.0
-.....\glue(\splittopskip) 3.05556 plus 2.0
-.....\hbox(6.94444+0.0)x167.5, glue set 57.05539fil, direction TLT
+.....\penalty 300
+.....\glue(\baselineskip) 4.5
+.....\hbox(7.5+2.5)x167.5, glue set 24.36089fil, direction TLT
......\OT1/cmr/m/n/10 W
......\kern-0.83334 (font)
......\OT1/cmr/m/n/10 e
@@ -1077,14 +1155,23 @@ Completed box being shipped out [1]
......\OT1/cmr/m/n/10 m
......\OT1/cmr/m/n/10 n
......\glue(\spaceskip) 3.33333 plus 1.66666 minus 1.11111
-......\OT1/cmr/m/n/10 L
......\write1{\mc at set@col at status{mc at col-11}{3}}
+......\OT1/cmr/m/n/10 (
+......\OT1/cmr/m/n/10 l
+......\OT1/cmr/m/n/10 a
+......\OT1/cmr/m/n/10 s
+......\OT1/cmr/m/n/10 t
+......\glue(\spaceskip) 3.33333 plus 1.66666 minus 1.11111
+......\OT1/cmr/m/n/10 c
+......\OT1/cmr/m/n/10 o
+......\OT1/cmr/m/n/10 l
+......\OT1/cmr/m/n/10 )
......\OT1/cmr/m/n/10 .
......\penalty 10000
......\glue(\parfillskip) 0.0 plus 1.0fil
......\glue(\rightskip) 0.0
.....\glue(\parskip) 0.0 plus 1.0
-.....\glue(\baselineskip) 5.05556
+.....\glue(\baselineskip) 2.55556
.....\hbox(6.94444+0.0)x167.5, glue set 0.91997, direction TLT
......\localpar
.......\localinterlinepenalty=0
@@ -1130,8 +1217,8 @@ Completed box being shipped out [1]
......\OT1/cmr/m/n/10 s
......\glue(\rightskip) 0.0
.....\penalty 300
-.....\glue(\baselineskip) 5.05556
-.....\hbox(6.94444+0.0)x167.5, glue set 57.05539fil, direction TLT
+.....\glue(\baselineskip) 4.5
+.....\hbox(7.5+2.5)x167.5, glue set 24.36089fil, direction TLT
......\OT1/cmr/m/n/10 W
......\kern-0.83334 (font)
......\OT1/cmr/m/n/10 e
@@ -1157,8 +1244,17 @@ Completed box being shipped out [1]
......\OT1/cmr/m/n/10 m
......\OT1/cmr/m/n/10 n
......\glue(\spaceskip) 3.33333 plus 1.66666 minus 1.11111
-......\OT1/cmr/m/n/10 L
......\write1{\mc at set@col at status{mc at col-12}{3}}
+......\OT1/cmr/m/n/10 (
+......\OT1/cmr/m/n/10 l
+......\OT1/cmr/m/n/10 a
+......\OT1/cmr/m/n/10 s
+......\OT1/cmr/m/n/10 t
+......\glue(\spaceskip) 3.33333 plus 1.66666 minus 1.11111
+......\OT1/cmr/m/n/10 c
+......\OT1/cmr/m/n/10 o
+......\OT1/cmr/m/n/10 l
+......\OT1/cmr/m/n/10 )
......\OT1/cmr/m/n/10 .
......\penalty 10000
......\glue(\parfillskip) 0.0 plus 1.0fil
@@ -1168,7 +1264,7 @@ Completed box being shipped out [1]
....\hbox(4.30554+1.94444)x0.0, glue set - 5.55557fil, direction TLT
.....\hbox(4.30554+1.94444)x5.55557, direction TLT
.....\glue 0.0 plus 1.0fil minus 1.0fil
-...\kern-1.94444
+...\kern-2.5
...\penalty 0
...\penalty 10000
...\penalty 0
@@ -1181,4 +1277,4 @@ Completed box being shipped out [1]
...\glue 0.0 plus 1.0fil
...\OT1/cmr/m/n/10 1
...\glue 0.0 plus 1.0fil
-(tlb-multicol-002.aux)
+(tlb-multicol-004.aux)
diff --git a/required/tools/testfiles/tlb-multicol-002.lvt b/required/tools/testfiles/tlb-multicol-004.lvt
similarity index 92%
copy from required/tools/testfiles/tlb-multicol-002.lvt
copy to required/tools/testfiles/tlb-multicol-004.lvt
index 79f0af7..e5244f5 100644
--- a/required/tools/testfiles/tlb-multicol-002.lvt
+++ b/required/tools/testfiles/tlb-multicol-004.lvt
@@ -8,7 +8,7 @@
% An application of \docolaction. We put the whole wrapfigure into the
% args so that the internal label used is placed after wrapfigure.
-\newcommand\test{\docolaction{F}{M}{L}}
+\newcommand\test{\docolaction*{\columnbreak}{\columnbreak}{(last col)}}
\setlength\columnseprule{.7pt}
@@ -21,6 +21,7 @@
\begin{multicols}{3}
Some text to test column actions We are now in column \test.
+ One extra line in middle column.
Some text to test column actions We are now in column \test.
Some text to test column actions We are now in column \test.
diff --git a/required/tools/testfiles/tlb-multicol-002.tlg b/required/tools/testfiles/tlb-multicol-004.tlg
similarity index 87%
copy from required/tools/testfiles/tlb-multicol-002.tlg
copy to required/tools/testfiles/tlb-multicol-004.tlg
index 9dbbab0..ebfbf3c 100644
--- a/required/tools/testfiles/tlb-multicol-002.tlg
+++ b/required/tools/testfiles/tlb-multicol-004.tlg
@@ -9,12 +9,12 @@ Completed box being shipped out [1]
...\hbox(0.0+0.0)x345.0
..\glue 25.0
..\glue(\lineskip) 0.0
-..\vbox(550.0+0.0)x345.0, glue set 335.96411fil
+..\vbox(550.0+0.0)x345.0, glue set 311.96667fil
...\write-{}
...\glue(\topskip) 0.0
-...\hbox(34.0+1.94444)x345.0, glue set 4.65001fil
+...\hbox(46.0+1.94444)x345.0, glue set 4.65001fil
....\write1{\mc at col@status{1}}
-....\vbox(34.0+0.0)x108.33333
+....\vbox(46.0+0.0)x108.33333
.....\glue 0.0 plus -2.0
.....\glue(\splittopskip) 3.05556 plus 2.0
.....\hbox(6.94444+0.0)x108.33333, glue set - 0.32503
@@ -75,7 +75,7 @@ Completed box being shipped out [1]
......\glue(\rightskip) 0.0
.....\penalty 150
.....\glue(\baselineskip) 5.05556
-.....\hbox(6.94444+0.0)x108.33333, glue set 52.36098fil
+.....\hbox(6.94444+0.0)x108.33333, glue set 58.88878fil
......\OT1/cmr/m/n/10 i
......\OT1/cmr/m/n/10 n
......\glue 3.33333 plus 1.66666 minus 1.11111
@@ -88,21 +88,64 @@ Completed box being shipped out [1]
......\OT1/cmr/m/n/10 m
......\OT1/cmr/m/n/10 n
......\glue 3.33333 plus 1.66666 minus 1.11111
-......\OT1/cmr/m/n/10 F
......\write1{\mc at set@col at status{mc at col-1}{1}}
......\OT1/cmr/m/n/10 .
......\penalty 10000
......\glue(\parfillskip) 0.0 plus 1.0fil
......\glue(\rightskip) 0.0
+.....\kern 0.0
....\glue 0.0 plus 1.0fil minus 1.0fil
....\rule(*+*)x0.7
....\glue 0.0 plus 1.0fil minus 1.0fil
....\write1{\mc at col@status{2}}
-....\vbox(34.0+0.0)x108.33333
+....\vbox(46.0+0.0)x108.33333
.....\glue 0.0 plus -2.0
.....\glue(\splittopskip) 3.05556 plus 2.0
-.....\hbox(6.94444+0.0)x108.33333, glue set - 0.32503
+.....\hbox(6.94444+0.0)x108.33333, glue set - 0.94379
......\hbox(0.0+0.0)x15.0
+......\OT1/cmr/m/n/10 O
+......\OT1/cmr/m/n/10 n
+......\OT1/cmr/m/n/10 e
+......\glue 3.33333 plus 1.66666 minus 1.11111
+......\OT1/cmr/m/n/10 e
+......\OT1/cmr/m/n/10 x
+......\discretionary
+.......\OT1/cmr/m/n/10 -
+......\OT1/cmr/m/n/10 t
+......\OT1/cmr/m/n/10 r
+......\OT1/cmr/m/n/10 a
+......\glue 3.33333 plus 1.66666 minus 1.11111
+......\OT1/cmr/m/n/10 l
+......\OT1/cmr/m/n/10 i
+......\OT1/cmr/m/n/10 n
+......\OT1/cmr/m/n/10 e
+......\glue 3.33333 plus 1.66666 minus 1.11111
+......\OT1/cmr/m/n/10 i
+......\OT1/cmr/m/n/10 n
+......\glue 3.33333 plus 1.66666 minus 1.11111
+......\OT1/cmr/m/n/10 m
+......\OT1/cmr/m/n/10 i
+......\OT1/cmr/m/n/10 d
+......\discretionary
+......\OT1/cmr/m/n/10 -
+......\glue(\rightskip) 0.0
+.....\penalty 250
+.....\glue(\baselineskip) 5.05556
+.....\hbox(6.94444+0.0)x108.33333, glue set - 0.82506
+......\OT1/cmr/m/n/10 d
+......\OT1/cmr/m/n/10 l
+......\OT1/cmr/m/n/10 e
+......\glue 3.33333 plus 1.66666 minus 1.11111
+......\OT1/cmr/m/n/10 c
+......\OT1/cmr/m/n/10 o
+......\OT1/cmr/m/n/10 l
+......\discretionary
+.......\OT1/cmr/m/n/10 -
+......\OT1/cmr/m/n/10 u
+......\OT1/cmr/m/n/10 m
+......\OT1/cmr/m/n/10 n
+......\OT1/cmr/m/n/10 .
+......\glue 4.44444 plus 4.99997 minus 0.37036
......\OT1/cmr/m/n/10 S
......\OT1/cmr/m/n/10 o
......\OT1/cmr/m/n/10 m
@@ -115,7 +158,9 @@ Completed box being shipped out [1]
......\glue 3.33333 plus 1.66666 minus 1.11111
......\OT1/cmr/m/n/10 t
......\OT1/cmr/m/n/10 o
-......\glue 3.33333 plus 1.66666 minus 1.11111
+......\glue(\rightskip) 0.0
+.....\glue(\baselineskip) 5.05556
+.....\hbox(6.94444+0.0)x108.33333, glue set 1.19997
......\OT1/cmr/m/n/10 t
......\OT1/cmr/m/n/10 e
......\OT1/cmr/m/n/10 s
@@ -125,11 +170,7 @@ Completed box being shipped out [1]
......\OT1/cmr/m/n/10 o
......\OT1/cmr/m/n/10 l
......\discretionary
-......\OT1/cmr/m/n/10 -
-......\glue(\rightskip) 0.0
-.....\penalty 250
-.....\glue(\baselineskip) 5.16669
-.....\hbox(6.83331+0.0)x108.33333, glue set 0.02914
+.......\OT1/cmr/m/n/10 -
......\OT1/cmr/m/n/10 u
......\OT1/cmr/m/n/10 m
......\OT1/cmr/m/n/10 n
@@ -147,7 +188,10 @@ Completed box being shipped out [1]
......\OT1/cmr/m/n/10 W
......\kern-0.83334
......\OT1/cmr/m/n/10 e
-......\glue 3.33333 plus 1.66666 minus 1.11111
+......\glue(\rightskip) 0.0
+.....\penalty 150
+.....\glue(\baselineskip) 5.05556
+.....\hbox(6.94444+0.0)x108.33333, glue set 21.36096fil
......\OT1/cmr/m/n/10 a
......\OT1/cmr/m/n/10 r
......\OT1/cmr/m/n/10 e
@@ -156,10 +200,7 @@ Completed box being shipped out [1]
......\OT1/cmr/m/n/10 o
......\kern-0.27779
......\OT1/cmr/m/n/10 w
-......\glue(\rightskip) 0.0
-.....\penalty 150
-.....\glue(\baselineskip) 5.05556
-.....\hbox(6.94444+0.0)x108.33333, glue set 49.72209fil
+......\glue 3.33333 plus 1.66666 minus 1.11111
......\OT1/cmr/m/n/10 i
......\OT1/cmr/m/n/10 n
......\glue 3.33333 plus 1.66666 minus 1.11111
@@ -172,17 +213,17 @@ Completed box being shipped out [1]
......\OT1/cmr/m/n/10 m
......\OT1/cmr/m/n/10 n
......\glue 3.33333 plus 1.66666 minus 1.11111
-......\OT1/cmr/m/n/10 M
......\write1{\mc at set@col at status{mc at col-2}{2}}
......\OT1/cmr/m/n/10 .
......\penalty 10000
......\glue(\parfillskip) 0.0 plus 1.0fil
......\glue(\rightskip) 0.0
+.....\kern 0.0
....\glue 0.0 plus 1.0fil minus 1.0fil
....\rule(*+*)x0.7
....\glue 0.0 plus 1.0fil minus 1.0fil
....\write1{\mc at col@status{3}}
-....\vbox(34.0+0.0)x108.33333
+....\vbox(46.0+0.0)x108.33333, glue set 9.5fil
.....\glue 0.0 plus -2.0
.....\glue(\splittopskip) 3.05556 plus 2.0
.....\hbox(6.94444+0.0)x108.33333, glue set - 0.32503
@@ -242,8 +283,8 @@ Completed box being shipped out [1]
......\OT1/cmr/m/n/10 w
......\glue(\rightskip) 0.0
.....\penalty 150
-.....\glue(\baselineskip) 5.05556
-.....\hbox(6.94444+0.0)x108.33333, glue set 52.63876fil
+.....\glue(\baselineskip) 4.5
+.....\hbox(7.5+2.5)x108.33333, glue set 19.94426fil
......\OT1/cmr/m/n/10 i
......\OT1/cmr/m/n/10 n
......\glue 3.33333 plus 1.66666 minus 1.11111
@@ -256,12 +297,22 @@ Completed box being shipped out [1]
......\OT1/cmr/m/n/10 m
......\OT1/cmr/m/n/10 n
......\glue 3.33333 plus 1.66666 minus 1.11111
-......\OT1/cmr/m/n/10 L
......\write1{\mc at set@col at status{mc at col-3}{3}}
+......\OT1/cmr/m/n/10 (
+......\OT1/cmr/m/n/10 l
+......\OT1/cmr/m/n/10 a
+......\OT1/cmr/m/n/10 s
+......\OT1/cmr/m/n/10 t
+......\glue 3.33333 plus 1.66666 minus 1.11111
+......\OT1/cmr/m/n/10 c
+......\OT1/cmr/m/n/10 o
+......\OT1/cmr/m/n/10 l
+......\OT1/cmr/m/n/10 )
......\OT1/cmr/m/n/10 .
......\penalty 10000
......\glue(\parfillskip) 0.0 plus 1.0fil
......\glue(\rightskip) 0.0
+.....\glue 0.0 plus 1.0fil
....\hbox(4.30554+1.94444)x0.0, glue set - 5.55557fil
.....\hbox(4.30554+1.94444)x5.55557
.....\glue 0.0 plus 1.0fil minus 1.0fil
@@ -274,9 +325,9 @@ Completed box being shipped out [1]
...\penalty 0
...\glue 12.0 plus 4.0 minus 3.0
...\kern 2.0
-...\hbox(34.0+1.94444)x345.0, glue set 4.65001fil
+...\hbox(46.0+2.5)x345.0, glue set 4.65001fil
....\write1{\mc at col@status{1}}
-....\vbox(34.0+0.0)x167.5
+....\vbox(46.0+0.0)x167.5
.....\glue 0.0 plus -2.0
.....\glue(\splittopskip) 3.05556 plus 2.0
.....\hbox(6.94444+0.0)x167.5, glue set 0.91997
@@ -320,7 +371,7 @@ Completed box being shipped out [1]
......\glue(\rightskip) 0.0
.....\penalty 300
.....\glue(\baselineskip) 5.05556
-.....\hbox(6.94444+0.0)x167.5, glue set 56.7776fil
+.....\hbox(6.94444+0.0)x167.5, glue set 63.3054fil
......\OT1/cmr/m/n/10 W
......\kern-0.83334
......\OT1/cmr/m/n/10 e
@@ -346,14 +397,19 @@ Completed box being shipped out [1]
......\OT1/cmr/m/n/10 m
......\OT1/cmr/m/n/10 n
......\glue 3.33333 plus 1.66666 minus 1.11111
-......\OT1/cmr/m/n/10 F
......\write1{\mc at set@col at status{mc at col-4}{1}}
......\OT1/cmr/m/n/10 .
......\penalty 10000
......\glue(\parfillskip) 0.0 plus 1.0fil
......\glue(\rightskip) 0.0
-.....\glue(\parskip) 0.0 plus 1.0
-.....\glue(\baselineskip) 5.05556
+.....\kern 0.0
+....\glue 0.0 plus 1.0fil minus 1.0fil
+....\rule(*+*)x0.7
+....\glue 0.0 plus 1.0fil minus 1.0fil
+....\write1{\mc at col@status{3}}
+....\vbox(46.0+2.5)x167.5
+.....\glue 0.0 plus -2.0
+.....\glue(\splittopskip) 3.05556 plus 2.0
.....\hbox(6.94444+0.0)x167.5, glue set 0.91997
......\hbox(0.0+0.0)x15.0
......\OT1/cmr/m/n/10 S
@@ -393,14 +449,9 @@ Completed box being shipped out [1]
......\OT1/cmr/m/n/10 n
......\OT1/cmr/m/n/10 s
......\glue(\rightskip) 0.0
-....\glue 0.0 plus 1.0fil minus 1.0fil
-....\rule(*+*)x0.7
-....\glue 0.0 plus 1.0fil minus 1.0fil
-....\write1{\mc at col@status{3}}
-....\vbox(34.0+0.0)x167.5
-.....\glue 0.0 plus -2.0
-.....\glue(\splittopskip) 3.05556 plus 2.0
-.....\hbox(6.94444+0.0)x167.5, glue set 57.05539fil
+.....\penalty 300
+.....\glue(\baselineskip) 4.5
+.....\hbox(7.5+2.5)x167.5, glue set 24.36089fil
......\OT1/cmr/m/n/10 W
......\kern-0.83334
......\OT1/cmr/m/n/10 e
@@ -426,14 +477,23 @@ Completed box being shipped out [1]
......\OT1/cmr/m/n/10 m
......\OT1/cmr/m/n/10 n
......\glue 3.33333 plus 1.66666 minus 1.11111
-......\OT1/cmr/m/n/10 L
......\write1{\mc at set@col at status{mc at col-5}{3}}
+......\OT1/cmr/m/n/10 (
+......\OT1/cmr/m/n/10 l
+......\OT1/cmr/m/n/10 a
+......\OT1/cmr/m/n/10 s
+......\OT1/cmr/m/n/10 t
+......\glue 3.33333 plus 1.66666 minus 1.11111
+......\OT1/cmr/m/n/10 c
+......\OT1/cmr/m/n/10 o
+......\OT1/cmr/m/n/10 l
+......\OT1/cmr/m/n/10 )
......\OT1/cmr/m/n/10 .
......\penalty 10000
......\glue(\parfillskip) 0.0 plus 1.0fil
......\glue(\rightskip) 0.0
.....\glue(\parskip) 0.0 plus 1.0
-.....\glue(\baselineskip) 5.05556
+.....\glue(\baselineskip) 2.55556
.....\hbox(6.94444+0.0)x167.5, glue set 0.91997
......\hbox(0.0+0.0)x15.0
......\OT1/cmr/m/n/10 S
@@ -474,8 +534,8 @@ Completed box being shipped out [1]
......\OT1/cmr/m/n/10 s
......\glue(\rightskip) 0.0
.....\penalty 300
-.....\glue(\baselineskip) 5.05556
-.....\hbox(6.94444+0.0)x167.5, glue set 57.05539fil
+.....\glue(\baselineskip) 4.5
+.....\hbox(7.5+2.5)x167.5, glue set 24.36089fil
......\OT1/cmr/m/n/10 W
......\kern-0.83334
......\OT1/cmr/m/n/10 e
@@ -501,8 +561,17 @@ Completed box being shipped out [1]
......\OT1/cmr/m/n/10 m
......\OT1/cmr/m/n/10 n
......\glue 3.33333 plus 1.66666 minus 1.11111
-......\OT1/cmr/m/n/10 L
......\write1{\mc at set@col at status{mc at col-6}{3}}
+......\OT1/cmr/m/n/10 (
+......\OT1/cmr/m/n/10 l
+......\OT1/cmr/m/n/10 a
+......\OT1/cmr/m/n/10 s
+......\OT1/cmr/m/n/10 t
+......\glue 3.33333 plus 1.66666 minus 1.11111
+......\OT1/cmr/m/n/10 c
+......\OT1/cmr/m/n/10 o
+......\OT1/cmr/m/n/10 l
+......\OT1/cmr/m/n/10 )
......\OT1/cmr/m/n/10 .
......\penalty 10000
......\glue(\parfillskip) 0.0 plus 1.0fil
@@ -510,7 +579,7 @@ Completed box being shipped out [1]
....\hbox(4.30554+1.94444)x0.0, glue set - 5.55557fil
.....\hbox(4.30554+1.94444)x5.55557
.....\glue 0.0 plus 1.0fil minus 1.0fil
-...\kern -1.94444
+...\kern -2.5
...\penalty 0
...\penalty 10000
...\penalty 0
@@ -621,7 +690,7 @@ Completed box being shipped out [1]
......\glue(\rightskip) 0.0
.....\penalty 150
.....\glue(\baselineskip) 5.05556
-.....\hbox(6.94444+0.0)x108.33333, glue set 31.52762fil
+.....\hbox(6.94444+0.0)x108.33333, glue set 38.05542fil
......\OT1/cmr/m/n/10 n
......\OT1/cmr/m/n/10 o
......\kern-0.27779
@@ -639,12 +708,12 @@ Completed box being shipped out [1]
......\OT1/cmr/m/n/10 m
......\OT1/cmr/m/n/10 n
......\glue 3.33333 plus 1.66666 minus 1.11111
-......\OT1/cmr/m/n/10 F
......\write1{\mc at set@col at status{mc at col-7}{1}}
......\OT1/cmr/m/n/10 .
......\penalty 10000
......\glue(\parfillskip) 0.0 plus 1.0fil
......\glue(\rightskip) 0.0
+.....\kern 0.0
....\glue -108.33333
....\glue -10.0
....\glue -108.33333
@@ -710,7 +779,7 @@ Completed box being shipped out [1]
......\glue(\rightskip) 0.0
.....\penalty 150
.....\glue(\baselineskip) 5.05556
-.....\hbox(6.94444+0.0)x108.33333, glue set 49.72209fil
+.....\hbox(6.94444+0.0)x108.33333, glue set 58.88878fil
......\OT1/cmr/m/n/10 i
......\OT1/cmr/m/n/10 n
......\glue 3.33333 plus 1.66666 minus 1.11111
@@ -723,14 +792,19 @@ Completed box being shipped out [1]
......\OT1/cmr/m/n/10 m
......\OT1/cmr/m/n/10 n
......\glue 3.33333 plus 1.66666 minus 1.11111
-......\OT1/cmr/m/n/10 M
......\write1{\mc at set@col at status{mc at col-8}{2}}
......\OT1/cmr/m/n/10 .
......\penalty 10000
......\glue(\parfillskip) 0.0 plus 1.0fil
......\glue(\rightskip) 0.0
-.....\glue(\parskip) 0.0 plus 1.0
-.....\glue(\baselineskip) 5.05556
+.....\kern 0.0
+....\glue -108.33333
+....\glue -10.0
+....\glue -108.33333
+....\write1{\mc at col@status{3}}
+....\vbox(46.0+0.0)x108.33333, glue set 9.5fil
+.....\glue 0.0 plus -2.0
+.....\glue(\splittopskip) 3.05556 plus 2.0
.....\hbox(6.94444+0.0)x108.33333, glue set - 0.32503
......\hbox(0.0+0.0)x15.0
......\OT1/cmr/m/n/10 S
@@ -757,13 +831,8 @@ Completed box being shipped out [1]
......\discretionary
......\OT1/cmr/m/n/10 -
......\glue(\rightskip) 0.0
-....\glue -108.33333
-....\glue -10.0
-....\glue -108.33333
-....\write1{\mc at col@status{3}}
-....\vbox(46.0+0.0)x108.33333, glue set 24.0fil
-.....\glue 0.0 plus -2.0
-.....\glue(\splittopskip) 3.16669 plus 2.0
+.....\penalty 250
+.....\glue(\baselineskip) 5.16669
.....\hbox(6.83331+0.0)x108.33333, glue set 0.02914
......\OT1/cmr/m/n/10 u
......\OT1/cmr/m/n/10 m
@@ -793,8 +862,8 @@ Completed box being shipped out [1]
......\OT1/cmr/m/n/10 w
......\glue(\rightskip) 0.0
.....\penalty 150
-.....\glue(\baselineskip) 5.05556
-.....\hbox(6.94444+0.0)x108.33333, glue set 52.63876fil
+.....\glue(\baselineskip) 4.5
+.....\hbox(7.5+2.5)x108.33333, glue set 19.94426fil
......\OT1/cmr/m/n/10 i
......\OT1/cmr/m/n/10 n
......\glue 3.33333 plus 1.66666 minus 1.11111
@@ -807,8 +876,17 @@ Completed box being shipped out [1]
......\OT1/cmr/m/n/10 m
......\OT1/cmr/m/n/10 n
......\glue 3.33333 plus 1.66666 minus 1.11111
-......\OT1/cmr/m/n/10 L
......\write1{\mc at set@col at status{mc at col-9}{3}}
+......\OT1/cmr/m/n/10 (
+......\OT1/cmr/m/n/10 l
+......\OT1/cmr/m/n/10 a
+......\OT1/cmr/m/n/10 s
+......\OT1/cmr/m/n/10 t
+......\glue 3.33333 plus 1.66666 minus 1.11111
+......\OT1/cmr/m/n/10 c
+......\OT1/cmr/m/n/10 o
+......\OT1/cmr/m/n/10 l
+......\OT1/cmr/m/n/10 )
......\OT1/cmr/m/n/10 .
......\penalty 10000
......\glue(\parfillskip) 0.0 plus 1.0fil
@@ -828,7 +906,7 @@ Completed box being shipped out [1]
...\penalty 0
...\glue 12.0 plus 4.0 minus 3.0
...\kern 2.0
-...\hbox(46.0+1.94444)x345.0, glue set 4.65001fil
+...\hbox(46.0+2.5)x345.0, glue set 4.65001fil
....\glue 167.5
....\glue 0.0 plus 1.0fil minus 1.0fil
....\rule(*+*)x0.7
@@ -929,7 +1007,7 @@ Completed box being shipped out [1]
......\glue(\rightskip) 0.0
.....\penalty 150
.....\glue(\baselineskip) 5.05556
-.....\hbox(6.94444+0.0)x167.5, glue set 111.52765fil
+.....\hbox(6.94444+0.0)x167.5, glue set 118.05545fil
......\OT1/cmr/m/n/10 i
......\OT1/cmr/m/n/10 n
......\glue 3.33333 plus 1.66666 minus 1.11111
@@ -942,14 +1020,19 @@ Completed box being shipped out [1]
......\OT1/cmr/m/n/10 m
......\OT1/cmr/m/n/10 n
......\glue 3.33333 plus 1.66666 minus 1.11111
-......\OT1/cmr/m/n/10 F
......\write1{\mc at set@col at status{mc at col-10}{1}}
......\OT1/cmr/m/n/10 .
......\penalty 10000
......\glue(\parfillskip) 0.0 plus 1.0fil
......\glue(\rightskip) 0.0
-.....\glue(\parskip) 0.0 plus 1.0
-.....\glue(\baselineskip) 5.05556
+.....\kern 0.0
+....\glue -167.5
+....\glue -10.0
+....\glue -167.5
+....\write1{\mc at col@status{3}}
+....\vbox(46.0+2.5)x167.5
+.....\glue 0.0 plus -2.0
+.....\glue(\splittopskip) 3.05556 plus 2.0
.....\hbox(6.94444+0.0)x167.5, glue set 0.91997
......\hbox(0.0+0.0)x15.0
......\OT1/cmr/m/n/10 S
@@ -989,14 +1072,9 @@ Completed box being shipped out [1]
......\OT1/cmr/m/n/10 n
......\OT1/cmr/m/n/10 s
......\glue(\rightskip) 0.0
-....\glue -167.5
-....\glue -10.0
-....\glue -167.5
-....\write1{\mc at col@status{3}}
-....\vbox(46.0+0.0)x167.5, glue set 12.0
-.....\glue 0.0 plus -2.0
-.....\glue(\splittopskip) 3.05556 plus 2.0
-.....\hbox(6.94444+0.0)x167.5, glue set 57.05539fil
+.....\penalty 300
+.....\glue(\baselineskip) 4.5
+.....\hbox(7.5+2.5)x167.5, glue set 24.36089fil
......\OT1/cmr/m/n/10 W
......\kern-0.83334
......\OT1/cmr/m/n/10 e
@@ -1022,14 +1100,23 @@ Completed box being shipped out [1]
......\OT1/cmr/m/n/10 m
......\OT1/cmr/m/n/10 n
......\glue 3.33333 plus 1.66666 minus 1.11111
-......\OT1/cmr/m/n/10 L
......\write1{\mc at set@col at status{mc at col-11}{3}}
+......\OT1/cmr/m/n/10 (
+......\OT1/cmr/m/n/10 l
+......\OT1/cmr/m/n/10 a
+......\OT1/cmr/m/n/10 s
+......\OT1/cmr/m/n/10 t
+......\glue 3.33333 plus 1.66666 minus 1.11111
+......\OT1/cmr/m/n/10 c
+......\OT1/cmr/m/n/10 o
+......\OT1/cmr/m/n/10 l
+......\OT1/cmr/m/n/10 )
......\OT1/cmr/m/n/10 .
......\penalty 10000
......\glue(\parfillskip) 0.0 plus 1.0fil
......\glue(\rightskip) 0.0
.....\glue(\parskip) 0.0 plus 1.0
-.....\glue(\baselineskip) 5.05556
+.....\glue(\baselineskip) 2.55556
.....\hbox(6.94444+0.0)x167.5, glue set 0.91997
......\hbox(0.0+0.0)x15.0
......\OT1/cmr/m/n/10 S
@@ -1070,8 +1157,8 @@ Completed box being shipped out [1]
......\OT1/cmr/m/n/10 s
......\glue(\rightskip) 0.0
.....\penalty 300
-.....\glue(\baselineskip) 5.05556
-.....\hbox(6.94444+0.0)x167.5, glue set 57.05539fil
+.....\glue(\baselineskip) 4.5
+.....\hbox(7.5+2.5)x167.5, glue set 24.36089fil
......\OT1/cmr/m/n/10 W
......\kern-0.83334
......\OT1/cmr/m/n/10 e
@@ -1097,8 +1184,17 @@ Completed box being shipped out [1]
......\OT1/cmr/m/n/10 m
......\OT1/cmr/m/n/10 n
......\glue 3.33333 plus 1.66666 minus 1.11111
-......\OT1/cmr/m/n/10 L
......\write1{\mc at set@col at status{mc at col-12}{3}}
+......\OT1/cmr/m/n/10 (
+......\OT1/cmr/m/n/10 l
+......\OT1/cmr/m/n/10 a
+......\OT1/cmr/m/n/10 s
+......\OT1/cmr/m/n/10 t
+......\glue 3.33333 plus 1.66666 minus 1.11111
+......\OT1/cmr/m/n/10 c
+......\OT1/cmr/m/n/10 o
+......\OT1/cmr/m/n/10 l
+......\OT1/cmr/m/n/10 )
......\OT1/cmr/m/n/10 .
......\penalty 10000
......\glue(\parfillskip) 0.0 plus 1.0fil
@@ -1108,7 +1204,7 @@ Completed box being shipped out [1]
....\hbox(4.30554+1.94444)x0.0, glue set - 5.55557fil
.....\hbox(4.30554+1.94444)x5.55557
.....\glue 0.0 plus 1.0fil minus 1.0fil
-...\kern -1.94444
+...\kern -2.5
...\penalty 0
...\penalty 10000
...\penalty 0
@@ -1121,4 +1217,4 @@ Completed box being shipped out [1]
...\glue 0.0 plus 1.0fil
...\OT1/cmr/m/n/10 1
...\glue 0.0 plus 1.0fil
-(tlb-multicol-002.aux)
+(tlb-multicol-004.aux)
More information about the latex3-commits
mailing list