Merge branch 'develop' into nfssaxes

base/doc/ltnews31.tex

@@ -266,6 +266,8 @@ \section{Changes to packages in the \pkg{tools} category}
 
 \emph{fixed gh190}
 
+\emph{fixed gh237}
+
 
 
 \section{Changes to packages in the \pkg{amsmath} category}

contrib/build.lua

@@ -0,0 +1,31 @@
+#!/usr/bin/env texlua
+
+-- Build script for contrib packages
+
+-- Identify the bundle and module
+-- Just filler as this is purely a location for tests
+module = "contrib"
+bundle = ""
+
+-- Location of main directory: use Unix-style path separators
+maindir = ".."
+
+-- Non-standard settings
+checkdeps   =
+  {
+    maindir .. "/base",
+    maindir .. "/required/amsmath",
+    maindir .. "/required/graphics",
+    maindir .. "/required/tools"
+  }
+checksearch = true
+
+-- Load the common build code
+dofile(maindir .. "/build-config.lua")
+
+-- Find and run the build system
+kpse.set_program_name("kpsewhich")
+if not release_date then
+  dofile(kpse.lookup("l3build.lua"))
+end
+

required/tools/changes.txt

@@ -5,6 +5,12 @@ completeness or accuracy and it contains some references to files that
 are not part of the distribution.
 =======================================================================
 
+2019-12-09  Frank Mittelbach  <Frank.Mittelbach@latex-project.org>
+
+	* multicol.dtx:
+	Support up to 20 columns instead of 10; also ensure that
+	the insert boxes are not clobbered (gh/237)
+
 2019-10-15  Frank Mittelbach  <Frank.Mittelbach@latex-project.org>
 
 	* multicol.dtx: Use \@maxdepth not \maxdepth (gh/190)

required/tools/multicol.dtx

@@ -98,7 +98,7 @@
 %<driver> \ProvidesFile{multicol.drv}
 % \fi
 %         \ProvidesFile{multicol.dtx}
-          [2019/10/15 v1.8x  multicolumn formatting (FMi)]
+          [2019/12/09 v1.8y  multicolumn formatting (FMi)]
 %
 %
 %%
@@ -1034,19 +1034,20 @@
        I therefore use two columns instead}%
      \col@number\tw@ \fi
 %    \end{macrocode}
-%    We have only enough box registers for ten columns, so we need to
+%    We have only enough box registers for twenty columns, so we need to
 %    check that the user hasn't asked for more.
 % \changes{v1.4k}{1992/06/27}{Maximum of 5 columns (temp)}
 % \changes{v1.5a}{1992/11/04}{Allow 10 columns again}
+% \changes{v1.8y}{2019/12/09}{Allow for 20 columns (gh/237)}
 %    \begin{macrocode}
-  \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
 %    \end{macrocode}
 %    Within the environment we need a special version of the
 %    kernel |\@footnotetext| command since the original sets the
@@ -3451,7 +3452,25 @@
 %    of this setup in the documentation, sigh.) This produced a problem
 %    at the moment we had more than 5 columns because then officially
 %    allocated boxes were overwritten by the algorithm.
-%    The new release now uses private box registers
+%    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
+%    jumped from below 255 to above omitting the boxes allocated for
+%    inserts and the output page box.
+%
+%    So nowadays we really have to check if we get the full sequence
+%    of boxes allocated without holes (i.e., $2\times\textit{max
+%    cols}+1$) and if not alter the allocation registers to start
+%    allocating after 255. This is all done quite low-level by looking
+%    directly at the values of the allocation counters.
+% \changes{v1.8y}{2019/12/09}{Allow for 20 columns (gh/237)}
+%    \begin{macrocode}
+\ifnum\numexpr \count20-\count14-1<41   % = 2 * 20 + 1
+  \count14=\@cclv
+\fi
+%    \end{macrocode}
+%    
 %    \begin{macrocode}
 \newbox\mult@rightbox
 \newbox\mult@grightbox
@@ -3465,6 +3484,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
 %    \end{macrocode}

required/tools/testfiles/github-0237.lvt

@@ -0,0 +1,71 @@
+% https://github.com/latex3/latex2e/issues/237
+
+\documentclass{article}
+
+\input{test2e}
+
+\newbox\zz\newbox\zz\newbox\zz\newbox\zz\newbox\zz\newbox\zz
+\newbox\zz\newbox\zz\newbox\zz\newbox\zz\newbox\zz\newbox\zz
+\newbox\zz\newbox\zz\newbox\zz\newbox\zz\newbox\zz\newbox\zz
+\newbox\zz\newbox\zz\newbox\zz\newbox\zz\newbox\zz\newbox\zz
+\newbox\zz\newbox\zz\newbox\zz\newbox\zz\newbox\zz\newbox\zz
+\newbox\zz\newbox\zz\newbox\zz\newbox\zz\newbox\zz\newbox\zz
+\newbox\zz\newbox\zz\newbox\zz\newbox\zz\newbox\zz\newbox\zz
+\newbox\zz\newbox\zz\newbox\zz\newbox\zz\newbox\zz\newbox\zz
+\newbox\zz\newbox\zz\newbox\zz\newbox\zz\newbox\zz\newbox\zz
+\newbox\zz\newbox\zz\newbox\zz\newbox\zz\newbox\zz\newbox\zz
+\newbox\zz\newbox\zz\newbox\zz\newbox\zz\newbox\zz\newbox\zz
+\newbox\zz\newbox\zz\newbox\zz\newbox\zz\newbox\zz\newbox\zz
+\newbox\zz\newbox\zz\newbox\zz\newbox\zz\newbox\zz\newbox\zz
+\newbox\zz\newbox\zz\newbox\zz\newbox\zz\newbox\zz\newbox\zz
+\newbox\zz\newbox\zz\newbox\zz\newbox\zz\newbox\zz\newbox\zz
+\newbox\zz\newbox\zz\newbox\zz\newbox\zz\newbox\zz\newbox\zz
+\newbox\zz\newbox\zz\newbox\zz\newbox\zz\newbox\zz\newbox\zz
+\newbox\zz\newbox\zz\newbox\zz\newbox\zz\newbox\zz\newbox\zz
+\newbox\zz\newbox\zz\newbox\zz\newbox\zz\newbox\zz\newbox\zz
+\newbox\zz\newbox\zz\newbox\zz\newbox\zz\newbox\zz\newbox\zz
+\newbox\zz\newbox\zz\newbox\zz\newbox\zz\newbox\zz\newbox\zz
+\newbox\zz\newbox\zz\newbox\zz\newbox\zz\newbox\zz\newbox\zz
+\newbox\zz\newbox\zz\newbox\zz\newbox\zz\newbox\zz\newbox\zz
+
+\addtolength\textwidth{2cm}
+
+\showoutput
+
+\usepackage{multicol}
+
+\begin{document}
+
+\START
+
+\begin{multicols}{10}
+ \raggedright
+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
+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
+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
+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
+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
+a b c d e f g h i j k l m some of this get lost !!!!!! in the output !!!!
+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
+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
+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
+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
+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
+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
+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
+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
+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
+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
+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
+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
+\end{multicols}
+
+
+\begin{multicols}{20}
+ \raggedright
+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
+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
+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
+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
+\end{multicols}
+\end{document}