summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source/latex/tools/multicol.dtx
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/source/latex/tools/multicol.dtx')
-rw-r--r--Master/texmf-dist/source/latex/tools/multicol.dtx41
1 files changed, 27 insertions, 14 deletions
diff --git a/Master/texmf-dist/source/latex/tools/multicol.dtx b/Master/texmf-dist/source/latex/tools/multicol.dtx
index 26b3b50355b..e0e293bb4f2 100644
--- a/Master/texmf-dist/source/latex/tools/multicol.dtx
+++ b/Master/texmf-dist/source/latex/tools/multicol.dtx
@@ -1,6 +1,7 @@
% \iffalse meta-comment
%
-% 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.
%
@@ -23,7 +24,7 @@
% \iffalse This is a METACOMMENT
%
%% 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
@@ -94,10 +95,10 @@
%<driver> \ProvidesFile{multicol.drv}
% \fi
% \ProvidesFile{multicol.dtx}
- [2006/05/18 v1.6g multicolumn formatting (FMi)]
+ [2008/12/05 v1.6h multicolumn formatting (FMi)]
%
%
-%% \CheckSum{1562}
+%% \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
@@ -308,6 +309,10 @@
% parameter |\columnseprule| to some positive value. In this
% article a value of {\sf.4pt} was used.
%
+% \DescribeMacro\columnseprulecolor
+% The color of the rules separating the columns can be specified through
+% |\columnseprulecolor|. The default value is |\normalcolor|.
+%
% \DescribeMacro\multicolbaselineskip
% Since narrow columns tend to need adjustments in interline spacing
% we also provide a \meta{skip} parameter called
@@ -380,13 +385,14 @@
% making its final decision. So a value of $-1$ may solve all your
% problems at the cost of slightly less optimal columns.
%
+%
% In the second step (balancing columns) we have other bells and
% whistles. First of all you can say |\raggedcolumns| if you
-% don't want the bottom lines to be aligned. The default is
-% |\flushcolumns|, so \TeX{} will normally try to make both the
-% top and bottom baselines of all columns align.
-%
+% don't want the bottom lines to be aligned.
+% The default is |\flushcolumns|, so \TeX{} will normally try to
+% make both
% \columnbreak
+% the top and bottom baselines of all columns align.
%
% Additionally you can set another counter, the `{\sf unbalance}'
% counter, to some positive \meta{number}. This will make all but the
@@ -1921,6 +1927,7 @@
% \changes{v1.5a}{1992/11/04}{New box mechanism}
% \changes{v1.5z}{2000/07/10}{Ensure that column rule has always
% \cs{normalcolor}}
+% \changes{v1.6f}{2006/09/19}{Make the color of the rule a hook}
% \begin{macrocode}
\process@cols\mult@gfirstbox{%
% \end{macrocode}
@@ -1931,7 +1938,7 @@
\ifdim\dp\count@>\dimen\tw@
\global\dimen\tw@\dp\count@ \fi
\box\count@
- \hss{\normalcolor\vrule
+ \hss{\columnseprulecolor\vrule
\@width\columnseprule}\hss}%
% \end{macrocode}
% As you will have noticed, we started with box register
@@ -1977,6 +1984,14 @@
% \end{macrocode}
% \end{macro}
%
+% \begin{macro}{\columnseprulecolor}
+% \changes{v1.6f}{2006/09/19}{Make the color of the rule a hook}
+% By default the vertical rule between columns will be in |\normalcolor|.
+% \begin{macrocode}
+\def\columnseprulecolor{\normalcolor}
+% \end{macrocode}
+% \end{macro}
+%
% \begin{macro}{\reinsert@footnotes}
% Before we tackle the bigger output routines we define just one
% more macro which will help us to find our way through the
@@ -2993,16 +3008,14 @@
% \changes{v1.5j}{1994/06/07}{Updated since floats have changed again}
% \changes{v1.5l}{1995/10/19}{Added \cs{@largefloatcheck}}
% \changes{v1.6g}{2006/02/23}{Added \cs{@minipagefalse}}
+% \changes{v1.6h}{2008/12/05}{Use \cs{@endfloatbox} to better support
+% the modifications done by the float package}
% Even if this should be used as a hook we use a |@| in the
% name since it is more for experts.
% \begin{macrocode}
\def\set@floatcmds{%
\let\@dblfloat\@dbflt
- \def\end@dblfloat{\par
- \vskip\z@
- \@minipagefalse
- \egroup
- \color@endbox
+ \def\end@dblfloat{\@endfloatbox
\@largefloatcheck
\outer@nobreak
% \end{macrocode}