diff options
Diffstat (limited to 'Master/texmf-dist/source/latex/tools/multicol.dtx')
-rw-r--r-- | Master/texmf-dist/source/latex/tools/multicol.dtx | 30 |
1 files changed, 17 insertions, 13 deletions
diff --git a/Master/texmf-dist/source/latex/tools/multicol.dtx b/Master/texmf-dist/source/latex/tools/multicol.dtx index 4575bb41be0..26b3b50355b 100644 --- a/Master/texmf-dist/source/latex/tools/multicol.dtx +++ b/Master/texmf-dist/source/latex/tools/multicol.dtx @@ -1,6 +1,6 @@ % \iffalse meta-comment % -% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 +% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006 % The LaTeX3 Project and any individual authors listed elsewhere % in this file. % @@ -8,12 +8,12 @@ % ------------------------------------------------------- % % It may be distributed and/or modified under the -% conditions of the LaTeX Project Public License, either version 1.3 +% 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 -% and version 1.3 or later is part of all distributions of LaTeX -% version 2003/12/01 or later. +% and version 1.3c or later is part of all distributions of LaTeX +% version 2005/12/01 or later. % % The list of all files belonging to the LaTeX `Tools Bundle' is % given in the file `manifest.txt'. @@ -23,7 +23,7 @@ % \iffalse This is a METACOMMENT % %% Package `multicol' to use with LaTeX2e -%% Copyright 1989-2003 Frank Mittelbach +%% Copyright 1989-2005 Frank Mittelbach %% %% In addition to the terms of LPPL any distributed version %% (unchanged or modified) of multicol has to keep the statement @@ -94,10 +94,10 @@ %<driver> \ProvidesFile{multicol.drv} % \fi % \ProvidesFile{multicol.dtx} - [2004/02/14 v1.6e multicolumn formatting (FMi)] + [2006/05/18 v1.6g multicolumn formatting (FMi)] % % -%% \CheckSum{1561} +%% \CheckSum{1562} %% \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 @@ -485,7 +485,7 @@ % argument, but {\tt h} doesn't work because the first possible place % is the top of the next page. One should also note, that this means % that their placement behavior is determined by the values of -% |\topfraction|, etc.\ rather then by |\dbl...|. +% |\topfraction|, etc.\ rather than by |\dbl...|. % % % \subsection{Warnings} @@ -1954,7 +1954,7 @@ \rlap{\phantom p}% }% % \end{macrocode} -% Now after typesetting the box we mack up to its baseline by using +% Now after typesetting the box we back up to its baseline by using % the value stored in |\dimen2|. % \changes{v1.6a}{2003/03/15}{Now adjusting \cs{prevdepth}} % \begin{macrocode} @@ -2741,12 +2741,13 @@ % Some tracing code that we don't compile into the production version % unless asked for. It will produce huge listings of the boxes % involved in balancing in the transcript file. +% \changes{v1.6f}{2004/07/03}{need to use \cs{mult@grightbox} in the loop} % \begin{macrocode} %<*debug> \ifnum\c@tracingmulticols>4 {\showoutput \batchmode - \process@cols\@ne + \process@cols\mult@grightbox {\showbox\count@}}% \errorstopmode \fi @@ -2826,6 +2827,7 @@ % \end{macrocode} % If |\@tempboxa| above was not void our trial was unsuccessful and % we report this fact and try again. +% \changes{v1.6f}{2004/07/03}{\texttt{/colbreak} guard in the wrong position} % \begin{macrocode} %<*colbreak> \else @@ -2835,8 +2837,8 @@ forced break(s) in last column!}% \fi \fi - \fi %</colbreak> + \fi % \end{macrocode} % If the natural height of the first box is smaller than the % current trial size but is larger than the previous trial size it @@ -2989,7 +2991,8 @@ % \changes{v1.2a}{1990/02/05}{Macro added.} % \changes{v1.5g}{1994/06/07}{Updated since floats have changed} % \changes{v1.5j}{1994/06/07}{Updated since floats have changed again} -% \changes{v1.5l}{1995/10/19}{Added \cmd{@largefloatcheck}} +% \changes{v1.5l}{1995/10/19}{Added \cs{@largefloatcheck}} +% \changes{v1.6g}{2006/02/23}{Added \cs{@minipagefalse}} % Even if this should be used as a hook we use a |@| in the % name since it is more for experts. % \begin{macrocode} @@ -2997,6 +3000,7 @@ \let\@dblfloat\@dbflt \def\end@dblfloat{\par \vskip\z@ + \@minipagefalse \egroup \color@endbox \@largefloatcheck @@ -3322,7 +3326,7 @@ % \changes{v1.5r}{1998/08/17}{Macro removed again.} % If we store the current column width in |\columnwidth| we have % to redefine the internal |\@footnotetext| macro to use |\textwidth| -% for the width of the footnotes rather then using the original +% for the width of the footnotes rather than using the original % definition. % % Starting with version v1.5r this is now done in a way that the original |