summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2011-02-25 23:44:40 +0000
committerKarl Berry <karl@freefriends.org>2011-02-25 23:44:40 +0000
commit33d636ef67864794bd7e1cd5395751ebb382bcfe (patch)
tree527b70c450e7677c53c3ef100cf5b24b7bc50438
parent100306d6ab464cd733fbec1e8f6edfcdb414f537 (diff)
tabu 2.7 (25feb11)
git-svn-id: svn://tug.org/texlive/trunk@21522 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/doc/latex/tabu/tabu.pdfbin2536860 -> 2513355 bytes
-rw-r--r--Master/texmf-dist/source/latex/tabu/tabu.drv8
-rw-r--r--Master/texmf-dist/source/latex/tabu/tabu.dtx50
-rw-r--r--Master/texmf-dist/source/latex/tabu/tabu.ins6
-rw-r--r--Master/texmf-dist/tex/latex/tabu/tabu.sty17
5 files changed, 47 insertions, 34 deletions
diff --git a/Master/texmf-dist/doc/latex/tabu/tabu.pdf b/Master/texmf-dist/doc/latex/tabu/tabu.pdf
index a800421fc13..630265215ff 100644
--- a/Master/texmf-dist/doc/latex/tabu/tabu.pdf
+++ b/Master/texmf-dist/doc/latex/tabu/tabu.pdf
Binary files differ
diff --git a/Master/texmf-dist/source/latex/tabu/tabu.drv b/Master/texmf-dist/source/latex/tabu/tabu.drv
index daf788c7726..7881f2fe600 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/24 v2.6 - tabu : Flexible LaTeX tabulars
+%% tabu : 2011/02/25 v2.7 - 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/24}
-\def\thisversion{2.6}
+\def\thisdate{2011/02/25}
+\def\thisversion{2.7}
\def\CTANbaseurl{http://www.ctan.org/tex-archive/macros/latex}
\def\CTANdisplay{CTAN:macros/latex}
\makeatletter\protected\def\CTANhref{\@ifstar\CTANhrefstar\CTANhrefnost}\makeatother
@@ -80,7 +80,7 @@
package #1 must be later than #2
to compile this documentation.}}}}%
\gdef\CheckDate#1{{\let\CheckDate\relax\toks@{}\@for\x:=\thisfile=\thisdate,#1\do{\expandafter\ErrorUpdate\x,}\CheckDate\expandafter{\the\toks@}}}}
-\AtBeginDocument{\CheckDate{interfaces=2011/02/12}}
+\AtBeginDocument{\CheckDate{interfaces=2011/02/12,linegoal=2011/02/25}}
\PassOptionsToPackage{svgnames,table}{xcolor}
\PassOptionsToPackage{hyperfootnotes}{hyperref}
\documentclass[a4paper,oneside]{ltxdoc}
diff --git a/Master/texmf-dist/source/latex/tabu/tabu.dtx b/Master/texmf-dist/source/latex/tabu/tabu.dtx
index e525ab5b155..ac5edcd45a4 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/24 v2.6 - tabu: flexible LaTeX tabulars]
+% tabu : 2011/02/25 v2.7 - 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/24 v2.6 - tabu: Flexible LaTeX tabulars}
+\Msg{* Package: 2011/02/25 v2.7 - tabu: Flexible LaTeX tabulars}
\Msg{************************************************************************}
\keepsilent
@@ -48,7 +48,7 @@
This is a generated file.
Copyright (FC) 2010-2011 - lppl
-tabu : 2011/02/24 v2.6 - tabu : Flexible LaTeX tabulars
+tabu : 2011/02/25 v2.7 - 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/24}
-\def\thisversion{2.6}
+\def\thisdate{2011/02/25}
+\def\thisversion{2.7}
\def\CTANbaseurl{http://www.ctan.org/tex-archive/macros/latex}
\def\CTANdisplay{CTAN:macros/latex}
\makeatletter\protected\def\CTANhref{\@ifstar\CTANhrefstar\CTANhrefnost}\makeatother
@@ -156,7 +156,7 @@ lppl copyright 2010-2011 by FC <florent.chervet@free.fr>
package #1 must be later than #2
to compile this documentation.}}}}%
\gdef\CheckDate#1{{\let\CheckDate\relax\toks@{}\@for\x:=\thisfile=\thisdate,#1\do{\expandafter\ErrorUpdate\x,}\CheckDate\expandafter{\the\toks@}}}}
-\AtBeginDocument{\CheckDate{interfaces=2011/02/12}}
+\AtBeginDocument{\CheckDate{interfaces=2011/02/12,linegoal=2011/02/25}}
\PassOptionsToPackage{svgnames,table}{xcolor}
\PassOptionsToPackage{hyperfootnotes}{hyperref}
\documentclass[a4paper,oneside]{ltxdoc}
@@ -252,7 +252,7 @@ morekeywords=[7]{yellow},
%</driver>
% \fi
%
-% \CheckSum{7856}
+% \CheckSum{7863}
%
% \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
@@ -270,7 +270,7 @@ morekeywords=[7]{yellow},
% Grave accent \` Left brace \{ Vertical bar \|
% Right brace \} Tilde \~}
%
-% \DoNotIndex{\begin,\CodelineIndex,\CodelineNumbered,\def,\DisableCrossrefs,\~,\@ifpackagelater,\z@,\@ne,\@@,\@firstoftwo,\@firstofone,\@secondoftwo,\@fornoop,\@elt}
+% \DoNotIndex{\begin,\CodelineIndex,\CodelineNumbered,\def,\DisableCrossrefs,\~,\@ifpackagelater,\z@,\@ne,\@@,\@firstoftwo,\@firstofone,\@secondoftwo,\@fornoop,\@elt,\tabu@temp}
% \DoNotIndex{\DocInput,\documentclass,\EnableCrossrefs,\end,\GetFileInfo,\TMP@EnsureCode,\@length,\@thick,\@m,\@makeother,\@mpfn,\@preamerr,\@preamerror,\@skip,\@spaces,\tabu@spaces}
% \DoNotIndex{\NeedsTeXFormat,\OnlyDescription,\RecordChanges,\usepackage,\@ss,\@therule,\@unbox,\[,\],\{,\},\cellspacetoplimit,\begin,\bcolumn,\adl@xarraydashrule,\adl@vlineR,\adl@vlineL}
% \DoNotIndex{\ProvidesClass,\ProvidesPackage,\ProvidesFile,\RequirePackage,\adl@ncol,\adl@leftrulefalse,\adl@dashgapcolor,\adl@colhtdp,\adl@class@start,\adl@box,\adl@arrayrestore}
@@ -348,7 +348,7 @@ morekeywords=[7]{yellow},
% \newrobustcmd*\grabcs{\leavevmode\hbox\bgroup\bgroup\makeatletter\aftergroup\endgrabcs}
% \def\endgrabcs{\egroup\xspaceverb}
% \renewrobustcmd*\cs{\grabcs\cs@}
-% \newrobustcmd*\cs@[2][]{\begingroup\escapechar\m@ne\def\x ##1{\endgroup\tabu@maybehyperlink{##1}{\texttt{#1{\@backslashchar##1}}}}\expandafter\x\expandafter{\string#2}\egroup}
+% \newrobustcmd\cs@[2][]{\begingroup\escapechar\m@ne\def\x ##1{\endgroup\tabu@maybehyperlink{##1}{\texttt{#1{\@backslashchar##1}}}}\expandafter\x\expandafter{\string#2}\egroup}
% \newcommand*\cs@pdf[1]{\@backslashchar\if\@backslashchar\string#1 \else\string#1\fi}
% \newrobustcmd*\csbf{\cs[\textbf]}
% \newrobustcmd*\csref[2][]{{\escapechar\m@ne\edef\my@tempa{\string#2}\edef\x ##1{\noexpand\hyperref{}{declcs}{\my@tempa}{\noexpand\cs[{##1}]{\my@tempa}}}\expandafter}\x{#1}}
@@ -973,7 +973,7 @@ morekeywords=[7]{yellow},
%
% {\smaller
% \begin{lstlisting}
-% \tabulinestyle{on2pt Crimson!60 off3pt yellow!50} \tabulinesep=1mm
+% \tabulinestyle{on2pt Crimson!60 off3pt yellow!50} \tabulinesep=2mm
% \makeatletter \@makeother\%
% \begin{tabu*}spread 0pt {|X[-1]X|} \tabucline-
% This is a small \Verb+\Verbatim+\par
@@ -988,19 +988,21 @@ morekeywords=[7]{yellow},
% \end{lstlisting}}
%
% {
-% \tabulinestyle{on2pt Crimson!60 off2pt yellow!50} \tabulinesep=1mm
+% \tabulinestyle{on2pt Crimson!60 off2pt yellow!80} \tabulinesep=2mm
% \makeatletter
% \begin{tabu*} spread 0pt {|X[-1]|X|} \tabucline-
% Here a small \Verb+\Verbatim+\par
% insertion
% &
+% \vtop\bgroup
% \begin{Verbatim}[gobble=1,listparameters={\topsep=-\ht\strutbox},commandchars=$()]
-% And this is a complete $@percentchar with some comments
+% And this is a complete $@percentchar with some comments $strut
% Verbatim environment $@percentchar every now and then
% \end{Verbatim}
+% \egroup
% \\ \tabucline-
% \end{tabu*}
-% }
+% \par}
%
% It's not possible to insert a \env*{lstlisting} presently, but you can save such an environment in a \cs\vbox
% and insert it inside the \env{tabu} of course.
@@ -3097,7 +3099,7 @@ morekeywords=[7]{yellow},
% \begin{macrocode}
%<*package>
\NeedsTeXFormat{LaTeX2e}[2005/12/01]
-\ProvidesPackage{tabu}[2011/02/24 v2.6 - flexible LaTeX tabulars (FC)]
+\ProvidesPackage{tabu}[2011/02/25 v2.7 - flexible LaTeX tabulars (FC)]
\RequirePackage{array}[2008/09/09]
\RequirePackage{varwidth}[2009/03/30]
% \end{macrocode}
@@ -3977,7 +3979,7 @@ morekeywords=[7]{yellow},
\noexpand\tabu@rearstrut
\global\advance\c@taburow \@ne}%
\iftabu@everyrow \toks@\expandafter
- {\expandafter\def\expandafter\tabu@evr@L\expandafter{\the\toks@}}%
+ {\expandafter\def\expandafter\tabu@evr@L\expandafter{\the\toks@}\ignorespaces}%
\else \xdef\tabu@evr@G{\the\toks@}%
\fi
\tabu@everyrow@egroup
@@ -4020,7 +4022,7 @@ morekeywords=[7]{yellow},
\newcommand*\tabulinestyle [1]{\tabu@everyrow@bgroup \tabu@getline{#1}%
\iftabu@everyrow
\toks@\expandafter{\expandafter \def \expandafter
- \tabu@ls@L\expandafter{\tabu@thestyle}}%
+ \tabu@ls@L\expandafter{\tabu@thestyle}\ignorespaces}%
\gdef\tabu@ls@{\tabu@ls@L}%
\else
\global\let\tabu@ls@G \tabu@thestyle
@@ -4079,7 +4081,8 @@ morekeywords=[7]{yellow},
\fi
\toks@\expandafter{\the\toks@
\let\tabu@arc@L \CT@arc@
- \let\tabu@drsc@L \CT@drsc@}%
+ \let\tabu@drsc@L \CT@drsc@
+ \ignorespaces}%
\else
\ifx \\#1#2\\\gdef\CT@arc@{}%
\else \gdef\CT@arc@{\color #1{#2}}%
@@ -4137,7 +4140,7 @@ morekeywords=[7]{yellow},
{\@tempa}%
}\x
\toks@\expandafter{\expandafter\def\expandafter\tabu@rc@\expandafter{\tabu@rc@}}%
- \toks@\expandafter{\the\toks@ \let\tabu@rc@L \tabu@rc@}%
+ \toks@\expandafter{\the\toks@ \let\tabu@rc@L \tabu@rc@ \ignorespaces}%
\else % inside \noalign
\definecolorseries{tabu@rcseries@\the\tabu@nested}{rgb}{last}{\tabu@temp}{\@tempa}%
\expandafter\resetcolorseries\expandafter[\the\count@]{tabu@rcseries@\the\tabu@nested}%
@@ -4572,7 +4575,9 @@ morekeywords=[7]{yellow},
% \begin{macrocode}
\def\tabu@setup{\tabu@alloc@
\ifcase \tabu@nested
- \ifmmode \else \ifdim\tabu@target=\z@ \let\tabu@afterendpar \par \fi\fi
+ \ifmmode \else \iftabu@spread\else \ifdim\tabu@target=\z@
+ \let\tabu@afterendpar \par
+ \fi\fi\fi
\def\tabu@aligndefault{c}\tabu@init \tabu@indent
\else % <nested tabu>
\def\tabu@aligndefault{t}\let\tabudefaulttarget \linewidth
@@ -6456,7 +6461,7 @@ morekeywords=[7]{yellow},
% \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
@@ -7681,6 +7686,11 @@ 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/25 v2.7}\HistLabel{2.7}
+% \item Automatic \cs\par after the end of the \env*{tabu} used with its default target is removed in case of \env{tabu spread}: this was a bug.
+% \item Some \cs\ignorespaces were missing (in \cs\everyrow, \cs\taburulecolor, \cs\taburowcolors and \cs\tabulinestyle).
+% \end{Version}
+%
% \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.
diff --git a/Master/texmf-dist/source/latex/tabu/tabu.ins b/Master/texmf-dist/source/latex/tabu/tabu.ins
index 381571a075f..f140a1facd0 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/24 v2.6 - tabu : Flexible LaTeX tabulars
+%% tabu : 2011/02/25 v2.7 - 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/24 v2.6 - tabu: Flexible LaTeX tabulars}
+\Msg{* Package: 2011/02/25 v2.7 - tabu: Flexible LaTeX tabulars}
\Msg{************************************************************************}
\keepsilent
@@ -77,7 +77,7 @@
This is a generated file.
Copyright (FC) 2010-2011 - lppl
-tabu : 2011/02/24 v2.6 - tabu : Flexible LaTeX tabulars
+tabu : 2011/02/25 v2.7 - 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 df6d0c7a26a..6b28197777a 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/24 v2.6 - tabu : Flexible LaTeX tabulars
+%% tabu : 2011/02/25 v2.7 - 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/24 v2.6 - flexible LaTeX tabulars (FC)]
+\ProvidesPackage{tabu}[2011/02/25 v2.7 - flexible LaTeX tabulars (FC)]
\RequirePackage{array}[2008/09/09]
\RequirePackage{varwidth}[2009/03/30]
\AtEndOfPackage{\tabu@AtEnd \let\tabu@AtEnd \@undefined}
@@ -322,7 +322,7 @@
\noexpand\tabu@rearstrut
\global\advance\c@taburow \@ne}%
\iftabu@everyrow \toks@\expandafter
- {\expandafter\def\expandafter\tabu@evr@L\expandafter{\the\toks@}}%
+ {\expandafter\def\expandafter\tabu@evr@L\expandafter{\the\toks@}\ignorespaces}%
\else \xdef\tabu@evr@G{\the\toks@}%
\fi
\tabu@everyrow@egroup
@@ -342,7 +342,7 @@
\newcommand*\tabulinestyle [1]{\tabu@everyrow@bgroup \tabu@getline{#1}%
\iftabu@everyrow
\toks@\expandafter{\expandafter \def \expandafter
- \tabu@ls@L\expandafter{\tabu@thestyle}}%
+ \tabu@ls@L\expandafter{\tabu@thestyle}\ignorespaces}%
\gdef\tabu@ls@{\tabu@ls@L}%
\else
\global\let\tabu@ls@G \tabu@thestyle
@@ -383,7 +383,8 @@
\fi
\toks@\expandafter{\the\toks@
\let\tabu@arc@L \CT@arc@
- \let\tabu@drsc@L \CT@drsc@}%
+ \let\tabu@drsc@L \CT@drsc@
+ \ignorespaces}%
\else
\ifx \\#1#2\\\gdef\CT@arc@{}%
\else \gdef\CT@arc@{\color #1{#2}}%
@@ -428,7 +429,7 @@
{\@tempa}%
}\x
\toks@\expandafter{\expandafter\def\expandafter\tabu@rc@\expandafter{\tabu@rc@}}%
- \toks@\expandafter{\the\toks@ \let\tabu@rc@L \tabu@rc@}%
+ \toks@\expandafter{\the\toks@ \let\tabu@rc@L \tabu@rc@ \ignorespaces}%
\else % inside \noalign
\definecolorseries{tabu@rcseries@\the\tabu@nested}{rgb}{last}{\tabu@temp}{\@tempa}%
\expandafter\resetcolorseries\expandafter[\the\count@]{tabu@rcseries@\the\tabu@nested}%
@@ -675,7 +676,9 @@
%% \tabu@setup \tabu@init \tabu@indent
\def\tabu@setup{\tabu@alloc@
\ifcase \tabu@nested
- \ifmmode \else \ifdim\tabu@target=\z@ \let\tabu@afterendpar \par \fi\fi
+ \ifmmode \else \iftabu@spread\else \ifdim\tabu@target=\z@
+ \let\tabu@afterendpar \par
+ \fi\fi\fi
\def\tabu@aligndefault{c}\tabu@init \tabu@indent
\else % <nested tabu>
\def\tabu@aligndefault{t}\let\tabudefaulttarget \linewidth