[latex3-commits] [git/LaTeX3-latex3-latex2e] master: fix for issue/39 (b087fd3)
Frank Mittelbach
frank.mittelbach at latex-project.org
Fri Apr 20 20:55:33 CEST 2018
Repository : https://github.com/latex3/latex2e
On branch : master
Link : https://github.com/latex3/latex2e/commit/b087fd319cbdb6845e74b1ad2e136d6578adb4e1
>---------------------------------------------------------------
commit b087fd319cbdb6845e74b1ad2e136d6578adb4e1
Author: Frank Mittelbach <frank.mittelbach at latex-project.org>
Date: Fri Apr 20 20:55:33 2018 +0200
fix for issue/39
>---------------------------------------------------------------
b087fd319cbdb6845e74b1ad2e136d6578adb4e1
required/tools/changes.txt | 6 +
required/tools/multicol.dtx | 12 +-
required/tools/testfiles/github-0039.lvt | 44 ++++
required/tools/testfiles/github-0039.tlg | 345 ++++++++++++++++++++++++++++++
4 files changed, 404 insertions(+), 3 deletions(-)
diff --git a/required/tools/changes.txt b/required/tools/changes.txt
index 58324da..a18fa53 100644
--- a/required/tools/changes.txt
+++ b/required/tools/changes.txt
@@ -5,6 +5,12 @@ completeness or accuracy and it contains some references to files that
are not part of the distribution.
=======================================================================
+2018-04-20 Frank Mittelbach <Frank.Mittelbach at latex-project.org>
+
+ * multicol.dtx: restoring column status when leaving a boxed
+ multicols so that any further \docolaction will know the
+ currect column (issue/39)
+
2018-04-07 Frank Mittelbach <Frank.Mittelbach at latex-project.org>
* array.dtx: Renamed internal \mcell at box to
diff --git a/required/tools/multicol.dtx b/required/tools/multicol.dtx
index 4da6dbd..b347d3e 100644
--- a/required/tools/multicol.dtx
+++ b/required/tools/multicol.dtx
@@ -98,7 +98,7 @@
%<driver> \ProvidesFile{multicol.drv}
% \fi
% \ProvidesFile{multicol.dtx}
- [2018/04/01 v1.8r multicolumn formatting (FMi)]
+ [2018/04/20 v1.8s multicolumn formatting (FMi)]
%
%
%%
@@ -1845,9 +1845,15 @@
\global\c at unbalance\z@
% \end{macrocode}
% Now it's time to return any footnotes if we are in unrestricted
-% mode:
+% mode. In boxed mode footnotes are kept inside, but in that case
+% we have to write another column status into the \texttt{.aux}
+% file to support \cs{docolaction} in case we have nested
+% environments.
+% \changes{v1.8s}{2018/04/20}{Support for \cs{docolaction} (issue/39)}
% \begin{macrocode}
- \if at boxedmulticols\else
+ \if at boxedmulticols
+ \mc at col@status at write
+ \else
\reinsert at footnotes
% \end{macrocode}
% We also take a look at the amount of free space on the current
diff --git a/required/tools/testfiles/github-0039.lvt b/required/tools/testfiles/github-0039.lvt
new file mode 100644
index 0000000..c4b895b
--- /dev/null
+++ b/required/tools/testfiles/github-0039.lvt
@@ -0,0 +1,44 @@
+% https://github.com/latex3/latex2e/issues/39
+
+\documentclass[a4paper]{article}
+\usepackage[colaction]{multicol}
+
+\input{test2e}
+
+\makeatletter
+\def\printNumberColumn{%
+\typeout{Status: \the\mc at col@check at num\space = \csname mc at col@type\endcsname}%
+\docolaction{\textbf{col 1}\typeout{col 1}}{}{\textbf{col 2}\typeout{col 2}}
+}
+\makeatother
+
+\setlength\columnseprule{0.4pt}
+
+\def\xxxxx{%
+Test Test Test Test Test Test Test Test
+}
+
+\begin{document}
+
+\START
+
+\begin{multicols}{2}
+\printNumberColumn\par\xxxxx\xxxxx\xxxxx\xxxxx\xxxxx
+\printNumberColumn\par\xxxxx\xxxxx\xxxxx\xxxxx\xxxxx
+\begin{multicols}{2}
+\printNumberColumn\par\xxxxx\xxxxx\xxxxx\xxxxx
+\printNumberColumn\par\xxxxx\xxxxx\xxxxx
+\end{multicols}
+\printNumberColumn\par\xxxxx\xxxxx\xxxxx\xxxxx\xxxxx
+\printNumberColumn\par\xxxxx\xxxxx\xxxxx\xxxxx\xxxxx
+\printNumberColumn\par\xxxxx\xxxxx\xxxxx\xxxxx\xxxxx
+\printNumberColumn\par\xxxxx\xxxxx\xxxxx\xxxxx\xxxxx
+\printNumberColumn\par\xxxxx\xxxxx\xxxxx\xxxxx\xxxxx
+\printNumberColumn\par\xxxxx\xxxxx\xxxxx\xxxxx\xxxxx
+\printNumberColumn\par\xxxxx\xxxxx\xxxxx\xxxxx\xxxxx
+\printNumberColumn\par\xxxxx\xxxxx\xxxxx\xxxxx\xxxxx
+\printNumberColumn\par\xxxxx\xxxxx\xxxxx\xxxxx\xxxxx
+\end{multicols}
+
+\end{document}
+
diff --git a/required/tools/testfiles/github-0039.tlg b/required/tools/testfiles/github-0039.tlg
new file mode 100644
index 0000000..a2a8b52
--- /dev/null
+++ b/required/tools/testfiles/github-0039.tlg
@@ -0,0 +1,345 @@
+This is a generated file for the LaTeX2e validation system.
+Don't change this file in any respect.
+Status: 0 = \mc at col@type
+col 1
+Status: 1 = 1
+col 1
+Status: 2 = 1
+col 1
+Status: 3 = 1
+col 2
+Underfull \hbox (badness 10000) in paragraph at lines 29--30
+\OT1/cmr/m/n/10 Test Test Test
+\hbox(6.83331+0.0)x78.75, glue set 4.82503
+.\OT1/cmr/m/n/10 T
+.\kern-0.83334
+.\OT1/cmr/m/n/10 e
+.\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 T
+.\kern-0.83334
+.\OT1/cmr/m/n/10 e
+.\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 T
+.\kern-0.83334
+.\OT1/cmr/m/n/10 e
+.\OT1/cmr/m/n/10 s
+.\OT1/cmr/m/n/10 t
+.\glue(\rightskip) 0.0
+Underfull \hbox (badness 10000) in paragraph at lines 29--30
+\OT1/cmr/m/n/10 Test Test Test
+\hbox(6.83331+0.0)x78.75, glue set 4.82503
+.\OT1/cmr/m/n/10 T
+.\kern-0.83334
+.\OT1/cmr/m/n/10 e
+.\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 T
+.\kern-0.83334
+.\OT1/cmr/m/n/10 e
+.\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 T
+.\kern-0.83334
+.\OT1/cmr/m/n/10 e
+.\OT1/cmr/m/n/10 s
+.\OT1/cmr/m/n/10 t
+.\glue(\rightskip) 0.0
+Underfull \hbox (badness 10000) in paragraph at lines 29--30
+\OT1/cmr/m/n/10 Test Test Test
+\hbox(6.83331+0.0)x78.75, glue set 4.82503
+.\OT1/cmr/m/n/10 T
+.\kern-0.83334
+.\OT1/cmr/m/n/10 e
+.\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 T
+.\kern-0.83334
+.\OT1/cmr/m/n/10 e
+.\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 T
+.\kern-0.83334
+.\OT1/cmr/m/n/10 e
+.\OT1/cmr/m/n/10 s
+.\OT1/cmr/m/n/10 t
+.\glue(\rightskip) 0.0
+Underfull \hbox (badness 10000) in paragraph at lines 29--30
+\OT1/cmr/m/n/10 Test Test Test
+\hbox(6.83331+0.0)x78.75, glue set 4.82503
+.\OT1/cmr/m/n/10 T
+.\kern-0.83334
+.\OT1/cmr/m/n/10 e
+.\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 T
+.\kern-0.83334
+.\OT1/cmr/m/n/10 e
+.\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 T
+.\kern-0.83334
+.\OT1/cmr/m/n/10 e
+.\OT1/cmr/m/n/10 s
+.\OT1/cmr/m/n/10 t
+.\glue(\rightskip) 0.0
+Underfull \hbox (badness 10000) in paragraph at lines 29--30
+\OT1/cmr/m/n/10 Test Test Test
+\hbox(6.83331+0.0)x78.75, glue set 4.82503
+.\OT1/cmr/m/n/10 T
+.\kern-0.83334
+.\OT1/cmr/m/n/10 e
+.\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 T
+.\kern-0.83334
+.\OT1/cmr/m/n/10 e
+.\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 T
+.\kern-0.83334
+.\OT1/cmr/m/n/10 e
+.\OT1/cmr/m/n/10 s
+.\OT1/cmr/m/n/10 t
+.\glue(\rightskip) 0.0
+Underfull \hbox (badness 10000) in paragraph at lines 29--30
+\OT1/cmr/m/n/10 Test Test Test
+\hbox(6.83331+0.0)x78.75, glue set 4.82503
+.\OT1/cmr/m/n/10 T
+.\kern-0.83334
+.\OT1/cmr/m/n/10 e
+.\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 T
+.\kern-0.83334
+.\OT1/cmr/m/n/10 e
+.\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 T
+.\kern-0.83334
+.\OT1/cmr/m/n/10 e
+.\OT1/cmr/m/n/10 s
+.\OT1/cmr/m/n/10 t
+.\glue(\rightskip) 0.0
+Underfull \hbox (badness 10000) in paragraph at lines 29--30
+\OT1/cmr/m/n/10 Test Test Test
+\hbox(6.83331+0.0)x78.75, glue set 4.82503
+.\OT1/cmr/m/n/10 T
+.\kern-0.83334
+.\OT1/cmr/m/n/10 e
+.\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 T
+.\kern-0.83334
+.\OT1/cmr/m/n/10 e
+.\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 T
+.\kern-0.83334
+.\OT1/cmr/m/n/10 e
+.\OT1/cmr/m/n/10 s
+.\OT1/cmr/m/n/10 t
+.\glue(\rightskip) 0.0
+Underfull \hbox (badness 10000) in paragraph at lines 29--30
+\OT1/cmr/m/n/10 Test Test Test
+\hbox(6.83331+0.0)x78.75, glue set 4.82503
+.\OT1/cmr/m/n/10 T
+.\kern-0.83334
+.\OT1/cmr/m/n/10 e
+.\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 T
+.\kern-0.83334
+.\OT1/cmr/m/n/10 e
+.\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 T
+.\kern-0.83334
+.\OT1/cmr/m/n/10 e
+.\OT1/cmr/m/n/10 s
+.\OT1/cmr/m/n/10 t
+.\glue(\rightskip) 0.0
+Underfull \hbox (badness 10000) in paragraph at lines 29--30
+\OT1/cmr/m/n/10 Test Test Test
+\hbox(6.83331+0.0)x78.75, glue set 4.82503
+.\OT1/cmr/m/n/10 T
+.\kern-0.83334
+.\OT1/cmr/m/n/10 e
+.\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 T
+.\kern-0.83334
+.\OT1/cmr/m/n/10 e
+.\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 T
+.\kern-0.83334
+.\OT1/cmr/m/n/10 e
+.\OT1/cmr/m/n/10 s
+.\OT1/cmr/m/n/10 t
+.\glue(\rightskip) 0.0
+Underfull \hbox (badness 10000) in paragraph at lines 30--31
+\OT1/cmr/m/n/10 Test Test Test
+\hbox(6.83331+0.0)x78.75, glue set 4.82503
+.\OT1/cmr/m/n/10 T
+.\kern-0.83334
+.\OT1/cmr/m/n/10 e
+.\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 T
+.\kern-0.83334
+.\OT1/cmr/m/n/10 e
+.\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 T
+.\kern-0.83334
+.\OT1/cmr/m/n/10 e
+.\OT1/cmr/m/n/10 s
+.\OT1/cmr/m/n/10 t
+.\glue(\rightskip) 0.0
+Underfull \hbox (badness 10000) in paragraph at lines 30--31
+\OT1/cmr/m/n/10 Test Test Test
+\hbox(6.83331+0.0)x78.75, glue set 4.82503
+.\OT1/cmr/m/n/10 T
+.\kern-0.83334
+.\OT1/cmr/m/n/10 e
+.\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 T
+.\kern-0.83334
+.\OT1/cmr/m/n/10 e
+.\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 T
+.\kern-0.83334
+.\OT1/cmr/m/n/10 e
+.\OT1/cmr/m/n/10 s
+.\OT1/cmr/m/n/10 t
+.\glue(\rightskip) 0.0
+Underfull \hbox (badness 10000) in paragraph at lines 30--31
+\OT1/cmr/m/n/10 Test Test Test
+\hbox(6.83331+0.0)x78.75, glue set 4.82503
+.\OT1/cmr/m/n/10 T
+.\kern-0.83334
+.\OT1/cmr/m/n/10 e
+.\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 T
+.\kern-0.83334
+.\OT1/cmr/m/n/10 e
+.\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 T
+.\kern-0.83334
+.\OT1/cmr/m/n/10 e
+.\OT1/cmr/m/n/10 s
+.\OT1/cmr/m/n/10 t
+.\glue(\rightskip) 0.0
+Underfull \hbox (badness 10000) in paragraph at lines 30--31
+\OT1/cmr/m/n/10 Test Test Test
+\hbox(6.83331+0.0)x78.75, glue set 4.82503
+.\OT1/cmr/m/n/10 T
+.\kern-0.83334
+.\OT1/cmr/m/n/10 e
+.\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 T
+.\kern-0.83334
+.\OT1/cmr/m/n/10 e
+.\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 T
+.\kern-0.83334
+.\OT1/cmr/m/n/10 e
+.\OT1/cmr/m/n/10 s
+.\OT1/cmr/m/n/10 t
+.\glue(\rightskip) 0.0
+Underfull \hbox (badness 10000) in paragraph at lines 30--31
+\OT1/cmr/m/n/10 Test Test Test
+\hbox(6.83331+0.0)x78.75, glue set 4.82503
+.\OT1/cmr/m/n/10 T
+.\kern-0.83334
+.\OT1/cmr/m/n/10 e
+.\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 T
+.\kern-0.83334
+.\OT1/cmr/m/n/10 e
+.\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 T
+.\kern-0.83334
+.\OT1/cmr/m/n/10 e
+.\OT1/cmr/m/n/10 s
+.\OT1/cmr/m/n/10 t
+.\glue(\rightskip) 0.0
+Underfull \hbox (badness 10000) in paragraph at lines 30--31
+\OT1/cmr/m/n/10 Test Test Test
+\hbox(6.83331+0.0)x78.75, glue set 4.82503
+.\OT1/cmr/m/n/10 T
+.\kern-0.83334
+.\OT1/cmr/m/n/10 e
+.\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 T
+.\kern-0.83334
+.\OT1/cmr/m/n/10 e
+.\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 T
+.\kern-0.83334
+.\OT1/cmr/m/n/10 e
+.\OT1/cmr/m/n/10 s
+.\OT1/cmr/m/n/10 t
+.\glue(\rightskip) 0.0
+Status: 4 = 1
+col 1
+Status: 5 = 1
+col 1
+Status: 6 = 1
+col 1
+Status: 7 = 1
+col 2
+Status: 8 = 3
+col 2
+Status: 9 = 3
+col 2
+Status: 10 = 3
+col 2
+Status: 11 = 3
+col 2
+Status: 12 = 3
+col 2
+[1
+] (github-0039.aux)
More information about the latex3-commits
mailing list