tabu 2.8 (26feb11)

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

1 files changed, 17 insertions, 10 deletions

diff --git a/Master/texmf-dist/tex/latex/tabu/tabu.sty b/Master/texmf-dist/tex/latex/tabu/tabu.sty
index 6b28197777a..3c18755daf2 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/25 v2.7 - tabu : Flexible LaTeX tabulars
+%% tabu : 2011/02/26 v2.8 - tabu : Flexible LaTeX tabulars
 %% 
 %% **********************************************************************************************
 %% \begin{tabu}               { preamble } => default target: \linewidth or \linegoal
@@ -62,8 +62,9 @@
 %% tabu : Flexible LaTeX tabulars
 %% lppl copyright 2010-2011 by FC <florent.chervet@free.fr>
 %% 
+
 \NeedsTeXFormat{LaTeX2e}[2005/12/01]
-\ProvidesPackage{tabu}[2011/02/25 v2.7 - flexible LaTeX tabulars (FC)]
+\ProvidesPackage{tabu}[2011/02/26 v2.8 - flexible LaTeX tabulars (FC)]
 \RequirePackage{array}[2008/09/09]
 \RequirePackage{varwidth}[2009/03/30]
 \AtEndOfPackage{\tabu@AtEnd \let\tabu@AtEnd \@undefined}
@@ -622,7 +623,8 @@
    \ifmmode\PackageError{tabu}{longtabu not allowed in math mode}\fi
    \def\tabu@{\longtable}\def\endlongtabu{\endlongtable}%
    \LTchunksize=\@M
-   \expandafter\let\csname tabu*\endcsname\tabu
+   \expandafter\let\csname tabu*\endcsname \tabu
+   \expandafter\def\csname endlongtabu*\endcsname{\endlongtabu}%
    \let\LT@startpbox \tabu@LT@startpbox % \everypar{ array struts }
    \tabu@spreadfalse \tabu@negcoeffalse \tabu@settarget
 }% {longtabu}
@@ -1241,9 +1243,12 @@
     \ifx \tabu@stack\@empty
         \toks@\expandafter{\expandafter\tabu@thebody\expandafter{\the\toks@ #2}%
                 \def\tabu@end@envir{\end{#3}}%
-                \iftabuscantokens \def\tabu@endenvir{\let\endarray \@empty
+                \iftabuscantokens
+                    \iftabu@long \def\tabu@endenvir {\end{#3}\tabu@gobbleX}%
+                    \else        \def\tabu@endenvir {\let\endarray \@empty
                                                      \end{#3}\tabu@gobbleX}%
-                \else             \def\tabu@endenvir{\end{#3}}\fi}%
+                    \fi
+                \else           \def\tabu@endenvir  {\end{#3}}\fi}%
         \let\tabu@collectbody \tabu@endofcollect
     \else\def\tabu@temp{#3}%
         \ifx \tabu@temp\@empty \toks@\expandafter{\the\toks@ #2\end }%
@@ -1309,10 +1314,12 @@
     \iftabuscantokens \tabu@rescan \else \expandafter\@secondoftwo \fi
        \expandafter{\expandafter \tabuthepreamble
                          \the\tabu@thebody
-                         \LT@echunk
-                         \global\setbox\@ne \hbox{\unhbox\@ne}\kern\wd\@ne
-                         \LT@get@widths}\egroup         % got \tabu@box
+                         \tabuendlongtrial}\egroup      % got \tabu@box
 }% \tabu@longtrial
+\def\tabuendlongtrial{% no @ allowed for \scantokens
+    \LT@echunk  \global\setbox\@ne \hbox{\unhbox\@ne}\kern\wd\@ne
+                \LT@get@widths
+}% \tabuendlongtrial
 \def\tabu@adl@endtrial{% <arydshln in nested trials - problem for global column counters!>
     \crcr \noalign{\global\adl@ncol \tabu@nbcols}}% anything global is crap, junky and fails !
 \def\tabu@seteverycr {\tabu@reset
@@ -1329,8 +1336,8 @@
         {\expandafter \tabu@closetrialsgroup \expandafter
          \tabu@rescan \expandafter{%
                     \expandafter\tabuthepreamble
-                        \the\tabu@thebody
-                                    \endarray}}
+                        \the\expandafter\tabu@thebody
+                                    \iftabu@long \else \endarray \fi}}
         {\expandafter\tabu@closetrialsgroup \expandafter
                     \tabuthepreamble
                         \the\tabu@thebody}%