From f0732064137de39f9c23910d9582592722418c68 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Wed, 15 Feb 2012 01:00:15 +0000 Subject: colortbl 1.0a (14feb12) git-svn-id: svn://tug.org/texlive/trunk@25394 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/colortbl/colortbl.sty | 33 ++++++++++++++--------- 1 file changed, 21 insertions(+), 12 deletions(-) (limited to 'Master/texmf-dist/tex/latex/colortbl') diff --git a/Master/texmf-dist/tex/latex/colortbl/colortbl.sty b/Master/texmf-dist/tex/latex/colortbl/colortbl.sty index ef4fe215e45..8e642542380 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 David Carlisle +%% Copyright 1996 1998 1999 2012 David Carlisle %% %% This file may be distributed under the terms of the LPPL. -%% See 00readme.txt for details. +%% See readme for details. %% \NeedsTeXFormat{LaTeX2e}[1995/06/01] \ProvidesPackage{colortbl} - [2001/02/13 v0.1j Color table columns (DPC)] + [2012/02/13 v1.0a Color table columns (DPC)] \edef\@tempa{% \noexpand\AtEndOfPackage{% \catcode`\noexpand\^^A\the\catcode`\^^A\relax}} @@ -31,6 +31,7 @@ \expandafter\CT@extract\the\toks\@tempcnta\columncolor!\@nil \@addtopreamble{% \setbox\z@\hbox\bgroup\bgroup + \CT@everycr{}% \ifcase \@chnum \hskip\stretch{.5}\kern\z@ \d@llarbegin @@ -118,7 +119,7 @@ \expandafter\def\expandafter\@tabarray\expandafter{% \expandafter\CT@start\@tabarray}} \def\endarray{\crcr \egroup \egroup \gdef\@preamble{}\CT@end} -\def\multicolumn#1#2#3{% +\long\def\multicolumn#1#2#3{% \multispan{#1}\begingroup \def\@addamp{\if@firstamp \@firstampfalse \else \@preamerr 5\fi}% @@ -126,7 +127,6 @@ \endgroup \def\@sharp{#3}% \let\CT@cell@color\relax - \let\CT@row@color\relax \let\CT@column@color\relax \let\CT@do@color\relax \@arstrut \@preamble @@ -248,10 +248,13 @@ \AtBeginDocument{% \ifx\hhline\@undefined\else \def\HH@box#1#2{\vbox{{% - {\CT@drsc@\dimen@\tw@\arrayrulewidth - \advance\dimen@\doublerulesep - \hrule \@height\dimen@ - \vskip-\dimen@}% + \ifx\CT@drsc@\relax\else + \global\dimen\thr@@\tw@\arrayrulewidth + \global\advance\dimen\thr@@\doublerulesep + {\CT@drsc@ + \hrule \@height\dimen\thr@@ + \vskip-\dimen\thr@@}% + \fi \CT@arc@ \hrule \@height \arrayrulewidth \@width #1 \vskip\doublerulesep @@ -281,20 +284,26 @@ \ifx\CT@drsc@\relax \HH@add{\hfil}\else \HH@add{{% -\CT@drsc@\leaders\hrule\@height\doublerulesep\hfil}}% + \CT@drsc@\leaders\hrule\@height\HH@height\hfil}}% \fi \else \ifx\@tempb-\@tempswafalse + \gdef\HH@height{\arrayrulewidth}% \if@firstamp\@firstampfalse\else\HH@add{&\omit}\fi \HH@add{{% \CT@arc@\leaders\hrule\@height\arrayrulewidth\hfil}}% \else \ifx\@tempb=\@tempswafalse + \gdef\HH@height{\dimen\thr@@}% \if@firstamp\@firstampfalse\else\HH@add{&\omit}\fi \HH@add {\rlap{\copy\@ne}\leaders\copy\@ne\hfil\llap{\copy\@ne}}\else - \ifx\@tempb t\HH@add{\HH@box\doublerulesep\z@}\@tempswafalse\else - \ifx\@tempb b\HH@add{\HH@box\z@\doublerulesep}\@tempswafalse\else + \ifx\@tempb t\HH@add{% + \def\HH@height{\dimen\thr@@}% + \HH@box\doublerulesep\z@}\@tempswafalse\else + \ifx\@tempb b\HH@add{% + \def\HH@height{\dimen\thr@@}% + \HH@box\z@\doublerulesep}\@tempswafalse\else \ifx\@tempb>\def\next##1##2{% \HH@add{% {\baselineskip\p@\relax -- cgit v1.2.3