From 2c98cf945156ecc4ac13ee49b51dbe2b553e5153 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Thu, 24 Feb 2011 23:38:02 +0000 Subject: tabu 2.6 (24feb11) git-svn-id: svn://tug.org/texlive/trunk@21513 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/tabu/tabu.sty | 38 +++++++++++++++++++++++++++---- 1 file changed, 34 insertions(+), 4 deletions(-) (limited to 'Master/texmf-dist/tex/latex/tabu') diff --git a/Master/texmf-dist/tex/latex/tabu/tabu.sty b/Master/texmf-dist/tex/latex/tabu/tabu.sty index e870b769172..df6d0c7a26a 100644 --- a/Master/texmf-dist/tex/latex/tabu/tabu.sty +++ b/Master/texmf-dist/tex/latex/tabu/tabu.sty @@ -9,7 +9,7 @@ %% This is a generated file. %% Copyright (FC) 2010-2011 - lppl %% -%% tabu : 2011/02/19 v2.5 - tabu : Flexible LaTeX tabulars +%% tabu : 2011/02/24 v2.6 - tabu : Flexible LaTeX tabulars %% %% ********************************************************************************************** %% \begin{tabu} { preamble } => default target: \linewidth or \linegoal @@ -63,7 +63,7 @@ %% lppl copyright 2010-2011 by FC %% \NeedsTeXFormat{LaTeX2e}[2005/12/01] -\ProvidesPackage{tabu}[2011/02/19 v2.5 - flexible LaTeX tabulars (FC)] +\ProvidesPackage{tabu}[2011/02/24 v2.6 - flexible LaTeX tabulars (FC)] \RequirePackage{array}[2008/09/09] \RequirePackage{varwidth}[2009/03/30] \AtEndOfPackage{\tabu@AtEnd \let\tabu@AtEnd \@undefined} @@ -292,7 +292,7 @@ \def\tabu@Gsave #1#2#3#4{\xdef#1{#1% \toks#2{\toks\the\currentgrouplevel{\global#3\the#3\global#4\the#4}}}% }% \tabu@Gsave -\def\tabu@Grestore#1#2{%\ifdim \baselineskip=\z@\noalign\fi +\def\tabu@Grestore#1#2{% \toks#2{}#1\toks\currentgrouplevel\expandafter{\expandafter}\the\toks#2\relax \ifcat$\the\toks\currentgrouplevel$\else \global\let#1\@empty \global\let#2\z@ @@ -692,7 +692,8 @@ \let\firsthline \tabu@firsthline \let\lasthline \tabu@lasthline \let\firstline \tabu@firstline \let\lastline \tabu@lastline \let\hline \tabu@hline \let\@xhline \tabu@xhline - \let\color \tabu@color \let\@arstrutbox \tabu@arstrutbox + \let\color \tabu@color \let\@arstrutbox \tabu@arstrutbox + \iftabu@colortbl\else\let\LT@@hline \tabu@LT@@hline \fi \tabu@trivlist % \let\@footnotetext \tabu@footnotetext \let\@xfootnotetext \tabu@xfootnotetext \let\@xfootnote \tabu@xfootnote \let\centering \tabu@centering @@ -807,6 +808,8 @@ \extratabsurround \the\extratabsurround \relax \extrarowheight \the\extrarowheight \relax \extrarowdepth \the\extrarowdepth \relax + \abovetabulinesep \the\abovetabulinesep \relax + \belowtabulinesep \the\belowtabulinesep \relax \def\noexpand\arraystretch{\arraystretch}% \ifdefined\minrowclearance \minrowclearance\the\minrowclearance\relax\fi}% \begingroup @@ -1587,6 +1590,8 @@ \def\extratabsurround####1\relax{(tabu) extratabsurround = \x{####1}^^J}% \def\extrarowheight ####1\relax{(tabu) extrarowheight #1 = \x{####1}}% \def\extrarowdepth ####1\relax {extrarowdepth = \x{####1}^^J}% + \def\abovetabulinesep####1\relax{(tabu) abovetabulinesep=\x{####1} }% + \def\belowtabulinesep####1\relax{ belowtabulinesep=\x{####1}^^J}% \def\arraystretch ####1{(tabu) arraystretch #1 #1 = \z{####1}^^J}% \def\minrowclearance####1\relax{(tabu) minrowclearance #1 = \x{####1}^^J}% \def\tabu@arc@L ####1{(tabu) taburulecolor #1 #1 = ####1^^J}% @@ -1825,6 +1830,31 @@ }\ifnum0=`{\fi \expandafter}\lasthline % we are then ! }% \tabu@lasthlinecorrection +\def\tabu@LT@@hline{% + \ifx\LT@next\hline + \global\let\LT@next \@gobble + \ifx \CT@drsc@\relax + \gdef\CT@LT@sep{% + \noalign{\penalty-\@medpenalty\vskip\doublerulesep}}% + \else + \gdef\CT@LT@sep{% + \multispan\LT@cols{% + \CT@drsc@\leaders\hrule\@height\doublerulesep\hfill}\cr}% + \fi + \else + \global\let\LT@next\empty + \gdef\CT@LT@sep{% + \noalign{\penalty-\@lowpenalty\vskip-\arrayrulewidth}}% + \fi + \ifnum0=`{\fi}% + \multispan\LT@cols + {\CT@arc@\leaders\hrule\@height\arrayrulewidth\hfill}\cr + \CT@LT@sep + \multispan\LT@cols + {\CT@arc@\leaders\hrule\@height\arrayrulewidth\hfill}\cr + \noalign{\penalty\@M}% + \LT@next +}% \tabu@LT@@hline %% Horizontal lines : \tabucline ------------------------------------ \let\tabu@start \@tempcnta \let\tabu@stop \@tempcntb -- cgit v1.2.3