From 7111ff10fd573d433de26c290c4b0b557f82d822 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Fri, 18 Feb 2011 00:17:22 +0000 Subject: tabu 2.4 (17feb11) git-svn-id: svn://tug.org/texlive/trunk@21445 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/tabu/tabu.sty | 41 +++++++++++++++++++++---------- 1 file changed, 28 insertions(+), 13 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 bd642627081..5c5dfc6320d 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/13 v2.3 - tabu : Flexible LaTeX tabulars +%% tabu : 2011/02/17 v2.4 - 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/13 v2.3 - flexible LaTeX tabulars (FC)] +\ProvidesPackage{tabu}[2011/02/17 v2.4 - flexible LaTeX tabulars (FC)] \RequirePackage{array}[2008/09/09] \RequirePackage{varwidth}[2009/03/30] \AtEndOfPackage{\tabu@AtEnd \let\tabu@AtEnd \@undefined} @@ -611,7 +611,7 @@ \ifmmode \def\tabu@ {\array}\def\endtabu {\endarray}% \else \def\tabu@ {\tabu@tabular}\def\endtabu {\endtabular}\fi \expandafter\let\csname tabu*\endcsname \tabu - \expandafter\let\csname endtabu*\endcsname\endtabu + \expandafter\def\csname endtabu*\endcsname{\endtabu}% \tabu@spreadfalse \tabu@negcoeffalse \tabu@settarget }% {tabu} \let\tabu@tabular \tabular % @@ -620,7 +620,6 @@ \ifmmode\PackageError{tabu}{longtabu not allowed in math mode}\fi \def\tabu@{\longtable}\def\endlongtabu{\endlongtable}% \LTchunksize=\@M - \expandafter\let\csname longtabu*\endcsname\longtabu % Humm... \expandafter\let\csname tabu*\endcsname\tabu \let\LT@startpbox \tabu@LT@startpbox % \everypar{ array struts } \tabu@spreadfalse \tabu@negcoeffalse \tabu@settarget @@ -864,7 +863,7 @@ \tabu@highprioritycolumns\expandafter{\tabu@highprioritycolumns \NC@do #1}}% \let\tabu@highprioritycolumns \@empty -%% The | ``column'' : rewritting process -------------------------- +%% The | ``column'' : rewriting process -------------------------- \tabu@privatecolumntype |{\tabu@rewritevline} \newcommand*\tabu@rewritevline[1][]{\tabu@vlinearg{#1}% \expandafter \NC@find \tabu@rewritten} @@ -923,7 +922,7 @@ {\iftabuscantokens \tabu@rescan \else \expandafter\@firstofone \fi {#3}}% }% \tabu@multic@lumn -%% The X column(s): rewritting process ----------------------------- +%% The X column(s): rewriting process ----------------------------- \tabu@privatecolumntype X[1][]{\begingroup \tabu@siunitx{\endgroup \tabu@rewriteX {#1}}} \def\tabu@nosiunitx #1{#1{}{}\expandafter \NC@find \tabu@rewritten } \def\tabu@siunitx #1{\@ifnextchar \bgroup @@ -1105,7 +1104,7 @@ \ifcase \tabu@cnt \expandafter\tabu@endrewrite \else \expandafter\NC@find \expandafter\tabu@rewritemiddle \fi -}% \NC@ewrite@\tabu@rewritelast +}% \NC@rewrite@\tabu@rewritelast %% Choosing the strategy -------------------------------------------- \def\tabu@endrewrite {% \let\tabu@temp \NC@find @@ -1238,6 +1237,7 @@ \edef\tabu@stack{\tabu@pushbegins #2\begin\end\expandafter\@gobble\tabu@stack}% \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 \end{#3}\tabu@gobbleX}% \else \def\tabu@endenvir{\end{#3}}\fi}% @@ -1661,9 +1661,18 @@ \expandafter\@gobble \@startpbox % gobbles \bgroup }% \tabu@startpboxquick \def\tabu@quick {\begingroup \iffalse{\fi \ifnum0=`}\fi - \toks@{}\def\tabu@stack{b}\tabu@collectbody - \endgroup + \toks@{}\def\tabu@stack{b}\tabu@collectbody \tabu@endquick }% \tabu@quick +\def\tabu@endquick {% + \ifodd 1\ifx\tabu@end@envir\tabu@endtabu \else + \ifx\tabu@end@envir\tabu@endtabus \else 0\fi\fi\relax + \endgroup + \else \let\endtabu \relax + \tabu@end@envir + \fi +}% \tabu@quick +\def\tabu@endtabu {\end{tabu}} +\def\tabu@endtabus {\end{tabu*}} %% Measuring the heights and depths - store the results ------------- \def\tabu@verticalmeasure{\everypar{}% \ifnum \currentgrouptype>12 % 14=semi-simple, 15=math shift group @@ -2481,10 +2490,16 @@ }% \tabu@warn@cellspace %% tabu Package initialisation \tabuscantokensfalse -\let\tabu@arc@G \relax \let\tabu@drsc@G \relax -\let\tabu@evr@G \@empty -\let\tabu@rc@G \@empty -\def\tabu@ls@G {\tabu@linestyle@}% +\let\tabu@arc@G \relax +\let\tabu@drsc@G \relax +\let\tabu@evr@G \@empty +\let\tabu@rc@G \@empty +\def\tabu@ls@G {\tabu@linestyle@}% +\let\tabu@@rowfontreset \@empty % +\let\tabu@@celllalign \@empty +\let\tabu@@cellralign \@empty +\let\tabu@@cellleft \@empty +\let\tabu@@cellright \@empty \def\tabu@naturalXmin {\z@} \def\tabu@naturalXmax {\z@} \let\tabu@rowfontreset \@empty -- cgit v1.2.3