summaryrefslogtreecommitdiff
path: root/Master
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2011-02-20 00:26:51 +0000
committerKarl Berry <karl@freefriends.org>2011-02-20 00:26:51 +0000
commitc747766b6218b8dfbe0165cdd31f602141d611d5 (patch)
tree50df96f95ce157034ab947f13aaeec6730e3c9ca /Master
parentfae5e7681cd67f0f98d7755e5065a0e54e15fbd0 (diff)
tabu 2.5 (19feb11)
git-svn-id: svn://tug.org/texlive/trunk@21473 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
-rw-r--r--Master/texmf-dist/doc/latex/tabu/tabu.pdfbin2515478 -> 2520552 bytes
-rw-r--r--Master/texmf-dist/source/latex/tabu/tabu.drv6
-rw-r--r--Master/texmf-dist/source/latex/tabu/tabu.dtx53
-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, 35 deletions
diff --git a/Master/texmf-dist/doc/latex/tabu/tabu.pdf b/Master/texmf-dist/doc/latex/tabu/tabu.pdf
index b404fbd1337..13582a02124 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 9f052b8dc24..a1b8b77c63a 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/17 v2.4 - tabu : Flexible LaTeX tabulars
+%% tabu : 2011/02/19 v2.5 - 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/17}
-\def\thisversion{2.4}
+\def\thisdate{2011/02/19}
+\def\thisversion{2.5}
\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 c8bfc3d9bfe..4d22317e1bc 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/17 v2.4 - tabu: flexible LaTeX tabulars]
+% tabu : 2011/02/19 v2.5 - 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/17 v2.4 - tabu: Flexible LaTeX tabulars}
+\Msg{* Package: 2011/02/19 v2.5 - tabu: Flexible LaTeX tabulars}
\Msg{************************************************************************}
\keepsilent
@@ -48,7 +48,7 @@
This is a generated file.
Copyright (FC) 2010-2011 - lppl
-tabu : 2011/02/17 v2.4 - tabu : Flexible LaTeX tabulars
+tabu : 2011/02/19 v2.5 - 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/17}
-\def\thisversion{2.4}
+\def\thisdate{2011/02/19}
+\def\thisversion{2.5}
\def\CTANbaseurl{http://www.ctan.org/tex-archive/macros/latex}
\def\CTANdisplay{CTAN:macros/latex}
\makeatletter\protected\def\CTANhref{\@ifstar\CTANhrefstar\CTANhrefnost}\makeatother
@@ -252,7 +252,7 @@ morekeywords=[7]{yellow},
%</driver>
% \fi
%
-% \CheckSum{7758}
+% \CheckSum{7768}
%
% \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
@@ -349,8 +349,6 @@ morekeywords=[7]{yellow},
% \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*\tabu@maybehyperlink [2]{\ifcsname tabu@declcs.\detokenize{#1}\endcsname \hyperref{}{declcs}{#1}{#2}\else #2\fi}
-% \csundef{tabu@declcs.begin}
% \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}}
@@ -358,6 +356,8 @@ morekeywords=[7]{yellow},
% \newcommand*\env@pdf[1]{#1}
% \newrobustcmd*\env@{\@ifstar {\env@starsw[environment]}{\env@starsw[]}}
% \new\def\env@starsw[#1]#2{\textt{#2}\ifblank{#1}{}{ #1}\Xspace}
+% \newrobustcmd*\tabu@maybehyperlink [2]{\ifcsname tabu@declcs.\detokenize{#1}\endcsname \hyperref{}{declcs}{#1}{#2}\else #2\fi}
+% \csundef{tabu@declcs.begin}
% \newcommand\textttbf[1]{\texorpdf\textbf{\textt{#1}}}
% \newrobustcmd*\blue{\color{blue}}\newcommand*\red{\color{dr}}\newcommand*\green{\color{green}}\newcommand\rred{\color{red}}
% \newrobustcmd*\FC[1][\color{copper}]{{#1\usefont{T1}{fts}xn FC}}
@@ -427,14 +427,14 @@ morekeywords=[7]{yellow},
% head/left=\moveleft1cm\vbox to\z@{\vss\setbox0=\null\ht0=\z@\wd0=\paperwidth\dp0=\headheight\rlap{\colorbox{GhostWhite}{\box0}}}\vskip-\headheight\thispackage,
% head/right=Flexible \LaTeX{} tabulars,
% foot/font=\lk\scriptsize,
-% foot/left=\vbox to\baselineskip{\vss{{\rotatebox[origin=l]{90}{\thispackage\,[rev.\thisversion]\,\copyright\,\thisyear\,\lower.4ex\hbox{\pkgcolor\NibRight}\,\FC}}}},
+% foot/left=\vbox to\baselineskip{\vss{{\rotatebox[origin=l]{90}{\thispackage\,[rev.\thisversion\ release]\,\copyright\,\thisyear\,\lower.4ex\hbox{\pkgcolor\NibRight}\,\FC}}}},
% foot/right=\oldstylenums{\arabic{page}} / \oldstylenums{\pageref{LastPage}}%
% }
% \pagesetup[plain]{%
% norules,font=\scriptsize,
% foot/right=\oldstylenums{\arabic{page}} / \oldstylenums{\pageref{LastPage}},
% left/offset=3cm,foot/left/offset+=.5cm,right/offset=1cm,
-% foot/left=\vbox to\baselineskip{\vss{{\rotatebox[origin=l]{90}{\thispackage\,[rev.\thisversion]\,\copyright\,\thisyear\,\lower.4ex\hbox{\pkgcolor\NibRight}\,\FC\quad \xemail{florent.chervet at free.fr}}}}},
+% foot/left=\vbox to\baselineskip{\vss{{\rotatebox[origin=l]{90}{\thispackage\,[rev.\thisversion\ release]\,\copyright\,\thisyear\,\lower.4ex\hbox{\pkgcolor\NibRight}\,\FC\quad \xemail{florent.chervet at free.fr}}}}},
% }
% \pagestyle{fancy}
% \bottomtitles=.15\textheight
@@ -527,7 +527,7 @@ morekeywords=[7]{yellow},
% }}}
%
% \date{}
-% \author{\small\thisdate~--~\hyperref[\thisversion]{version \thisversion}}
+% \author{\small\thisdate~--~\hyperref[\thisversion]{version \thisversion\ release}}
% \subtitle{\begin{tabu}{X[c]}\Large tabu\, and\, longtabu \\[1ex] \LARGE Flexible \LaTeX{} tabulars\\ \small\FC \end{tabu}\vspace*{-12pt}}
%
% \maketitle
@@ -3099,7 +3099,7 @@ morekeywords=[7]{yellow},
% \begin{macrocode}
%<*package>
\NeedsTeXFormat{LaTeX2e}[2005/12/01]
-\ProvidesPackage{tabu}[2011/02/17 v2.4 - flexible LaTeX tabulars (FC)]
+\ProvidesPackage{tabu}[2011/02/19 v2.5 - flexible LaTeX tabulars (FC)]
\RequirePackage{array}[2008/09/09]
\RequirePackage{varwidth}[2009/03/30]
% \end{macrocode}
@@ -3750,6 +3750,12 @@ morekeywords=[7]{yellow},
% \end{macrocode}
% \end{macro}
%
+% \begin{macro}{\tabu@finalstrut}
+% \begin{macrocode}
+\def\tabu@finalstrut #1{\unskip\ifhmode\nobreak\fi\vrule height\z@ depth\z@ width\z@}
+% \end{macrocode}
+% \end{macro}
+%
% \subsubsection{Disable some commands during trials}
%
% \begin{macro}{\tabuDisableCommands}
@@ -4614,10 +4620,6 @@ morekeywords=[7]{yellow},
\box\z@}%
\fi\fi
}% \tabu@indent
-\ifdefined\pdfelapsedtime
- \def\tabu@pdftimer {\xdef\tabu@starttime{\the\pdfelapsedtime}}%
-\else \let\tabu@pdftimer \relax \let\tabu@message@etime \relax
-\fi
% \end{macrocode}
% \end{macro}
% \end{macro}
@@ -5299,7 +5301,7 @@ morekeywords=[7]{yellow},
\let\tabu@temp \NC@find
\ifx \@arrayright\relax \let\@arrayright \@empty \fi
\count@=%
- \ifx \@finalstrut\@gobble \z@ % outer in mode 0 print
+ \ifx \@finalstrut\tabu@finalstrut \z@ % outer in mode 0 print
\iftabu@measuring
\xdef\tabu@mkpreambuffer{\tabu@mkpreambuffer
\tabu@target \csname tabu@\the\tabu@nested.T\endcsname
@@ -5695,7 +5697,7 @@ morekeywords=[7]{yellow},
\global\tabu@cnt \tabu@cnt
\tabu@evr{\tabu@verticaldynamicadjustment}%
\tabu@celllalign@def{\everypar{}}\let\tabu@cellralign \@empty
- \let\@finalstrut \@gobble
+ \let\@finalstrut \tabu@finalstrut
\else % vertical measure of nested tabu
\tabu@evr{\tabu@verticalinit}%
\tabu@celllalign@def{\tabu@verticalmeasure}%
@@ -6149,8 +6151,8 @@ morekeywords=[7]{yellow},
%
% \begin{macro}{\tabu@startpboxquick}
%
-% With the \textt{quick} option, content of paragraph columns are not
-% built during trials in strategy number 2.
+% Contents of paragraph columns are not built during trials in
+% strategy number $4$.
%
% \begin{macrocode}
\def\tabu@startpboxquick {\bgroup
@@ -6162,7 +6164,7 @@ morekeywords=[7]{yellow},
\toks@{}\def\tabu@stack{b}\tabu@collectbody \tabu@endquick
}% \tabu@quick
\def\tabu@endquick {%
- \ifodd 1\ifx\tabu@end@envir\tabu@endtabu \else
+ \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
@@ -7592,6 +7594,10 @@ morekeywords=[7]{yellow},
\let\tabu@rowfontreset \@empty
\def\tabulineon {4pt}\let\tabulineoff \tabulineon
\tabu@everyrowtrue
+\ifdefined\pdfelapsedtime % <pdfTeX>
+ \def\tabu@pdftimer {\xdef\tabu@starttime{\the\pdfelapsedtime}}%
+\else \let\tabu@pdftimer \relax \let\tabu@message@etime \relax
+\fi
\tracingtabu=\z@
\newtabulinestyle {=\maxdimen}% creates the 'factory' settings \tabu@linestyle@
\tabulinestyle{}
@@ -7640,6 +7646,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/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.
+% \end{Version}
+%
% \begin{Version}{2011/02/17 v2.4}\HistLabel{2.4}
% \item Documentation revisited
% \end{Version}
diff --git a/Master/texmf-dist/source/latex/tabu/tabu.ins b/Master/texmf-dist/source/latex/tabu/tabu.ins
index 94e92b48bff..e35e1d1791a 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/17 v2.4 - tabu : Flexible LaTeX tabulars
+%% tabu : 2011/02/19 v2.5 - 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/17 v2.4 - tabu: Flexible LaTeX tabulars}
+\Msg{* Package: 2011/02/19 v2.5 - tabu: Flexible LaTeX tabulars}
\Msg{************************************************************************}
\keepsilent
@@ -77,7 +77,7 @@
This is a generated file.
Copyright (FC) 2010-2011 - lppl
-tabu : 2011/02/17 v2.4 - tabu : Flexible LaTeX tabulars
+tabu : 2011/02/19 v2.5 - 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 5c5dfc6320d..e870b769172 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/17 v2.4 - tabu : Flexible LaTeX tabulars
+%% tabu : 2011/02/19 v2.5 - 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/17 v2.4 - flexible LaTeX tabulars (FC)]
+\ProvidesPackage{tabu}[2011/02/19 v2.5 - flexible LaTeX tabulars (FC)]
\RequirePackage{array}[2008/09/09]
\RequirePackage{varwidth}[2009/03/30]
\AtEndOfPackage{\tabu@AtEnd \let\tabu@AtEnd \@undefined}
@@ -201,6 +201,7 @@
\def\tabu@savedecl{\ifcat$\d@llarend\else
\let\save@decl \tabu@save@decl \fi % no inversion of tokens in text mode
}% \tabu@savedecl
+\def\tabu@finalstrut #1{\unskip\ifhmode\nobreak\fi\vrule height\z@ depth\z@ width\z@}
\newcommand*\tabuDisableCommands {\g@addto@macro\tabu@trialh@@k }
\let\tabu@trialh@@k \@empty
\def\tabu@nowrite #1#{{\afterassignment}\toks@}
@@ -719,10 +720,6 @@
\box\z@}%
\fi\fi
}% \tabu@indent
-\ifdefined\pdfelapsedtime
- \def\tabu@pdftimer {\xdef\tabu@starttime{\the\pdfelapsedtime}}%
-\else \let\tabu@pdftimer \relax \let\tabu@message@etime \relax
-\fi
\def\tabu@setcleanup {% saves last global assignments
\ifodd 1\ifmmode \else \iftabu@long \else 0\fi\fi\relax
\def\tabu@aftergroupcleanup{%
@@ -1110,7 +1107,7 @@
\let\tabu@temp \NC@find
\ifx \@arrayright\relax \let\@arrayright \@empty \fi
\count@=%
- \ifx \@finalstrut\@gobble \z@ % outer in mode 0 print
+ \ifx \@finalstrut\tabu@finalstrut \z@ % outer in mode 0 print
\iftabu@measuring
\xdef\tabu@mkpreambuffer{\tabu@mkpreambuffer
\tabu@target \csname tabu@\the\tabu@nested.T\endcsname
@@ -1347,7 +1344,7 @@
\global\tabu@cnt \tabu@cnt
\tabu@evr{\tabu@verticaldynamicadjustment}%
\tabu@celllalign@def{\everypar{}}\let\tabu@cellralign \@empty
- \let\@finalstrut \@gobble
+ \let\@finalstrut \tabu@finalstrut
\else % vertical measure of nested tabu
\tabu@evr{\tabu@verticalinit}%
\tabu@celllalign@def{\tabu@verticalmeasure}%
@@ -2505,6 +2502,10 @@
\let\tabu@rowfontreset \@empty
\def\tabulineon {4pt}\let\tabulineoff \tabulineon
\tabu@everyrowtrue
+\ifdefined\pdfelapsedtime % <pdfTeX>
+ \def\tabu@pdftimer {\xdef\tabu@starttime{\the\pdfelapsedtime}}%
+\else \let\tabu@pdftimer \relax \let\tabu@message@etime \relax
+\fi
\tracingtabu=\z@
\newtabulinestyle {=\maxdimen}% creates the 'factory' settings \tabu@linestyle@
\tabulinestyle{}