diff options
Diffstat (limited to 'Master/texmf-dist/tex/latex/tools/multicol.sty')
-rw-r--r-- | Master/texmf-dist/tex/latex/tools/multicol.sty | 24 |
1 files changed, 14 insertions, 10 deletions
diff --git a/Master/texmf-dist/tex/latex/tools/multicol.sty b/Master/texmf-dist/tex/latex/tools/multicol.sty index c990c7273d1..81add474837 100644 --- a/Master/texmf-dist/tex/latex/tools/multicol.sty +++ b/Master/texmf-dist/tex/latex/tools/multicol.sty @@ -80,7 +80,7 @@ %% - multicol is used for non-commercial purposes %% %% -%% Determinating a license fee might result in a license fee of zero +%% Determining a license fee might result in a license fee of zero %% (i.e., no payment) in case a producer has determined that the use %% of multicol has no enhancing effect on the product. This is a %% plausible scenario, i.e., in the above two cases the producer is @@ -96,8 +96,8 @@ %% \NeedsTeXFormat{LaTeX2e}[1997/12/01] \ProvidesPackage{multicol} - [2014/08/24 v1.8g multicolumn formatting (FMi)] -%% \CheckSum{1840} + [2014/10/28 v1.8i multicolumn formatting (FMi)] +%% \CheckSum{1853} %% \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 @@ -344,6 +344,7 @@ \fi \fi \addvspace\multicolsep + \prevdepth\z@ \mult@info\z@ {Ending environment \if@boxedmulticols @@ -413,6 +414,7 @@ \def\columnseprulecolor{\normalcolor} \def\reinsert@footnotes{\ifvoid\footins\else \insert\footins{}\fi} +\def\vfillmaxdepth{\vskip \z@ \@plus 1fill \@minus \maxdepth} \def\multi@column@out{% \ifnum\outputpenalty <-\@M \speci@ls \else @@ -445,7 +447,7 @@ \vbox to\dimen@ {\unvbox\count@ \remove@discardable@items - \ifshr@nking\vfill\fi}% + \ifshr@nking\vfillmaxdepth\fi}% }% \setbox\mult@rightbox \vsplit\@cclv to\dimen@ @@ -453,7 +455,7 @@ \setbox\mult@rightbox\vbox to\dimen@ {\unvbox\mult@rightbox \remove@discardable@items - \ifshr@nking\vfill\fi}% + \ifshr@nking\vfillmaxdepth\fi}% \let\ifshr@king\ifshr@kingsaved \ifvoid\@cclv \else \unvbox\@cclv @@ -611,6 +613,7 @@ \@plus\multicolundershoot \@minus\multicolovershoot \splitmaxdepth\maxdepth + \boxmaxdepth\maxdepth \setbox\@tempboxa\vsplit\mult@box to\z@ \@tempdima\ht\mult@box \advance\@tempdima\dp\mult@box @@ -636,7 +639,7 @@ \dimen@\topskip \fi \vbadness\@M - \vfuzz \col@number\baselineskip + \vfuzz \maxdimen \last@try-\p@ \loop {\process@cols\mult@grightbox @@ -668,7 +671,6 @@ \too@badtrue \fi }}% - \boxmaxdepth\maxdepth \global\setbox\mult@grightbox \vbox{\unvbox\mult@grightbox}% \setbox\mult@nat@firstbox @@ -702,7 +704,7 @@ \ifnum\badness>\c@finalcolumnbadness \global\setbox\mult@grightbox \vbox to\dimen@ - {\unvbox\mult@grightbox\vfill}% + {\unvbox\mult@grightbox\vfillmaxdepth}% \ifnum\c@tracingmulticols>\@ne \message{ setting natural (> \the\c@finalcolumnbadness)}% @@ -746,7 +748,7 @@ \@plus-\multicolundershoot \@minus-\multicolovershoot \unvbox\@tempcnta - \ifshr@nking\vfill\fi + \ifshr@nking\vfillmaxdepth\fi }% \ifnum\badness>\@M \vfuzz\maxdimen % no overfull warning @@ -888,7 +890,9 @@ \fi \begin{multicols} } - \@namedef{endmulticols*}{\vfill + \@namedef{endmulticols*}{\ifshr@nking\else + \vfillmaxdepth\nointerlineskip\null + \fi \end{multicols}} \mathchardef\@Mv=10005 \def\columnbreak{% |