summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Master/texmf-dist/doc/latex/tabu/tabu.pdfbin1572415 -> 1594602 bytes
-rw-r--r--Master/texmf-dist/source/latex/tabu/tabu.drv6
-rw-r--r--Master/texmf-dist/source/latex/tabu/tabu.dtx65
-rw-r--r--Master/texmf-dist/source/latex/tabu/tabu.ins8
-rw-r--r--Master/texmf-dist/tex/latex/tabu/tabu.sty18
5 files changed, 53 insertions, 44 deletions
diff --git a/Master/texmf-dist/doc/latex/tabu/tabu.pdf b/Master/texmf-dist/doc/latex/tabu/tabu.pdf
index ff38df7b257..ac7b1da14f6 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 6fe19b118d5..ffab7fadafe 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/07 v1.5 - tabu : Flexible LaTeX tabulars
+%% tabu : 2010/12/18 v1.7 - 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/07}
-\def\thisversion{1.5}
+\def\thisdate{2010/12/18}
+\def\thisversion{1.7}
\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 8bef61f5657..e11d3ce94b7 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/07 v1.5 - tabu: flexible LaTeX tabulars]
+% tabu : 2010/12/18 v1.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: 2010/12/07 v1.5 - tabu: Flexible LaTeX tabulars}
+\Msg{* Package: 2010/12/18 v1.7 - tabu: Flexible LaTeX tabulars}
\Msg{************************************************************************}
\keepsilent
@@ -47,7 +47,7 @@
This is a generated file.
-tabu : 2010/12/07 v1.5 - tabu : Flexible LaTeX tabulars
+tabu : 2010/12/18 v1.7 - tabu : Flexible LaTeX tabulars
This work may be distributed and/or modified under the
conditions of the LaTeX Project Public License, either
@@ -70,7 +70,7 @@ Copyright (C) 2010 by Florent Chervet <florent.chervet@free.fr>
\file{tabu.sty}{\from{tabu.dtx}{package}}%
}
-\askforoverwritetrue
+\askforoverwritefalse
\generate{%
\file{tabu.drv}{\from{tabu.dtx}{driver}}%
}
@@ -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/07}
-\def\thisversion{1.5}
+\def\thisdate{2010/12/18}
+\def\thisversion{1.7}
\def\CTANbaseurl{http://www.ctan.org/tex-archive/macros/latex}
\def\CTANdisplay{CTAN:macros/latex}
\makeatletter\protected\def\CTANhref{\@ifstar\CTANhrefstar\CTANhrefnost}\makeatother
@@ -155,7 +155,7 @@ Copyright (C) 2010 by Florent Chervet <florent.chervet@free.fr>
%</driver>
% \fi
%
-% \CheckSum{4463}
+% \CheckSum{4479}
%
% \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
@@ -522,7 +522,7 @@ Copyright (C) 2010 by Florent Chervet <florent.chervet@free.fr>
%
% \textbf\textbar\, \textt{X}\, \cs{usetabu}\, and\, \cs{preamble} are defined as new column types loaded
% only inside the \cs{@mkpream} group inside the \textt{tabu} environment.
-%
+%
%
% \clearpage
% \endgroup
@@ -601,7 +601,7 @@ Copyright (C) 2010 by Florent Chervet <florent.chervet@free.fr>
% and line specification for \hyperref[Vertical lines]{vertical rules}. \textt{longtabu} is thus much easier than
% \Xpackage{ltxtable}.
%
-% The following commmands provided for \textt{tabu} does not work with \textt{longtabu}:
+% The following commands provided for \textt{tabu} does not work with \textt{longtabu}:
%
% \let\theadfont\bfseries
% \begin{longtabu}{X[-1]*2{X[-1c]}X} \toprule
@@ -610,7 +610,7 @@ Copyright (C) 2010 by Florent Chervet <florent.chervet@free.fr>
% \csref{usetabu} &\CheckFAIL & &but \csref{savetabu} and \csref{preamble} work. \\
% \hyperref[sec.math mode]{mathematical mode} &\CheckFAIL & &\textt{longtable} is not designed to work in math mode. \\
% \xpackage{delarray} shortcuts &\CheckFAIL & &a delimiter cannot be spanned over pages... \\
-% \csref{tabuphantomline} &\CheckFAIL & &useless inside \textt{longtabu} \\
+% \csref{tabuphantomline} &\CheckFAIL & &useless inside \textt{longtabu}
% \\\bottomrule
% \end{longtabu}
%
@@ -962,7 +962,7 @@ Copyright (C) 2010 by Florent Chervet <florent.chervet@free.fr>
% \multicolumn3c{In each table, \cs{extrarowheight} is equal to \textt{8 pt}.} \\
% \end{tabu}}
%
-% \cs{tabuclines} tries to put the line in the middle, so that the text is centered in its cell.
+% \cs{tabuclines} tries to put the line in the middle, so that the text is centered in its cell.
% \cs{tabuclines}\stform* tries to take care of vertical lines.
% Well this is not perfect: it works pretty well with simple vertical lines, but not really with double
% lines, triple lines with colours etc... But it can help in simple cases...
@@ -1229,7 +1229,7 @@ Copyright (C) 2010 by Florent Chervet <florent.chervet@free.fr>
% {\centering
% \extrarowheight=8pt
% \AtBeginShipoutNext{\AtBeginShipoutUpperLeft{\tikz[remember picture,overlay]
-% \node at (tabularx overfull) [xshift=-3cm,yshift=-1cm,rotate=45,font=\ttfamily\smaller]
+% \node at (tabularx overfull) [xshift=-3cm,yshift=-1cm,rotate=45,font=\ttfamily\smaller]
% {\begin{tabu}{c}
% with overfull hboxes\\
% (15.8pt and 16.1pt two wide)\\
@@ -1292,7 +1292,7 @@ Copyright (C) 2010 by Florent Chervet <florent.chervet@free.fr>
% The \meta{user-name} must exist otherwise, you get an error.
%
% \cs{usetabu} does not work with \hyperref[sec.longtabu]{\textt{longtabu}}.
-%
+%
% \needspace{2\baselineskip}
%
% \cs{usetabu} locally restores:\nobreak
@@ -1358,7 +1358,7 @@ Copyright (C) 2010 by Florent Chervet <florent.chervet@free.fr>
% \item the \textt{tabu} / \textt{longtabu} target width, unless another target is specified.
% \end{itemize}
% Any other tabular parameters are not restored.
-%
+%
% Put \cs{preamble}\M{user-name} alone inside the \textt{tabu} (or \textt{longtabu}) preamble in place of the usual
% columns specifications.
%
@@ -1366,7 +1366,7 @@ Copyright (C) 2010 by Florent Chervet <florent.chervet@free.fr>
%
% \cs{preamble} works with \hyperref[sec.longtabu]{\textt{longtabu}}.
%
-%
+%
%
%
% \section(row font and alignment){Modifying the font and the alignment in one row: \cs{rowfont}}
@@ -1755,7 +1755,7 @@ Copyright (C) 2010 by Florent Chervet <florent.chervet@free.fr>
% \begin{macrocode}
%<*package>
\NeedsTeXFormat{LaTeX2e}[2005/12/01]
-\ProvidesPackage{tabu}[2010/12/07 v1.5 - flexible LaTeX tabulars (FC)]
+\ProvidesPackage{tabu}[2010/12/18 v1.7 - flexible LaTeX tabulars (FC)]
\RequirePackage{array}[2008/09/09]
\RequirePackage{varwidth}[2009/03/30]
\let\DEBUG\@gobble%\message
@@ -2085,7 +2085,11 @@ Copyright (C) 2010 by Florent Chervet <florent.chervet@free.fr>
\aftergroup \tabu@restore@NC@list
\NC@list{\NC@do\usetabu \NC@do\preamble \NC@do *}%
\tabu@lines % defines NC@rewrite@| for tabu only (inside @mkpream group)
- \NC@list\expandafter{\the\NC@list \NC@do X\NC@do\tabu@rewritelast}%
+ %\NC@list\expandafter{\the\NC@list \NC@do X\NC@do\tabu@rewritelast}%
+%% \message{NC@list est: \the\NC@list^^J}%
+ \NC@list\expandafter{\the\expandafter\NC@list \expandafter\NC@do \expandafter X%
+ \tabu@NC@list \NC@do\tabu@rewritelast}%
+%% \message{NC@list est: \the\NC@list^^J}%
\ifcat$\d@llarend\else
\let\save@decl \tabu@save@decl \fi % no inversion of tokens in text mode
\NC@find \tabu@rewritelast
@@ -2244,7 +2248,7 @@ Copyright (C) 2010 by Florent Chervet <florent.chervet@free.fr>
\let\@footnotetext \tabu@footnotetext \let\@xfootnotetext \tabu@xfootnotetext
\let\@xfootnote \tabu@xfootnote \let\centering \tabu@centering
\let\raggedright \tabu@raggedright \let\raggedleft \tabu@raggedleft
- \let\@trivlist \tabu@trivlist %<restore \\=\@centercr inside lists>
+ \tabu@trivlist %<restore \\=\@centercr inside lists>
\def\tabudecimal {\tabu@tabudecimal}\let\verbatim \tabu@sanitizetext
\let\fbox \tabu@fbox \let\rowfont \tabu@rowfont
\let\prepnext@tok \tabu@prepnext@tok %<for \rowfont and \tabucline>
@@ -3008,7 +3012,7 @@ Copyright (C) 2010 by Florent Chervet <florent.chervet@free.fr>
\tabu@X@cols \@ne \count@ \tabu@X@cols
\@whilesw \ifcsname tabu@X\the\tabu@X@cols\endcsname\fi{%
\ifdim \tabu@wd\tabu@X@cols>\p@
- \expandafter\let\expandafter\tabu@temp
+ \expandafter\let\expandafter\tabu@temp
\csname tabu@X\the\tabu@X@cols\endcsname
\ifdim \tabu@wd\tabu@X@cols <\tabu@temp\tabucolX
\advance\tabu@X@sum -\tabu@temp\p@
@@ -3035,7 +3039,7 @@ Copyright (C) 2010 by Florent Chervet <florent.chervet@free.fr>
\tabucolX \tabu@naturalX@min\relax
\tabu@message{\tabu@message@spread}%
\ifdim \dimexpr \wd\tabu@box + \tabu@spreadtarget <\tabu@target
- \advance\tabu@spreadtarget
+ \advance\tabu@spreadtarget
\dimexpr\wd\tabu@box-\tabu@naturalX+\tabucolX\relax
\ifdim \tabu@spreadtarget <\tabu@target
\tabu@target =\tabu@spreadtarget
@@ -3155,7 +3159,7 @@ Copyright (C) 2010 by Florent Chervet <florent.chervet@free.fr>
\def\tabu@measure@startpbox#1{\bgroup
\let\@startpbox \tabu@startpboxORI % in case of nesting
\in@{\tabu@dimexpr}{#1}%
- \ifin@
+ \ifin@
\global\advance\tabu@X@cols \@ne
\ifcsname tabu@X\the\tabu@X@cols\endcsname\else
\global\tabu@X@cols \@ne
@@ -3681,7 +3685,7 @@ Copyright (C) 2010 by Florent Chervet <florent.chervet@free.fr>
\noexpand\tabu@warn@usetabu
\noexpand\fi
\tabu@target \the\tabu@target\relax
- \tabucolX \the\tabucolX\relax
+ \tabucolX \the\tabucolX\relax
\the\toks1%
\gdef\noexpand\tabu@usetabu{%
\the\toks1%
@@ -4134,10 +4138,8 @@ Copyright (C) 2010 by Florent Chervet <florent.chervet@free.fr>
\raggedleft\arraybackslash}
\expandafter\def\expandafter\tabu@raggedright\expandafter{%
\raggedright\arraybackslash}
-\AtBeginDocument{%
-\expandafter\def\expandafter\tabu@trivlist\expandafter{%
- \expandafter\let\expandafter\\\expandafter\@centercr\@trivlist}%
-}%
+\def\tabu@trivlist{\expandafter\def\expandafter\@trivlist\expandafter{%
+ \expandafter\let\expandafter\\\expandafter\@centercr\@trivlist}}%
% \end{macrocode}
%
%
@@ -4278,14 +4280,19 @@ Copyright (C) 2010 by Florent Chervet <florent.chervet@free.fr>
%
% \end{thebibliography}
%
-%
-%
+%
+%
% \begin{History}
%
% \def\Version#1{\HistVersion{#1}\setitemize{name=#1,leftmargin=2em}\itemize}
%
% \sectionformat\subsection[hang]{font=\large\bfseries\macrocodecolor}
%
+% \begin{Version}{2010/12/18 v1.7}
+% \item Code optimisation
+% \item Modification in the columns rewritting process (bug with some new column types defined by the user).
+% \end{Version}
+%
% \begin{Version}{2010/12/07 v1.5}
% \item Implementation of negativ width coefficients for \textt X columns (cf. \refitem{tabu X columns,2}[\nameref*{tabu X columns} point \ref]).
% \item Columns natural widths computation (for \textt{tabu spread} with \textt X columns and negativ coefficients)
@@ -4336,7 +4343,7 @@ Copyright (C) 2010 by Florent Chervet <florent.chervet@free.fr>
% \end{Version}
%
% \end{History}
-%
+%
%
% \PrintIndex
%
diff --git a/Master/texmf-dist/source/latex/tabu/tabu.ins b/Master/texmf-dist/source/latex/tabu/tabu.ins
index ffce078a079..b83c61086ed 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/07 v1.5 - tabu : Flexible LaTeX tabulars
+%% tabu : 2010/12/18 v1.7 - 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/07 v1.5 - tabu: Flexible LaTeX tabulars}
+\Msg{* Package: 2010/12/18 v1.7 - tabu: Flexible LaTeX tabulars}
\Msg{************************************************************************}
\keepsilent
@@ -37,7 +37,7 @@
This is a generated file.
-tabu : 2010/12/07 v1.5 - tabu : Flexible LaTeX tabulars
+tabu : 2010/12/18 v1.7 - tabu : Flexible LaTeX tabulars
This work may be distributed and/or modified under the
conditions of the LaTeX Project Public License, either
@@ -60,7 +60,7 @@ Copyright (C) 2010 by Florent Chervet <florent.chervet@free.fr>
\file{tabu.sty}{\from{tabu.dtx}{package}}%
}
-\askforoverwritetrue
+\askforoverwritefalse
\generate{%
\file{tabu.drv}{\from{tabu.dtx}{driver}}%
}
diff --git a/Master/texmf-dist/tex/latex/tabu/tabu.sty b/Master/texmf-dist/tex/latex/tabu/tabu.sty
index 8d3aef8aa16..76b129c0a6d 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/07 v1.5 - tabu : Flexible LaTeX tabulars
+%% tabu : 2010/12/18 v1.7 - 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/07 v1.5 - flexible LaTeX tabulars (FC)]
+\ProvidesPackage{tabu}[2010/12/18 v1.7 - flexible LaTeX tabulars (FC)]
\RequirePackage{array}[2008/09/09]
\RequirePackage{varwidth}[2009/03/30]
\let\DEBUG\@gobble%\message
@@ -138,7 +138,11 @@
\aftergroup \tabu@restore@NC@list
\NC@list{\NC@do\usetabu \NC@do\preamble \NC@do *}%
\tabu@lines % defines NC@rewrite@| for tabu only (inside @mkpream group)
- \NC@list\expandafter{\the\NC@list \NC@do X\NC@do\tabu@rewritelast}%
+ %\NC@list\expandafter{\the\NC@list \NC@do X\NC@do\tabu@rewritelast}%
+%% \message{NC@list est: \the\NC@list^^J}%
+ \NC@list\expandafter{\the\expandafter\NC@list \expandafter\NC@do \expandafter X%
+ \tabu@NC@list \NC@do\tabu@rewritelast}%
+%% \message{NC@list est: \the\NC@list^^J}%
\ifcat$\d@llarend\else
\let\save@decl \tabu@save@decl \fi % no inversion of tokens in text mode
\NC@find \tabu@rewritelast
@@ -229,7 +233,7 @@
\let\@footnotetext \tabu@footnotetext \let\@xfootnotetext \tabu@xfootnotetext
\let\@xfootnote \tabu@xfootnote \let\centering \tabu@centering
\let\raggedright \tabu@raggedright \let\raggedleft \tabu@raggedleft
- \let\@trivlist \tabu@trivlist %<restore \\=\@centercr inside lists>
+ \tabu@trivlist %<restore \\=\@centercr inside lists>
\def\tabudecimal {\tabu@tabudecimal}\let\verbatim \tabu@sanitizetext
\let\fbox \tabu@fbox \let\rowfont \tabu@rowfont
\let\prepnext@tok \tabu@prepnext@tok %<for \rowfont and \tabucline>
@@ -1380,10 +1384,8 @@
\raggedleft\arraybackslash}
\expandafter\def\expandafter\tabu@raggedright\expandafter{%
\raggedright\arraybackslash}
-\AtBeginDocument{%
-\expandafter\def\expandafter\tabu@trivlist\expandafter{%
- \expandafter\let\expandafter\\\expandafter\@centercr\@trivlist}%
-}%
+\def\tabu@trivlist{\expandafter\def\expandafter\@trivlist\expandafter{%
+ \expandafter\let\expandafter\\\expandafter\@centercr\@trivlist}}%
\def\tabu@fix@arrayright{%
\@ifpackageloaded{arydshln}
{%
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-26 00:33:00 +0000