summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Master/texmf-dist/doc/latex/tabu/tabu.pdfbin1611749 -> 1617198 bytes
-rw-r--r--Master/texmf-dist/source/latex/tabu/tabu.drv6
-rw-r--r--Master/texmf-dist/source/latex/tabu/tabu.dtx40
-rw-r--r--Master/texmf-dist/source/latex/tabu/tabu.ins6
-rw-r--r--Master/texmf-dist/tex/latex/tabu/tabu.sty14
5 files changed, 38 insertions, 28 deletions
diff --git a/Master/texmf-dist/doc/latex/tabu/tabu.pdf b/Master/texmf-dist/doc/latex/tabu/tabu.pdf
index 4ccbfc46301..4de9aac0942 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 fb95ecf5af6..d99c80f5b1c 100644
--- a/Master/texmf-dist/source/latex/tabu/tabu.drv
+++ b/Master/texmf-dist/source/latex/tabu/tabu.drv
@@ -8,7 +8,7 @@
%%
%% This is a generated file.
%%
-%% tabu : 2010/12/28 v1.8 - tabu : Flexible LaTeX tabulars
+%% tabu : 2011/01/15 v1.9 - tabu : Flexible LaTeX tabulars
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either
@@ -25,8 +25,8 @@
%%
\edef\thisfile{\jobname}
\def\thisinfo{Flexible \LaTeX{} tabulars (\FC)}
-\def\thisdate{2010/12/28}
-\def\thisversion{1.8}
+\def\thisdate{2011/01/15}
+\def\thisversion{1.9}
\def\CTANbaseurl{http://www.ctan.org/tex-archive/macros/latex}
\def\CTANdisplay{CTAN:macros/latex}
\makeatletter\protected\def\CTANhref{\@ifstar\CTANhrefstar\CTANhrefnost}\makeatother
diff --git a/Master/texmf-dist/source/latex/tabu/tabu.dtx b/Master/texmf-dist/source/latex/tabu/tabu.dtx
index 5f090403340..6b44a81856b 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 : 2010/12/28 v1.8 - tabu: flexible LaTeX tabulars]
+% tabu : 2011/01/15 v1.9 - 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: 2010/12/28 v1.8 - tabu: Flexible LaTeX tabulars}
+\Msg{* Package: 2011/01/15 v1.9 - tabu: Flexible LaTeX tabulars}
\Msg{************************************************************************}
\keepsilent
@@ -47,7 +47,7 @@
This is a generated file.
-tabu : 2010/12/28 v1.8 - tabu : Flexible LaTeX tabulars
+tabu : 2011/01/15 v1.9 - tabu : Flexible LaTeX tabulars
This work may be distributed and/or modified under the
conditions of the LaTeX Project Public License, either
@@ -98,8 +98,8 @@ Copyright (C) 2010 by Florent Chervet <florent.chervet@free.fr>
%<*driver>
\edef\thisfile{\jobname}
\def\thisinfo{Flexible \LaTeX{} tabulars (\FC)}
-\def\thisdate{2010/12/28}
-\def\thisversion{1.8}
+\def\thisdate{2011/01/15}
+\def\thisversion{1.9}
\def\CTANbaseurl{http://www.ctan.org/tex-archive/macros/latex}
\def\CTANdisplay{CTAN:macros/latex}
\makeatletter\protected\def\CTANhref{\@ifstar\CTANhrefstar\CTANhrefnost}\makeatother
@@ -269,7 +269,7 @@ Copyright (C) 2010 by Florent Chervet <florent.chervet@free.fr>
% \def\M@Bracket#1#2#3{{\ttfamily#1#2#3}}
% \newrobustcmd*\thisyear{\begingroup
% \def\thisyear##1/##2\@nil{\endgroup
-% \oldstylenums{##1\ifnum##1=\year\else\,\textendash\,\the\year\fi}%
+% \oldstylenums{\ifnum##1=2010\else 2010\,\textendash\,\fi ##1}^^A
% }\expandafter\thisyear\thisdate\@nil
% }
% \renewrobustcmd\declcs[2][]{^^A
@@ -445,7 +445,7 @@ Copyright (C) 2010 by Florent Chervet <florent.chervet@free.fr>
% \pagesetup*{left/offset-=2.5cm,right/offset-=.5cm}
%
% \changefont{spread*=1.1}
-% \phantomsection\label{Summary}
+% \phantomsection \label{Summary}
% \addcontentsline{toc}{section}{Summary of the features provided by \textt{tabu}}
% \def\arraystretch{1.1}\enlargethispage\baselineskip\vspace*{-6mm}
% \begin{tabu}{>{\ttfamily\bfseries}X[-1]X} \toprule
@@ -494,6 +494,9 @@ Copyright (C) 2010 by Florent Chervet <florent.chervet@free.fr>
% \end{itempunct}
% In this case, \textt{tabu} behaves as if it was said:\, \textt{\M*{tabu} spread 0pt}.
% \\ \tabucline[dash]-
+% \csref{rowfont}\M*[align]\M*{font spec} &
+% Modify the font and optionally the alignment of each cell in one row.
+% \\ \tabucline[dash]-
% \csref{savetabu}\M*{user-name} &
% Saves the \textt{tabu} preamble and its parameters. \par
% The command must appear at the end of a line: after \string\\\ or \cs{hline}.
@@ -605,7 +608,7 @@ Copyright (C) 2010 by Florent Chervet <florent.chervet@free.fr>
% \Xpackage{ltxtable}.
% \goodbreak
%
-% The following commands provided for \textt{tabu} does not work with \textt{longtabu}:\par\nobreak
+% The following commands provided for \textt{tabu} do not work with \textt{longtabu}:\par\nobreak
% \let\theadfont\bfseries
% \begin{tabu}{X[-1]*2{X[-1c]}X} \toprule
% \rowfont[c]{\bfseries} \textt{tabu} command &\thead{Not \\available} &\thead{Not \\implemented} &Comment \\\tabucline[dash]-
@@ -1785,7 +1788,7 @@ Copyright (C) 2010 by Florent Chervet <florent.chervet@free.fr>
% \begin{macrocode}
%<*package>
\NeedsTeXFormat{LaTeX2e}[2005/12/01]
-\ProvidesPackage{tabu}[2010/12/28 v1.8 - flexible LaTeX tabulars (FC)]
+\ProvidesPackage{tabu}[2011/01/15 v1.9 - flexible LaTeX tabulars (FC)]
\RequirePackage{array}[2008/09/09]
\RequirePackage{varwidth}[2009/03/30]
% \end{macrocode}
@@ -2295,13 +2298,13 @@ Copyright (C) 2010 by Florent Chervet <florent.chervet@free.fr>
\def\tabu{%
\ifmmode \def\tabu@{\array}\def\endtabu{\endarray}%
\else \def\tabu@{\tabular}\def\endtabu{\endtabular}\fi
+ \let\tabu@arrayleft@measure \tabu@arrayleftmeasure
\tabu@setup \tabu@settarget
}% \tabu
\def\longtabu{%
\ifmmode\PackageError{tabu}{longtabu not allowed in math mode}\fi
\def\tabu@{\longtable}\def\endlongtabu{\endlongtable}%
\let\tabu@arrayleft@measure \tabu@long@arrayleft@measure
- \let\tabu@endTRIAL \tabu@long@endTRIAL
\tabu@setup \tabu@settarget
}% \longtabu
\def\tabu@nolongtabu{\PackageError{tabu}
@@ -2938,7 +2941,7 @@ Copyright (C) 2010 by Florent Chervet <florent.chervet@free.fr>
%
% \subsection{One trial after another}
%
-% \begin{macro}{\tabu@arrayleft@measure}
+% \begin{macro}{\tabu@arrayleftmeasure}
%
% Measuring the whole tabular occurs just before \cs{@arrayleft}.
% Hence the name of the macro: \cs{tabu@arrayleft@measure}.
@@ -2948,7 +2951,7 @@ Copyright (C) 2010 by Florent Chervet <florent.chervet@free.fr>
% \cs{halign} is temporarily expanded inside a \cs{vbox} which is captured in \cs{tabu@box}.
%
% \begin{macrocode}
-\def\tabu@arrayleft@measure#1\bgroup{%
+\def\tabu@arrayleftmeasure#1\bgroup{%
\def\tabu@Xfinish{%
\tabu@global@Xnested \ifnum0=`{}\fi\endgroup
\tabu@global@X #1\bgroup}%
@@ -2957,7 +2960,7 @@ Copyright (C) 2010 by Florent Chervet <florent.chervet@free.fr>
\toks@{\tabu@setup@everycr
\let\@preamble \tabu@savedpreamble}% <required for multicolumn>
\tabu@collect
-}% \tabu@arrayleft@measure
+}% \tabu@arrayleftmeasure
% \end{macrocode}
% \end{macro}
% \end{macro}
@@ -2965,6 +2968,7 @@ Copyright (C) 2010 by Florent Chervet <florent.chervet@free.fr>
% \begin{macro}{\tabu@long@arrayleft@measure}
%
% This is the long version for \textt{longtabu}
+%
% \begin{macrocode}
\long\def\tabu@long@arrayleft@measure #1\LT@bchunk #2\LT@bchunk{%
\def\tabu@Xfinish{%
@@ -2975,7 +2979,7 @@ Copyright (C) 2010 by Florent Chervet <florent.chervet@free.fr>
\setbox\tabu@box \hbox\bgroup
\tabu@setup@everycr \let\@preamble \tabu@savedpreamble
\tabu@global@X \LTchunksize\@M
- #1\LT@bchunk #2\LT@bchunk \the\toks@ \tabu@endTRIAL}%
+ #1\LT@bchunk #2\LT@bchunk \the\toks@ \tabu@long@endTRIAL}%
\toks@{}%\let\LT@output\relax
\tabu@collect
}% \tabu@long@arrayleft@measure
@@ -3790,7 +3794,7 @@ Copyright (C) 2010 by Florent Chervet <florent.chervet@free.fr>
\the\toks1%
\gdef\noexpand\tabu@usetabu{%
\the\toks1%
- \def\noexpand\@halignto{\@halignto}%
+ \def\noexpand\@halignto{\tabu@halignto}%
\tabucolX \the\tabucolX\relax
\def\noexpand\@preamble{\the\toks0}%
\noexpand\tabu@make@arstrutbox
@@ -4412,6 +4416,12 @@ Copyright (C) 2010 by Florent Chervet <florent.chervet@free.fr>
%
% \sectionformat\subsection[hang]{font=\large\bfseries\macrocodecolor}
%
+% \begin{Version}{2011/01/15 v1.9}\HistLabel{1.9}
+% \item Bug in \csref{savetabu} when used inside \textt{longtabu}...
+% \item Bug when \textt{tabu} with \textt X column is nested inside \textt{lontabu}.
+% \item Documentation (\csref{rowfont} was missing in the \hyperref[Summary]{summary}).
+% \end{Version}
+%
% \begin{Version}{2010/12/28 v1.8}\HistLabel{1.8}
% \item \csref{tracingtabu} / \hyperref[debugshow]{\textt{debugshow}} package option:\\
% reporting of the time elapsed during trials (if \cs{pdfelapsedtime} and thus \hologo{pdfTeX} is available) \\
diff --git a/Master/texmf-dist/source/latex/tabu/tabu.ins b/Master/texmf-dist/source/latex/tabu/tabu.ins
index d4dde6e930d..19d353d648c 100644
--- a/Master/texmf-dist/source/latex/tabu/tabu.ins
+++ b/Master/texmf-dist/source/latex/tabu/tabu.ins
@@ -8,7 +8,7 @@
%%
%% This is a generated file.
%%
-%% tabu : 2010/12/28 v1.8 - tabu : Flexible LaTeX tabulars
+%% tabu : 2011/01/15 v1.9 - tabu : Flexible LaTeX tabulars
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either
@@ -26,7 +26,7 @@
\input docstrip.tex
\Msg{************************************************************************}
\Msg{* Installation}
-\Msg{* Package: 2010/12/28 v1.8 - tabu: Flexible LaTeX tabulars}
+\Msg{* Package: 2011/01/15 v1.9 - tabu: Flexible LaTeX tabulars}
\Msg{************************************************************************}
\keepsilent
@@ -37,7 +37,7 @@
This is a generated file.
-tabu : 2010/12/28 v1.8 - tabu : Flexible LaTeX tabulars
+tabu : 2011/01/15 v1.9 - tabu : Flexible LaTeX tabulars
This work may be distributed and/or modified under the
conditions of the LaTeX Project Public License, either
diff --git a/Master/texmf-dist/tex/latex/tabu/tabu.sty b/Master/texmf-dist/tex/latex/tabu/tabu.sty
index b123d51ce9b..fe2b5876561 100644
--- a/Master/texmf-dist/tex/latex/tabu/tabu.sty
+++ b/Master/texmf-dist/tex/latex/tabu/tabu.sty
@@ -8,7 +8,7 @@
%%
%% This is a generated file.
%%
-%% tabu : 2010/12/28 v1.8 - tabu : Flexible LaTeX tabulars
+%% tabu : 2011/01/15 v1.9 - tabu : Flexible LaTeX tabulars
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either
@@ -25,7 +25,7 @@
%%
\NeedsTeXFormat{LaTeX2e}[2005/12/01]
-\ProvidesPackage{tabu}[2010/12/28 v1.8 - flexible LaTeX tabulars (FC)]
+\ProvidesPackage{tabu}[2011/01/15 v1.9 - flexible LaTeX tabulars (FC)]
\RequirePackage{array}[2008/09/09]
\RequirePackage{varwidth}[2009/03/30]
\AtEndOfPackage{\tabu@AtEnd\let\tabu@AtEnd\@undefined}
@@ -243,13 +243,13 @@
\def\tabu{%
\ifmmode \def\tabu@{\array}\def\endtabu{\endarray}%
\else \def\tabu@{\tabular}\def\endtabu{\endtabular}\fi
+ \let\tabu@arrayleft@measure \tabu@arrayleftmeasure
\tabu@setup \tabu@settarget
}% \tabu
\def\longtabu{%
\ifmmode\PackageError{tabu}{longtabu not allowed in math mode}\fi
\def\tabu@{\longtable}\def\endlongtabu{\endlongtable}%
\let\tabu@arrayleft@measure \tabu@long@arrayleft@measure
- \let\tabu@endTRIAL \tabu@long@endTRIAL
\tabu@setup \tabu@settarget
}% \longtabu
\def\tabu@nolongtabu{\PackageError{tabu}
@@ -561,7 +561,7 @@
}% \tabu@savecounters
\let\tabu@TRIAL@hook \@empty
\newcommand\tabuDisableCommands[1]{\g@addto@macro\tabu@TRIAL@hook {#1}}
-\def\tabu@arrayleft@measure#1\bgroup{%
+\def\tabu@arrayleftmeasure#1\bgroup{%
\def\tabu@Xfinish{%
\tabu@global@Xnested \ifnum0=`{}\fi\endgroup
\tabu@global@X #1\bgroup}%
@@ -570,7 +570,7 @@
\toks@{\tabu@setup@everycr
\let\@preamble \tabu@savedpreamble}% <required for multicolumn>
\tabu@collect
-}% \tabu@arrayleft@measure
+}% \tabu@arrayleftmeasure
\long\def\tabu@long@arrayleft@measure #1\LT@bchunk #2\LT@bchunk{%
\def\tabu@Xfinish{%
\tabu@global@Xnested \ifnum0=`{}\fi\endgroup
@@ -580,7 +580,7 @@
\setbox\tabu@box \hbox\bgroup
\tabu@setup@everycr \let\@preamble \tabu@savedpreamble
\tabu@global@X \LTchunksize\@M
- #1\LT@bchunk #2\LT@bchunk \the\toks@ \tabu@endTRIAL}%
+ #1\LT@bchunk #2\LT@bchunk \the\toks@ \tabu@long@endTRIAL}%
\toks@{}%\let\LT@output\relax
\tabu@collect
}% \tabu@long@arrayleft@measure
@@ -1166,7 +1166,7 @@
\the\toks1%
\gdef\noexpand\tabu@usetabu{%
\the\toks1%
- \def\noexpand\@halignto{\@halignto}%
+ \def\noexpand\@halignto{\tabu@halignto}%
\tabucolX \the\tabucolX\relax
\def\noexpand\@preamble{\the\toks0}%
\noexpand\tabu@make@arstrutbox