From 3b2588f229928b9e6953df53c2dfbfeadcb686af Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Fri, 4 May 2018 22:10:53 +0000 Subject: colortbl (4may18) git-svn-id: svn://tug.org/texlive/trunk@47614 c570f23f-e606-0410-a88d-b1316a301751 --- .../texmf-dist/source/latex/colortbl/colortbl.dtx | 46 ++++++++++++++-------- 1 file changed, 30 insertions(+), 16 deletions(-) (limited to 'Master/texmf-dist/source/latex/colortbl') 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 @@ %\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 -- cgit v1.2.3