summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/colortbl
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2018-05-04 22:10:53 +0000
committerKarl Berry <karl@freefriends.org>2018-05-04 22:10:53 +0000
commit3b2588f229928b9e6953df53c2dfbfeadcb686af (patch)
tree652ad5781f9c37d494297ac7066d2d5e4b372304 /Master/texmf-dist/tex/latex/colortbl
parent9f5f371b6edfed9acecb0137104ce2e1bc796e60 (diff)
colortbl (4may18)
git-svn-id: svn://tug.org/texlive/trunk@47614 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/colortbl')
-rw-r--r--Master/texmf-dist/tex/latex/colortbl/colortbl.sty28
1 files changed, 19 insertions, 9 deletions
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