From b8f67cb908880c8fdf6b03eb9c4d5219d7409171 Mon Sep 17 00:00:00 2001
From: Karl Berry <karl@freefriends.org>
Date: Tue, 11 Dec 2018 22:32:49 +0000
Subject: latex(2e) (11dec18)

git-svn-id: svn://tug.org/texlive/trunk@49390 c570f23f-e606-0410-a88d-b1316a301751
---
 Master/texmf-dist/tex/latex/tools/array.sty | 46 +++++------------------------
 1 file changed, 7 insertions(+), 39 deletions(-)

(limited to 'Master/texmf-dist/tex/latex/tools/array.sty')

diff --git a/Master/texmf-dist/tex/latex/tools/array.sty b/Master/texmf-dist/tex/latex/tools/array.sty
index f60e38cd37f..01af6d80549 100644
--- a/Master/texmf-dist/tex/latex/tools/array.sty
+++ b/Master/texmf-dist/tex/latex/tools/array.sty
@@ -45,7 +45,7 @@
 \DeclareCurrentRelease{}{2018-04-30}
 
 \ProvidesPackage{array}
-         [2018/04/30 v2.4h Tabular extension package (FMi)]
+         [2018/11/13 v2.4j Tabular extension package (FMi)]
 %%
 
 \def\@addtopreamble#1{\xdef\@preamble{\@preamble #1}}
@@ -95,31 +95,6 @@
    \the@toks \the \count@ \relax}
 \newdimen\col@sep
 \def\@acol{\@addtopreamble{\hskip\col@sep}}
-\def\@mkpream#1{\gdef\@preamble{}\@lastchclass 4 \@firstamptrue
-   \let\@sharp\relax \let\@startpbox\relax \let\@endpbox\relax
-   \let\do@row@strut\relax
-   \let\ar@align@mcell\relax
-   \@xexpast #1*0x\@@
-   \count@\m@ne
-   \let\the@toks\relax
-   \prepnext@tok
-   \expandafter \@tfor \expandafter \@nextchar
-    \expandafter :\expandafter =\@tempa \do
-   {\@testpach
-   \ifcase \@chclass \@classz \or \@classi \or \@classii
-     \or \save@decl \or \or \@classv \or \@classvi
-     \or \@classvii \or \@classviii  \or \@classix
-     \or \@classx \fi
-   \@lastchclass\@chclass}%
-   \ifcase\@lastchclass
-   \@acol \or
-   \or
-   \@acol \or
-   \@preamerr \thr@@ \or
-   \@preamerr \tw@ \@addtopreamble\@sharp \or
-   \or
-   \else  \@preamerr \@ne \fi
-   \def\the@toks{\the\toks}}
 \def\@classx{%
   \ifcase \@lastchclass
   \@acolampacol \or
@@ -140,7 +115,7 @@
       \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\ar@mcellbox\vbox
-       \@startpbox{\@nextchar}\insert@column \@endpbox
+    \@startpbox{\@nextchar}\insert@column \@endpbox
     \ar@align@mcell
     \do@row@strut \or
    \vtop \@startpbox{\@nextchar}\insert@column \@endpbox\do@row@strut \or
@@ -160,11 +135,6 @@
     \box\ar@mcellbox
   \fi}
 
-\def\@classix{\ifnum \@lastchclass = \thr@@
-       \@preamerr \thr@@ \fi
-       \@classx}
-\def\@classviii{\ifnum \@lastchclass >\z@
-      \@preamerr 4\@chclass 6 \@classvi \fi}
 \def\@arrayrule{\@addtopreamble \vline}
 \def\@classvii{\ifnum \@lastchclass = \thr@@
    \@preamerr \thr@@ \fi}
@@ -176,19 +146,17 @@
       \fi}
 \def\@classii{\advance \count@ \m@ne
    \save@decl\prepnext@tok}
-\def\@classv{\save@decl
-   \@addtopreamble{\d@llarbegin\the@toks\the\count@\relax\d@llarend}%
-   \prepnext@tok}
 \def\@classi{\@classvi
    \ifcase \@chnum \@arrayrule \or
       \@classv \fi}
 \def\@startpbox#1{\bgroup
+  \color@begingroup
   \setlength\hsize{#1}\@arrayparboxrestore
    \everypar{%
       \vrule \@height \ht\@arstrutbox \@width \z@
       \everypar{}}%
    }
-\def\@endpbox{\@finalstrut\@arstrutbox \egroup\hfil}
+\def\@endpbox{\@finalstrut\@arstrutbox \color@endgroup \egroup\hfil}
 \def\@array[#1]#2{%
   \@tempdima \ht \strutbox
   \advance \@tempdima by\extrarowheight
@@ -244,7 +212,6 @@
 \def\array{\col@sep\arraycolsep
   \def\d@llarbegin{$}\let\d@llarend\d@llarbegin\def\@halignto{}%
   \@tabarray}
-\def\@tabarray{\@ifnextchar[{\@array}{\@array[c]}}
 \def\tabular{\def\@halignto{}\@tabular}
 \expandafter\def\csname tabular*\endcsname#1{%
        \setlength\dimen@{#1}%
@@ -254,7 +221,6 @@
   \hbox \bgroup $\col@sep\tabcolsep \let\d@llarbegin\begingroup
                                     \let\d@llarend\endgroup
   \@tabarray}
-\def\endarray{\crcr \egroup \egroup \gdef\@preamble{}}
 \def\endtabular{\endarray $\egroup}
 \expandafter\let\csname endtabular*\endcsname=\endtabular
 \let\@ampacol=\relax        \let\@expast=\relax
@@ -315,7 +281,9 @@
 \def\save@decl{\toks \count@ = \expandafter\expandafter\expandafter
                   {\expandafter\@nextchar\the\toks\count@}}
 \def\@mkpream#1{\gdef\@preamble{}\@lastchclass 4 \@firstamptrue
-   \let\@sharp\relax \let\@startpbox\relax \let\@endpbox\relax
+   \let\@sharp\relax
+   \def\@startpbox##1{\unexpanded\expandafter{\expandafter
+                      \@startpbox\expandafter{##1}}}\let\@endpbox\relax
    \let\do@row@strut\relax
    \let\ar@align@mcell\relax
    \@temptokena{#1}\@tempswatrue
-- 
cgit v1.2.3

