colortbl (4may18)

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

6 files changed, 50 insertions, 33 deletions

diff --git a/Master/texmf-dist/doc/latex/colortbl/README b/Master/texmf-dist/doc/latex/colortbl/README
deleted file mode 100644
index 542498a9031..00000000000
--- a/Master/texmf-dist/doc/latex/colortbl/README
+++ /dev/null
@@ -1,7 +0,0 @@
-The colortbl package:
-
-   Add colour to LaTeX tables. Requires array and color packages.
-   Process colortbl.ins to produce the package file colortbl.sty.
-   Process colortbl.dtx to get the documentation (this requires
-   longtable hhline and dcolumn from the standard `tools'
-   distribution.)
diff --git a/Master/texmf-dist/doc/latex/colortbl/colortbl-DE.pdf b/Master/texmf-dist/doc/latex/colortbl/colortbl-DE.pdf
index 6c6b376143f..ad63ffd4a48 100644
--- a/Master/texmf-dist/doc/latex/colortbl/colortbl-DE.pdf
+++ b/Master/texmf-dist/doc/latex/colortbl/colortbl-DE.pdf
diff --git a/Master/texmf-dist/doc/latex/colortbl/colortbl-DE.tex b/Master/texmf-dist/doc/latex/colortbl/colortbl-DE.tex
index 99fe294248e..113bbee8afc 100644
--- a/Master/texmf-dist/doc/latex/colortbl/colortbl-DE.tex
+++ b/Master/texmf-dist/doc/latex/colortbl/colortbl-DE.tex
@@ -352,7 +352,7 @@ sodass die voreingestellten Farben der betreffenden Zeile und Spalte aufgehoben
  \section{Der \slash \textsf{cellcolor} Befehl}
 
 Die Einstellung der Hintergrundfarbe kann auch auf eine einzelne Zelle beschr"ankt werden, 
-indem zu Beginn der Befehl \slash \textsf{multicolumn}{1\}\{>\slash
+indem zu Beginn der Befehl \slash \textsf{multicolumn}\{1\}\{>\slash
 \textsf{rowcolor}\ldots, (oder
 \slash \textsf{columncolor}, wenn keine Zeilenfarbe eingestellt ist) eingegeben wird. Hier treten 
 jedoch Defizite auf: 1)~Es hindert die Daten in der Zelle, die F"arbung
diff --git a/Master/texmf-dist/doc/latex/colortbl/colortbl.pdf b/Master/texmf-dist/doc/latex/colortbl/colortbl.pdf
index 1ba12db2345..8ab227c0fc8 100644
--- a/Master/texmf-dist/doc/latex/colortbl/colortbl.pdf
+++ b/Master/texmf-dist/doc/latex/colortbl/colortbl.pdf
diff --git a/Master/texmf-dist/source/latex/colortbl/colortbl.dtx b/Master/texmf-dist/source/latex/colortbl/colortbl.dtx
index 30328484101..1456995dab5 100644
--- a/Master/texmf-dist/source/latex/colortbl/colortbl.dtx
+++ b/Master/texmf-dist/source/latex/colortbl/colortbl.dtx
@@ -15,7 +15,7 @@
 %<driver>\ProvidesFile{colortbl.drv}
 % \fi
 %         \ProvidesFile{colortbl.dtx}
-          [2012/02/13 v1.0a Color table columns (DPC)]
+          [2018/05/02 v1.0c Color table columns (DPC)]
 %
 % \iffalse
 %<*driver>
@@ -42,11 +42,9 @@
 %
 %  \maketitle
 % 
-% \CheckSum{966}
-%
 %
 % \begin{abstract}
-% This package implements a flexibable mechanism for giving colured 
+% This package implements a flexible mechanism for giving coloured 
 % `panels' behind specified columns in a table. 
 % This package requires the \textsf{array} and \textsf{color} packages.
 % \end{abstract}
@@ -72,6 +70,7 @@
 % \changes{v0.1i}{1999/03/24}
 %     {LPPL}
 % \changes{v0.1j}{2001/02/13}{\cs{cellcolor} (Donald Arseneau)}
+% \changes{v1.0c}{2018/05/02}{Updates to match new array code}
 %
 % \section{Introduction}
 %
@@ -613,6 +612,11 @@
 %
 %
 % \begin{macro}{\@classz}
+% First define stub for new \textsf{array} package code.
+%    \begin{macrocode}
+\ifx\do@row@strut\@undefined\let\do@row@strut\relax\fi
+%    \end{macrocode}
+%
 % "\@classz" is the main function in the \textsf{array} package handling
 % of primitive column types: It inserts the code for each of the column
 % specifiers, `"clrpmb"'. The other classes deal with the other preamble
@@ -647,7 +651,7 @@
    \@addtopreamble{%
     \setbox\z@\hbox\bgroup\bgroup
 %    \end{macrocode}
-% \changes{v1.0a}{2012/02/13}{reset everycr for nested uses (see test ct2)}
+% \changes{v1.0a}{2012/02/13}{reset \cs{everycr} for nested uses (see test ct2)}
 %    \begin{macrocode}
       \CT@everycr{}%
       \ifcase \@chnum
@@ -660,19 +664,27 @@
       \hskip\stretch{.5}\kern\z@
       \d@llarbegin
       \insert@column
-      \d@llarend\hskip\stretch{.5}\or
+      \d@llarend\do@row@strut\hskip\stretch{.5}\or
 %    \end{macrocode}
 % "l" and "r" as before, but using fill glue.
 %    \begin{macrocode}
-      \d@llarbegin \insert@column \d@llarend \hfill \or
-      \hfill\kern\z@ \d@llarbegin \insert@column \d@llarend \or
+      \d@llarbegin \insert@column \d@llarend\do@row@strut \hfill \or
+      \hfill\kern\z@ \d@llarbegin \insert@column \d@llarend\do@row@strut \or
 %    \end{macrocode}
-% "m", "p" and "b" as before.
+% "m", "p" and "b" as before, but need to take account of array package update.
 %    \begin{macrocode}
-   $\vcenter
-   \@startpbox{\@nextchar}\insert@column \@endpbox $\or
-   \vtop \@startpbox{\@nextchar}\insert@column \@endpbox \or
-   \vbox \@startpbox{\@nextchar}\insert@column \@endpbox
+      \ifx\ar@align@mcell\@undefined
+        $\vcenter
+         \@startpbox{\@nextchar}\insert@column \@endpbox $
+      \else
+        \setbox\ar@mcellbox\vbox
+          \@startpbox{\@nextchar}\insert@column \@endpbox
+        \ar@align@mcell
+        \do@row@strut
+      \fi
+   \or
+   \vtop \@startpbox{\@nextchar}\insert@column \@endpbox\do@row@strut \or
+   \vbox \@startpbox{\@nextchar}\insert@column \@endpbox\do@row@strut
   \fi
 %    \end{macrocode}
 % Close the box register assignment.
@@ -898,14 +910,16 @@
 % \end{macro}
 %
 % \begin{macro}{\endarray}
+% \changes{v1.0b}{2012/21/06}{re-insert \cs{@arrayright} to match \textsf{array} definition, for \textsf{delarray}}
 %    \begin{macrocode}
-\def\endarray{\crcr \egroup \egroup \gdef\@preamble{}\CT@end}
+\def\endarray{%
+  \crcr \egroup \egroup \@arrayright\gdef\@preamble{}\CT@end}
 %    \end{macrocode}
 % \end{macro}
 %
 % \begin{macro}{\multicolumn}
 % "\multicolumn"
-% \changes{v1.0a}{2012/02/13}{make multicolumn long (see test ct1)}
+% \changes{v1.0a}{2012/02/13}{make \cs{multicolumn} long (see test ct1)}
 %    \begin{macrocode}
 \long\def\multicolumn#1#2#3{%
    \multispan{#1}\begingroup
@@ -916,7 +930,7 @@
    \def\@sharp{#3}%
    \let\CT@cell@color\relax
 %    \end{macrocode}
-% \changes{v1.0a}{2012/02/13}{don't reset CT@row@color (see test ct3)}
+% \changes{v1.0a}{2012/02/13}{don't reset \cs{CT@row@color} (see test ct3)}
 %   \let\CT@row@color\relax
 %    \begin{macrocode}
    \let\CT@column@color\relax
diff --git a/Master/texmf-dist/tex/latex/colortbl/colortbl.sty b/Master/texmf-dist/tex/latex/colortbl/colortbl.sty
index 8e642542380..dd573426eb8 100644
--- a/Master/texmf-dist/tex/latex/colortbl/colortbl.sty
+++ b/Master/texmf-dist/tex/latex/colortbl/colortbl.sty
@@ -15,7 +15,7 @@
 %%
 \NeedsTeXFormat{LaTeX2e}[1995/06/01]
 \ProvidesPackage{colortbl}
-          [2012/02/13 v1.0a Color table columns (DPC)]
+          [2018/05/02 v1.0c Color table columns (DPC)]
 \edef\@tempa{%
   \noexpand\AtEndOfPackage{%
     \catcode`\noexpand\^^A\the\catcode`\^^A\relax}}
@@ -25,6 +25,7 @@
 \DeclareOption*{\PassOptionsToPackage\CurrentOption{color}}
 \ProcessOptions
 \RequirePackage{array,color}
+\ifx\do@row@strut\@undefined\let\do@row@strut\relax\fi
 \def\@classz{\@classx
    \@tempcnta \count@
    \prepnext@tok
@@ -36,13 +37,21 @@
       \hskip\stretch{.5}\kern\z@
       \d@llarbegin
       \insert@column
-      \d@llarend\hskip\stretch{.5}\or
-      \d@llarbegin \insert@column \d@llarend \hfill \or
-      \hfill\kern\z@ \d@llarbegin \insert@column \d@llarend \or
-   $\vcenter
-   \@startpbox{\@nextchar}\insert@column \@endpbox $\or
-   \vtop \@startpbox{\@nextchar}\insert@column \@endpbox \or
-   \vbox \@startpbox{\@nextchar}\insert@column \@endpbox
+      \d@llarend\do@row@strut\hskip\stretch{.5}\or
+      \d@llarbegin \insert@column \d@llarend\do@row@strut \hfill \or
+      \hfill\kern\z@ \d@llarbegin \insert@column \d@llarend\do@row@strut \or
+      \ifx\ar@align@mcell\@undefined
+        $\vcenter
+         \@startpbox{\@nextchar}\insert@column \@endpbox $
+      \else
+        \setbox\ar@mcellbox\vbox
+          \@startpbox{\@nextchar}\insert@column \@endpbox
+        \ar@align@mcell
+        \do@row@strut
+      \fi
+   \or
+   \vtop \@startpbox{\@nextchar}\insert@column \@endpbox\do@row@strut \or
+   \vbox \@startpbox{\@nextchar}\insert@column \@endpbox\do@row@strut
   \fi
  \egroup\egroup
 \begingroup
@@ -118,7 +127,8 @@
 \AtBeginDocument{%
   \expandafter\def\expandafter\@tabarray\expandafter{%
     \expandafter\CT@start\@tabarray}}
-\def\endarray{\crcr \egroup \egroup \gdef\@preamble{}\CT@end}
+\def\endarray{%
+  \crcr \egroup \egroup \@arrayright\gdef\@preamble{}\CT@end}
 \long\def\multicolumn#1#2#3{%
    \multispan{#1}\begingroup
    \def\@addamp{\if@firstamp \@firstampfalse \else