latex2e 2015/01/01

git-svn-id: svn://tug.org/texlive/trunk@36834 c570f23f-e606-0410-a88d-b1316a301751

39 files changed, 352 insertions, 115 deletions

diff --git a/Master/texmf-dist/tex/latex/tools/.tex b/Master/texmf-dist/tex/latex/tools/.tex
index d0be988b65b..f5a1a205278 100644
--- a/Master/texmf-dist/tex/latex/tools/.tex
+++ b/Master/texmf-dist/tex/latex/tools/.tex
@@ -8,7 +8,12 @@
 %% 
 %% 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.
 %% 
diff --git a/Master/texmf-dist/tex/latex/tools/afterpage.sty b/Master/texmf-dist/tex/latex/tools/afterpage.sty
index e87fd061829..fea11f31be2 100644
--- a/Master/texmf-dist/tex/latex/tools/afterpage.sty
+++ b/Master/texmf-dist/tex/latex/tools/afterpage.sty
@@ -8,7 +8,11 @@
 %% 
 %% 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.
 %% 
diff --git a/Master/texmf-dist/tex/latex/tools/array.sty b/Master/texmf-dist/tex/latex/tools/array.sty
index c346e0cfed6..b06e4869c70 100644
--- a/Master/texmf-dist/tex/latex/tools/array.sty
+++ b/Master/texmf-dist/tex/latex/tools/array.sty
@@ -8,7 +8,12 @@
 %% 
 %% 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.
 %% 
diff --git a/Master/texmf-dist/tex/latex/tools/bm.sty b/Master/texmf-dist/tex/latex/tools/bm.sty
index 02933964b82..16eaa641722 100644
--- a/Master/texmf-dist/tex/latex/tools/bm.sty
+++ b/Master/texmf-dist/tex/latex/tools/bm.sty
@@ -8,7 +8,11 @@
 %% 
 %% 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.
 %% 
diff --git a/Master/texmf-dist/tex/latex/tools/calc.sty b/Master/texmf-dist/tex/latex/tools/calc.sty
index e245308d506..9f56061183c 100644
--- a/Master/texmf-dist/tex/latex/tools/calc.sty
+++ b/Master/texmf-dist/tex/latex/tools/calc.sty
@@ -8,7 +8,12 @@
 %% 
 %% 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.
 %% 
diff --git a/Master/texmf-dist/tex/latex/tools/dcolumn.sty b/Master/texmf-dist/tex/latex/tools/dcolumn.sty
index 7706537a213..ad92467e7c2 100644
--- a/Master/texmf-dist/tex/latex/tools/dcolumn.sty
+++ b/Master/texmf-dist/tex/latex/tools/dcolumn.sty
@@ -8,7 +8,12 @@
 %% 
 %% 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.
 %% 
diff --git a/Master/texmf-dist/tex/latex/tools/delarray.sty b/Master/texmf-dist/tex/latex/tools/delarray.sty
index a3067fd4140..3705f07a29b 100644
--- a/Master/texmf-dist/tex/latex/tools/delarray.sty
+++ b/Master/texmf-dist/tex/latex/tools/delarray.sty
@@ -8,7 +8,12 @@
 %% 
 %% 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.
 %% 
diff --git a/Master/texmf-dist/tex/latex/tools/e.tex b/Master/texmf-dist/tex/latex/tools/e.tex
index 2784b30cd6c..9a2e7375d77 100644
--- a/Master/texmf-dist/tex/latex/tools/e.tex
+++ b/Master/texmf-dist/tex/latex/tools/e.tex
@@ -8,7 +8,12 @@
 %% 
 %% 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.
 %% 
diff --git a/Master/texmf-dist/tex/latex/tools/enumerate.sty b/Master/texmf-dist/tex/latex/tools/enumerate.sty
index cf6289665e9..4326e65e29f 100644
--- a/Master/texmf-dist/tex/latex/tools/enumerate.sty
+++ b/Master/texmf-dist/tex/latex/tools/enumerate.sty
@@ -8,7 +8,12 @@
 %% 
 %% 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.
 %% 
diff --git a/Master/texmf-dist/tex/latex/tools/fontsmpl.sty b/Master/texmf-dist/tex/latex/tools/fontsmpl.sty
index 6c69853387f..4e83b581738 100644
--- a/Master/texmf-dist/tex/latex/tools/fontsmpl.sty
+++ b/Master/texmf-dist/tex/latex/tools/fontsmpl.sty
@@ -8,7 +8,12 @@
 %% 
 %% 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.
 %% 
diff --git a/Master/texmf-dist/tex/latex/tools/fontsmpl.tex b/Master/texmf-dist/tex/latex/tools/fontsmpl.tex
index 0758db5351a..636748cd350 100644
--- a/Master/texmf-dist/tex/latex/tools/fontsmpl.tex
+++ b/Master/texmf-dist/tex/latex/tools/fontsmpl.tex
@@ -8,7 +8,12 @@
 %% 
 %% 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.
 %% 
diff --git a/Master/texmf-dist/tex/latex/tools/ftnright.sty b/Master/texmf-dist/tex/latex/tools/ftnright.sty
index 2f732538def..783e5595b06 100644
--- a/Master/texmf-dist/tex/latex/tools/ftnright.sty
+++ b/Master/texmf-dist/tex/latex/tools/ftnright.sty
@@ -8,7 +8,12 @@
 %% 
 %% 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.
 %% 
diff --git a/Master/texmf-dist/tex/latex/tools/h.tex b/Master/texmf-dist/tex/latex/tools/h.tex
index e5bd1486723..31032cee41a 100644
--- a/Master/texmf-dist/tex/latex/tools/h.tex
+++ b/Master/texmf-dist/tex/latex/tools/h.tex
@@ -8,7 +8,12 @@
 %% 
 %% 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.
 %% 
diff --git a/Master/texmf-dist/tex/latex/tools/hhline.sty b/Master/texmf-dist/tex/latex/tools/hhline.sty
index e4e47507df7..f70c9d5e176 100644
--- a/Master/texmf-dist/tex/latex/tools/hhline.sty
+++ b/Master/texmf-dist/tex/latex/tools/hhline.sty
@@ -8,7 +8,12 @@
 %% 
 %% 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.
 %% 
diff --git a/Master/texmf-dist/tex/latex/tools/indentfirst.sty b/Master/texmf-dist/tex/latex/tools/indentfirst.sty
index 971fca81688..e827f02c84e 100644
--- a/Master/texmf-dist/tex/latex/tools/indentfirst.sty
+++ b/Master/texmf-dist/tex/latex/tools/indentfirst.sty
@@ -8,7 +8,12 @@
 %% 
 %% 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.
 %% 
diff --git a/Master/texmf-dist/tex/latex/tools/layout.sty b/Master/texmf-dist/tex/latex/tools/layout.sty
index f1af363e263..7be98dd1f74 100644
--- a/Master/texmf-dist/tex/latex/tools/layout.sty
+++ b/Master/texmf-dist/tex/latex/tools/layout.sty
@@ -8,7 +8,12 @@
 %% 
 %% 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.
 %% 
diff --git a/Master/texmf-dist/tex/latex/tools/longtable.sty b/Master/texmf-dist/tex/latex/tools/longtable.sty
index 70b2ebd60e0..7832d46b515 100644
--- a/Master/texmf-dist/tex/latex/tools/longtable.sty
+++ b/Master/texmf-dist/tex/latex/tools/longtable.sty
@@ -8,7 +8,11 @@
 %% 
 %% 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.
 %% 
diff --git a/Master/texmf-dist/tex/latex/tools/multicol.sty b/Master/texmf-dist/tex/latex/tools/multicol.sty
index 81add474837..652dc29b15a 100644
--- a/Master/texmf-dist/tex/latex/tools/multicol.sty
+++ b/Master/texmf-dist/tex/latex/tools/multicol.sty
@@ -4,11 +4,15 @@
 %%
 %% The original source files were:
 %%
-%% multicol.dtx  (with options: `package,badness,check,marktrace,nobalance,colbreak')
+%% multicol.dtx  (with options: `package,badness,check,marktrace,nobalance')
 %% 
 %% 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.
 %% 
@@ -31,7 +35,7 @@
 %% given in the file `manifest.txt'.
 %% 
 %% 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
@@ -96,8 +100,8 @@
 %%
 \NeedsTeXFormat{LaTeX2e}[1997/12/01]
 \ProvidesPackage{multicol}
-          [2014/10/28 v1.8i  multicolumn formatting (FMi)]
-%% \CheckSum{1853}
+          [2015/03/31 v1.8m  multicolumn formatting (FMi)]
+%% \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
@@ -324,7 +328,8 @@
         \unvbox\colbreak@box\fi
     \fi
    \penalty\z@
-   \output{\balance@columns@out}\eject
+   \output{\balance@columns@out}%
+   \eject
     \ifvbox\partial@page
          \unvbox\partial@page\fi
      \global\let\kept@firstmark\@empty
@@ -414,19 +419,22 @@
 \def\columnseprulecolor{\normalcolor}
 \def\reinsert@footnotes{\ifvoid\footins\else
          \insert\footins{}\fi}
-\def\vfillmaxdepth{\vskip \z@ \@plus 1fill \@minus \maxdepth}
+\def\vfilmaxdepth{\vskip \z@ \@plus .0001fil
+                           \@minus \maxdepth}
 \def\multi@column@out{%
    \ifnum\outputpenalty <-\@M
-   \speci@ls \else
-   \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
+    \speci@ls \else
+    \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
    \splittopskip\topskip
    \splitmaxdepth\maxdepth
+   \boxmaxdepth\maxdepth
    \dimen@\@colroom
    \divide\skip\footins\col@number
    \ifvoid\footins \else
@@ -446,16 +454,14 @@
             \setbox\count@
                  \vbox to\dimen@
                   {\unvbox\count@
-                   \remove@discardable@items
-                   \ifshr@nking\vfillmaxdepth\fi}%
+                   \ifshr@nking\vfilmaxdepth\fi}%
            }%
    \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}%
    \let\ifshr@king\ifshr@kingsaved
    \ifvoid\@cclv \else
        \unvbox\@cclv
@@ -536,18 +542,26 @@
                         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
+              \boxmaxdepth\maxdepth
+              \setbox\@cclv\vbox{%
+                 \unvbox\@cclv
+                 \remove@discardable@items}%
+              \dimen@\dp\@cclv
+              \unvbox\@cclv
+              \kern-\dimen@
+         }%
          \reinsert@footnotes
      \else
         \PackageWarningNoLine{multicol}%
            {Floats and marginpars not
             allowed inside `multicols'
-            environment!}
+            environment!}%
         \unvbox\@cclv\reinsert@footnotes
        \xdef\@freelist{\@freelist\@currlist}%
        \gdef\@currlist{}%
@@ -573,11 +587,14 @@
 \def\balance@columns@out{%
    \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}%
+       \unvbox\@cclv
+       \remove@discardable@items
+   }%
    \balance@columns
    \iftoo@bad
      \mult@info\@ne
@@ -588,7 +605,6 @@
           \vskip-\splittopskip
           \unvbox\mult@box}%
      \multi@column@out
-     \break
    \else
      \global\vsize\@colroom
      \global\advance\vsize\ht\partial@page
@@ -606,7 +622,6 @@
    \setbox\mult@box\vbox{%
         \penalty-\@M
         \unvbox\mult@box
-        \remove@discardable@items
         }%
    \@tempdima\topskip
    \splittopskip\@tempdima
@@ -648,13 +663,13 @@
     \global\setbox\mult@grightbox
            \copy\mult@box
    \too@badfalse
+   \forcedbreak@leftoverfalse
    {\process@cols\mult@firstbox{%
          \global\setbox\count@
          \vsplit\mult@grightbox to\dimen@
          \global\setbox\count@
                  \vbox to\dimen@
-                  {\unvbox\count@
-                   \remove@discardable@items}%
+                  {\unvbox\count@}%
          \ifnum\c@tracingmulticols>\@ne
            \@tempcnta\count@
            \advance\@tempcnta-\mult@grightbox
@@ -704,18 +719,28 @@
         \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)}%
            \fi
         \fi
       \else
+       \@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
     \fi
     \ifdim\ht\mult@nat@firstbox<\dimen@
@@ -733,42 +758,46 @@
     \iftoo@bad
       \advance\dimen@\p@
     \repeat
-   \if@boxedmulticols\else
-     \ifdim\dimen@>\@colroom
-       \dimen@\@colroom
+    \ifforcedbreak@leftover
+       \too@badtrue
+    \else
+     \if@boxedmulticols\else
+       \ifdim\dimen@>\@colroom
+         \dimen@\@colroom
+       \fi
      \fi
-   \fi
-   \process@cols\mult@rightbox
-       {\@tempcnta\count@
-        \advance\@tempcnta\@ne
-        \vfuzz\z@
-        \setbox\count@\vbox to\dimen@
-           {%
-            \vskip \z@
-              \@plus-\multicolundershoot
-              \@minus-\multicolovershoot
-            \unvbox\@tempcnta
-            \ifshr@nking\vfillmaxdepth\fi
-           }%
-        \ifnum\badness>\@M
-          \vfuzz\maxdimen % no overfull warning
-          \setbox\@tempboxa \vbox to\dimen@
-               {\vskip-\maxbalancingoverflow
-                \unvcopy\count@}%
+     \process@cols\mult@rightbox
+         {\@tempcnta\count@
+          \advance\@tempcnta\@ne
+          \vfuzz\z@
+          \setbox\count@\vbox to\dimen@
+             {%
+              \vskip \z@
+                \@plus-\multicolundershoot
+                \@minus-\multicolovershoot
+              \unvbox\@tempcnta
+              \ifshr@nking\vfilmaxdepth\fi
+             }%
           \ifnum\badness>\@M
-            \mult@info\@ne
-              {Balanced column more than
-                \the\maxbalancingoverflow\space
-                too large}%
-            \too@badtrue
-          \else
-            \mult@info\@ne
-              {Balanced column
-               too large, but less than
-               \the\maxbalancingoverflow}%
+            \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}%
+              \too@badtrue
+            \else
+              \mult@info\@ne
+                {Balanced column
+                 too large, but less than
+                 \the\maxbalancingoverflow}%
+            \fi
           \fi
-        \fi
-       }%
+         }%
+   \fi
 }
 \newdimen\maxbalancingoverflow
 \maxbalancingoverflow=12pt
@@ -850,15 +879,31 @@
    \if@boxedmulticols \else
      \get@keptmarks\partial@page
    \fi}
+\skip0=0pt
+\edef\the@zero@skip{\the\skip0}
 \def\remove@discardable@items{%
-        \unskip\unpenalty\unkern
-        \unskip\unpenalty\unkern
-        \unskip\unpenalty\unkern
-        \unskip\unpenalty\unkern
+     \unpenalty
+     \edef\@tempa{\the\lastskip}%
+     \unskip
+     \ifx\@tempa\the@zero@skip
+       \edef\@tempb{\the\lastskip}%
+       \ifx\@tempb\the@zero@skip
+       \else
+         \unskip
+         \ifnum \lastpenalty=\@M
+           \vskip\@tempb\vskip\@tempa\relax
+         \else
+           \remove@discardable@items
+         \fi
+       \fi
+     \else
+       \remove@discardable@items
+     \fi
 }
 \newif\iftoo@bad
 \def\too@badtrue{\global\let\iftoo@bad\iftrue}
 \def\too@badfalse{\global\let\iftoo@bad\iffalse}
+\newif\ifforcedbreak@leftover
 \newcount\c@columnbadness
 \c@columnbadness=10000
 \newcount\c@finalcolumnbadness
@@ -890,9 +935,16 @@
    \fi
    \begin{multicols}
 }
- \@namedef{endmulticols*}{\ifshr@nking\else
-                             \vfillmaxdepth\nointerlineskip\null
-                          \fi
+\@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}}
 \mathchardef\@Mv=10005
 \def\columnbreak{%
diff --git a/Master/texmf-dist/tex/latex/tools/q.tex b/Master/texmf-dist/tex/latex/tools/q.tex
index 0cb180593ff..225c88686f6 100644
--- a/Master/texmf-dist/tex/latex/tools/q.tex
+++ b/Master/texmf-dist/tex/latex/tools/q.tex
@@ -8,7 +8,12 @@
 %% 
 %% 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.
 %% 
diff --git a/Master/texmf-dist/tex/latex/tools/r.tex b/Master/texmf-dist/tex/latex/tools/r.tex
index 71dfeb9f34d..1dd514b8544 100644
--- a/Master/texmf-dist/tex/latex/tools/r.tex
+++ b/Master/texmf-dist/tex/latex/tools/r.tex
@@ -8,7 +8,12 @@
 %% 
 %% 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.
 %% 
diff --git a/Master/texmf-dist/tex/latex/tools/rawfonts.sty b/Master/texmf-dist/tex/latex/tools/rawfonts.sty
index f1e3d2de6ec..f5a7070ac17 100644
--- a/Master/texmf-dist/tex/latex/tools/rawfonts.sty
+++ b/Master/texmf-dist/tex/latex/tools/rawfonts.sty
@@ -8,7 +8,12 @@
 %% 
 %% 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.
 %% 
diff --git a/Master/texmf-dist/tex/latex/tools/s.tex b/Master/texmf-dist/tex/latex/tools/s.tex
index 1bd553b16be..22ebd5d6cf1 100644
--- a/Master/texmf-dist/tex/latex/tools/s.tex
+++ b/Master/texmf-dist/tex/latex/tools/s.tex
@@ -8,7 +8,12 @@
 %% 
 %% 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.
 %% 
diff --git a/Master/texmf-dist/tex/latex/tools/showkeys.sty b/Master/texmf-dist/tex/latex/tools/showkeys.sty
index 4e1a7edccbd..d9ab40914c2 100644
--- a/Master/texmf-dist/tex/latex/tools/showkeys.sty
+++ b/Master/texmf-dist/tex/latex/tools/showkeys.sty
@@ -8,7 +8,12 @@
 %% 
 %% 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.
 %% 
diff --git a/Master/texmf-dist/tex/latex/tools/somedefs.sty b/Master/texmf-dist/tex/latex/tools/somedefs.sty
index 4c64f1b9e3e..0d216121bf9 100644
--- a/Master/texmf-dist/tex/latex/tools/somedefs.sty
+++ b/Master/texmf-dist/tex/latex/tools/somedefs.sty
@@ -8,7 +8,12 @@
 %% 
 %% 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.
 %% 
diff --git a/Master/texmf-dist/tex/latex/tools/tabularx.sty b/Master/texmf-dist/tex/latex/tools/tabularx.sty
index d228e50761c..70ff2a4af3a 100644
--- a/Master/texmf-dist/tex/latex/tools/tabularx.sty
+++ b/Master/texmf-dist/tex/latex/tools/tabularx.sty
@@ -8,7 +8,11 @@
 %% 
 %% 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.
 %% 
diff --git a/Master/texmf-dist/tex/latex/tools/thb.sty b/Master/texmf-dist/tex/latex/tools/thb.sty
index 9e5ac59129f..6aa3694cd9d 100644
--- a/Master/texmf-dist/tex/latex/tools/thb.sty
+++ b/Master/texmf-dist/tex/latex/tools/thb.sty
@@ -8,7 +8,12 @@
 %% 
 %% 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.
 %% 
diff --git a/Master/texmf-dist/tex/latex/tools/thc.sty b/Master/texmf-dist/tex/latex/tools/thc.sty
index e9b20b6d6e3..1ae6da53075 100644
--- a/Master/texmf-dist/tex/latex/tools/thc.sty
+++ b/Master/texmf-dist/tex/latex/tools/thc.sty
@@ -8,7 +8,12 @@
 %% 
 %% 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.
 %% 
diff --git a/Master/texmf-dist/tex/latex/tools/thcb.sty b/Master/texmf-dist/tex/latex/tools/thcb.sty
index f7b727155e3..8537359ab5e 100644
--- a/Master/texmf-dist/tex/latex/tools/thcb.sty
+++ b/Master/texmf-dist/tex/latex/tools/thcb.sty
@@ -8,7 +8,12 @@
 %% 
 %% 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.
 %% 
diff --git a/Master/texmf-dist/tex/latex/tools/theorem.sty b/Master/texmf-dist/tex/latex/tools/theorem.sty
index ae3d4053afe..dd245aa6996 100644
--- a/Master/texmf-dist/tex/latex/tools/theorem.sty
+++ b/Master/texmf-dist/tex/latex/tools/theorem.sty
@@ -8,7 +8,12 @@
 %% 
 %% 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.
 %% 
diff --git a/Master/texmf-dist/tex/latex/tools/thm.sty b/Master/texmf-dist/tex/latex/tools/thm.sty
index ff02542753e..c6684177fae 100644
--- a/Master/texmf-dist/tex/latex/tools/thm.sty
+++ b/Master/texmf-dist/tex/latex/tools/thm.sty
@@ -8,7 +8,12 @@
 %% 
 %% 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.
 %% 
diff --git a/Master/texmf-dist/tex/latex/tools/thmb.sty b/Master/texmf-dist/tex/latex/tools/thmb.sty
index b5ccf609f4d..9830890ca88 100644
--- a/Master/texmf-dist/tex/latex/tools/thmb.sty
+++ b/Master/texmf-dist/tex/latex/tools/thmb.sty
@@ -8,7 +8,12 @@
 %% 
 %% 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.
 %% 
diff --git a/Master/texmf-dist/tex/latex/tools/thp.sty b/Master/texmf-dist/tex/latex/tools/thp.sty
index eecd42448cd..4add49d6219 100644
--- a/Master/texmf-dist/tex/latex/tools/thp.sty
+++ b/Master/texmf-dist/tex/latex/tools/thp.sty
@@ -8,7 +8,12 @@
 %% 
 %% 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.
 %% 
diff --git a/Master/texmf-dist/tex/latex/tools/trace.sty b/Master/texmf-dist/tex/latex/tools/trace.sty
index 35b9c6aeae8..4b222479362 100644
--- a/Master/texmf-dist/tex/latex/tools/trace.sty
+++ b/Master/texmf-dist/tex/latex/tools/trace.sty
@@ -8,7 +8,12 @@
 %% 
 %% 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.
 %% 
diff --git a/Master/texmf-dist/tex/latex/tools/varioref.sty b/Master/texmf-dist/tex/latex/tools/varioref.sty
index 5d56661bbab..d8ca7c3c46b 100644
--- a/Master/texmf-dist/tex/latex/tools/varioref.sty
+++ b/Master/texmf-dist/tex/latex/tools/varioref.sty
@@ -8,7 +8,11 @@
 %% 
 %% 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.
 %% 
diff --git a/Master/texmf-dist/tex/latex/tools/verbatim.sty b/Master/texmf-dist/tex/latex/tools/verbatim.sty
index 04cc1cdc508..f2c96136cd7 100644
--- a/Master/texmf-dist/tex/latex/tools/verbatim.sty
+++ b/Master/texmf-dist/tex/latex/tools/verbatim.sty
@@ -8,7 +8,12 @@
 %% 
 %% 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.
 %% 
diff --git a/Master/texmf-dist/tex/latex/tools/verbtest.tex b/Master/texmf-dist/tex/latex/tools/verbtest.tex
index d8fc5b971ad..5334bb4e37b 100644
--- a/Master/texmf-dist/tex/latex/tools/verbtest.tex
+++ b/Master/texmf-dist/tex/latex/tools/verbtest.tex
@@ -8,7 +8,12 @@
 %% 
 %% 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.
 %% 
diff --git a/Master/texmf-dist/tex/latex/tools/x.tex b/Master/texmf-dist/tex/latex/tools/x.tex
index 805386d09c5..27bcbf782a4 100644
--- a/Master/texmf-dist/tex/latex/tools/x.tex
+++ b/Master/texmf-dist/tex/latex/tools/x.tex
@@ -8,7 +8,12 @@
 %% 
 %% 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.
 %% 
diff --git a/Master/texmf-dist/tex/latex/tools/xr.sty b/Master/texmf-dist/tex/latex/tools/xr.sty
index b990457f12d..19c6c14ef29 100644
--- a/Master/texmf-dist/tex/latex/tools/xr.sty
+++ b/Master/texmf-dist/tex/latex/tools/xr.sty
@@ -8,7 +8,12 @@
 %% 
 %% 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.
 %% 
diff --git a/Master/texmf-dist/tex/latex/tools/xspace.sty b/Master/texmf-dist/tex/latex/tools/xspace.sty
index ce5e70c6fd6..25ecb024365 100644
--- a/Master/texmf-dist/tex/latex/tools/xspace.sty
+++ b/Master/texmf-dist/tex/latex/tools/xspace.sty
@@ -8,7 +8,12 @@
 %% 
 %% 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.
 %%