From 3b378d704d5d92df25314e52e0ce8cac217e9fd0 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Fri, 19 Sep 2014 22:29:15 +0000 Subject: latex2e (19sep14) git-svn-id: svn://tug.org/texlive/trunk@35209 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/tools/multicol.sty | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'Master/texmf-dist/tex/latex/tools/multicol.sty') diff --git a/Master/texmf-dist/tex/latex/tools/multicol.sty b/Master/texmf-dist/tex/latex/tools/multicol.sty index 974a431f34d..c990c7273d1 100644 --- a/Master/texmf-dist/tex/latex/tools/multicol.sty +++ b/Master/texmf-dist/tex/latex/tools/multicol.sty @@ -31,7 +31,7 @@ %% given in the file `manifest.txt'. %% %% Package `multicol' to use with LaTeX2e -%% Copyright 1989-2013 Frank Mittelbach +%% Copyright 1989-2014 Frank Mittelbach %% %% In addition to the terms of LPPL any distributed version %% (unchanged or modified) of multicol has to keep the statement @@ -96,8 +96,8 @@ %% \NeedsTeXFormat{LaTeX2e}[1997/12/01] \ProvidesPackage{multicol} - [2014/04/23 v1.8e multicolumn formatting (FMi)] -%% \CheckSum{1839} + [2014/08/24 v1.8g multicolumn formatting (FMi)] +%% \CheckSum{1840} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z @@ -300,7 +300,7 @@ \newdimen\multicol@leftmargin \def\endmulticols{\par \if@boxedmulticols - \color@endgroup\egroup + \remove@discardable@items\color@endgroup\egroup \balance@columns \return@nonemptymark{first}% \kept@firstmark @@ -324,7 +324,6 @@ \unvbox\colbreak@box\fi \fi \penalty\z@ - \prevdepth\z@ \output{\balance@columns@out}\eject \ifvbox\partial@page \unvbox\partial@page\fi @@ -403,8 +402,9 @@ \mc@align@columns \rlap{\phantom p}% }% + \prevdepth\z@ \kern-\dimen\tw@ - \ifdim\dimen\tw@ = \mc@gridwarn + \ifdim\dimen\tw@ > \mc@gridwarn \PackageWarning{multicol}% {Very deep columns!\MessageBreak Grid alignment might be broken}% -- cgit v1.2.3