tabu 2.6 (24feb11)

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

5 files changed, 96 insertions, 24 deletions

diff --git a/Master/texmf-dist/doc/latex/tabu/tabu.pdf b/Master/texmf-dist/doc/latex/tabu/tabu.pdf
index 13582a02124..a800421fc13 100644
--- a/Master/texmf-dist/doc/latex/tabu/tabu.pdf
+++ b/Master/texmf-dist/doc/latex/tabu/tabu.pdf
diff --git a/Master/texmf-dist/source/latex/tabu/tabu.drv b/Master/texmf-dist/source/latex/tabu/tabu.drv
index a1b8b77c63a..daf788c7726 100644
--- a/Master/texmf-dist/source/latex/tabu/tabu.drv
+++ b/Master/texmf-dist/source/latex/tabu/tabu.drv
@@ -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
@@ -65,8 +65,8 @@
 \let\microtypeYN=y
 \edef\thisfile{\jobname}
 \def\thisinfo{Flexible \LaTeX{} tabulars (\FC)}
-\def\thisdate{2011/02/19}
-\def\thisversion{2.5}
+\def\thisdate{2011/02/24}
+\def\thisversion{2.6}
 \def\CTANbaseurl{http://www.ctan.org/tex-archive/macros/latex}
 \def\CTANdisplay{CTAN:macros/latex}
 \makeatletter\protected\def\CTANhref{\@ifstar\CTANhrefstar\CTANhrefnost}\makeatother
@@ -93,7 +93,7 @@
 \ifx y\microtypeYN                                                         %
    \usepackage[expansion=all,stretch=20,shrink=60]{microtype}\fi           % font (microtype)
 \usepackage{xspace,tocloft,titlesec,fancyhdr,lastpage,enumitem,marginnote} % paragraphs & pages management
-\usepackage{holtxdoc,bookmark,hypbmsec,enumitem-zref}                      % hyper-links (before tabularx...)
+\usepackage{holtxdoc,bookmark,hypbmsec,enumitem-zref}                      % hyper-links
 \usepackage{array,delarray,longtable,colortbl,multirow,makecell,booktabs}  % tabulars
 \usepackage{tabularx}\tracingtabularx                                      % tabularx
 \usepackage{amsmath,amsopn}                                                % mathematics \DeclareMathOperator in amsopn
diff --git a/Master/texmf-dist/source/latex/tabu/tabu.dtx b/Master/texmf-dist/source/latex/tabu/tabu.dtx
index 4d22317e1bc..e525ab5b155 100644
--- a/Master/texmf-dist/source/latex/tabu/tabu.dtx
+++ b/Master/texmf-dist/source/latex/tabu/tabu.dtx
@@ -1,5 +1,5 @@
 % \iffalse meta-comment
-% tabu : 2011/02/19 v2.5 - tabu: flexible LaTeX tabulars]
+% tabu : 2011/02/24 v2.6 - tabu: flexible LaTeX tabulars]
 %
 % This work may be distributed and/or modified under the
 % conditions of the LaTeX Project Public License, either
@@ -36,7 +36,7 @@
 \input docstrip.tex
 \Msg{************************************************************************}
 \Msg{* Installation}
-\Msg{* Package: 2011/02/19 v2.5 - tabu: Flexible LaTeX tabulars}
+\Msg{* Package: 2011/02/24 v2.6 - tabu: Flexible LaTeX tabulars}
 \Msg{************************************************************************}
 
 \keepsilent
@@ -48,7 +48,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
 
 **********************************************************************************************
 \string\begin{tabu}               { preamble } => default target: \string\linewidth or \string\linegoal
@@ -141,8 +141,8 @@ lppl copyright 2010-2011 by FC <florent.chervet@free.fr>
 \let\microtypeYN=y
 \edef\thisfile{\jobname}
 \def\thisinfo{Flexible \LaTeX{} tabulars (\FC)}
-\def\thisdate{2011/02/19}
-\def\thisversion{2.5}
+\def\thisdate{2011/02/24}
+\def\thisversion{2.6}
 \def\CTANbaseurl{http://www.ctan.org/tex-archive/macros/latex}
 \def\CTANdisplay{CTAN:macros/latex}
 \makeatletter\protected\def\CTANhref{\@ifstar\CTANhrefstar\CTANhrefnost}\makeatother
@@ -169,7 +169,7 @@ lppl copyright 2010-2011 by FC <florent.chervet@free.fr>
 \ifx y\microtypeYN                                                         %
    \usepackage[expansion=all,stretch=20,shrink=60]{microtype}\fi           % font (microtype)
 \usepackage{xspace,tocloft,titlesec,fancyhdr,lastpage,enumitem,marginnote} % paragraphs & pages management
-\usepackage{holtxdoc,bookmark,hypbmsec,enumitem-zref}                      % hyper-links (before tabularx...)
+\usepackage{holtxdoc,bookmark,hypbmsec,enumitem-zref}                      % hyper-links
 \usepackage{array,delarray,longtable,colortbl,multirow,makecell,booktabs}  % tabulars
 \usepackage{tabularx}\tracingtabularx                                      % tabularx
 \usepackage{amsmath,amsopn}                                                % mathematics \DeclareMathOperator in amsopn
@@ -252,7 +252,7 @@ morekeywords=[7]{yellow},
 %</driver>
 % \fi
 %
-% \CheckSum{7768}
+% \CheckSum{7856}
 %
 % \CharacterTable
 %  {Upper-case    \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
@@ -413,9 +413,7 @@ morekeywords=[7]{yellow},
 %  }
 % \def\declmargin{\hspace*\declmarginwidth }
 % \def\declmarginwidth{\dimexpr -\leftmargini +\arrayrulewidth +\tabcolsep\relax}
-%
 % \pretocmd\textasteriskcentered{\usefont{OMS}{cmsy}mn}{}{}
-%
 % \newsavebox\tempbox
 %
 % \bookmarksetup{open=true,openlevel=2}
@@ -3099,7 +3097,7 @@ morekeywords=[7]{yellow},
 %    \begin{macrocode}
 %<*package>
 \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]
 %    \end{macrocode}
@@ -3928,7 +3926,7 @@ morekeywords=[7]{yellow},
 \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@
@@ -4591,7 +4589,8 @@ morekeywords=[7]{yellow},
     \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     %<restore \\=\@normalcr inside lists>
     \let\@footnotetext \tabu@footnotetext \let\@xfootnotetext \tabu@xfootnotetext
     \let\@xfootnote    \tabu@xfootnote    \let\centering      \tabu@centering
@@ -4740,6 +4739,8 @@ morekeywords=[7]{yellow},
         \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
@@ -6046,6 +6047,8 @@ morekeywords=[7]{yellow},
         \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}%
@@ -6450,6 +6453,39 @@ morekeywords=[7]{yellow},
 %    \end{macrocode}
 %    \end{macro}
 %
+%    \begin{macro}{\tabu@LT@@hline}
+%
+%    Allowing colored rules even if \xpackage{colortbl} is not loaded.
+%    
+%    \begin{macrocode}
+\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
+%    \end{macrocode}
+%    \end{macro}
+%
 % \subsubsection{Horizontal lines: \cs{tabucline}}
 %
 %¤<package>%% Horizontal lines : \tabucline ------------------------------------
@@ -6528,7 +6564,6 @@ morekeywords=[7]{yellow},
 %    \end{macrocode}
 %    \end{macro}
 %
-%
 %    \begin{macro}{\tabu@startstop}
 %
 %    This macro parses the mandatory argument of \cs\tabucline: start-column and end-column of the \cs\cline.
@@ -7646,6 +7681,13 @@ morekeywords=[7]{yellow},
 %
 %   \sectionformat\subsection[hang]{font=\normalsize\bfseries\pkgcolor} \robustify\textbf \robustify\xfile ^^A\HistLabel does \edef on \@currentlabel (\protected@edef required !!)
 %
+%   \begin{Version}{2011/02/24 v2.6}\HistLabel{2.6}
+%   \item \cs\savetabu now also saves \cs\tabulinesep (\ie \cs\abovetabulinesep and \cs\belowtabulinesep)
+%   \item Bug fixed for \hyperref[Custom environments]{custom-environments} when nested.
+%   \item \cs\taburulecolor works even if \xpackage{colortbl} is not loaded for the \env*{tabu}. \\
+%         This is now the same for the \env*{longtabu}.
+%   \end{Version}
+%
 %   \begin{Version}{2011/02/19 v2.5}\HistLabel{2.5}
 %   \item Bug fixed for \cs\pdfelapsedtime when compilation without \hologo{pdfTeX}.
 %   \item Modification of \cs\@finalstrut (``null-rule'' added) to avoid problems with \cs\columncolor.
diff --git a/Master/texmf-dist/source/latex/tabu/tabu.ins b/Master/texmf-dist/source/latex/tabu/tabu.ins
index e35e1d1791a..381571a075f 100644
--- a/Master/texmf-dist/source/latex/tabu/tabu.ins
+++ b/Master/texmf-dist/source/latex/tabu/tabu.ins
@@ -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
@@ -65,7 +65,7 @@
 \input docstrip.tex
 \Msg{************************************************************************}
 \Msg{* Installation}
-\Msg{* Package: 2011/02/19 v2.5 - tabu: Flexible LaTeX tabulars}
+\Msg{* Package: 2011/02/24 v2.6 - tabu: Flexible LaTeX tabulars}
 \Msg{************************************************************************}
 
 \keepsilent
@@ -77,7 +77,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
 
 **********************************************************************************************
 \string\begin{tabu}               { preamble } => default target: \string\linewidth or \string\linegoal
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 <florent.chervet@free.fr>
 %% 
 \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     %<restore \\=\@normalcr inside lists>
     \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