latex2e (1apr16), now including amsmath

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

25 files changed, 176 insertions, 210 deletions

diff --git a/Master/texmf-dist/source/latex/tools/afterpage.dtx b/Master/texmf-dist/source/latex/tools/afterpage.dtx
index 4722377aeaf..9619ca092c4 100644
--- a/Master/texmf-dist/source/latex/tools/afterpage.dtx
+++ b/Master/texmf-dist/source/latex/tools/afterpage.dtx
@@ -58,7 +58,6 @@
 % \changes{v1.08}{1995/10/27}
 %      {Try and do something sensible with footnotes, for tools/1884}
 %
-% \CheckSum{269}
 %
 % This package implements a command, |\afterpage|, that causes the
 % commands specified in its argument to be expanded after the current
diff --git a/Master/texmf-dist/source/latex/tools/array.dtx b/Master/texmf-dist/source/latex/tools/array.dtx
index d869ca48fbf..e31656c5e07 100644
--- a/Master/texmf-dist/source/latex/tools/array.dtx
+++ b/Master/texmf-dist/source/latex/tools/array.dtx
@@ -30,22 +30,6 @@
 %
 % \fi
 %
-% \CheckSum{1115}
-%% \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
-%%   Digits        \0\1\2\3\4\5\6\7\8\9
-%%   Exclamation   \!     Double quote  \"     Hash (number) \#
-%%   Dollar        \$     Percent       \%     Ampersand     \&
-%%   Acute accent  \'     Left paren    \(     Right paren   \)
-%%   Asterisk      \*     Plus          \+     Comma         \,
-%%   Minus         \-     Point         \.     Solidus       \/
-%%   Colon         \:     Semicolon     \;     Less than     \<
-%%   Equals        \=     Greater than  \>     Question mark \?
-%%   Commercial at \@     Left bracket  \[     Backslash     \\
-%%   Right bracket \]     Circumflex    \^     Underscore    \_
-%%   Grave accent  \`     Left brace    \{     Vertical bar  \|
-%%   Right brace   \}     Tilde         \~}
 %%
 %
 %
diff --git a/Master/texmf-dist/source/latex/tools/bm.dtx b/Master/texmf-dist/source/latex/tools/bm.dtx
index cf1da612630..6dcefa78a65 100644
--- a/Master/texmf-dist/source/latex/tools/bm.dtx
+++ b/Master/texmf-dist/source/latex/tools/bm.dtx
@@ -1,6 +1,6 @@
 % \iffalse meta-comment
 %
-% Copyright 1993-2014
+% Copyright 1993-2016
 %
 % The LaTeX3 Project and any individual authors listed elsewhere
 % in this file.
@@ -22,7 +22,8 @@
 % \fi
 %
 % \iffalse
-%% Copyright 1996 1997 1998 1999 2002 2003 2004 David Carlisle Frank Mittelbach
+%% Copyright 1996 1997 1998 1999 2002 2003 2004 2016
+%% David Carlisle Frank Mittelbach
 %%
 %% Development of this package was commissioned by Y&Y Inc.
 %% http://www.yandy.com
@@ -36,7 +37,7 @@
 %<driver>\ProvidesFile{bm.drv}
 % \fi
 %         \ProvidesFile{bm.dtx}
-          [2014/10/28 v1.1c Bold Symbol Support (DPC/FMi)]
+          [2016/02/27 v1.2a Bold Symbol Support (DPC/FMi)]
 %
 % \iffalse
 %<*driver>
@@ -48,7 +49,6 @@
 %</driver>
 % \fi
 %
-% \CheckSum{944}
 %
 % \GetFileInfo{bm.dtx}
 %
@@ -1143,9 +1143,11 @@
 %    \end{macrocode}
 % Other command, look if it's a mathchardef token (otherwise just add
 % it).
+% \changes{v1.2a}{2016/02/27}
+%      {Additional quotes for testing \cs{Umathchar}}
 %    \begin{macrocode}
     \xdef\meaning@{\meaning#1}%
-    \expandafter\bm@mchar@test\meaning@""\@nil#1%
+    \expandafter\bm@mchar@test\meaning@""""\@nil#1%
 %    \end{macrocode}
 % \changes{v1.0d}{1997/11/15}
 %      {New active \cs{mathcode} code.}
@@ -1345,6 +1347,27 @@
 %    \end{macrocode}
 % \end{macro}
 %
+% \begin{macro}{\bm@umathchar}
+% \changes{v1.2a}{2016/02/27}
+%      {Macro added}
+% Version of \verb|\bm@mathchar| for \verb|\Umathchar|, this is easier
+% as no need to take apart the number, the match class and fam are provided
+% as distinct arguments.
+%    \begin{macrocode}
+\def\bm@umathchar#1#2#3{%
+\@tempcnta#2\relax
+\count@\bm@table
+\ifx\count@=\m@ne
+% no bold
+\else
+  \advance\@tempcnta\count@
+\fi
+\bm@xadd{\Umathchar#1\space
+                   \the\@tempcnta\space\space
+                   #3\space}}
+%    \end{macrocode}
+% \end{macro}
+%
 % \begin{macro}{\bm@pmb}
 % \changes{v0.10}{1997/01/04}
 %      {Macro added}
@@ -1529,6 +1552,15 @@
 %    \end{macrocode}
 % \end{macro}
 %
+% \begin{macro}{\bm@umchar@}
+% \changes{v1.2a}{2016/02/27}
+%      {Macro added}
+% Catcode 12 |\Umathchar|, for |\ifx| tests.
+%    \begin{macrocode}
+\edef\bm@umchar@{\string\U\expandafter\@gobble\meaning\mathchar}
+%    \end{macrocode}
+% \end{macro}
+%
 % \begin{macro}{\bm@mchar@test}
 % Test if the |\meaning| starts with |\mathchar|. If it does, grab the
 % value into |\count@| and call |\bm@mathchar|, else just copy the
@@ -1536,24 +1568,33 @@
 % |#1|, |#2|, |#3| are all |\meaning| produced tokens, or `dummy tokens'
 % added at the time this is called. |#4| is the original token, in case
 %  decide not to use the |\meaning|.
+% \changes{v1.2a}{2016/02/27}
+%      {Additional arguments added}
 %    \begin{macrocode}
-\def\bm@mchar@test#1"#2"#3\@nil#4{%
+\def\bm@mchar@test#1"#2"#3"#4"#5\@nil#6{%
   \xdef\meaning@{#1}%
   \ifx\meaning@\bm@mchar@
     \count@"#2\relax
     \bm@mathchar
   \else
 %    \end{macrocode}
+% Test for \verb|\Umathchar|.
+%    \begin{macrocode}
+    \ifx\meaning@\bm@umchar@
+       \bm@umathchar{"#2}{"#3}{"#4}%
+    \else
+%    \end{macrocode}
 % Some other command: copy it straight over. If it is the first thing
 % added, and it is a |\relax| token, save it in |\bm@first| for use
 % in |\bm@define|.
 %    \begin{macrocode}
-    \ifx\bm@previous\@empty
-      \ifx\relax#4%
-        \gdef\bm@first{#4}%
+      \ifx\bm@previous\@empty
+        \ifx\relax#6%
+          \gdef\bm@first{#6}%
+        \fi
       \fi
+      \bm@add{#6}%
     \fi
-    \bm@add{#4}%
   \fi}
 %    \end{macrocode}
 % \end{macro}
diff --git a/Master/texmf-dist/source/latex/tools/calc.dtx b/Master/texmf-dist/source/latex/tools/calc.dtx
index 284a8e1b2d3..50f725e3f7e 100644
--- a/Master/texmf-dist/source/latex/tools/calc.dtx
+++ b/Master/texmf-dist/source/latex/tools/calc.dtx
@@ -55,7 +55,6 @@
 % \fi
 %
 % \GetFileInfo{calc.dtx}
-% \CheckSum{676}
 %
 % \title{The \texttt{calc} package\\Infix notation
 %        arithmetic in \LaTeX\thanks{We thank Frank Mittelbach for his
diff --git a/Master/texmf-dist/source/latex/tools/dcolumn.dtx b/Master/texmf-dist/source/latex/tools/dcolumn.dtx
index 81f2f474c74..24de1dad05c 100644
--- a/Master/texmf-dist/source/latex/tools/dcolumn.dtx
+++ b/Master/texmf-dist/source/latex/tools/dcolumn.dtx
@@ -65,7 +65,6 @@
 % \changes{v1.06}{2001/05/28}
 %      {More doc changes (suggested by BNB, done by CAR) latex/3315}
 %
-% \CheckSum{143}
 %
 %
 % \begin{abstract}
diff --git a/Master/texmf-dist/source/latex/tools/delarray.dtx b/Master/texmf-dist/source/latex/tools/delarray.dtx
index 7a9495af405..525f8df4985 100644
--- a/Master/texmf-dist/source/latex/tools/delarray.dtx
+++ b/Master/texmf-dist/source/latex/tools/delarray.dtx
@@ -51,7 +51,6 @@
 % \changes{v1.01}{1994/03/14}
 %    {Update to LaTeX2e}
 %
-% \CheckSum{64}
 %
 % \section{Examples}
 %
diff --git a/Master/texmf-dist/source/latex/tools/enumerate.dtx b/Master/texmf-dist/source/latex/tools/enumerate.dtx
index 065f766cbc7..172e3711f9b 100644
--- a/Master/texmf-dist/source/latex/tools/enumerate.dtx
+++ b/Master/texmf-dist/source/latex/tools/enumerate.dtx
@@ -54,7 +54,6 @@
 %
 % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
-% \CheckSum{200}
 %
 % \changes{v1.00}{1990/00/00}{First version (since lost)}
 % \changes{v2.00}{1991/07/25}{New Algorithm}
diff --git a/Master/texmf-dist/source/latex/tools/fileerr.dtx b/Master/texmf-dist/source/latex/tools/fileerr.dtx
index 9aadbd0f86d..b665750f91b 100644
--- a/Master/texmf-dist/source/latex/tools/fileerr.dtx
+++ b/Master/texmf-dist/source/latex/tools/fileerr.dtx
@@ -21,7 +21,6 @@
 %
 % \fi
 % \def\fileversion{v1.1a} \def\filedate{2003/12/28}
-% \CheckSum{18}
 % \iffalse    This is a METACOMMENT
 % Doc-Source file to use with LaTeX2e
 % Copyright (C) 1994-2004 Frank Mittelbach, all rights reserved.
@@ -120,20 +119,5 @@ or `X' to terminate TeX}
 %    \begin{macrocode}
 \endinput
 %    \end{macrocode}
-%% \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
-%%   Digits        \0\1\2\3\4\5\6\7\8\9
-%%   Exclamation   \!     Double quote  \"     Hash (number) \#
-%%   Dollar        \$     Percent       \%     Ampersand     \&
-%%   Acute accent  \'     Left paren    \(     Right paren   \)
-%%   Asterisk      \*     Plus          \+     Comma         \,
-%%   Minus         \-     Point         \.     Solidus       \/
-%%   Colon         \:     Semicolon     \;     Less than     \<
-%%   Equals        \=     Greater than  \>     Question mark \?
-%%   Commercial at \@     Left bracket  \[     Backslash     \\
-%%   Right bracket \]     Circumflex    \^     Underscore    \_
-%%   Grave accent  \`     Left brace    \{     Vertical bar  \|
-%%   Right brace   \}     Tilde         \~}
 %%
 % \Finale
diff --git a/Master/texmf-dist/source/latex/tools/fontsmpl.dtx b/Master/texmf-dist/source/latex/tools/fontsmpl.dtx
index da6883c63ca..815cb9476e9 100644
--- a/Master/texmf-dist/source/latex/tools/fontsmpl.dtx
+++ b/Master/texmf-dist/source/latex/tools/fontsmpl.dtx
@@ -27,23 +27,7 @@
 % \MaintainedByLaTeXTeam{tools}
 % \maketitle
 %
-% \CheckSum{335}
 %
-%% \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
-%%   Digits        \0\1\2\3\4\5\6\7\8\9
-%%   Exclamation   \!     Double quote  \"     Hash (number) \#
-%%   Dollar        \$     Percent       \%     Ampersand     \&
-%%   Acute accent  \'     Left paren    \(     Right paren   \)
-%%   Asterisk      \*     Plus          \+     Comma         \,
-%%   Minus         \-     Point         \.     Solidus       \/
-%%   Colon         \:     Semicolon     \;     Less than     \<
-%%   Equals        \=     Greater than  \>     Question mark \?
-%%   Commercial at \@     Left bracket  \[     Backslash     \\
-%%   Right bracket \]     Circumflex    \^     Underscore    \_
-%%   Grave accent  \`     Left brace    \{     Vertical bar  \|
-%%   Right brace   \}     Tilde         \~}
 %%
 %
 % \changes{v0.01}{1994/05/01}{Created this test document as part of
diff --git a/Master/texmf-dist/source/latex/tools/ftnright.dtx b/Master/texmf-dist/source/latex/tools/ftnright.dtx
index 7a141940e42..0bcc0121e7a 100644
--- a/Master/texmf-dist/source/latex/tools/ftnright.dtx
+++ b/Master/texmf-dist/source/latex/tools/ftnright.dtx
@@ -30,22 +30,6 @@
 %
 % \fi
 %%
-%% \CheckSum{431}
-%% \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
-%%   Digits        \0\1\2\3\4\5\6\7\8\9
-%%   Exclamation   \!     Double quote  \"     Hash (number) \#
-%%   Dollar        \$     Percent       \%     Ampersand     \&
-%%   Acute accent  \'     Left paren    \(     Right paren   \)
-%%   Asterisk      \*     Plus          \+     Comma         \,
-%%   Minus         \-     Point         \.     Solidus       \/
-%%   Colon         \:     Semicolon     \;     Less than     \<
-%%   Equals        \=     Greater than  \>     Question mark \?
-%%   Commercial at \@     Left bracket  \[     Backslash     \\
-%%   Right bracket \]     Circumflex    \^     Underscore    \_
-%%   Grave accent  \`     Left brace    \{     Vertical bar  \|
-%%   Right brace   \}     Tilde         \~}
 %%
 %
 %
diff --git a/Master/texmf-dist/source/latex/tools/hhline.dtx b/Master/texmf-dist/source/latex/tools/hhline.dtx
index b7521594131..bcde38623f8 100644
--- a/Master/texmf-dist/source/latex/tools/hhline.dtx
+++ b/Master/texmf-dist/source/latex/tools/hhline.dtx
@@ -57,7 +57,6 @@
 %    {New style warning.}
 %
 %
-% \CheckSum{244}
 %
 % \MakeShortVerb{\"}
 %
diff --git a/Master/texmf-dist/source/latex/tools/layout.dtx b/Master/texmf-dist/source/latex/tools/layout.dtx
index 5d96f1dda4f..99349491408 100644
--- a/Master/texmf-dist/source/latex/tools/layout.dtx
+++ b/Master/texmf-dist/source/latex/tools/layout.dtx
@@ -20,7 +20,6 @@
 % given in the file `manifest.txt'.
 %
 % \fi
-% \CheckSum{920}
 %\iffalse
 %    This file is built for \LaTeXe, so we make sure an error is
 %    generated when it is used with another format
diff --git a/Master/texmf-dist/source/latex/tools/longtable.dtx b/Master/texmf-dist/source/latex/tools/longtable.dtx
index 32e958fd5a8..74ab53d7231 100644
--- a/Master/texmf-dist/source/latex/tools/longtable.dtx
+++ b/Master/texmf-dist/source/latex/tools/longtable.dtx
@@ -143,7 +143,6 @@
 % \changes{v4.06}{1997/06/28}
 %      {(DK) new email address}
 %
-% \CheckSum{1045}
 %
 %
 % \makeatletter
diff --git a/Master/texmf-dist/source/latex/tools/multicol.dtx b/Master/texmf-dist/source/latex/tools/multicol.dtx
index e5f431ed365..3b0ec5c3ec9 100644
--- a/Master/texmf-dist/source/latex/tools/multicol.dtx
+++ b/Master/texmf-dist/source/latex/tools/multicol.dtx
@@ -91,25 +91,9 @@
 %<driver> \ProvidesFile{multicol.drv}
 % \fi
 %         \ProvidesFile{multicol.dtx}
-          [2015/08/19 v1.8n  multicolumn formatting (FMi)]
-%
-%
-%% \CheckSum{1894}
-%% \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
-%%   Digits        \0\1\2\3\4\5\6\7\8\9
-%%   Exclamation   \!     Double quote  \"     Hash (number) \#
-%%   Dollar        \$     Percent       \%     Ampersand     \&
-%%   Acute accent  \'     Left paren    \(     Right paren   \)
-%%   Asterisk      \*     Plus          \+     Comma         \,
-%%   Minus         \-     Point         \.     Solidus       \/
-%%   Colon         \:     Semicolon     \;     Less than     \<
-%%   Equals        \=     Greater than  \>     Question mark \?
-%%   Commercial at \@     Left bracket  \[     Backslash     \\
-%%   Right bracket \]     Circumflex    \^     Underscore    \_
-%%   Grave accent  \`     Left brace    \{     Vertical bar  \|
-%%   Right brace   \}     Tilde         \~}
+          [2016/02/08 v1.8o  multicolumn formatting (FMi)]
+%
+%
 %%
 %
 % \changes{v1.5n}{1997/06/05}{Applied improvement of documentation,
@@ -1911,8 +1895,11 @@
 %    environment the counter |\col@number| gets a default of |1|
 %    outside the the environment.
 % \changes{v1.3d}{1991/10/23}{\cs{col@number} set to one}
+% \changes{v1.8o}{2016/02/08}{\cs{col@number} already initialized in the 
+%    kernel, so not initializing it in the package 
+%    in case the document is in two-column (pr/4435)}
 %    \begin{macrocode}
-\col@number = 1
+%\col@number = 1
 \multicoltolerance = 9999
 \multicolpretolerance = -1
 \premulticols = 50pt
@@ -3842,7 +3829,8 @@
 %    in some stretchable vertical glue so that the last column still
 %    containing text is not vertically stretched out. 
 %
-%    We do this as follows: first we cancel out |\lastskip| if it was
+%    We do this as follows: first we ensure that we are back in vertical mode
+%    and then 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
@@ -3862,8 +3850,11 @@
 % \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}}
+% \changes{v1.8o}{2016/02/08}{Ensure we are back in vmode before using
+%    \cs{prevdepth} (pr/4448)}
 %    \begin{macrocode}
 \@namedef{endmulticols*}{%
+   \par
    \ifdim\lastskip>\z@ \vskip-\lastskip \fi
    \ifdim \prevdepth>\z@
      \vskip-\ifdim\prevdepth>\boxmaxdepth 
diff --git a/Master/texmf-dist/source/latex/tools/rawfonts.dtx b/Master/texmf-dist/source/latex/tools/rawfonts.dtx
index f27688331b6..1057b58fe3e 100644
--- a/Master/texmf-dist/source/latex/tools/rawfonts.dtx
+++ b/Master/texmf-dist/source/latex/tools/rawfonts.dtx
@@ -26,7 +26,6 @@
 % \MaintainedByLaTeXTeam{tools}
 % \maketitle
 %
-% \CheckSum{286}
 %
 % \section*{Overview}
 %
diff --git a/Master/texmf-dist/source/latex/tools/shellesc.dtx b/Master/texmf-dist/source/latex/tools/shellesc.dtx
index 636167d3504..72f6108140e 100644
--- a/Master/texmf-dist/source/latex/tools/shellesc.dtx
+++ b/Master/texmf-dist/source/latex/tools/shellesc.dtx
@@ -15,7 +15,7 @@
 %<driver> \ProvidesFile{shellesc.drv}
 % \fi
 %         \ProvidesFile{shellesc.dtx}
-       [2015/12/05 v0.01 unified shell escape interface for LaTeX]
+       [2016/02/02 v0.01b unified shell escape interface for LaTeX]
 %
 % \iffalse
 %<*driver>
@@ -30,16 +30,16 @@
 %
 % \title{The \textsf{shellesc} Package\thanks{This file
 %        has version number \fileversion, last
-%        revised \filedate.
-% Please report any issues at https://github.com/josephwright/luatex85/issues}}
+%        revised \filedate.}}
 % \author{LaTeX3 project}
 % \date{\filedate}
 % \maketitle
 %
+% \changes{v0.1b}{2016/02/02}{Doc typo fixes (JB)}
 % \section{Introduction}
 %
 % 
-% For many yeas web2c based \TeX\ implementations have used the syntax
+% For many years web2c based \TeX\ implementations have used the syntax
 % of the \verb|\write| command to access  system commands by using a
 % special stream 18 (streams above 15 can not be allocated to files in
 % classical \TeX\ so stream 18 would otherwise just print to the
@@ -76,10 +76,10 @@
 % will work with Lua\TeX. Note that the redefinition of \verb|\write|
 % can not detect whether \verb|\immediate| has been used,
 % \verb|\immediate| will work as normal when writing to file streams
-% or the terminal but the specal case of stream 18 which is defined to
+% or the terminal but the special case of stream 18 which is defined to
 % use \verb|os.execute| always uses \verb|\directlua| (so corresponds
 % to \verb|\immediate\write18|. In the rare situations that you need
-% non-immedate \verb|\write18| in a document being ported to current
+% non-immediate \verb|\write18| in a document being ported to current
 % Lua\TeX, you will need to change to use the
 % \verb|DelayedShellescape| command.
 % 
diff --git a/Master/texmf-dist/source/latex/tools/showkeys.dtx b/Master/texmf-dist/source/latex/tools/showkeys.dtx
index 960120bcb15..841be6c3add 100644
--- a/Master/texmf-dist/source/latex/tools/showkeys.dtx
+++ b/Master/texmf-dist/source/latex/tools/showkeys.dtx
@@ -59,7 +59,6 @@
 %
 % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
-% \CheckSum{595}
 %
 %
 % \changes{v1.01}{1992/08/25}{Initial version}
diff --git a/Master/texmf-dist/source/latex/tools/somedefs.dtx b/Master/texmf-dist/source/latex/tools/somedefs.dtx
index 3e086754332..70c05c58382 100644
--- a/Master/texmf-dist/source/latex/tools/somedefs.dtx
+++ b/Master/texmf-dist/source/latex/tools/somedefs.dtx
@@ -26,7 +26,6 @@
 % \MaintainedByLaTeXTeam{tools}
 % \maketitle
 %
-% \CheckSum{56}
 %
 % \changes{v0.03}{1994/06/01}{Use new style error commands. DPC}
 % \changes{v0.02}{1994/05/10}{Added a \cmd\relax, to stop arguments to
diff --git a/Master/texmf-dist/source/latex/tools/tabularx.dtx b/Master/texmf-dist/source/latex/tools/tabularx.dtx
index fee7a2ec626..3d2b641789e 100644
--- a/Master/texmf-dist/source/latex/tools/tabularx.dtx
+++ b/Master/texmf-dist/source/latex/tools/tabularx.dtx
@@ -1,6 +1,6 @@
 % \iffalse meta-comment
 %
-% Copyright 1993-2014
+% Copyright 1993-2016
 %
 % The LaTeX3 Project and any individual authors listed elsewhere
 % in this file.
@@ -21,7 +21,7 @@
 %
 % \fi
 % \iffalse
-%% File: tabularx.dtx Copyright (C) 1991-1999 2012 2014 David Carlisle
+%% File: tabularx.dtx Copyright (C) 1991-1999 2012 2014 2016 David Carlisle
 %
 %<*dtx>
           \ProvidesFile{tabularx.dtx}
@@ -31,7 +31,7 @@
 %<driver> \ProvidesFile{tabularx.drv}
 % \fi
 %         \ProvidesFile{tabularx.dtx}
-          [2014/10/28 v2.10 `tabularx' package (DPC)]
+          [2016/02/03 v2.11 `tabularx' package (DPC)]
 % \iffalse
 %<*driver>
 \documentclass{ltxdoc}
@@ -66,7 +66,6 @@
 % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
 %
-% \CheckSum{527}
 %
 % \GetFileInfo{tabularx.dtx}
 % \title{The \textsf{tabularx} package\thanks{This file
@@ -392,12 +391,13 @@
 %
 % \begin{macro}{\TX@find@endtabularxa}
 % \changes{v2.09}{2014/04/22}{macro added}
-% \changes{v2.10}{2014/05/13}{macro modified to test for missing `\cs{endtabularx}}
+% \changes{v2.10}{2014/05/13}{macro modified to test for missing \cs{endtabularx}}
+% \changes{v2.11}{2016/01/03}{Fix to previous change to guard against empty arg 2. (Ulrike Fischer)}
 % split up the end code, and extract the part that lives in the table body.
 %    \begin{macrocode}
 \long\def\TX@find@endtabularxa
        #1\endtabularx#2\endtabularx#3\TX@find@endtabularxa{%
-  \ifx\TX@#2\else
+  \ifx\TX@#2\relax\else
   \toks@\expandafter{\the\toks@#1}%
   \fi}
 %    \end{macrocode}
diff --git a/Master/texmf-dist/source/latex/tools/theorem.dtx b/Master/texmf-dist/source/latex/tools/theorem.dtx
index 1a9d4f6bf09..fe782782406 100644
--- a/Master/texmf-dist/source/latex/tools/theorem.dtx
+++ b/Master/texmf-dist/source/latex/tools/theorem.dtx
@@ -21,22 +21,6 @@
 %
 % \fi
 %
-% \CheckSum{467}
-%% \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
-%%   Digits        \0\1\2\3\4\5\6\7\8\9
-%%   Exclamation   \!     Double quote  \"     Hash (number) \#
-%%   Dollar        \$     Percent       \%     Ampersand     \&
-%%   Acute accent  \'     Left paren    \(     Right paren   \)
-%%   Asterisk      \*     Plus          \+     Comma         \,
-%%   Minus         \-     Point         \.     Solidus       \/
-%%   Colon         \:     Semicolon     \;     Less than     \<
-%%   Equals        \=     Greater than  \>     Question mark \?
-%%   Commercial at \@     Left bracket  \[     Backslash     \\
-%%   Right bracket \]     Circumflex    \^     Underscore    \_
-%%   Grave accent  \`     Left brace    \{     Vertical bar  \|
-%%   Right brace   \}     Tilde         \~}
 %%
 %
 %
diff --git a/Master/texmf-dist/source/latex/tools/trace.dtx b/Master/texmf-dist/source/latex/tools/trace.dtx
index a9439dff7d4..0a082f3f471 100644
--- a/Master/texmf-dist/source/latex/tools/trace.dtx
+++ b/Master/texmf-dist/source/latex/tools/trace.dtx
@@ -22,8 +22,6 @@
 % \fi
 % \iffalse
 %%
-%% $Id: trace.dtx 5291 2003-06-29 14:44:49Z mittelba $
-%%
 %% (C) Copyright 1999-2014 Frank Mittelbach
 %% All rights reserved.
 %%
@@ -54,7 +52,6 @@
 %</driver>
 % \fi
 %
-% \CheckSum{237}
 %
 % \GetFileInfo{trace.dtx}
 %
diff --git a/Master/texmf-dist/source/latex/tools/varioref.dtx b/Master/texmf-dist/source/latex/tools/varioref.dtx
index f8059e5db8f..a506523d4af 100644
--- a/Master/texmf-dist/source/latex/tools/varioref.dtx
+++ b/Master/texmf-dist/source/latex/tools/varioref.dtx
@@ -22,7 +22,7 @@
 % \fi
 % \iffalse
 %% Package varioref to use with LaTeX2e
-%% Copyright (C) 1992-2015  Frank Mittelbach, all rights reserved.
+%% Copyright (C) 1992-2016  Frank Mittelbach, all rights reserved.
 %%
 %% For additions or updates to the language options please contact
 %% the author at
@@ -34,31 +34,19 @@
 %
 %<package>\NeedsTeXFormat{LaTeX2e}[1995/05/16]
 %<package>\ProvidesPackage{varioref}
-%<package>    [2015/09/22 v1.5b package for extended references (FMi)]
+%<package>    [2016/02/16 v1.5c package for extended references (FMi)]
 % \fi
 %
-% \CheckSum{2165}
-%% \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
-%%   Digits        \0\1\2\3\4\5\6\7\8\9
-%%   Exclamation   \!     Double quote  \"     Hash (number) \#
-%%   Dollar        \$     Percent       \%     Ampersand     \&
-%%   Acute accent  \'     Left paren    \(     Right paren   \)
-%%   Asterisk      \*     Plus          \+     Comma         \,
-%%   Minus         \-     Point         \.     Solidus       \/
-%%   Colon         \:     Semicolon     \;     Less than     \<
-%%   Equals        \=     Greater than  \>     Question mark \?
-%%   Commercial at \@     Left bracket  \[     Backslash     \\
-%%   Right bracket \]     Circumflex    \^     Underscore    \_
-%%   Grave accent  \`     Left brace    \{     Vertical bar  \|
-%%   Right brace   \}     Tilde         \~}
 %%
 %
 %
 % \changes{v1.0a}{1993/12/06}{Upgrade to LaTeX2e}
 % \changes{v1.0g}{1994/05/27}{Use \cmd\DeclareRobustCommand}
+% \changes{v1.5c}{2016/02/09}{Revamped some of the documentation to better
+%	explain how varioref could be used in a multi-lingual context}
+
 %
+% \newcommand\NewIn[1]{\marginpar{\fbox{\fbox{\sffamily\tabular{l}New in\\#1\endtabular}}}}
 %
 % \title{The \texttt{varioref} package\thanks{This file
 %        has version number \fileversion, last
@@ -84,6 +72,12 @@
 %   commands are usable with various languages.
 % \end{abstract}
 %
+%
+% \columnsep=2\columnsep
+% \begin{multicols}{2}
+%   \tableofcontents
+% \end{multicols}
+%
 % \section{Introduction}
 %
 % In many cases it is helpful when referring to a figure or table to
@@ -167,9 +161,9 @@
 % to achieve the desired effect.
 %
 %
-% \subsection{Additions in 1998}
-%
-% \DescribeMacro\vrefrange This command is similar to |\vref| but it
+% \DescribeMacro\vrefrange 
+% \NewIn{1998}
+% This command is similar to |\vref| but it
 % takes two mandatory arguments denoting a range to refer to (e.g., a
 % sequences of figures or a sequence of equations, etc.). So if
 % |fig:a| is your first figure in the sequence and |fig:c| your last
@@ -232,9 +226,9 @@
 % \end{quote}
 % in case the are on different pages.
 %
-% \subsection{Additions in 2001}
 %
 % The user commands |\vref|, |\vpageref|, and |\vpagerefrange| all
+% \NewIn{2001}
 % work by first removing any space on their left and then inserting
 % some space of their own (|\vref|, for example, a nonbreakable
 % space). That seemed like a good idea back then, but it has the
@@ -251,9 +245,9 @@
 % generated text (they do nevertheless remove space at the left).
 %
 %
-% \subsection{Additions in 2002}
 %
 % \DescribeMacro\labelformat
+% \NewIn{2002}
 % A reference via |\ref| produces by default the data associated with
 % the corresponding |\label| command (typically a number); any
 % additional formatting has to be provided by the user. If, for
@@ -308,17 +302,45 @@
 %\end{verbatim}
 % textual references can be suppressed.
 %
+% \section{Multi-lingual usage}
+%
+% The package works well together with the babel system if it is
+% loaded \textit{after} the babel package, e.g., a document in English
+% (default), French and German text could load the packages as
+% follows:
+%\begin{verbatim}
+%   \usepackage[ngerman,french,english]{babel,varioref}
+%\end{verbatim}
+% (or in two separate lines if you prefer one |\usepackage| line per
+% package). Depending on the current babel language |\vref| and
+% friends would then generate strings in different languages. If the
+% language options are given as global options to the document class
+% then it is enough to use
+%\begin{verbatim}
+%   \usepackage{babel,varioref}
+%\end{verbatim}
+% to achieve the same effect.
+%
+% If more than one language is specified with \texttt{varioref} then
+% it will start using the last language selected. Switching of
+% languages is managed through Babel; nevertheless all languages of
+% interest need to be specified when \texttt{varioref} is loaded so
+% that it can integrate their strings into the Babel system.
+%
 %
 % \section{Customization}
 %
 % The package supports all options defined by the babel package to
 % translate the fixed strings into other languages than English.
-% (Some languages need updating, however.)
-% It also supports languages currently not in babel;
-% check the section on options later on.
+% (Some languages need updating, however---help is appreciated.)  It
+% also supports languages currently not in babel (those can only be
+% used standalone, obviously); check the section on options later~on.
+%
+%
+% \pagebreak[3]
 %
 % You can also modify some or all of the strings by redefining the
-% following commands.
+% following commands after the package has been loaded.
 %\DescribeMacro\reftextbefore
 %\DescribeMacro\reftextfacebefore
 %\DescribeMacro\reftextafter
@@ -346,22 +368,8 @@
 % |\vpageref| commands.  As an example see the definitions of
 % |\reftextbefore| etc.\ \vpageref[below]{reftextbefore}.
 %
-% \begin{itshape} If babel is being used then the above commands need to be
-% changed using the Babel mechanism, e.g.,
-%\begin{verbatim}
-%\addto\extrasngerman{%
-%   \renewcommand\reftextfaceafter {auf der n\"achsten Seite}%
-%    ...
-%  }
-%\end{verbatim}
-% Otherwise babel will reintroduce its own defaults each time the language is
-% changed (which happens in particular during |\begin{document}| where the
-%    main language is selected).
-% \end{itshape}
-%
-% \subsection{Additions in 1998}
-%
 % The commands |\vrefrange| and |\vpagerefrange| produce their text
+% \NewIn{1998}
 % using two macros described below. By redefining them one can modify
 % the results to accommodate special requirements.
 %
@@ -379,14 +387,32 @@
 % describes the range of figures, tables, or whatever the labels refer
 % to, the default for English is ``|\ref{#1} to~\ref{#2}|''.
 %
+% \subsection{\ldots\ if Babel is used}
+%
+% \begin{itshape} If babel is being used then the above commands need to be
+% changed using the Babel mechanism, e.g.,
+%\begin{verbatim}
+%  \addto\extrasngerman{%
+%     \renewcommand\reftextfaceafter {auf der n\"achsten Seite}%
+%      ... }
+%\end{verbatim}
+% Otherwise babel will reintroduce its own defaults whenever the language is
+% changed (which happens in particular during |\begin{document}| where the
+%    main language is selected).
+% \end{itshape}
+%
+%
+%
 %
 % \section{Options}
 %
 % As mentioned above the package supports all standard options offered
-% by the Babel system to customize the strings produced. In addition it
-% offers the option \texttt{draft} to turn error messages into warnings
-% during development. The default \texttt{final} produces error message
-% when a generated string falls onto a page boundary (see next section).
+% by the Babel system to customize the strings produced, it may also
+% have a few not supported by babel, for a full list look
+% in section\vref{sec:impoptions}. In addition it offers the option
+% \texttt{draft} to turn error messages into warnings during
+% development. The default \texttt{final} produces error message when
+% a generated string falls onto a page boundary (see next section).
 %
 %
 % \section{A few warnings}
@@ -439,7 +465,7 @@
 %    \begin{macrocode}
 %<*driver>
 \documentclass{ltxdoc}
-\usepackage{varioref}
+\usepackage{multicol,varioref}
 \GetFileInfo{varioref.sty}
 \setlength\hfuzz{1pt}    % ignore slight overfulls
 \EnableCrossrefs
@@ -506,7 +532,7 @@
 %  \end{macro}
 %
 %
-% \subsection{Options}
+% \subsection{Options}\label{sec:impoptions}
 %
 %  \begin{macro}{\vref@excuse}
 %    Excuse that we don't know the strings for a certain language.
@@ -1540,7 +1566,7 @@
 % \changes{v1.4e}{2003/01/08}{Use \cs{vref@label} instead of
 %    \cs{label} (pr/3489)}
 %    \begin{macrocode}
-   \vref@label{\the\c@vrcnt @xvr}%
+  \vref@label{\the\c@vrcnt @xvr}%
 %    \end{macrocode}
 % \changes{v1.1g}{1998/05/10}{Test if inside AMS display (pr2175)}
 %    Inside displays of the \texttt{amsmath} package the |\label| command
@@ -1550,16 +1576,26 @@
 %    [This is no longer necessary as |\label| isn't used any more]
 %    \begin{macrocode}
 %  \ifx\label\label@in@display\else
-    \ifx\@tempa\@tempb\else
+  \ifx\@tempa\@tempb
+    \let\vref@may@loop\relax
+  \else
 %    \end{macrocode}
 %    If both points do not fall onto the same page with either issue
 %    an error or a warning message.
+%    However, we do no longer issue that warning now but wait until we
+%    are sure that both labels aren't ``far away'' because in that
+%    case it doesn't matter. So we just save that info in a macro now.
 % \changes{v1.0g}{1994/05/27}{Looping pages shown in wrong order}
+% \changes{v1.5c}{2016/02/16}{Delay generating the looping warning
+%                until we know more}
 %    \begin{macrocode}
-    \vref@err{\noexpand\vref or \noexpand\vpageref at page boundary
+    \edef\vref@may@loop{%
+      \noexpand\vref@err{\noexpand\vref or \noexpand\vpageref
+              at page boundary
               \@tempb-\@tempa\space (may loop)%
               }%
-    \fi
+      }%
+   \fi
 %  \fi
 %    \end{macrocode}
 %    Same game for the user requested label; this time the page
@@ -1696,12 +1732,14 @@
 %    \end{macrocode}
 %    If the above test also returns false then we have object and
 %    references on pages which are far away or don't contain simple
-%    page numbers. Therefore we generate the |\reftextfaraway| string.
+%    page numbers. Therefore we generate the |\reftextfaraway| string
+%    and drop any possible ``looping warning'' in |\vref@may@loop|.
 %    Recall that this is a macro which has the user label as an
 %    argument.
 %    \begin{macrocode}
           \else
-            \reftextfaraway{#3}%
+          \let\vref@may@loop\relax % added
+          \reftextfaraway{#3}%
           \fi
         \fi
        }%
@@ -1709,7 +1747,9 @@
 %    We do the same if our first test (that the page with the object
 %    has a positive page number) turns out to be false.
 %    \begin{macrocode}
-       {\reftextfaraway{#3}}%
+       {%
+         \let\vref@may@loop\relax %added
+         \reftextfaraway{#3}}%
   \fi
 %    \end{macrocode}
 %    Finally we generate the internal label so that it can be check on
@@ -1725,8 +1765,14 @@
 %    the latter command.
 % \changes{v1.4e}{2003/01/08}{Use \cs{vref@label} instead of
 %    \cs{label}  (pr/3489)}
+% \changes{v1.5c}{2016/02/16}{}
 %    \begin{macrocode}
    \vref@label{\the\c@vrcnt @vr}%
+%    \end{macrocode}
+%    Finally we run |\vref@may@loop| which is either |\relax| or generates
+%    a ``may loop'' warning or error as appropriate.
+%    \begin{macrocode}
+   \vref@may@loop
 }
 %    \end{macrocode}
 % \end{macro}
diff --git a/Master/texmf-dist/source/latex/tools/verbatim.dtx b/Master/texmf-dist/source/latex/tools/verbatim.dtx
index 45cd00e1e19..b47419085c2 100644
--- a/Master/texmf-dist/source/latex/tools/verbatim.dtx
+++ b/Master/texmf-dist/source/latex/tools/verbatim.dtx
@@ -20,7 +20,6 @@
 % given in the file `manifest.txt'.
 %
 % \fi
-% \CheckSum{625}
 %
 %\iffalse   % this is a METACOMMENT !
 %
@@ -1856,19 +1855,4 @@ asdfa<fsa
 % \Finale
 %
 \endinput
-%% \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
-%%   Digits        \0\1\2\3\4\5\6\7\8\9
-%%   Exclamation   \!     Double quote  \"     Hash (number) \#
-%%   Dollar        \$     Percent       \%     Ampersand     \&
-%%   Acute accent  \'     Left paren    \(     Right paren   \)
-%%   Asterisk      \*     Plus          \+     Comma         \,
-%%   Minus         \-     Point         \.     Solidus       \/
-%%   Colon         \:     Semicolon     \;     Less than     \<
-%%   Equals        \=     Greater than  \>     Question mark \?
-%%   Commercial at \@     Left bracket  \[     Backslash     \\
-%%   Right bracket \]     Circumflex    \^     Underscore    \_
-%%   Grave accent  \`     Left brace    \{     Vertical bar  \|
-%%   Right brace   \}     Tilde         \~}
 %%
diff --git a/Master/texmf-dist/source/latex/tools/xr.dtx b/Master/texmf-dist/source/latex/tools/xr.dtx
index e48c5d3e483..bb766181482 100644
--- a/Master/texmf-dist/source/latex/tools/xr.dtx
+++ b/Master/texmf-dist/source/latex/tools/xr.dtx
@@ -47,7 +47,6 @@
 %
 % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
-% \CheckSum{87}
 %
 % \changes{v5.00}{1993/07/07}
 %         {First DPC version (by agreement with J-PD).  New mechanism
diff --git a/Master/texmf-dist/source/latex/tools/xspace.dtx b/Master/texmf-dist/source/latex/tools/xspace.dtx
index 75d6426d335..6e3784cf09a 100644
--- a/Master/texmf-dist/source/latex/tools/xspace.dtx
+++ b/Master/texmf-dist/source/latex/tools/xspace.dtx
@@ -61,7 +61,6 @@
 %
 % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
-% \CheckSum{218}
 %
 % \changes{v1.00}{1991/08/30}{Initial version}
 % \changes{v1.01}{1992/06/26}{Re-issue for the new doc and docstrip}