summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex-dev/tools/multicol.sty
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2020-01-13 21:35:18 +0000
committerKarl Berry <karl@freefriends.org>2020-01-13 21:35:18 +0000
commit07df7cbdd54b0d08935f3c9f90881763e705038e (patch)
tree195766c19349f38120f83bff80b049e8b67afbc1 /Master/texmf-dist/tex/latex-dev/tools/multicol.sty
parentce9eb3564e7376e4452732aef5229a8461f52a09 (diff)
latex-dev (13jan20)
git-svn-id: svn://tug.org/texlive/trunk@53395 c570f23f-e606-0410-a88d-b1316a301751
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, 18 insertions, 5 deletions
diff --git a/Master/texmf-dist/tex/latex-dev/tools/multicol.sty b/Master/texmf-dist/tex/latex-dev/tools/multicol.sty
index 6ffd3cf0a48..e9953373b49 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}
- [2019/10/15 v1.8x multicolumn formatting (FMi)]
+ [2019/12/09 v1.8y multicolumn formatting (FMi)]
%%
\DeclareOption{twocolumn}
{\PackageWarning{multicol}{May not work
@@ -145,14 +145,14 @@
columns doesn't seem a good idea.^^J
I therefore use two columns instead}%
\col@number\tw@ \fi
- \ifnum\col@number>10
+ \ifnum\col@number>20
\PackageError{multicol}%
{Too many columns}%
{Current implementation doesn't
- support more than 10 columns.%
+ support more than 20 columns.%
\MessageBreak
- I therefore use 10 columns instead}%
- \col@number10 \fi
+ I therefore use 20 columns instead}%
+ \col@number20 \fi
\ifx\@footnotetext\mult@footnotetext\else
\let\orig@footnotetext\@footnotetext
\let\@footnotetext\mult@footnotetext
@@ -821,6 +821,9 @@
\newdimen\maxbalancingoverflow
\maxbalancingoverflow=12pt
+\ifnum\numexpr \count20-\count14-1<41 % = 2 * 20 + 1
+ \count14=\@cclv
+\fi
\newbox\mult@rightbox
\newbox\mult@grightbox
\newbox\mult@gfirstbox
@@ -833,6 +836,16 @@
\newbox\@tempa\newbox\@tempa
\newbox\@tempa\newbox\@tempa
\newbox\@tempa\newbox\@tempa
+\newbox\@tempa\newbox\@tempa
+\newbox\@tempa\newbox\@tempa
+\newbox\@tempa\newbox\@tempa
+\newbox\@tempa\newbox\@tempa
+\newbox\@tempa\newbox\@tempa
+\newbox\@tempa\newbox\@tempa
+\newbox\@tempa\newbox\@tempa
+\newbox\@tempa\newbox\@tempa
+\newbox\@tempa\newbox\@tempa
+\newbox\@tempa\newbox\@tempa
\newbox\@tempa
\let\@tempa\relax
\@ifundefined{emergencystretch}