diff options
Diffstat (limited to 'macros/latex-dev/required/tools/multicol.dtx')
-rw-r--r-- | macros/latex-dev/required/tools/multicol.dtx | 58 |
1 files changed, 28 insertions, 30 deletions
diff --git a/macros/latex-dev/required/tools/multicol.dtx b/macros/latex-dev/required/tools/multicol.dtx index 5adc4db0da..39bccef2d7 100644 --- a/macros/latex-dev/required/tools/multicol.dtx +++ b/macros/latex-dev/required/tools/multicol.dtx @@ -470,7 +470,7 @@ % `\textsf{minrows}' (default 1). If set to a higher value then the % balancing will have at least that many rows in the first column (and % also all further columns until it runs outs of material). -% +% % Additionally you can set another counter, the `\textsf{unbalance}' % counter, to some positive \meta{number}. This will make all but the % right-most column \meta{number} of lines longer than they would @@ -1339,7 +1339,7 @@ % resetting the |\parshape| in case we are inside some list % environment. The correct indentation for the \mc{} environment in % such a case will be produced by moving the result to the right by -% |\multicol@leftmargin| later on. If we would use the value of of +% |\multicol@leftmargin| later on. If we would use the value of % |\@totalleftmargin| directly then lists inside the \mc{} % environment could cause a shift of the output. % \changes{v1.4l}{1992/08/17}{saved \cs{@totalleftmargin}} @@ -1720,7 +1720,7 @@ % remove any space at the end of the box as we don't want to use % this in balancing. Because of the |\color@endgroup| this can't be % done later in |\balance@columns| as the color command will hide -% it. +% it. % \changes{v1.8c}{2013/11/03}{Add \cs{color@endgroup} to prevent color leak} % \changes{v1.8f}{2014/06/19}{Discard spaces before adding \cs{color@endgroup}} % \begin{macrocode} @@ -1762,7 +1762,7 @@ \else % \end{macrocode} % If there was a |\columnbreak| on the very last line all material -% will have been moved to the |\colbreak@box|. Thus the the galley +% will have been moved to the |\colbreak@box|. Thus the galley % will be empty and no output routine gets called so that the text % is lost. To avoid this problem (though unlikely) we check if the % current galley is empty and the |\colbreak@box| contains text and @@ -1959,10 +1959,10 @@ % \end{macrocode} % To allow checking whether some macro is used within the \mc{} % environment the counter |\col@number| gets a default of |1| -% outside the the environment. +% outside 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 +% \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 @@ -2197,12 +2197,12 @@ % would be allowed a depth of |\@maxdepth|. So we allow shrinking by % that amount. This only makes a difference if the box would % otherwise become overfull and shrinking never exceeds the -% specified value, so we should be fine. +% specified value, so we should be fine. % \changes{v1.8h}{2014/09/12}{Macro added (pr/4395)} % \changes{v1.8j}{2015/03/07}{Use only `0.0001fil' for stretching} % \changes{v1.8x}{2019/10/15}{Use \cs{@maxdepth} not \cs{maxdepth} (gh/190)} % \begin{macrocode} -\def\vfilmaxdepth{\vskip \z@ \@plus .0001fil +\def\vfilmaxdepth{\vskip \z@ \@plus .0001fil \@minus \@maxdepth} % \end{macrocode} % \end{macro} @@ -2252,7 +2252,7 @@ \splitmaxdepth\@maxdepth % \end{macrocode} % We also need to restrict |\boxmaxdepth| so that re-boxing is not -% generating boxes with arbitrary depth. +% generating boxes with arbitrary depth. % \changes{v1.8j}{2015/03/07}{Set \cs{boxmaxdepth}} % \begin{macrocode} \boxmaxdepth\@maxdepth @@ -2287,7 +2287,7 @@ % reestablished. However, in theory there is a possibility to sneak % in a whole multicols environment into the running header % definition. If that happens then it will also be affected by this -% change---too bad I think. +% change---too bad I think. % \changes{v1.8a}{2011/12/20}{Support for \cs{enlargethispage}} % \changes{v1.8v}{2018/12/27}{Removed dead code, the case where this % can go wrong is too obscure to worry about it (gh/101)} @@ -2446,7 +2446,7 @@ % % Within the OR |\boxmaxdepth| needs to be unrestricted so we set it back % now as it was changed above. -% \changes{v1.8p}{2016/04/07}{Reset \cs{boxmaxdepth}} +% \changes{v1.8p}{2016/04/07}{Reset \cs{boxmaxdepth}} % \begin{macrocode} \boxmaxdepth\maxdimen \setbox\@cclv\vbox{\unvbox\partial@page @@ -2480,7 +2480,7 @@ % Now we reset |\@colroom| to |\@colht| which is \LaTeX's % saved value of |\textheight|. % We also have to reset the recorded position of the last -% |\marginpar| as well as the recorded size of in-text floats +% |\marginpar| as well as the recorded size of in-text floats % as we are now on a new page. % \changes{v1.8d}{2014/04/23}{Reset \cs{@mparbottom} after page finishes} % \changes{v1.8n}{2015/08/19}{Reset \cs{@textfloatsheight} after page finishes} @@ -2617,7 +2617,7 @@ \ifnum\outputpenalty = -\@Mvi \mult@info\@ne{End penalty of multicols seen}% % \end{macrocode} -% If we are at this point then have have to run the balancing code +% If we are at this point then we have to run the balancing code % (which was previously its own output routine). First we pretend % that we had a normal forced breakpoint and then call % |\balance@column@out|. The latter may be let to |\multi@column@out| @@ -3006,7 +3006,7 @@ \vbadness\@M % \end{macrocode} % We also allow for overfull boxes while we trying to split the -% columns. They can easily happen if we have objects with unusual depth. +% columns. They can easily happen if we have objects with unusual depth. % \changes{v1.8h}{2014/09/12}{Do not report overfull} % \begin{macrocode} \vfuzz \maxdimen @@ -3258,7 +3258,7 @@ % If we have unprocessed forced breaks we normally reiterate with a % larger column size to fit them in eventually. However, if there % are simply too many of them (e.g., 3 forced breaks but only 2 -% columns to balance) then this will never succeed and and we would +% columns to balance) then this will never succeed and we would % continue growing the columns until we hit the largest possible % column size. So in addition we check how big the column size is % compared to available room and if we exceed this by @@ -3315,7 +3315,7 @@ %</badness> \advance\dimen@\p@ \repeat -% \end{macrocode} +% \end{macrocode} % If we come out of the loop with the switch |forcedbreak@leftover| % set to true then balancing has failed and we should cut a normal % page. We indicate this below with |\too@badtrue| when any of the @@ -3455,7 +3455,7 @@ % The new release now uses private box registers. % % There was in fact a bug in the new implementation because at one -% point \LaTeX{} started to use the the extended registers and so +% point \LaTeX{} started to use the extended registers and so % jumped from below 255 to above omitting the boxes allocated for % inserts and the output page box. % @@ -3470,7 +3470,7 @@ \count14=\@cclv \fi % \end{macrocode} -% +% % \begin{macrocode} \newbox\mult@rightbox \newbox\mult@grightbox @@ -3785,7 +3785,7 @@ % % Special care is needed with handling |\vspace*| as that % corresponds to |\penalty10000|, |\vskip <skip>|, followed by -% |\vskip 0pt|. If we see this sequence going backwards in the the +% |\vskip 0pt|. If we see this sequence going backwards in the % vertical list we assume that this is a ``desired'' space. We % therefore stop the recursion and reinsert the spaces. % @@ -3832,7 +3832,7 @@ % recurse. % \begin{macrocode} \vskip\@tempb\vskip\@tempa\relax - \else + \else \remove@discardable@items \fi \fi @@ -3852,7 +3852,7 @@ \def\too@badtrue{\global\let\iftoo@bad\iftrue} \def\too@badfalse{\global\let\iftoo@bad\iffalse} % \end{macrocode} -% +% % \changes{v1.8k}{2015/03/21}{The new switch} % \begin{macrocode} \newif\ifforcedbreak@leftover @@ -3996,7 +3996,7 @@ % When ending the environment we simply end the inner % \texttt{multicols} environment, except that we better also stick % in some stretchable vertical glue so that the last column still -% containing text is not vertically stretched out. +% containing text is not vertically stretched out. % % We do this as follows: first we ensure that we are back in vertical mode % and then we cancel out |\lastskip| if it was @@ -4026,7 +4026,7 @@ \par \ifdim\lastskip>\z@ \vskip-\lastskip \fi \ifdim \prevdepth>\z@ - \vskip-\ifdim\prevdepth>\boxmaxdepth + \vskip-\ifdim\prevdepth>\boxmaxdepth \boxmaxdepth \else \prevdepth \fi \fi @@ -4343,9 +4343,9 @@ % \begin{macrocode} \newcommand\@docolaction[4][1]{% % \end{macrocode} -% -% How does the column number get associated with our label? We -% do do this by writing another line into the aux file. Here are the +% +% How does the column number get associated with our label? We +% do this by writing another line into the aux file. Here are the % preparations. % \begin{macrocode} \edef\@docolactioncheck{\write\@auxout @@ -4394,7 +4394,7 @@ % \begin{macrocode} \newif\if@docolactionstar % \end{macrocode} -% +% % Because of extra data writing to the aux file the aux file will % now contain something like the following after the document is % processed the first time: @@ -4480,5 +4480,3 @@ % \Finale % \endinput - - |