summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source/latex/tools
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2018-04-29 23:33:08 +0000
committerKarl Berry <karl@freefriends.org>2018-04-29 23:33:08 +0000
commiteca3f5fdf6c224e5d2294694df10e49b281dd9c4 (patch)
treea2f78741d7434a8d9396d07f2b360523c42d524c /Master/texmf-dist/source/latex/tools
parent46a67949b248f35d9e46a1f6236cf5bb014fb5b3 (diff)
latex2e (24apr18)
git-svn-id: svn://tug.org/texlive/trunk@47500 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source/latex/tools')
-rw-r--r--Master/texmf-dist/source/latex/tools/multicol.dtx12
1 files changed, 9 insertions, 3 deletions
diff --git a/Master/texmf-dist/source/latex/tools/multicol.dtx b/Master/texmf-dist/source/latex/tools/multicol.dtx
index 4da6dbd38d8..b347d3e80b5 100644
--- a/Master/texmf-dist/source/latex/tools/multicol.dtx
+++ b/Master/texmf-dist/source/latex/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@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@boxedmulticols\else
+ \if@boxedmulticols
+ \mc@col@status@write
+ \else
\reinsert@footnotes
% \end{macrocode}
% We also take a look at the amount of free space on the current