summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex-dev/tools/multicol.sty
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/tex/latex-dev/tools/multicol.sty')
-rw-r--r--Master/texmf-dist/tex/latex-dev/tools/multicol.sty23
1 files changed, 11 insertions, 12 deletions
diff --git a/Master/texmf-dist/tex/latex-dev/tools/multicol.sty b/Master/texmf-dist/tex/latex-dev/tools/multicol.sty
index 1cf82bbdee8..4f11a7584fc 100644
--- a/Master/texmf-dist/tex/latex-dev/tools/multicol.sty
+++ b/Master/texmf-dist/tex/latex-dev/tools/multicol.sty
@@ -107,7 +107,7 @@
\DeclareCurrentRelease{}{2018-04-01}
\ProvidesPackage{multicol}
- [2021/10/08 v1.9a multicolumn formatting (FMi)]
+ [2021/10/28 v1.9b multicolumn formatting (FMi)]
%%
\DeclareOption{twocolumn}
{\PackageWarning{multicol}{May not work
@@ -454,7 +454,7 @@
\shr@nkingtrue
\fi
\fi
- \process@cols\mult@gfirstbox{%
+ \process@cols\mult@firstbox{%
\setbox\count@
\vsplit\@cclv to\dimen@
\set@keptmarks
@@ -698,7 +698,7 @@
\copy\mult@box
\too@badfalse
\forcedbreak@leftoverfalse
- {\process@cols\mult@firstbox{%
+ {\process@cols\mult@gfirstbox{%
\global\setbox\count@
\vsplit\mult@grightbox to\dimen@
\global\setbox\count@
@@ -723,7 +723,7 @@
\global\setbox\mult@grightbox
\vbox{\unvbox\mult@grightbox}%
\setbox\mult@nat@firstbox
- \vbox{\unvcopy\mult@firstbox}%
+ \vbox{\unvcopy\mult@gfirstbox}%
\ifnum\c@tracingmulticols>\@ne
\message{^^JFirst column
= \the\dimen@\space
@@ -837,14 +837,14 @@
\maxbalancingoverflow=12pt
\ifnum\numexpr
- \count20-\count14-1<41
- % this is = 2 * 20 + 1
+ \count20-\count14-1<40
+ % this is = 2 * 20
\count14=\@cclv
\fi
\newbox\mult@rightbox
\newbox\mult@grightbox
-\newbox\mult@gfirstbox
\newbox\mult@firstbox
+\newbox\mult@gfirstbox
\newbox\@tempa\newbox\@tempa
\newbox\@tempa\newbox\@tempa
\newbox\@tempa\newbox\@tempa
@@ -863,7 +863,6 @@
\newbox\@tempa\newbox\@tempa
\newbox\@tempa\newbox\@tempa
\newbox\@tempa\newbox\@tempa
-\newbox\@tempa
\let\@tempa\relax
\@ifundefined{emergencystretch}
{\newdimen\emergencystretch}{}
@@ -1002,7 +1001,7 @@
\newcommand\columnbreak[1][4]{%
\ifnum\col@number<\tw@
\PackageError{multicol}%
- {\noexpand\newcolumn outside multicols}%
+ {\noexpand\columnbreak outside multicols}%
{This command can only be used within
a multicols or multicols* environment.}%
\else
@@ -1033,7 +1032,7 @@
\fi}
\newbox\colbreak@box
\def\LR@column@boxes{%
- \process@cols\mult@gfirstbox{%
+ \process@cols\mult@firstbox{%
\ifdim\dp\count@>\dimen\tw@
\global\dimen\tw@\dp\count@ \fi
\mc@col@status@write
@@ -1047,13 +1046,13 @@
}
\def\RL@column@boxes{%
- \process@cols\mult@gfirstbox{%
+ \process@cols\mult@firstbox{%
\hskip\hsize
\hss{\columnseprulecolor\vrule
\@width\columnseprule}\hss
}%
\hskip\hsize
- \process@cols\mult@gfirstbox{%
+ \process@cols\mult@firstbox{%
\ifdim\dp\count@>\dimen\tw@
\global\dimen\tw@\dp\count@ \fi
\hskip-\hsize