summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source/latex/tools
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2015-04-13 13:48:08 +0000
committerKarl Berry <karl@freefriends.org>2015-04-13 13:48:08 +0000
commit013bf3bc293cf08e4b4167cb42180bc355f399c0 (patch)
tree5235dfbae8830590c7fc6a0c70ecd3c84d22c677 /Master/texmf-dist/source/latex/tools
parentbacfc70aefdbc2ec3496c976ad12fe9ef26604e1 (diff)
latex2e 2015/01/01
git-svn-id: svn://tug.org/texlive/trunk@36834 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source/latex/tools')
-rw-r--r--Master/texmf-dist/source/latex/tools/afterpage.dtx3
-rw-r--r--Master/texmf-dist/source/latex/tools/afterpage.ins26
-rw-r--r--Master/texmf-dist/source/latex/tools/array.dtx1
-rw-r--r--Master/texmf-dist/source/latex/tools/bm.dtx1
-rw-r--r--Master/texmf-dist/source/latex/tools/bm.ins26
-rw-r--r--Master/texmf-dist/source/latex/tools/calc.dtx1
-rw-r--r--Master/texmf-dist/source/latex/tools/dcolumn.dtx1
-rw-r--r--Master/texmf-dist/source/latex/tools/delarray.dtx3
-rw-r--r--Master/texmf-dist/source/latex/tools/enumerate.dtx1
-rw-r--r--Master/texmf-dist/source/latex/tools/fileerr.dtx1
-rw-r--r--Master/texmf-dist/source/latex/tools/fontsmpl.dtx1
-rw-r--r--Master/texmf-dist/source/latex/tools/ftnright.dtx2
-rw-r--r--Master/texmf-dist/source/latex/tools/hhline.dtx3
-rw-r--r--Master/texmf-dist/source/latex/tools/indentfirst.dtx3
-rw-r--r--Master/texmf-dist/source/latex/tools/layout.dtx1
-rw-r--r--Master/texmf-dist/source/latex/tools/longtable.dtx4
-rw-r--r--Master/texmf-dist/source/latex/tools/longtable.ins26
-rw-r--r--Master/texmf-dist/source/latex/tools/multicol.dtx434
-rw-r--r--Master/texmf-dist/source/latex/tools/multicol.ins28
-rw-r--r--Master/texmf-dist/source/latex/tools/rawfonts.dtx1
-rw-r--r--Master/texmf-dist/source/latex/tools/showkeys.dtx1
-rw-r--r--Master/texmf-dist/source/latex/tools/somedefs.dtx1
-rw-r--r--Master/texmf-dist/source/latex/tools/tabularx.dtx1
-rw-r--r--Master/texmf-dist/source/latex/tools/tabularx.ins26
-rw-r--r--Master/texmf-dist/source/latex/tools/theorem.dtx10
-rw-r--r--Master/texmf-dist/source/latex/tools/tools.ins29
-rw-r--r--Master/texmf-dist/source/latex/tools/trace.dtx7
-rw-r--r--Master/texmf-dist/source/latex/tools/varioref.dtx1
-rw-r--r--Master/texmf-dist/source/latex/tools/varioref.ins26
-rw-r--r--Master/texmf-dist/source/latex/tools/verbatim.dtx14
-rw-r--r--Master/texmf-dist/source/latex/tools/xr.dtx4
-rw-r--r--Master/texmf-dist/source/latex/tools/xspace.dtx1
32 files changed, 430 insertions, 258 deletions
diff --git a/Master/texmf-dist/source/latex/tools/afterpage.dtx b/Master/texmf-dist/source/latex/tools/afterpage.dtx
index 932ce59b072..4722377aeaf 100644
--- a/Master/texmf-dist/source/latex/tools/afterpage.dtx
+++ b/Master/texmf-dist/source/latex/tools/afterpage.dtx
@@ -35,8 +35,9 @@
\title{The \textsf{afterpage} package\thanks{This file
has version number \fileversion, last
revised \filedate.}}
-\author{David Carlisle\\carlisle@cs.man.ac.uk}
+\author{David Carlisle}
\date{\filedate}
+\MaintainedByLaTeXTeam{tools}
\maketitle
\DocInput{afterpage.dtx}
\end{document}
diff --git a/Master/texmf-dist/source/latex/tools/afterpage.ins b/Master/texmf-dist/source/latex/tools/afterpage.ins
index ad544fade7e..fa0a5ff1dcb 100644
--- a/Master/texmf-dist/source/latex/tools/afterpage.ins
+++ b/Master/texmf-dist/source/latex/tools/afterpage.ins
@@ -3,28 +3,28 @@
%% driver files from the doc files in this package when run through
%% LaTeX or TeX.
%%
-%% Copyright 1993-2014
+%% Copyright 1993-2015
%% The LaTeX3 Project and any individual authors listed elsewhere
-%% in this file.
-%%
+%% in this file.
+%%
%% This file is part of the Standard LaTeX `Tools Bundle'.
%% -------------------------------------------------------
-%%
+%%
%% It may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3c
%% of this license or (at your option) any later version.
%% The latest version of this license is in
%% http://www.latex-project.org/lppl.txt
-%% and version 1.3c or later is part of all distributions of LaTeX
+%% and version 1.3c or later is part of all distributions of LaTeX
%% version 2005/12/01 or later.
-%%
+%%
%% In particular, NO PERMISSION is granted to modify the contents of this
%% file since it contains the legal notices that are placed in the files
%% it generates.
-%%
+%%
%% The list of all files belonging to the `Tools Bundle' is
%% given in the file `manifest.txt'.
-%%
+%%
%%
%% --------------- start of docstrip commands ------------------
%%
@@ -38,9 +38,13 @@
This is a generated file.
-Copyright 1993-2014
+The source is maintained by the LaTeX Project team and bug
+reports for it can be opened at http://latex-project.org/bugs.html
+(but please observe conditions on bug reports sent to that address!)
+
+Copyright 1993-2015
The LaTeX3 Project and any individual authors listed elsewhere
-in this file.
+in this file.
This file was generated from file(s) of the Standard LaTeX `Tools Bundle'.
--------------------------------------------------------------------------
@@ -50,7 +54,7 @@ conditions of the LaTeX Project Public License, either version 1.3c
of this license or (at your option) any later version.
The latest version of this license is in
http://www.latex-project.org/lppl.txt
-and version 1.3c or later is part of all distributions of LaTeX
+and version 1.3c or later is part of all distributions of LaTeX
version 2005/12/01 or later.
This file may only be distributed together with a copy of the LaTeX
diff --git a/Master/texmf-dist/source/latex/tools/array.dtx b/Master/texmf-dist/source/latex/tools/array.dtx
index 5b48c6d1538..d869ca48fbf 100644
--- a/Master/texmf-dist/source/latex/tools/array.dtx
+++ b/Master/texmf-dist/source/latex/tools/array.dtx
@@ -197,6 +197,7 @@
%
% \date{Printed \today}
%
+% \MaintainedByLaTeXTeam{tools}
% \maketitle
%
% \MakeShortVerb{\=}
diff --git a/Master/texmf-dist/source/latex/tools/bm.dtx b/Master/texmf-dist/source/latex/tools/bm.dtx
index 2f2a7be12ab..cf1da612630 100644
--- a/Master/texmf-dist/source/latex/tools/bm.dtx
+++ b/Master/texmf-dist/source/latex/tools/bm.dtx
@@ -59,6 +59,7 @@
%
% \date{\filedate}
% \author{David Carlisle with support by Frank Mittelbach}
+% \MaintainedByLaTeXTeam{tools}
% \maketitle
%
% \section{Introduction}
diff --git a/Master/texmf-dist/source/latex/tools/bm.ins b/Master/texmf-dist/source/latex/tools/bm.ins
index b9e659bdbdc..cf5c792f866 100644
--- a/Master/texmf-dist/source/latex/tools/bm.ins
+++ b/Master/texmf-dist/source/latex/tools/bm.ins
@@ -3,28 +3,28 @@
%% driver files from the doc files in this package when run through
%% LaTeX or TeX.
%%
-%% Copyright 1993-2014
+%% Copyright 1993-2015
%% The LaTeX3 Project and any individual authors listed elsewhere
-%% in this file.
-%%
+%% in this file.
+%%
%% This file is part of the Standard LaTeX `Tools Bundle'.
%% -------------------------------------------------------
-%%
+%%
%% It may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3c
%% of this license or (at your option) any later version.
%% The latest version of this license is in
%% http://www.latex-project.org/lppl.txt
-%% and version 1.3c or later is part of all distributions of LaTeX
+%% and version 1.3c or later is part of all distributions of LaTeX
%% version 2005/12/01 or later.
-%%
+%%
%% In particular, NO PERMISSION is granted to modify the contents of this
%% file since it contains the legal notices that are placed in the files
%% it generates.
-%%
+%%
%% The list of all files belonging to the `Tools Bundle' is
%% given in the file `manifest.txt'.
-%%
+%%
%%
%% --------------- start of docstrip commands ------------------
%%
@@ -38,9 +38,13 @@
This is a generated file.
-Copyright 1993-2014
+The source is maintained by the LaTeX Project team and bug
+reports for it can be opened at http://latex-project.org/bugs.html
+(but please observe conditions on bug reports sent to that address!)
+
+Copyright 1993-2015
The LaTeX3 Project and any individual authors listed elsewhere
-in this file.
+in this file.
This file was generated from file(s) of the Standard LaTeX `Tools Bundle'.
--------------------------------------------------------------------------
@@ -50,7 +54,7 @@ conditions of the LaTeX Project Public License, either version 1.3c
of this license or (at your option) any later version.
The latest version of this license is in
http://www.latex-project.org/lppl.txt
-and version 1.3c or later is part of all distributions of LaTeX
+and version 1.3c or later is part of all distributions of LaTeX
version 2005/12/01 or later.
This file may only be distributed together with a copy of the LaTeX
diff --git a/Master/texmf-dist/source/latex/tools/calc.dtx b/Master/texmf-dist/source/latex/tools/calc.dtx
index 0c57e6e00fd..284a8e1b2d3 100644
--- a/Master/texmf-dist/source/latex/tools/calc.dtx
+++ b/Master/texmf-dist/source/latex/tools/calc.dtx
@@ -64,6 +64,7 @@
% \author{Kresten Krab Thorup, Frank Jensen (and Chris Rowley)}
% \date{\filedate}
%
+% \MaintainedByLaTeXTeam{tools}
% \maketitle
%
% \changes{v4.0d}{1997/11/08}
diff --git a/Master/texmf-dist/source/latex/tools/dcolumn.dtx b/Master/texmf-dist/source/latex/tools/dcolumn.dtx
index b0be7a5422c..81f2f474c74 100644
--- a/Master/texmf-dist/source/latex/tools/dcolumn.dtx
+++ b/Master/texmf-dist/source/latex/tools/dcolumn.dtx
@@ -52,6 +52,7 @@
% \author{David Carlisle}
% \date{\filedate}
% \author{David Carlisle}
+% \MaintainedByLaTeXTeam{tools}
% \maketitle
%
%
diff --git a/Master/texmf-dist/source/latex/tools/delarray.dtx b/Master/texmf-dist/source/latex/tools/delarray.dtx
index eee2563a0f6..7a9495af405 100644
--- a/Master/texmf-dist/source/latex/tools/delarray.dtx
+++ b/Master/texmf-dist/source/latex/tools/delarray.dtx
@@ -35,8 +35,9 @@
\title{The \textsf{delarray} package\thanks{This file
has version number \fileversion, last
revised \filedate.}}
-\author{David Carlisle\\carlisle@cs.man.ac.uk}
+\author{David Carlisle}
\date{\filedate}
+ \MaintainedByLaTeXTeam{tools}
\maketitle
\DocInput{delarray.dtx}
\end{document}
diff --git a/Master/texmf-dist/source/latex/tools/enumerate.dtx b/Master/texmf-dist/source/latex/tools/enumerate.dtx
index 3c26cbdde92..b3a6b98eacd 100644
--- a/Master/texmf-dist/source/latex/tools/enumerate.dtx
+++ b/Master/texmf-dist/source/latex/tools/enumerate.dtx
@@ -49,6 +49,7 @@
% revised \filedate.}}
% \author{David Carlisle}
% \date{\filedate}
+% \MaintainedByLaTeXTeam{tools}
% \maketitle
%
% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
diff --git a/Master/texmf-dist/source/latex/tools/fileerr.dtx b/Master/texmf-dist/source/latex/tools/fileerr.dtx
index cbddc36eeff..9aadbd0f86d 100644
--- a/Master/texmf-dist/source/latex/tools/fileerr.dtx
+++ b/Master/texmf-dist/source/latex/tools/fileerr.dtx
@@ -29,6 +29,7 @@
% \title{File not found error\thanks{This file has version
% \fileversion\ last revised \filedate}}
% \author{Frank Mittelbach}
+% \MaintainedByLaTeXTeam{tools}
% \maketitle
%
% \changes{v1.0e}{97/07/07}{Added q and r replies (PR/2525).}
diff --git a/Master/texmf-dist/source/latex/tools/fontsmpl.dtx b/Master/texmf-dist/source/latex/tools/fontsmpl.dtx
index 0bf8f9455fe..da6883c63ca 100644
--- a/Master/texmf-dist/source/latex/tools/fontsmpl.dtx
+++ b/Master/texmf-dist/source/latex/tools/fontsmpl.dtx
@@ -24,6 +24,7 @@
% \author{Alan Jeffrey}
% \date{v0.11}
%
+% \MaintainedByLaTeXTeam{tools}
% \maketitle
%
% \CheckSum{335}
diff --git a/Master/texmf-dist/source/latex/tools/ftnright.dtx b/Master/texmf-dist/source/latex/tools/ftnright.dtx
index 286738be565..b4fe704e84e 100644
--- a/Master/texmf-dist/source/latex/tools/ftnright.dtx
+++ b/Master/texmf-dist/source/latex/tools/ftnright.dtx
@@ -1,6 +1,6 @@
% \iffalse meta-comment
%
-% Copyright 1993-2014
+% Copyright 1993-2015
%
% The LaTeX3 Project and any individual authors listed elsewhere
% in this file.
diff --git a/Master/texmf-dist/source/latex/tools/hhline.dtx b/Master/texmf-dist/source/latex/tools/hhline.dtx
index 52536a93752..b7521594131 100644
--- a/Master/texmf-dist/source/latex/tools/hhline.dtx
+++ b/Master/texmf-dist/source/latex/tools/hhline.dtx
@@ -35,8 +35,9 @@
\title{The \textsf{hhline} package\thanks{This file
has version number \fileversion, last
revised \filedate.}}
-\author{David Carlisle\\carlisle@cs.man.ac.uk}
+\author{David Carlisle}
\date{\filedate}
+ \MaintainedByLaTeXTeam{tools}
\maketitle
\DeleteShortVerb{\|}
\DocInput{hhline.dtx}
diff --git a/Master/texmf-dist/source/latex/tools/indentfirst.dtx b/Master/texmf-dist/source/latex/tools/indentfirst.dtx
index 229dbbe58f9..a487867aab3 100644
--- a/Master/texmf-dist/source/latex/tools/indentfirst.dtx
+++ b/Master/texmf-dist/source/latex/tools/indentfirst.dtx
@@ -35,8 +35,9 @@
\title{The \textsf{indentfirst} package\thanks{This file
has version number \fileversion, last
revised \filedate.}}
-\author{David Carlisle\\carlisle@cs.man.ac.uk}
+\author{David Carlisle}
\date{\filedate}
+\MaintainedByLaTeXTeam{tools}
\maketitle
\DocInput{indentfirst.dtx}
\end{document}
diff --git a/Master/texmf-dist/source/latex/tools/layout.dtx b/Master/texmf-dist/source/latex/tools/layout.dtx
index 2734c526d6c..5d96f1dda4f 100644
--- a/Master/texmf-dist/source/latex/tools/layout.dtx
+++ b/Master/texmf-dist/source/latex/tools/layout.dtx
@@ -64,6 +64,7 @@
% \markboth{layout package version \fileversion\space as of \filedate}
% {layout package version \fileversion\space as of \filedate}
%
+% \MaintainedByLaTeXTeam{tools}
% \maketitle
%
% \section{Introduction}
diff --git a/Master/texmf-dist/source/latex/tools/longtable.dtx b/Master/texmf-dist/source/latex/tools/longtable.dtx
index 9cd4852b86f..32e958fd5a8 100644
--- a/Master/texmf-dist/source/latex/tools/longtable.dtx
+++ b/Master/texmf-dist/source/latex/tools/longtable.dtx
@@ -49,14 +49,14 @@
% revised \filedate.}}
% \author{David Carlisle\thanks{The new algorithm for aligning `chunks'
% of a table used in version 4 of this package was devised coded
-% and documented by David Kastrup,
-% \texttt{dak@neuroinformatik.ruhr-uni-bochum.de}.}}
+% and documented by David Kastrup.}}
% \date{\filedate}
%
% \let\package\textsf
% \let\env\textsf
% \providecommand\finalclearpage{\clearpage}
%
+% \MaintainedByLaTeXTeam{tools}
% \maketitle
%
% \begin{abstract}
diff --git a/Master/texmf-dist/source/latex/tools/longtable.ins b/Master/texmf-dist/source/latex/tools/longtable.ins
index c6ace539ddb..f04e21181eb 100644
--- a/Master/texmf-dist/source/latex/tools/longtable.ins
+++ b/Master/texmf-dist/source/latex/tools/longtable.ins
@@ -3,28 +3,28 @@
%% driver files from the doc files in this package when run through
%% LaTeX or TeX.
%%
-%% Copyright 1993-2014
+%% Copyright 1993-2015
%% The LaTeX3 Project and any individual authors listed elsewhere
-%% in this file.
-%%
+%% in this file.
+%%
%% This file is part of the Standard LaTeX `Tools Bundle'.
%% -------------------------------------------------------
-%%
+%%
%% It may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3c
%% of this license or (at your option) any later version.
%% The latest version of this license is in
%% http://www.latex-project.org/lppl.txt
-%% and version 1.3c or later is part of all distributions of LaTeX
+%% and version 1.3c or later is part of all distributions of LaTeX
%% version 2005/12/01 or later.
-%%
+%%
%% In particular, NO PERMISSION is granted to modify the contents of this
%% file since it contains the legal notices that are placed in the files
%% it generates.
-%%
+%%
%% The list of all files belonging to the `Tools Bundle' is
%% given in the file `manifest.txt'.
-%%
+%%
%%
%% --------------- start of docstrip commands ------------------
%%
@@ -38,9 +38,13 @@
This is a generated file.
-Copyright 1993-2014
+The source is maintained by the LaTeX Project team and bug
+reports for it can be opened at http://latex-project.org/bugs.html
+(but please observe conditions on bug reports sent to that address!)
+
+Copyright 1993-2015
The LaTeX3 Project and any individual authors listed elsewhere
-in this file.
+in this file.
This file was generated from file(s) of the Standard LaTeX `Tools Bundle'.
--------------------------------------------------------------------------
@@ -50,7 +54,7 @@ conditions of the LaTeX Project Public License, either version 1.3c
of this license or (at your option) any later version.
The latest version of this license is in
http://www.latex-project.org/lppl.txt
-and version 1.3c or later is part of all distributions of LaTeX
+and version 1.3c or later is part of all distributions of LaTeX
version 2005/12/01 or later.
This file may only be distributed together with a copy of the LaTeX
diff --git a/Master/texmf-dist/source/latex/tools/multicol.dtx b/Master/texmf-dist/source/latex/tools/multicol.dtx
index 4e0fb6b16ab..3eff4d0c1e7 100644
--- a/Master/texmf-dist/source/latex/tools/multicol.dtx
+++ b/Master/texmf-dist/source/latex/tools/multicol.dtx
@@ -20,7 +20,7 @@
% \iffalse This is a METACOMMENT
%
%% Package `multicol' to use with LaTeX2e
-%% Copyright 1989-2014 Frank Mittelbach
+%% Copyright 1989-2015 Frank Mittelbach
%%
%% In addition to the terms of LPPL any distributed version
%% (unchanged or modified) of multicol has to keep the statement
@@ -91,10 +91,10 @@
%<driver> \ProvidesFile{multicol.drv}
% \fi
% \ProvidesFile{multicol.dtx}
- [2014/10/28 v1.8i multicolumn formatting (FMi)]
+ [2015/03/31 v1.8m multicolumn formatting (FMi)]
%
%
-%% \CheckSum{1853}
+%% \CheckSum{1891}
%% \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
@@ -173,6 +173,7 @@
% {\rm Email:} see top of the source file}
% \date{Printed \today}
%
+% \MaintainedByLaTeXTeam{tools}
% \maketitle
%
% \begin{abstract}
@@ -1675,7 +1676,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}
@@ -1727,16 +1728,13 @@
% \changes{v1.6d}{2003/04/17}{Catch problem with \cs{columnbreak} in
% last line}
% \begin{macrocode}
-%<*colbreak>
\ifdim\pagegoal=\maxdimen
\ifvoid\colbreak@box\else
\mult@info\@ne{Re-adding forced
break(s) for splitting}%
\unvbox\colbreak@box\fi
\fi
-%</colbreak>
% \end{macrocode}
-%
% If we are in an unrestricted \mc{} environment we end the current
% paragraph above with |\par| but this isn't sufficient since \TeX{}s
% {\it page\_builder} will not totally empty the contribution
@@ -1765,7 +1763,8 @@
% Now it's safe to change the output routine in order to balance
% the columns.
% \begin{macrocode}
- \output{\balance@columns@out}\eject
+ \output{\balance@columns@out}%
+ \eject
% \end{macrocode}
% If the \mc{} environment body was completely empty or if a
% multi-page \mc{} just ends at a page boundary we have the unusual
@@ -2136,7 +2135,7 @@
% \end{macro}
%
%
-% \begin{macro}{\vfillmaxdepth}
+% \begin{macro}{\vfilmaxdepth}
% This curious definition is used as the space at the bottom of a
% column if we implement |\raggedcolumns|. Normlly one only appends
% |\vfill| in that case but this is actually wrong for columns that
@@ -2145,10 +2144,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}
% \begin{macrocode}
-\def\vfillmaxdepth{\vskip \z@ \@plus 1fill \@minus \maxdepth}
+\def\vfilmaxdepth{\vskip \z@ \@plus .0001fil
+ \@minus \maxdepth}
% \end{macrocode}
% \end{macro}
%
@@ -2171,7 +2172,7 @@
% If this was a |\clearpage|, a float or a marginpar we call
% |\speci@ls|
% \begin{macrocode}
- \speci@ls \else
+ \speci@ls \else
% \end{macrocode}
% otherwise we construct the final page.
% \changes{v1.5u}{1999/05/25}{Support \cs{columnbreak}}
@@ -2179,15 +2180,14 @@
% column break support}
% For the next block of code see comments in section~\ref{sec:colbreak}.
% \begin{macrocode}
-%<*colbreak>
- \ifvoid\colbreak@box\else
- \mult@info\@ne{Re-adding forced
- break(s) for splitting}%
- \setbox\@cclv\vbox{%
- \unvbox\colbreak@box
- \penalty-\@Mv\unvbox\@cclv}%
- \fi
-%</colbreak>
+ \ifvoid\colbreak@box\else
+ \mult@info\@ne{Re-adding forced
+ break(s) for splitting}%
+ \setbox\@cclv\vbox{%
+ \unvbox\colbreak@box
+ \penalty-\@Mv
+ \unvbox\@cclv}%
+ \fi
% \end{macrocode}
% Let us now consider the
% normal case. We have to |\vsplit| the columns from the
@@ -2197,6 +2197,12 @@
\splittopskip\topskip
\splitmaxdepth\maxdepth
% \end{macrocode}
+% We also need to restrict |\boxmaxdepth| so that re-boxing is not
+% generating boxes with arbitrary depth.
+% \changes{v1.8j}{2015/03/07}{Set \cs{boxmaxdepth}}
+% \begin{macrocode}
+ \boxmaxdepth\maxdepth
+% \end{macrocode}
% Then we calculate the current column height (in |\dimen@|).
% Note that the height of |\partial@page| is already
% subtracted from |\@colroom| so we can use its value as a
@@ -2264,28 +2270,28 @@
% this was wrong and unboxing is always needed.}
% \changes{v1.8b}{2013/08/28}{Remove discardable items at the
% end of split boxes}
-% \changes{v1.8h}{2014/09/12}{Use \cs{vfillmaxdepth}}
+% \changes{v1.8h}{2014/09/12}{Use \cs{vfilmaxdepth}}
+% \changes{v1.8k}{2015/03/22}{\cs{remove@discardable@items} removed}
% \begin{macrocode}
\setbox\count@
\vbox to\dimen@
{\unvbox\count@
- \remove@discardable@items
- \ifshr@nking\vfillmaxdepth\fi}%
+ \ifshr@nking\vfilmaxdepth\fi}%
}%
% \end{macrocode}
% Then the last column follows.
% \changes{v1.5a}{1992/11/04}{New box mechanism}
% \changes{v1.8b}{2013/08/28}{Remove discardable items at the
% end of split boxes}
-% \changes{v1.8h}{2014/09/12}{Use \cs{vfillmaxdepth}}
+% \changes{v1.8h}{2014/09/12}{Use \cs{vfilmaxdepth}}
+% \changes{v1.8k}{2015/03/22}{\cs{remove@discardable@items} removed}
% \begin{macrocode}
\setbox\mult@rightbox
\vsplit\@cclv to\dimen@
\set@keptmarks
\setbox\mult@rightbox\vbox to\dimen@
{\unvbox\mult@rightbox
- \remove@discardable@items
- \ifshr@nking\vfillmaxdepth\fi}%
+ \ifshr@nking\vfilmaxdepth\fi}%
% \end{macrocode}
% Now that we are done with the boxes, we restored the current
% setting for shrinking in case it got changed:
@@ -2503,21 +2509,44 @@
% column break support}
% For the next block of code see comments in section~\ref{sec:colbreak}.
% \begin{macrocode}
-%<*colbreak>
\ifnum\outputpenalty = -\@Mv
\mult@info\@ne{Forced column
break seen}%
\global\advance\vsize-\pagetotal
\global\setbox\colbreak@box
- \vbox{\ifvoid\colbreak@box
- \else
- \unvbox\colbreak@box
- \penalty-\@Mv
- \fi
- \unvbox\@cclv}
+ \vbox{%
+ \ifvoid\colbreak@box
+ \else
+ \unvbox\colbreak@box
+ \penalty-\@Mv
+ \fi
+% \end{macrocode}
+% As this is the place of a forced break we now remove vertical
+% white space just in front of it (or some of it at least) as it is
+% quite likely that the break is not exactly in the right place,
+% e.g., after a display environment (if LaTeX would break here by
+% its own it would break before the space following the display).
+%
+% Thus we rebox box 255 once (using |\maxdepth| and calling
+% |\remove@discardable@items| inside). The depth of 255 will then
+% give us the depth the box would have had if it would have been a
+% natural break. We then unbox 255 to get it into the
+% |\colbreak@box| and then back up by this depth. This will position
+% the bottom of the box at its natural baseline which is useful for
+% balancing later on.
+% \changes{v1.8k}{2015/03/21}{Remove discarable items just before a
+% forced break}
+% \begin{macrocode}
+ \boxmaxdepth\maxdepth
+ \setbox\@cclv\vbox{%
+ \unvbox\@cclv
+ \remove@discardable@items}%
+ \dimen@\dp\@cclv
+ \unvbox\@cclv
+ \kern-\dimen@
+ }%
\reinsert@footnotes
\else
-%</colbreak>
% \end{macrocode}
% If we encounter a float or a marginpar in the current
% implementation we simply warn the user that this is not allowed.
@@ -2526,7 +2555,7 @@
\PackageWarningNoLine{multicol}%
{Floats and marginpars not
allowed inside `multicols'
- environment!}
+ environment!}%
\unvbox\@cclv\reinsert@footnotes
% \end{macrocode}
% Additionally we empty the |\@currlist| to avoid later error
@@ -2538,9 +2567,7 @@
% \begin{macrocode}
\xdef\@freelist{\@freelist\@currlist}%
\gdef\@currlist{}%
-%<*colbreak>
\fi
-%</colbreak>
\fi
% \end{macrocode}
% If the penalty is $-10001$ it will come from a |\clearpage| and
@@ -2624,24 +2651,33 @@
\def\balance@columns@out{%
% \end{macrocode}
% For this we need to put the contents of box 255 into |\mult@box|.
-% \begin{macrocode}
-%<-colbreak> \setbox\mult@box
-%<-colbreak> \vbox{\unvbox\@cclv}%
-% \end{macrocode}
% \changes{v1.5u}{1999/05/25}{Support \cs{columnbreak}}
-% \changes{v1.5v}{1999/07/18}{Added debug statements for
-% column break support}
-% For the next block of code see comments in section~\ref{sec:colbreak}.
+% \changes{v1.5v}{1999/07/18}{Added debug statements for column break
+% support} For the next block of code see also comments in
+% section~\ref{sec:colbreak}. All forced breaks except the last are
+% inside |\colbreak@box| so all we have to do is to concatenate this
+% box with box |\@cclv| and put a penalty inbetween. Here we test if
+% |\colbreak@box| is void so that the message is only generated if
+% we really add forced breaks and the penalty.
+% \changes{v1.8k}{2015/03/21}{Use \cs{@Mv} and not \cs{break} in case
+% this forced break is not used on this page}
% \begin{macrocode}
-%<*colbreak>
\setbox\mult@box\vbox{%
\ifvoid\colbreak@box\else
- \unvbox\colbreak@box\break
+ \unvbox\colbreak@box
+ \penalty-\@Mv
\mult@info\@ne{Re-adding
forced break(s) in balancing}%
\fi
- \unvbox\@cclv}%
-%</colbreak>
+ \unvbox\@cclv
+% \end{macrocode}
+% The last column again is a forced break, so here we discard white
+% space as well as that is normally unwanted.
+% \changes{v1.8k}{2015/03/21}{Add \cs{remove@discardable@items} at the
+% end of the last column when balancing.}
+% \begin{macrocode}
+ \remove@discardable@items
+ }%
\balance@columns
% \end{macrocode}
% If during balancing the columns got too long the flag
@@ -2653,7 +2689,8 @@
{Balancing failed ...
cut a normal page}%
% \end{macrocode}
-% In that case we put the material back in box 255. The curious set of
+% In that case we put the material back in box 255 so that we can
+% cut a normal page. The curious set of
% |\vskip|s we add is necessary to cancel out the |\splittopskip|
% that got added for balancing.
% \begin{macrocode}
@@ -2664,7 +2701,8 @@
% \end{macrocode}
% We then call the standard multicol output routine which will
% produce a normal page for us (remember we are still within the
-% OR).
+% OR so some part of the code in |\multi@column@out| is actually not
+% doing anything---perhaps this should be cleaned up at some point).
% This also means that if there was an |\enlargethispage| present
% it will apply to this page as |\multi@column@out| will look at
% the status of |\@kludgeins|.
@@ -2673,11 +2711,13 @@
% \end{macrocode}
% Because balancing made the columns too long we are sure that there
% will be some material remaining which was put back onto the main
-% vertical list by |\multi@column@out|. We therefore add another
-% breakpoint so that this material will then be processed by the
-% balancing OR to finish off the multicol environment.
+% vertical list by |\multi@column@out|. This will also put the
+% explicit |\eject| penalty back so the current
+% |\balance@columns@out| output routine will be called again (so we
+% better do not add another penalty or else the OR will be called
+% twice and we may get scrambled results).
+% \changes{v1.8k}{2015/03/21}{No additional penalty here}
% \begin{macrocode}
- \break
\else
% \end{macrocode}
% If the balancing went ok, we are in the position
@@ -2741,11 +2781,11 @@
% also add a forced break point at the very beginning, so that we
% can split the box to height zero later on, thereby adding a known
% |\splittopskip| glue at the beginning.
+% \changes{v1.8k}{2015/03/21}{\cs{remove@discardable@items} removed}
% \begin{macrocode}
\setbox\mult@box\vbox{%
\penalty-\@M
\unvbox\mult@box
- \remove@discardable@items
}%
% \end{macrocode}
% Then follow values assignments to get the |\vsplit|ting right.
@@ -2859,7 +2899,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
@@ -2894,11 +2934,15 @@
% \end{macrocode}
% We start with the assumption that the trial will be successful.
% If we end up with a solution that is too bad we set
-% |too@bad| to \texttt{true}.
+% |too@bad| to \texttt{true}. We also assume that all forced breaks
+% (if any) will be used during balancing. If this is not the case
+% we record this in |forcedbreak@leftover|.
% \changes{v1.5b}{1992/11/05}{New badness mechanism}
+% \changes{v1.8k}{2015/03/21}{Init \cs{ifforcedbreak@leftover}}
% \begin{macrocode}
%<*badness>
\too@badfalse
+ \forcedbreak@leftoverfalse
%</badness>
% \end{macrocode}
% Using |\vsplit| we extract the other columns from box register
@@ -2914,11 +2958,12 @@
% the bottom, so we rebox once more.
% \changes{v1.8b}{2013/08/28}{Remove discardable items at the
% end of split boxes}
+% \changes{v1.8k}{2015/03/21}{Do not use \cs{remove@discardable@items}
+% here}
% \begin{macrocode}
\global\setbox\count@
\vbox to\dimen@
- {\unvbox\count@
- \remove@discardable@items}%
+ {\unvbox\count@}%
% \end{macrocode}
% After every split we check the badness of the resulting column,
% normally the amount of extra white in the column.
@@ -3059,12 +3104,10 @@
% the column in which case the material after the break would have
% stayed in the box.
% \begin{macrocode}
-%<*colbreak>
\setbox\@tempboxa
\copy\mult@grightbox
\setbox\z@\vsplit\@tempboxa to\maxdimen
\ifvoid\@tempboxa
-%</colbreak>
% \end{macrocode}
% Thus if |\@tempboxa| is void we have a valid solution.
% In this case we take a closer
@@ -3086,12 +3129,13 @@
% We then compare this badness with the allowed badness for the final
% column. If it does not exceed this value we use the box, otherwise
% we rebox it once more and add some glue at the bottom.
-% \changes{v1.8h}{2014/09/12}{Use \cs{vfillmaxdepth}}
+% \changes{v1.8h}{2014/09/12}{Use \cs{vfilmaxdepth}}
+% \changes{v1.8j}{2015/03/07}{Use \cs{vfil} in this case}
% \begin{macrocode}
\ifnum\badness>\c@finalcolumnbadness
\global\setbox\mult@grightbox
\vbox to\dimen@
- {\unvbox\mult@grightbox\vfillmaxdepth}%
+ {\unvbox\mult@grightbox\vfil}%
\ifnum\c@tracingmulticols>\@ne
\message{ setting natural
(> \the\c@finalcolumnbadness)}%
@@ -3102,15 +3146,38 @@
% we report this fact and try again.
% \changes{v1.6f}{2004/07/03}{\texttt{/colbreak} guard in the wrong position}
% \begin{macrocode}
-%<*colbreak>
\else
+% \end{macrocode}
+% 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
+% 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
+% |\maxbalancingoverflow| we give up and instead of balancing cut
+% another normal page. To be indicate this case we set
+% |forcedbreak@leftover| to true.
+% \changes{v1.8k}{2015/03/21}{Watch out for columns growing too far in
+% case of forced breaks}
+% \changes{v1.8l}{2015/03/25}{Added additional tracing if column overflows}
+% \begin{macrocode}
+ \@tempdima\@colroom
+ \advance\@tempdima \maxbalancingoverflow
+ \ifdim \dimen@ < \@tempdima
\too@badtrue
- \ifnum\c@tracingmulticols>\@ne
- \typeout{Rejected: unprocessed
- forced break(s) in last column!}%
- \fi
+ \ifnum\c@tracingmulticols>\@ne
+ \typeout{Rejected: unprocessed
+ forced break(s) in last column!}%
+ \fi
+ \else
+ \forcedbreak@leftovertrue
+ \ifnum\c@tracingmulticols>\@ne
+ \typeout{Failed: columns too large
+ with unprocessed forced break(s)!}%
+ \fi
+ \fi
\fi
-%</colbreak>
\fi
% \end{macrocode}
% If the natural height of the first box is smaller than the
@@ -3141,6 +3208,19 @@
%</badness>
\advance\dimen@\p@
\repeat
+% \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
+% columns get too high, so we set this flag here too in order to
+% get the same processing logic.\footnote{Should get cleaned up as
+% we now have two different routes to reach this part of the
+% processing.}
+% \changes{v1.8k}{2015/03/21}{}
+% \begin{macrocode}
+ \ifforcedbreak@leftover
+ \too@badtrue
+ \else
% \end{macrocode}
% At that point |\dimen@| holds the height that was determined by
% the balancing loop.
@@ -3161,11 +3241,11 @@
% \changes{v1.5y}{2000/06/10}{Limit column height only in unrestricted
% mode (pr/3212)}
% \begin{macrocode}
- \if@boxedmulticols\else
- \ifdim\dimen@>\@colroom
- \dimen@\@colroom
+ \if@boxedmulticols\else
+ \ifdim\dimen@>\@colroom
+ \dimen@\@colroom
+ \fi
\fi
- \fi
% \end{macrocode}
% Then we move the contents of the odd-numbered box registers to
% the even-numbered ones, shrinking them if requested.
@@ -3176,26 +3256,26 @@
% page-builder via |\page@sofar|.
% \changes{v1.3a}{1990/05/20}{Changed \cs{vtop} to \cs{vbox}.}
% \begin{macrocode}
- \process@cols\mult@rightbox
- {\@tempcnta\count@
- \advance\@tempcnta\@ne
+ \process@cols\mult@rightbox
+ {\@tempcnta\count@
+ \advance\@tempcnta\@ne
% \end{macrocode}
% when putting the final column together we want overfull
% information:
% \begin{macrocode}
- \vfuzz\z@
- \setbox\count@\vbox to\dimen@
- {%
+ \vfuzz\z@
+ \setbox\count@\vbox to\dimen@
+ {%
% \end{macrocode}
%
-% \changes{v1.8h}{2014/09/12}{Use \cs{vfillmaxdepth}}
+% \changes{v1.8h}{2014/09/12}{Use \cs{vfilmaxdepth}}
% \begin{macrocode}
- \vskip \z@
- \@plus-\multicolundershoot
- \@minus-\multicolovershoot
- \unvbox\@tempcnta
- \ifshr@nking\vfillmaxdepth\fi
- }%
+ \vskip \z@
+ \@plus-\multicolundershoot
+ \@minus-\multicolovershoot
+ \unvbox\@tempcnta
+ \ifshr@nking\vfilmaxdepth\fi
+ }%
% \end{macrocode}
% If the resulting box is overfull there was too much material to
% fit into the available space. The question though is how much? If
@@ -3204,32 +3284,37 @@
% would then have difficulties to balance).
% \changes{v1.8a}{2011/12/20}{Balancing concept improved}
% \begin{macrocode}
- \ifnum\badness>\@M
- \vfuzz\maxdimen % no overfull warning
- \setbox\@tempboxa \vbox to\dimen@
- {\vskip-\maxbalancingoverflow
- \unvcopy\count@}%
\ifnum\badness>\@M
- \mult@info\@ne
- {Balanced column more than
- \the\maxbalancingoverflow\space
- too large}%
+ \vfuzz\maxdimen % no overfull warning
+ \setbox\@tempboxa \vbox to\dimen@
+ {\vskip-\maxbalancingoverflow
+ \unvcopy\count@}%
+ \ifnum\badness>\@M
+ \mult@info\@ne
+ {Balanced column more than
+ \the\maxbalancingoverflow\space
+ too large}%
% \end{macrocode}
% Fail the balancing attempt:
% \begin{macrocode}
- \too@badtrue
- \else
+ \too@badtrue
+ \else
% \end{macrocode}
% Otherwise report that there is a problem but within the accepted
% boundary.
% \begin{macrocode}
- \mult@info\@ne
- {Balanced column
- too large, but less than
- \the\maxbalancingoverflow}%
+ \mult@info\@ne
+ {Balanced column
+ too large, but less than
+ \the\maxbalancingoverflow}%
+ \fi
\fi
- \fi
- }%
+ }%
+% \end{macrocode}
+% Finally end the |\ifforcedbreak@leftover| conditional.
+% \changes{v1.8k}{2015/03/21}{Finish the new conditional}
+% \begin{macrocode}
+ \fi
}
% \end{macrocode}
% \end{macro}
@@ -3559,39 +3644,69 @@
%
% \begin{macro}{\remove@discardable@items}
% There are situations when we may have some space at the end of a
-% column and this macro here will attempt to get rid of it. This
-% will not remove an extremely long sequence of spaces and
-% penalties, but in nearly all cases this will be enough.
-% \begin{macrocode}
+% column and this macro here will attempt to get rid of it. The
+% typical \LaTeX{} sequence is a series of selfcanceling glues so
+% if we remove them recursively we are usually fine.
+%
+% 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
+% vertical list we assume that this is a ``desired'' space. We
+% therefore stop the recursion and reinsert the spaces.
+%
+% As the multicol code sometimes add an explicit penalty at the end
+% of a column we first attempt to remove it in case it is there.
+% \changes{v1.8m}{2015/03/31}{Another rewrite of
+% \cs{remove@discardable@items} hopefully okay now}
+% \begin{macrocode}
+\skip0=0pt
+\edef\the@zero@skip{\the\skip0}
\def\remove@discardable@items{%
-%<*debug>
- \edef\@tempa{s=\the\lastskip,
- p=\the\lastpenalty,
- k=\the\lastkern}%
- \typeout\@tempa
-%</debug>
- \unskip\unpenalty\unkern
-%<*debug>
- \edef\@tempa{s=\the\lastskip,
- p=\the\lastpenalty,
- k=\the\lastkern}%
- \typeout\@tempa
-%</debug>
- \unskip\unpenalty\unkern
-%<*debug>
- \edef\@tempa{s=\the\lastskip,
- p=\the\lastpenalty,
- k=\the\lastkern}%
- \typeout\@tempa
-%</debug>
- \unskip\unpenalty\unkern
-%<*debug>
- \edef\@tempa{s=\the\lastskip,
- p=\the\lastpenalty,
- k=\the\lastkern}%
- \typeout\@tempa
-%</debug>
- \unskip\unpenalty\unkern
+ \unpenalty
+% \end{macrocode}
+% Save a previous skip (if there) and then remove it, we can't
+% really tell the difference between no skip an a skip of zero but
+% that's life.
+% \begin{macrocode}
+ \edef\@tempa{\the\lastskip}%
+%\typeout{s1=\@tempa}%
+ \unskip
+% \end{macrocode}
+% If it was a zero skip (or none) we save the next previous skip
+% (if any).
+% \begin{macrocode}
+ \ifx\@tempa\the@zero@skip
+ \edef\@tempb{\the\lastskip}%
+%\typeout{s2=\@tempb}%
+% \end{macrocode}
+% If this one again was zero (or more likely not there in the first
+% place) we stop.
+% \begin{macrocode}
+ \ifx\@tempb\the@zero@skip
+ \else
+% \end{macrocode}
+% Otherwise we remove this ``real'' skip. Then we look if it was
+% preceeded by a penalty of 10000 (i.e., a |\nobreak|)
+% \begin{macrocode}
+ \unskip
+%\typeout{p=\lastpenalty}%
+ \ifnum \lastpenalty=\@M
+% \end{macrocode}
+% If so this was a |\vspace*| or something equivalent to
+% it. Therefore we reintroduce the skips and stop. Otherwise we
+% recurse.
+% \begin{macrocode}
+ \vskip\@tempb\vskip\@tempa\relax
+ \else
+ \remove@discardable@items
+ \fi
+ \fi
+ \else
+% \end{macrocode}
+% If the first skip was a non-zero skip we recurse as well.
+% \begin{macrocode}
+ \remove@discardable@items
+ \fi
}
% \end{macrocode}
% \end{macro}
@@ -3602,6 +3717,11 @@
\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
+% \end{macrocode}
%
% \begin{macro}{\c@columnbadness}
% \begin{macro}{\c@finalcolumnbadness}
@@ -3717,19 +3837,39 @@
% 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. The final |\null| hides this space
-% so that it doesn't get removed again when the columns are assembled.
-% However, we only do this if we aren't already doing |\raggedcolumns|
-% because it would be a mistake to add such glue twice. After all it contains
-% a minus component of |\maxdepth| and that would then be applied twice!
+% containing text is not vertically stretched out.
+%
+% We do this as follows: first 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
+% as this only works inside boxes but we are here on the main
+% vertical list.
+%
+% Then we back up by |\prevdepth| but not more than |\boxmaxdepth|
+% so that a baseline of the last box is now at the bottom. This way
+% the material will align properly in case something like |\vfill|
+% spreads it out after all.
+% Finally we append |\vfil| to put white space at the bottom of the
+% column, but we only do this if we aren't anyway doing |\raggedcolumns|.
% \changes{v1.5q}{1998/01/19}{Macro added}
-% \changes{v1.8h}{2014/09/12}{Use \cs{vfillmaxdepth}}
+% \changes{v1.8h}{2014/09/12}{Use \cs{vfilmaxdepth}}
% \changes{v1.8i}{2014/10/28}{Add \cs{null} to hide the final fill and only add
% vertical space if not doing \cs{raggedcolumns}}
-% \begin{macrocode}
- \@namedef{endmulticols*}{\ifshr@nking\else
- \vfillmaxdepth\nointerlineskip\null
- \fi
+% \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}}
+% \begin{macrocode}
+\@namedef{endmulticols*}{%
+ \ifdim\lastskip>\z@ \vskip-\lastskip \fi
+ \ifdim \prevdepth>\z@
+ \vskip-\ifdim\prevdepth>\boxmaxdepth
+ \boxmaxdepth
+ \else \prevdepth \fi
+ \fi
+ \ifshr@nking\else
+ \vfil
+ \fi
\end{multicols}}
%</nobalance>
% \end{macrocode}
@@ -3771,7 +3911,6 @@
% |\columnbreak| is modelled after |\pagebreak| except that we
% generate a penalty -10005.
% \begin{macrocode}
-%<*colbreak>
\mathchardef\@Mv=10005
\def\columnbreak{%
% \end{macrocode}
@@ -3802,7 +3941,6 @@
% Need a box to collect the galley up to the column break.
% \begin{macrocode}
\newbox\colbreak@box
-%</colbreak>
%</package>
% \end{macrocode}
% \end{macro}
diff --git a/Master/texmf-dist/source/latex/tools/multicol.ins b/Master/texmf-dist/source/latex/tools/multicol.ins
index d1bb5709742..e5ac6721d27 100644
--- a/Master/texmf-dist/source/latex/tools/multicol.ins
+++ b/Master/texmf-dist/source/latex/tools/multicol.ins
@@ -3,28 +3,28 @@
%% driver files from the doc files in this package when run through
%% LaTeX or TeX.
%%
-%% Copyright 1993-2014
+%% Copyright 1993-2015
%% The LaTeX3 Project and any individual authors listed elsewhere
-%% in this file.
-%%
+%% in this file.
+%%
%% This file is part of the Standard LaTeX `Tools Bundle'.
%% -------------------------------------------------------
-%%
+%%
%% It may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3c
%% of this license or (at your option) any later version.
%% The latest version of this license is in
%% http://www.latex-project.org/lppl.txt
-%% and version 1.3c or later is part of all distributions of LaTeX
+%% and version 1.3c or later is part of all distributions of LaTeX
%% version 2005/12/01 or later.
-%%
+%%
%% In particular, NO PERMISSION is granted to modify the contents of this
%% file since it contains the legal notices that are placed in the files
%% it generates.
-%%
+%%
%% The list of all files belonging to the `Tools Bundle' is
%% given in the file `manifest.txt'.
-%%
+%%
%%
%% --------------- start of docstrip commands ------------------
%%
@@ -38,9 +38,13 @@
This is a generated file.
-Copyright 1993-2014
+The source is maintained by the LaTeX Project team and bug
+reports for it can be opened at http://latex-project.org/bugs.html
+(but please observe conditions on bug reports sent to that address!)
+
+Copyright 1993-2015
The LaTeX3 Project and any individual authors listed elsewhere
-in this file.
+in this file.
This file was generated from file(s) of the Standard LaTeX `Tools Bundle'.
--------------------------------------------------------------------------
@@ -50,7 +54,7 @@ conditions of the LaTeX Project Public License, either version 1.3c
of this license or (at your option) any later version.
The latest version of this license is in
http://www.latex-project.org/lppl.txt
-and version 1.3c or later is part of all distributions of LaTeX
+and version 1.3c or later is part of all distributions of LaTeX
version 2005/12/01 or later.
This file may only be distributed together with a copy of the LaTeX
@@ -64,7 +68,7 @@ given in the file `manifest.txt'.
\generateFile{multicol.sty}{t}{%
- \from{multicol.dtx}{package,badness,check,marktrace,nobalance,colbreak}}
+ \from{multicol.dtx}{package,badness,check,marktrace,nobalance}}
\endbatchfile
diff --git a/Master/texmf-dist/source/latex/tools/rawfonts.dtx b/Master/texmf-dist/source/latex/tools/rawfonts.dtx
index 579d5d1122d..f27688331b6 100644
--- a/Master/texmf-dist/source/latex/tools/rawfonts.dtx
+++ b/Master/texmf-dist/source/latex/tools/rawfonts.dtx
@@ -23,6 +23,7 @@
% \title{The \textsf{rawfonts} package}
% \date{v0.01}
% \author{Alan Jeffrey}
+% \MaintainedByLaTeXTeam{tools}
% \maketitle
%
% \CheckSum{286}
diff --git a/Master/texmf-dist/source/latex/tools/showkeys.dtx b/Master/texmf-dist/source/latex/tools/showkeys.dtx
index e30d1a57101..960120bcb15 100644
--- a/Master/texmf-dist/source/latex/tools/showkeys.dtx
+++ b/Master/texmf-dist/source/latex/tools/showkeys.dtx
@@ -54,6 +54,7 @@
% revised \filedate.}}
% \author{David Carlisle \and Morten H\o gholm}
% \date{\filedate}
+% \MaintainedByLaTeXTeam{tools}
% \maketitle
%
% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
diff --git a/Master/texmf-dist/source/latex/tools/somedefs.dtx b/Master/texmf-dist/source/latex/tools/somedefs.dtx
index f611912d0bc..3e086754332 100644
--- a/Master/texmf-dist/source/latex/tools/somedefs.dtx
+++ b/Master/texmf-dist/source/latex/tools/somedefs.dtx
@@ -23,6 +23,7 @@
% \title{The \textsf{somedefs} toolkit package}
% \date{long time ago in a different century\ldots}
% \author{Alan Jeffrey}
+% \MaintainedByLaTeXTeam{tools}
% \maketitle
%
% \CheckSum{56}
diff --git a/Master/texmf-dist/source/latex/tools/tabularx.dtx b/Master/texmf-dist/source/latex/tools/tabularx.dtx
index e9ebca7e967..ba816ea8a4c 100644
--- a/Master/texmf-dist/source/latex/tools/tabularx.dtx
+++ b/Master/texmf-dist/source/latex/tools/tabularx.dtx
@@ -74,6 +74,7 @@
% revised \filedate.}}
% \author{David Carlisle}
% \date{\filedate}
+% \MaintainedByLaTeXTeam{tools}
% \maketitle
% \DeleteShortVerb{\|}
% \MakeShortVerb{\"}
diff --git a/Master/texmf-dist/source/latex/tools/tabularx.ins b/Master/texmf-dist/source/latex/tools/tabularx.ins
index b5d0515cd6f..2a121836236 100644
--- a/Master/texmf-dist/source/latex/tools/tabularx.ins
+++ b/Master/texmf-dist/source/latex/tools/tabularx.ins
@@ -3,28 +3,28 @@
%% driver files from the doc files in this package when run through
%% LaTeX or TeX.
%%
-%% Copyright 1993-2014
+%% Copyright 1993-2015
%% The LaTeX3 Project and any individual authors listed elsewhere
-%% in this file.
-%%
+%% in this file.
+%%
%% This file is part of the Standard LaTeX `Tools Bundle'.
%% -------------------------------------------------------
-%%
+%%
%% It may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3c
%% of this license or (at your option) any later version.
%% The latest version of this license is in
%% http://www.latex-project.org/lppl.txt
-%% and version 1.3c or later is part of all distributions of LaTeX
+%% and version 1.3c or later is part of all distributions of LaTeX
%% version 2005/12/01 or later.
-%%
+%%
%% In particular, NO PERMISSION is granted to modify the contents of this
%% file since it contains the legal notices that are placed in the files
%% it generates.
-%%
+%%
%% The list of all files belonging to the `Tools Bundle' is
%% given in the file `manifest.txt'.
-%%
+%%
%%
%% --------------- start of docstrip commands ------------------
%%
@@ -38,9 +38,13 @@
This is a generated file.
-Copyright 1993-2014
+The source is maintained by the LaTeX Project team and bug
+reports for it can be opened at http://latex-project.org/bugs.html
+(but please observe conditions on bug reports sent to that address!)
+
+Copyright 1993-2015
The LaTeX3 Project and any individual authors listed elsewhere
-in this file.
+in this file.
This file was generated from file(s) of the Standard LaTeX `Tools Bundle'.
--------------------------------------------------------------------------
@@ -50,7 +54,7 @@ conditions of the LaTeX Project Public License, either version 1.3c
of this license or (at your option) any later version.
The latest version of this license is in
http://www.latex-project.org/lppl.txt
-and version 1.3c or later is part of all distributions of LaTeX
+and version 1.3c or later is part of all distributions of LaTeX
version 2005/12/01 or later.
This file may only be distributed together with a copy of the LaTeX
diff --git a/Master/texmf-dist/source/latex/tools/theorem.dtx b/Master/texmf-dist/source/latex/tools/theorem.dtx
index e7550ae7c85..429039d3f28 100644
--- a/Master/texmf-dist/source/latex/tools/theorem.dtx
+++ b/Master/texmf-dist/source/latex/tools/theorem.dtx
@@ -1,6 +1,6 @@
% \iffalse meta-comment
%
-% Copyright 1993-2014
+% Copyright 1993-2015
%
% The LaTeX3 Project and any individual authors listed elsewhere
% in this file.
@@ -109,13 +109,9 @@
% \LaTeX{} theorem environment\thanks{This file
% has version number \fileversion, last
% revised \filedate.}}
-% \author{Frank Mittelbach\\
-% Electronic Data Systems\\
-% (Deutschland) GmbH\\
-% Eisenstra\ss e 56\\
-% D-65424 R\"usselsheim\\
-% Federal Republic of Germany}
+% \author{Frank Mittelbach}
%
+% \MaintainedByLaTeXTeam{tools}
% \maketitle
%
% \begin{abstract}
diff --git a/Master/texmf-dist/source/latex/tools/tools.ins b/Master/texmf-dist/source/latex/tools/tools.ins
index 0ef92ae22a5..a65ca0d5dfa 100644
--- a/Master/texmf-dist/source/latex/tools/tools.ins
+++ b/Master/texmf-dist/source/latex/tools/tools.ins
@@ -3,28 +3,28 @@
%% driver files from the doc files in this package when run through
%% LaTeX or TeX.
%%
-%% Copyright 1993-2014
+%% Copyright 1993-2015
%% The LaTeX3 Project and any individual authors listed elsewhere
-%% in this file.
-%%
+%% in this file.
+%%
%% This file is part of the Standard LaTeX `Tools Bundle'.
%% -------------------------------------------------------
-%%
+%%
%% It may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3c
%% of this license or (at your option) any later version.
%% The latest version of this license is in
%% http://www.latex-project.org/lppl.txt
-%% and version 1.3c or later is part of all distributions of LaTeX
+%% and version 1.3c or later is part of all distributions of LaTeX
%% version 2005/12/01 or later.
-%%
+%%
%% In particular, NO PERMISSION is granted to modify the contents of this
%% file since it contains the legal notices that are placed in the files
%% it generates.
-%%
+%%
%% The list of all files belonging to the `Tools Bundle' is
%% given in the file `manifest.txt'.
-%%
+%%
%%
%% --------------- start of docstrip commands ------------------
%%
@@ -41,9 +41,14 @@
This is a generated file.
-Copyright 1993-2014
+The source is maintained by the LaTeX Project team and bug
+reports for it can be opened at http://latex-project.org/bugs.html
+(but please observe conditions on bug reports sent to that address!)
+
+
+Copyright 1993-2015
The LaTeX3 Project and any individual authors listed elsewhere
-in this file.
+in this file.
This file was generated from file(s) of the Standard LaTeX `Tools Bundle'.
--------------------------------------------------------------------------
@@ -53,7 +58,7 @@ conditions of the LaTeX Project Public License, either version 1.3c
of this license or (at your option) any later version.
The latest version of this license is in
http://www.latex-project.org/lppl.txt
-and version 1.3c or later is part of all distributions of LaTeX
+and version 1.3c or later is part of all distributions of LaTeX
version 2005/12/01 or later.
This file may only be distributed together with a copy of the LaTeX
@@ -158,7 +163,7 @@ given in the file `manifest.txt'.
\SimplePackage{layout}
-% Infix Arithmetic
+% Infix Arithmetic
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\SimplePackage{calc}
diff --git a/Master/texmf-dist/source/latex/tools/trace.dtx b/Master/texmf-dist/source/latex/tools/trace.dtx
index a5e99a673b9..0dfcc4baf21 100644
--- a/Master/texmf-dist/source/latex/tools/trace.dtx
+++ b/Master/texmf-dist/source/latex/tools/trace.dtx
@@ -1,6 +1,6 @@
% \iffalse meta-comment
%
-% Copyright 1993-2014
+% Copyright 1993-2015
%
% The LaTeX3 Project and any individual authors listed elsewhere
% in this file.
@@ -61,10 +61,9 @@
% \title{The \textsf{trace} package\thanks{This file
% has version number \fileversion, last
% revised \filedate.}}
-% \author{Frank Mittelbach\\
-% \LaTeX3 project\\
-% \texttt{frank.mittelbach@latex-project.org}}
+% \author{Frank Mittelbach}
% \date{\filedate}
+% \MaintainedByLaTeXTeam{tools}
% \maketitle
%
%
diff --git a/Master/texmf-dist/source/latex/tools/varioref.dtx b/Master/texmf-dist/source/latex/tools/varioref.dtx
index e200ffdcab7..2c984b2c125 100644
--- a/Master/texmf-dist/source/latex/tools/varioref.dtx
+++ b/Master/texmf-dist/source/latex/tools/varioref.dtx
@@ -66,6 +66,7 @@
% \author{Frank Mittelbach}
% \date{\filedate}
%
+% \MaintainedByLaTeXTeam{tools}
% \maketitle
%
%
diff --git a/Master/texmf-dist/source/latex/tools/varioref.ins b/Master/texmf-dist/source/latex/tools/varioref.ins
index e973ebd9c14..bc693721cae 100644
--- a/Master/texmf-dist/source/latex/tools/varioref.ins
+++ b/Master/texmf-dist/source/latex/tools/varioref.ins
@@ -3,28 +3,28 @@
%% driver files from the doc files in this package when run through
%% LaTeX or TeX.
%%
-%% Copyright 1993-2014
+%% Copyright 1993-2015
%% The LaTeX3 Project and any individual authors listed elsewhere
-%% in this file.
-%%
+%% in this file.
+%%
%% This file is part of the Standard LaTeX `Tools Bundle'.
%% -------------------------------------------------------
-%%
+%%
%% It may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3c
%% of this license or (at your option) any later version.
%% The latest version of this license is in
%% http://www.latex-project.org/lppl.txt
-%% and version 1.3c or later is part of all distributions of LaTeX
+%% and version 1.3c or later is part of all distributions of LaTeX
%% version 2005/12/01 or later.
-%%
+%%
%% In particular, NO PERMISSION is granted to modify the contents of this
%% file since it contains the legal notices that are placed in the files
%% it generates.
-%%
+%%
%% The list of all files belonging to the `Tools Bundle' is
%% given in the file `manifest.txt'.
-%%
+%%
%%
%% --------------- start of docstrip commands ------------------
%%
@@ -38,9 +38,13 @@
This is a generated file.
-Copyright 1993-2014
+The source is maintained by the LaTeX Project team and bug
+reports for it can be opened at http://latex-project.org/bugs.html
+(but please observe conditions on bug reports sent to that address!)
+
+Copyright 1993-2015
The LaTeX3 Project and any individual authors listed elsewhere
-in this file.
+in this file.
This file was generated from file(s) of the Standard LaTeX `Tools Bundle'.
--------------------------------------------------------------------------
@@ -50,7 +54,7 @@ conditions of the LaTeX Project Public License, either version 1.3c
of this license or (at your option) any later version.
The latest version of this license is in
http://www.latex-project.org/lppl.txt
-and version 1.3c or later is part of all distributions of LaTeX
+and version 1.3c or later is part of all distributions of LaTeX
version 2005/12/01 or later.
This file may only be distributed together with a copy of the LaTeX
diff --git a/Master/texmf-dist/source/latex/tools/verbatim.dtx b/Master/texmf-dist/source/latex/tools/verbatim.dtx
index d9d1702a8a1..45cd00e1e19 100644
--- a/Master/texmf-dist/source/latex/tools/verbatim.dtx
+++ b/Master/texmf-dist/source/latex/tools/verbatim.dtx
@@ -51,23 +51,15 @@
\title{A New Implementation of \LaTeX{}'s \\ \texttt{verbatim}
and \texttt{verbatim*} Environments.}
\author{Rainer Sch\"opf\\
- Internet: \texttt{Schoepf@Uni-Mainz.DE}
\and
Bernd Raichle\\
- Stettener Str.~73\\
- D-73732 W\"aldenbronn\\
- Federal Republic of Germany\\
- Internet: \texttt{raichle@azu.Informatik.Uni-Stuttgart.DE}
\and
- Chris Rowley\\
- The Open University\\
- Parsifal College\\
- Finchley Road\\
- London NW3 7BG, UK\\
- Internet: \texttt{C.A.Rowley@open.ac.uk}}
+ Chris Rowley}
+
\date{2001/03/12}
\begin{document}
\markboth{Verbatim style option}{Verbatim style option}
+\MaintainedByLaTeXTeam{tools}
\maketitle
\DocInput{verbatim.dtx}
\end{document}
diff --git a/Master/texmf-dist/source/latex/tools/xr.dtx b/Master/texmf-dist/source/latex/tools/xr.dtx
index 2ca7c7fed8d..e48c5d3e483 100644
--- a/Master/texmf-dist/source/latex/tools/xr.dtx
+++ b/Master/texmf-dist/source/latex/tools/xr.dtx
@@ -36,9 +36,9 @@
has version number \fileversion, last
revised \filedate.}}
\author{David Carlisle\thanks{%
- The Author of Versions 1--4 was Jean-Pierre Drucbert}\\
- carlisle@cs.man.ac.uk}
+ The Author of Versions 1--4 was Jean-Pierre Drucbert}}
\date{\filedate}
+\MaintainedByLaTeXTeam{tools}
\maketitle
\DocInput{xr.dtx}
\end{document}
diff --git a/Master/texmf-dist/source/latex/tools/xspace.dtx b/Master/texmf-dist/source/latex/tools/xspace.dtx
index 18ef9093d3f..75d6426d335 100644
--- a/Master/texmf-dist/source/latex/tools/xspace.dtx
+++ b/Master/texmf-dist/source/latex/tools/xspace.dtx
@@ -56,6 +56,7 @@
% revised \filedate.}}
% \author{David Carlisle \and Morten H\o gholm}
% \date{\filedate}
+% \MaintainedByLaTeXTeam{tools}
% \maketitle
%
% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%