latex2e (7apr18)

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

2 files changed, 52 insertions, 11 deletions

diff --git a/Master/texmf-dist/tex/latex/tools/.tex b/Master/texmf-dist/tex/latex/tools/.tex
new file mode 100644
index 00000000000..0e5218a077d
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/tools/.tex
@@ -0,0 +1,41 @@
+%%
+%% This is file `.tex',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% fileerr.dtx  (with options: `return')
+%% 
+%% This is a generated file.
+%% 
+%% The source is maintained by the LaTeX Project team and bug
+%% reports for it can be opened at https://latex-project.org/bugs/
+%% (but please observe conditions on bug reports sent to that address!)
+%% 
+%% 
+%% Copyright 1993-2017
+%% The LaTeX3 Project and any individual authors listed elsewhere
+%% in this file.
+%% 
+%% This file was generated from file(s) 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
+%%    https://www.latex-project.org/lppl.txt
+%% 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
+%% `Tools Bundle'. You may however distribute the LaTeX `Tools Bundle'
+%% without such generated files.
+%% 
+%% The list of all files belonging to the LaTeX `Tools Bundle' is
+%% given in the file `manifest.txt'.
+%% 
+ \message{File ignored}
+\endinput
+%%
+%% End of file `.tex'.
diff --git a/Master/texmf-dist/tex/latex/tools/array.sty b/Master/texmf-dist/tex/latex/tools/array.sty
index 7cdb801c170..1777fddbfec 100644
--- a/Master/texmf-dist/tex/latex/tools/array.sty
+++ b/Master/texmf-dist/tex/latex/tools/array.sty
@@ -39,7 +39,7 @@
 %% Copyright (C) 1989-1998 Frank Mittelbach, all rights reserved.
 \NeedsTeXFormat{LaTeX2e}[1995/06/01]
 \ProvidesPackage{array}
-         [2017/11/07 v2.4f Tabular extension package (FMi)]
+         [2018/04/07 v2.4g Tabular extension package (FMi)]
 %%
 
 \def\@addtopreamble#1{\xdef\@preamble{\@preamble #1}}
@@ -92,7 +92,7 @@
 \def\@mkpream#1{\gdef\@preamble{}\@lastchclass 4 \@firstamptrue
    \let\@sharp\relax \let\@startpbox\relax \let\@endpbox\relax
    \let\do@row@strut\relax
-   \let\align@mcell\relax
+   \let\ar@align@mcell\relax
    \@xexpast #1*0x\@@
    \count@\m@ne
    \let\the@toks\relax
@@ -133,25 +133,25 @@
       \d@llarend \do@row@strut \hfil \or
       \hskip1sp\d@llarbegin \insert@column \d@llarend \do@row@strut \hfil \or
       \hfil\hskip1sp\d@llarbegin \insert@column \d@llarend \do@row@strut \or
-    \setbox\mcell@box\vbox
+    \setbox\ar@mcellbox\vbox
        \@startpbox{\@nextchar}\insert@column \@endpbox
-    \align@mcell
+    \ar@align@mcell
     \do@row@strut \or
    \vtop \@startpbox{\@nextchar}\insert@column \@endpbox\do@row@strut \or
    \vbox \@startpbox{\@nextchar}\insert@column \@endpbox\do@row@strut
   \fi}\prepnext@tok}
 
-\newbox\mcell@box
-\def\align@mcell{%
-  \ifdim \ht\mcell@box > \ht\@arstrutbox
+\newbox\ar@mcellbox
+\def\ar@align@mcell{%
+  \ifdim \ht\ar@mcellbox > \ht\@arstrutbox
     \begingroup
-     \dimen@\ht\mcell@box
+     \dimen@\ht\ar@mcellbox
      \advance\dimen@-\ht\@arstrutbox
      \advance\dimen@\baselineskip
-     \lower.5\dimen@\box\mcell@box
+     \lower.5\dimen@\box\ar@mcellbox
     \endgroup
   \else % assume one line and align at baseline
-    \box\mcell@box
+    \box\ar@mcellbox
   \fi}
 
 \def\@classix{\ifnum \@lastchclass = \thr@@
@@ -308,7 +308,7 @@
 \def\@mkpream#1{\gdef\@preamble{}\@lastchclass 4 \@firstamptrue
    \let\@sharp\relax \let\@startpbox\relax \let\@endpbox\relax
    \let\do@row@strut\relax
-   \let\align@mcell\relax
+   \let\ar@align@mcell\relax
    \@temptokena{#1}\@tempswatrue
    \@whilesw\if@tempswa\fi{\@tempswafalse\the\NC@list}%
    \count@\m@ne