summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/tools/multicol.sty
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2018-12-11 22:32:49 +0000
committerKarl Berry <karl@freefriends.org>2018-12-11 22:32:49 +0000
commitb8f67cb908880c8fdf6b03eb9c4d5219d7409171 (patch)
tree87574d214a3f39e7293bc54e2b40076ae052bed3 /Master/texmf-dist/tex/latex/tools/multicol.sty
parent6ffd766f7627989e12bfb89d63f908de8c052c81 (diff)
latex(2e) (11dec18)
git-svn-id: svn://tug.org/texlive/trunk@49390 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/tools/multicol.sty')
-rw-r--r--Master/texmf-dist/tex/latex/tools/multicol.sty29
1 files changed, 18 insertions, 11 deletions
diff --git a/Master/texmf-dist/tex/latex/tools/multicol.sty b/Master/texmf-dist/tex/latex/tools/multicol.sty
index af85baa4a4a..a8548dc89ea 100644
--- a/Master/texmf-dist/tex/latex/tools/multicol.sty
+++ b/Master/texmf-dist/tex/latex/tools/multicol.sty
@@ -107,7 +107,7 @@
\DeclareCurrentRelease{}{2018-04-01}
\ProvidesPackage{multicol}
- [2018/04/20 v1.8s multicolumn formatting (FMi)]
+ [2018/11/09 v1.8u multicolumn formatting (FMi)]
%%
\DeclareOption{twocolumn}
{\PackageWarning{multicol}{May not work
@@ -941,8 +941,8 @@
not make sense.\MessageBreak
Going to balance anyway}%
\else
- \let\balance@columns@out
- \multi@column@out
+ \def\balance@columns@out
+ {\multi@column@out \penalty-\@Mvi }%
\fi
\begin{multicols}
}
@@ -1022,7 +1022,7 @@
\LRmulticolcolumns
\newcount\mc@col@check@num
-\newcommand\docolaction[4][1]{%
+\newcommand\docolaction{%
\ifx\mc@col@status@write\relax
\PackageError{multicol}%
{Option 'colaction' not selected}%
@@ -1037,7 +1037,17 @@
0\else
\csname mc@col-\the\mc@col@check@num
\endcsname
- \fi}%
+ \fi}%
+ \@ifstar
+ {\@docolactionstartrue \@docolaction}%
+ {\@docolactionstarfalse\@docolaction}%
+}
+\newcommand\@docolaction[4][1]{%
+ \edef\@docolactioncheck{\write\@auxout
+ {\string\mc@set@col@status
+ {mc@col-\the\mc@col@check@num}%
+ {\mc@col@type}}}%
+ \if@docolactionstar \@docolactioncheck \fi
\ifcase \mc@col@type\relax
\ifcase #1\or #2\or#3\or#4\fi
\or
@@ -1047,14 +1057,11 @@
\or
#4% % 3 last col
\else
- \ERROR
+ \ERRORwrongdefaultgiven
\fi
- \edef\next{\write\@auxout
- {\string\mc@set@col@status
- {mc@col-\the\mc@col@check@num}%
- {\mc@col@type}}}%
- \next
+ \if@docolactionstar \else \@docolactioncheck \fi
}
+\newif\if@docolactionstar
\def\mc@col@status#1{%
\gdef\mc@curr@col@status{#1}}
\def\mc@set@col@status#1#2{%