diff options
Diffstat (limited to 'Master/texmf-dist/source/latex/tools/multicol.dtx')
-rw-r--r-- | Master/texmf-dist/source/latex/tools/multicol.dtx | 33 |
1 files changed, 12 insertions, 21 deletions
diff --git a/Master/texmf-dist/source/latex/tools/multicol.dtx b/Master/texmf-dist/source/latex/tools/multicol.dtx index e5f431ed365..3b0ec5c3ec9 100644 --- a/Master/texmf-dist/source/latex/tools/multicol.dtx +++ b/Master/texmf-dist/source/latex/tools/multicol.dtx @@ -91,25 +91,9 @@ %<driver> \ProvidesFile{multicol.drv} % \fi % \ProvidesFile{multicol.dtx} - [2015/08/19 v1.8n multicolumn formatting (FMi)] -% -% -%% \CheckSum{1894} -%% \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 -%% Digits \0\1\2\3\4\5\6\7\8\9 -%% Exclamation \! Double quote \" Hash (number) \# -%% Dollar \$ Percent \% Ampersand \& -%% Acute accent \' Left paren \( Right paren \) -%% Asterisk \* Plus \+ Comma \, -%% Minus \- Point \. Solidus \/ -%% Colon \: Semicolon \; Less than \< -%% Equals \= Greater than \> Question mark \? -%% Commercial at \@ Left bracket \[ Backslash \\ -%% Right bracket \] Circumflex \^ Underscore \_ -%% Grave accent \` Left brace \{ Vertical bar \| -%% Right brace \} Tilde \~} + [2016/02/08 v1.8o multicolumn formatting (FMi)] +% +% %% % % \changes{v1.5n}{1997/06/05}{Applied improvement of documentation, @@ -1911,8 +1895,11 @@ % environment the counter |\col@number| gets a default of |1| % outside the the environment. % \changes{v1.3d}{1991/10/23}{\cs{col@number} set to one} +% \changes{v1.8o}{2016/02/08}{\cs{col@number} already initialized in the +% kernel, so not initializing it in the package +% in case the document is in two-column (pr/4435)} % \begin{macrocode} -\col@number = 1 +%\col@number = 1 \multicoltolerance = 9999 \multicolpretolerance = -1 \premulticols = 50pt @@ -3842,7 +3829,8 @@ % in some stretchable vertical glue so that the last column still % containing text is not vertically stretched out. % -% We do this as follows: first we cancel out |\lastskip| if it was +% We do this as follows: first we ensure that we are back in vertical mode +% and then we cancel out |\lastskip| if it was % positive (in case of a negative glue we assume that it was % deliberate, for a deliberate positive glue one needs to use % |\vspace*|). We can't simply use |\remove@discardable@items| here @@ -3862,8 +3850,11 @@ % \changes{v1.8j}{2015/03/07}{Redesign the whole approach.} % \changes{v1.8k}{2015/03/21}{And a bit more redesign because of the % change in \cs{remove@discardable@items}} +% \changes{v1.8o}{2016/02/08}{Ensure we are back in vmode before using +% \cs{prevdepth} (pr/4448)} % \begin{macrocode} \@namedef{endmulticols*}{% + \par \ifdim\lastskip>\z@ \vskip-\lastskip \fi \ifdim \prevdepth>\z@ \vskip-\ifdim\prevdepth>\boxmaxdepth |