summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/tools/multicol.sty
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/tex/latex/tools/multicol.sty')
-rw-r--r--Master/texmf-dist/tex/latex/tools/multicol.sty41
1 files changed, 28 insertions, 13 deletions
diff --git a/Master/texmf-dist/tex/latex/tools/multicol.sty b/Master/texmf-dist/tex/latex/tools/multicol.sty
index 10ebd6a17bb..ace287301af 100644
--- a/Master/texmf-dist/tex/latex/tools/multicol.sty
+++ b/Master/texmf-dist/tex/latex/tools/multicol.sty
@@ -9,10 +9,10 @@
%% This is a generated file.
%%
%% The source is maintained by the LaTeX Project team and bug
-%% reports for it can be opened at http://latex-project.org/bugs.html
+%% reports for it can be opened at https://latex-project.org/bugs/
%% (but please observe conditions on bug reports sent to that address!)
%%
-%% Copyright 1993-2016
+%% Copyright 1993-2017
%% The LaTeX3 Project and any individual authors listed elsewhere
%% in this file.
%%
@@ -23,7 +23,7 @@
%% conditions of the LaTeX Project Public License, either version 1.3c
%% of this license or (at your option) any later version.
%% The latest version of this license is in
-%% http://www.latex-project.org/lppl.txt
+%% https://www.latex-project.org/lppl.txt
%% and version 1.3c or later is part of all distributions of LaTeX
%% version 2005/12/01 or later.
%%
@@ -35,7 +35,7 @@
%% given in the file `manifest.txt'.
%%
%% Package `multicol' to use with LaTeX2e
-%% Copyright 1989-2016 Frank Mittelbach
+%% Copyright 1989-2018 Frank Mittelbach
%%
%% In addition to the terms of LPPL any distributed version
%% (unchanged or modified) of multicol has to keep the statement
@@ -98,9 +98,16 @@
%%
%% Frank.Mittelbach@latex-project.org
%%
-\NeedsTeXFormat{LaTeX2e}[1997/12/01]
+\NeedsTeXFormat{LaTeX2e}[2018-04-01]
+
+\providecommand\DeclareRelease[3]{}
+\providecommand\DeclareCurrentRelease[2]{}
+
+\DeclareRelease{}{2017-04-11}{multicol-2017-04-11.sty}
+\DeclareCurrentRelease{}{2018-04-01}
+
\ProvidesPackage{multicol}
- [2017/04/11 v1.8q multicolumn formatting (FMi)]
+ [2018/04/01 v1.8r multicolumn formatting (FMi)]
%%
\DeclareOption{twocolumn}
{\PackageWarning{multicol}{May not work
@@ -295,6 +302,7 @@
#1\advance\vsize
\c@collectmore\baselineskip}
\newdimen\multicol@leftmargin
+\mathchardef\@Mvi=10006 % 10005 is \columnbreak
\def\endmulticols{\par
\if@boxedmulticols
\remove@discardable@items\color@endgroup\egroup
@@ -320,9 +328,8 @@
break(s) for splitting}%
\unvbox\colbreak@box\fi
\fi
- \penalty\z@
- \output{\balance@columns@out}%
- \eject
+ \penalty\z@
+ \penalty-\@Mvi
\ifvbox\partial@page
\unvbox\partial@page\fi
\global\let\kept@firstmark\@empty
@@ -552,14 +559,20 @@
}%
\reinsert@footnotes
\else
+ \ifnum\outputpenalty = -\@Mvi
+ \mult@info\@ne{End penalty of multicols seen}%
+ \outputpenalty\@M % pretend we had a natural forced break
+ \balance@columns@out
+ \else
\PackageWarningNoLine{multicol}%
{Floats and marginpars not
allowed inside `multicols'
environment!}%
\unvbox\@cclv\reinsert@footnotes
- \xdef\@freelist{\@freelist\@currlist}%
- \gdef\@currlist{}%
- \fi
+ \xdef\@freelist{\@freelist\@currlist}%
+ \gdef\@currlist{}%
+ \fi
+ \fi
\fi
\else \@doclearpage \fi
}
@@ -597,7 +610,9 @@
\setbox\@cclv\vbox
{\vskip\topskip
\vskip-\splittopskip
- \unvbox\mult@box}%
+ \unvbox\mult@box
+ \penalty-\@Mvi
+ }%
\multi@column@out
\else
\global\vsize\@colroom