summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/tools/multicol.sty
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2009-09-28 15:28:40 +0000
committerKarl Berry <karl@freefriends.org>2009-09-28 15:28:40 +0000
commit0ca968cf4811fe9dee1a22dfbd031510dbcbda70 (patch)
treeea5a997fcee434f40f13fc8951e00255b7d521de /Master/texmf-dist/tex/latex/tools/multicol.sty
parenta7413da58c33f9b31d87d35b556eb455cefa06eb (diff)
tools (latex core) update via latex-tds (25sep09)
git-svn-id: svn://tug.org/texlive/trunk@15511 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.sty18
1 files changed, 8 insertions, 10 deletions
diff --git a/Master/texmf-dist/tex/latex/tools/multicol.sty b/Master/texmf-dist/tex/latex/tools/multicol.sty
index d780d1fd569..a52e88d679b 100644
--- a/Master/texmf-dist/tex/latex/tools/multicol.sty
+++ b/Master/texmf-dist/tex/latex/tools/multicol.sty
@@ -8,7 +8,8 @@
%%
%% This is a generated file.
%%
-%% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006
+%% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005
+%% 2006 2008 2009
%% The LaTeX3 Project and any individual authors listed elsewhere
%% in this file.
%%
@@ -31,7 +32,7 @@
%% given in the file `manifest.txt'.
%%
%% Package `multicol' to use with LaTeX2e
-%% Copyright 1989-2005 Frank Mittelbach
+%% Copyright 1989-2007 Frank Mittelbach
%%
%% In addition to the terms of LPPL any distributed version
%% (unchanged or modified) of multicol has to keep the statement
@@ -96,8 +97,8 @@
%%
\NeedsTeXFormat{LaTeX2e}[1997/12/01]
\ProvidesPackage{multicol}
- [2006/05/18 v1.6g multicolumn formatting (FMi)]
-%% \CheckSum{1562}
+ [2008/12/05 v1.6h multicolumn formatting (FMi)]
+%% \CheckSum{1560}
%% \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
@@ -391,7 +392,7 @@
\ifdim\dp\count@>\dimen\tw@
\global\dimen\tw@\dp\count@ \fi
\box\count@
- \hss{\normalcolor\vrule
+ \hss{\columnseprulecolor\vrule
\@width\columnseprule}\hss}%
\ifdim\dp\mult@rightbox>\dimen\tw@
\global\dimen\tw@\dp\mult@rightbox \fi
@@ -405,6 +406,7 @@
Grid alignment might be broken}%
\fi
}
+\def\columnseprulecolor{\normalcolor}
\def\reinsert@footnotes{\ifvoid\footins\else
\insert\footins{}\fi}
\def\multi@column@out{%
@@ -733,11 +735,7 @@
\def\set@floatcmds{%
\let\@dblfloat\@dbflt
- \def\end@dblfloat{\par
- \vskip\z@
- \@minipagefalse
- \egroup
- \color@endbox
+ \def\end@dblfloat{\@endfloatbox
\@largefloatcheck
\outer@nobreak
\ifnum\@floatpenalty<\z@