colortbl (13dec18)

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

5 files changed, 34 insertions, 24 deletions

diff --git a/Master/texmf-dist/doc/latex/colortbl/README.txt b/Master/texmf-dist/doc/latex/colortbl/README.txt
new file mode 100644
index 00000000000..542498a9031
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/colortbl/README.txt
@@ -0,0 +1,7 @@
+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 ad63ffd4a48..83cd3c8589a 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.pdf b/Master/texmf-dist/doc/latex/colortbl/colortbl.pdf
index 8ab227c0fc8..685037c86b6 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 1456995dab5..65c4b975b72 100644
--- a/Master/texmf-dist/source/latex/colortbl/colortbl.dtx
+++ b/Master/texmf-dist/source/latex/colortbl/colortbl.dtx
@@ -1,7 +1,7 @@
 % \iffalse
 %%
 %% Source File: `colortbl.dtx'.
-%% Copyright 1996 1998 1999 2012 David Carlisle
+%% Copyright 1996 1998 1999 2012 2018 David Carlisle
 %%
 %% This file may be distributed under the terms of the LPPL.
 %% See readme for details.
@@ -15,7 +15,7 @@
 %<driver>\ProvidesFile{colortbl.drv}
 % \fi
 %         \ProvidesFile{colortbl.dtx}
-          [2018/05/02 v1.0c Color table columns (DPC)]
+          [2018/12/12 v1.0d Color table columns (DPC)]
 %
 % \iffalse
 %<*driver>
@@ -71,6 +71,7 @@
 %     {LPPL}
 % \changes{v0.1j}{2001/02/13}{\cs{cellcolor} (Donald Arseneau)}
 % \changes{v1.0c}{2018/05/02}{Updates to match new array code}
+% \changes{v1.0d}{2018/12/22}{Updates to match even newer array code}
 %
 % \section{Introduction}
 %
@@ -1060,23 +1061,25 @@
 % \end{macro}
 %
 % \begin{macro}{\@mkpream}
+% \begin{macro}{\@mkpreamarray}
 % While expanding the preamble \textsf{array} passes tokens through an
 % "\edef". It doesn't use "\protect"ion as it thinks it has full control
 % at that point. As the redefinition above adds "\color", I need to add
 % that to the list of commands made safe.
 %    \begin{macrocode}
-\expandafter\def\expandafter\@mkpream\expandafter#\expandafter1%
-  \expandafter{%
-    \expandafter\let\expandafter\CT@setup\expandafter\relax
-    \expandafter\let\expandafter\CT@color\expandafter\relax
-    \expandafter\let\expandafter\CT@do@color\expandafter\relax
-    \expandafter\let\expandafter\color\expandafter\relax
-    \expandafter\let\expandafter\CT@column@color\expandafter\relax
-    \expandafter\let\expandafter\CT@row@color\expandafter\relax
-    \expandafter\let\expandafter\CT@cell@color\expandafter\relax
-    \@mkpream{#1}}
+\let\@mkpreamarray\@mkpream
+\def\@mkpream{%
+     \let\CT@setup\relax
+     \let\CT@color\relax
+     \let\CT@do@color\relax
+     \let\color\relax
+     \let\CT@column@color\relax
+     \let\CT@row@color\relax
+     \let\CT@cell@color\relax
+     \@mkpreamarray}
 %    \end{macrocode}
 % \end{macro}
+% \end{macro}
 %
 % \begin{macro}{\CT@do@color}
 % For similar reasons, need to make this non-expandable
diff --git a/Master/texmf-dist/tex/latex/colortbl/colortbl.sty b/Master/texmf-dist/tex/latex/colortbl/colortbl.sty
index dd573426eb8..1b9b1d0d5d9 100644
--- a/Master/texmf-dist/tex/latex/colortbl/colortbl.sty
+++ b/Master/texmf-dist/tex/latex/colortbl/colortbl.sty
@@ -8,14 +8,14 @@
 %% 
 %%
 %% Source File: `colortbl.dtx'.
-%% Copyright 1996 1998 1999 2012 David Carlisle
+%% Copyright 1996 1998 1999 2012 2018 David Carlisle
 %%
 %% This file may be distributed under the terms of the LPPL.
 %% See readme for details.
 %%
 \NeedsTeXFormat{LaTeX2e}[1995/06/01]
 \ProvidesPackage{colortbl}
-          [2018/05/02 v1.0c Color table columns (DPC)]
+          [2018/12/12 v1.0d Color table columns (DPC)]
 \edef\@tempa{%
   \noexpand\AtEndOfPackage{%
     \catcode`\noexpand\^^A\the\catcode`\^^A\relax}}
@@ -193,16 +193,16 @@
   \noalign{\vskip-\arrayrulewidth}}
 \newlength\minrowclearance
 \minrowclearance=0pt
-\expandafter\def\expandafter\@mkpream\expandafter#\expandafter1%
-  \expandafter{%
-    \expandafter\let\expandafter\CT@setup\expandafter\relax
-    \expandafter\let\expandafter\CT@color\expandafter\relax
-    \expandafter\let\expandafter\CT@do@color\expandafter\relax
-    \expandafter\let\expandafter\color\expandafter\relax
-    \expandafter\let\expandafter\CT@column@color\expandafter\relax
-    \expandafter\let\expandafter\CT@row@color\expandafter\relax
-    \expandafter\let\expandafter\CT@cell@color\expandafter\relax
-    \@mkpream{#1}}
+\let\@mkpreamarray\@mkpream
+\def\@mkpream{%
+     \let\CT@setup\relax
+     \let\CT@color\relax
+     \let\CT@do@color\relax
+     \let\color\relax
+     \let\CT@column@color\relax
+     \let\CT@row@color\relax
+     \let\CT@cell@color\relax
+     \@mkpreamarray}
 \let\CT@do@color\relax
 \def\rowcolor{%
   \noalign{\ifnum0=`}\fi