summaryrefslogtreecommitdiff
path: root/Master
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2011-02-13 23:31:01 +0000
committerKarl Berry <karl@freefriends.org>2011-02-13 23:31:01 +0000
commit87c9798fd0683af80bab34cff8a68fc61579c159 (patch)
tree5edc02336ffa1b1969bd73f4c5bdb5882e8ee69a /Master
parent4d6ffda67a7c20ceb75a0a407c48814b4335a950 (diff)
tabu 2.3 (13feb11)
git-svn-id: svn://tug.org/texlive/trunk@21389 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
-rw-r--r--Master/texmf-dist/doc/latex/tabu/tabu.pdfbin1777486 -> 2554632 bytes
-rw-r--r--Master/texmf-dist/source/latex/tabu/tabu.drv145
-rw-r--r--Master/texmf-dist/source/latex/tabu/tabu.dtx8302
-rw-r--r--Master/texmf-dist/source/latex/tabu/tabu.ins101
-rw-r--r--Master/texmf-dist/tex/latex/tabu/tabu.sty3722
5 files changed, 7906 insertions, 4364 deletions
diff --git a/Master/texmf-dist/doc/latex/tabu/tabu.pdf b/Master/texmf-dist/doc/latex/tabu/tabu.pdf
index 95b5c8f289e..d33720b9432 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 40ae06907fe..cbf17ca60ea 100644
--- a/Master/texmf-dist/source/latex/tabu/tabu.drv
+++ b/Master/texmf-dist/source/latex/tabu/tabu.drv
@@ -7,23 +7,47 @@
%% tabu.dtx (with options: `driver')
%%
%% This is a generated file.
+%% Copyright (FC) 2010-2011 - lppl
%%
-%% tabu : 2011/01/19 v2.1 - tabu : Flexible LaTeX tabulars
+%% tabu : 2011/02/13 v2.3 - tabu : Flexible LaTeX tabulars
%%
-%% *******************************************************
-%% \begin{tabu} to <dimen>{ preamble }
-%% \begin{tabu} spread <dimen>{ preamble }
+%% **********************************************************************************************
+%% \begin{tabu} { preamble } => default target: \linewidth or \linegoal
+%% \begin{tabu} to <dimen>{ preamble } => target specified
+%% \begin{tabu} spread <dimen>{ preamble } => target relative to the ``natural width''
%%
-%% Default target: \linewidth or \linegoal:
+%% tabu works in text and in math modes.
%%
-%% \tabulinesep=2pt
+%% X columns: automatic width ajustment + horizontal and vertical alignment
+%% \begin{tabu} { X[4c] X[1c] X[-2ml] }
%%
-%% \begin{tabu} { |[3pt red] X[4c] X[1c] X[-2ml] |[3pt blue] }
-%% \tabucline[3pt on 2pt, cyan]-
-%% one & two & three
-%% \\ \tabucline[3pt yellow]-
-%% \end{tabu}
-%% *******************************************************
+%% Horizontal lines and / or leaders:
+%% \hline\hline => double horizontal line
+%% \firsthline\hline => for nested tabulars
+%% \lasthline\hline => for nested tabulars
+%% \tabucline[line spec]{column-column} => ``funny'' lines (dash/leader)
+%% Automatic lines / leaders :
+%% \everyrow{\hline\hline}
+%%
+%% Vertical lines and / or leaders:
+%% \begin{tabu} { |[3pt red] X[4c] X[1c] X[-2ml] |[3pt blue] }
+%% \begin{tabu} { |[3pt red] X[4c] X[1c] X[-2ml] |[3pt on 2pt off 4pt blue] }
+%%
+%% Fixed vertical spacing adjustment:
+%% \extrarowheight=<dimen> \extrarowdepth=<dimen>
+%% or: \extrarowsep=<dimen> => may be prefixed by \global
+%%
+%% Dynamic vertical spacing adjustment:
+%% \abovetabulinesep=<dimen> \belowtabulinesep=<dimen>
+%% or: \tabulinesep=<dimen> => may be prefixed by \global
+%%
+%% delarray.sty shortcuts: in math and text modes
+%% \begin{tabu} .... \({ preamble }\)
+%%
+%% Algorithms reports:
+%% \tracingtabu=1 \tracingtabu=2
+%%
+%% **********************************************************************************************
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either
@@ -38,10 +62,11 @@
%% tabu : Flexible LaTeX tabulars
%% 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/01/19}
-\def\thisversion{2.1}
+\def\thisdate{2011/02/13}
+\def\thisversion{2.3}
\def\CTANbaseurl{http://www.ctan.org/tex-archive/macros/latex}
\def\CTANdisplay{CTAN:macros/latex}
\makeatletter\protected\def\CTANhref{\@ifstar\CTANhrefstar\CTANhrefnost}\makeatother
@@ -49,51 +74,97 @@
\newcommand*\CTANhrefnost[2][/contrib/]{\href{\CTANbaseurl#1#2}{\nolinkurl{\CTANdisplay#1#2}}}
\let\loadclass\LoadClass
\def\LoadClass#1{\loadclass[abstracton]{scrartcl}\let\scrmaketitle\maketitle\AtEndOfClass{\let\maketitle\scrmaketitle}}
-\PassOptionsToPackage{svgnames}{xcolor}
+{\makeatletter{\endlinechar`\^^J\obeyspaces
+ \gdef\ErrorUpdate#1=#2,{\@ifpackagelater{#1}{#2}{}{\let\CheckDate\errmessage\toks@\expandafter{\the\toks@
+ \thisfile-documentation: updates required !
+ 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}}
+\PassOptionsToPackage{svgnames,table}{xcolor}
\PassOptionsToPackage{hyperfootnotes}{hyperref}
\documentclass[a4paper,oneside]{ltxdoc}
-\AtBeginDocument{
- \DeleteShortVerb{\|}
- \csname @ifpackagelater\endcsname{interfaces}{2011/01/19}{}
- {\PackageError{tabu-pdf-documentation}
- {interfaces must be later\MessageBreak
- than 2011/01/19 to compile this\MessageBreak
- documentation. Please update your packages}\@ehd}}
+\AtBeginDocument{\tracingnesting=1 \DeleteShortVerb{\|}\catcode164=14}
\usepackage[latin1]{inputenc}
\usepackage[T1]{fontenc}
-\usepackage{etoolbox,geometry,graphicx,xcolor,lastpage,lmodern,bbding,hologo,relsize,moresize,manfnt,pifont,xspace,numprint,amsmath}
-\usepackage[official]{eurosym}
-\usepackage[expansion=all,stretch=20,shrink=60]{microtype}
-\usepackage{tocloft,titlesec,hypbmsec,fancyhdr,enumitem,multirow,makecell,booktabs,delarray,ragged2e,colortbl,marginnote,shapepar,needspace}
-\heavyrulewidth=.7pt
-\usepackage{holtxdoc,bookmark}
-\usepackage{longtable}
-\usepackage{tabularx}\tracingtabularx
-\usepackage{enumitem-zref}
-\usepackage[verbose]{linegoal}[2010/12/07]
-\usepackage{interfaces}[2011/01/19]
-\usetikz{basic,chains,positioning}
+\usepackage{ltxnew,etoolbox,geometry,graphicx,xcolor,needspace,ragged2e} % general tools
+\usepackage{lmodern,bbding,hologo,relsize,moresize,manfnt,pifont,upgreek} % fonts
+\usepackage[official]{eurosym} % font
+\ifx y\microtypeYN %
+ \usepackage[expansion=all,stretch=20,shrink=60]{microtype}\fi % font (microtype)
+\usepackage{xspace,tocloft,titlesec,fancyhdr,lastpage,enumitem,marginnote} % paragraphs & pages management
+\usepackage{holtxdoc,bookmark,hypbmsec,enumitem-zref} % hyper-links (before tabularx...)
+\usepackage{array,delarray,longtable,colortbl,multirow,makecell,booktabs} % tabulars
+\usepackage{tabularx}\tracingtabularx % tabularx
+\usepackage{amsmath,amsopn} % mathematics \DeclareMathOperator in amsopn
+\usepackage[a]{esvect} % mathematics : for nice vectors arrows
+\usepackage{numprint,xfrac,siunitx} % numbers / units / fractions
+\usepackage{embedfile} % .dtx enclosed in .pdf
+\usepackage{fancyvrb}\fvset{gobble=0,listparameters={\topsep=0pt}} % verbatim
+\usepackage{interfaces} % interfaces (à tester aussi avant \documentclass)
+\usetikz{basic,chains,positioning} % pgf / TikZ
\usepackage{embedfile}
-\RequirePackage{amsopn,amsmath}% \DeclareMathOperator
+\RequirePackage{amsopn,amsmath}%
\RequirePackage[a]{esvect}% for vectors
\DeclareMathOperator*\Div{div}
\DeclareMathOperator*\Rot{\vv{\text{rot}}}
+\DeclareMathOperator*\Min{Min}
+\DeclareMathOperator*\Max{Max}
\newrobustcmd*\dpartial[2]{\displaystyle\genfrac{}{}{}{}{\partial\mkern.2\thinmuskip#1}{\partial\mkern.2\thinmuskip#2}}
\newrobustcmd*\dtotal[2]{\displaystyle\genfrac{}{}{}{}{\text d\mkern.2\thinmuskip#1}{\text d\mkern.2\thinmuskip#2}}
+\newrobustcmd*\abs[1]{\left\lvert#1\right\rvert}
\usepackage{expl3,l3keys2e,siunitx}
\usepackage{xfrac}
+\usepackage{listings}
+\lstset{
+ gobble=1,
+ language=[LaTeX]TeX,
+ basicstyle=\ttfamily,
+ breaklines=true,
+ upquote=true,
+ backgroundcolor=\color[gray]{0.90},
+ keywordstyle=\color{blue}\bfseries,
+ keywordstyle=[2]{\color{ForestGreen}},
+ commentstyle=\ttfamily\color{violet},
+ keywordstyle=[3]{\color{black}\bfseries},
+ keywordstyle=[4]{\color{red}\bfseries},
+ keywordstyle=[5]{\color{blue}\bfseries},
+ keywordstyle=[6]{\color{green}\bfseries},
+ keywordstyle=[7]{\color{yellow}\bfseries},
+ %extendedchars={true},
+ alsoletter={&},
+morekeywords=[1]{
+ \lstdefinestyle,
+ \lstinputlisting,\lstset,
+ \color,
+ \geometry,\lasthline,\firsthline,
+ \cmidrule,\toprule,\bottomrule,
+ \everyrow,\tabulinestyle,\tabureset,\savetabu,\usetabu,\preamble,
+ \taburulecolor,\taburowcolors},
+morekeywords=[2]{
+ tabular,
+ caption,
+ table,
+ tabu},
+morekeywords=[3]{
+ &},
+morekeywords=[4]{red},
+morekeywords=[5]{blue},
+morekeywords=[6]{green},
+morekeywords=[7]{yellow},
+}
\csname endofdump\endcsname
\CodelineNumbered
\usepackage{fancyvrb}\fvset{gobble=1,listparameters={\topsep=0pt}}
\usepackage[linegoal]{tabu}\tracingtabu=2
-\tabulinestyle{dash=\hbox{$\mkern2mu\scriptscriptstyle\cdotp\mkern2mu$}}
+\newtabulinestyle{dash=on1pt off1pt}
\lastlinefit999
\geometry{top=0pt,includeheadfoot,headheight=.6cm,headsep=.6cm,bottom=.6cm,footskip=.5cm,left=4cm,right=1.5cm}
\hypersetup{%
pdftitle={tabu},
pdfsubject={a simple line parser for TeX},
pdfauthor={Florent CHERVET},
- colorlinks,linkcolor=reflink,urlcolor=CornflowerBlue,
+ colorlinks,linkcolor=reflink,urlcolor=refurl,
pdfstartview=FitH,pdfpagemode=UseOutlines,
pdfkeywords={tex, e-tex, latex, package, tabular, array, halign, tabularx, longtable, color, colortbl, alignment},
}
diff --git a/Master/texmf-dist/source/latex/tabu/tabu.dtx b/Master/texmf-dist/source/latex/tabu/tabu.dtx
index 511851da3dc..d9356c23a54 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/01/19 v2.1 - tabu: flexible LaTeX tabulars]
+% tabu : 2011/02/13 v2.3 - 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/01/26 v2.1 - tabu: Flexible LaTeX tabulars}
+\Msg{* Package: 2011/02/13 v2.3 - tabu: Flexible LaTeX tabulars}
\Msg{************************************************************************}
\keepsilent
@@ -46,24 +46,47 @@
\preamble
This is a generated file.
+Copyright (FC) 2010-2011 - lppl
-tabu : 2011/01/19 v2.1 - tabu : Flexible LaTeX tabulars
+tabu : 2011/02/13 v2.3 - tabu : Flexible LaTeX tabulars
-*******************************************************
-\string\begin{tabu} to <dimen>{ preamble }
-\string\begin{tabu} spread <dimen>{ preamble }
+**********************************************************************************************
+\string\begin{tabu} { preamble } => default target: \string\linewidth or \string\linegoal
+\string\begin{tabu} to <dimen>{ preamble } => target specified
+\string\begin{tabu} spread <dimen>{ preamble } => target relative to the ``natural width''
+ tabu works in text and in math modes.
-Default target: \string\linewidth or \string\linegoal:
+ X columns: automatic width ajustment + horizontal and vertical alignment
+ \string\begin{tabu} { X[4c] X[1c] X[-2ml] }
-\string\tabulinesep=2pt
+ Horizontal lines and / or leaders:
+ \string\hline\string\hline => double horizontal line
+ \string\firsthline\string\hline => for nested tabulars
+ \string\lasthline\string\hline => for nested tabulars
+ \string\tabucline[line spec]{column-column} => ``funny'' lines (dash/leader)
+ Automatic lines / leaders :
+ \string\everyrow{\string\hline\string\hline}
-\string\begin{tabu} { |[3pt red] X[4c] X[1c] X[-2ml] |[3pt blue] }
- \string\tabucline[3pt on 2pt, cyan]-
- one & two & three
- \string\\ \string\tabucline[3pt yellow]-
-\string\end{tabu}
-*******************************************************
+ Vertical lines and / or leaders:
+ \string\begin{tabu} { |[3pt red] X[4c] X[1c] X[-2ml] |[3pt blue] }
+ \string\begin{tabu} { |[3pt red] X[4c] X[1c] X[-2ml] |[3pt on 2pt off 4pt blue] }
+
+ Fixed vertical spacing adjustment:
+ \string\extrarowheight=<dimen> \string\extrarowdepth=<dimen>
+ or: \string\extrarowsep=<dimen> => may be prefixed by \string\global
+
+ Dynamic vertical spacing adjustment:
+ \string\abovetabulinesep=<dimen> \string\belowtabulinesep=<dimen>
+ or: \string\tabulinesep=<dimen> => may be prefixed by \string\global
+
+ delarray.sty shortcuts: in math and text modes
+ \string\begin{tabu} .... \string\({ preamble }\string\)
+
+ Algorithms reports:
+ \string\tracingtabu=1 \string\tracingtabu=2
+
+**********************************************************************************************
This work may be distributed and/or modified under the
conditions of the LaTeX Project Public License, either
@@ -81,10 +104,13 @@ lppl copyright 2010-2011 by FC <florent.chervet@free.fr>
\endpreamble
\let\MetaPrefix \DoubleperCent
+{
+\catcode164=9
\generate{%
\file{tabu.ins}{\from{tabu.dtx}{install}}%
\file{tabu.sty}{\from{tabu.dtx}{package}}%
}
+}
\askforoverwritefalse
\generate{%
@@ -112,10 +138,11 @@ lppl copyright 2010-2011 by FC <florent.chervet@free.fr>
\fi
%</ignore>
%<*driver>
+\let\microtypeYN=y
\edef\thisfile{\jobname}
\def\thisinfo{Flexible \LaTeX{} tabulars (\FC)}
-\def\thisdate{2011/01/19}
-\def\thisversion{2.1}
+\def\thisdate{2011/02/13}
+\def\thisversion{2.3}
\def\CTANbaseurl{http://www.ctan.org/tex-archive/macros/latex}
\def\CTANdisplay{CTAN:macros/latex}
\makeatletter\protected\def\CTANhref{\@ifstar\CTANhrefstar\CTANhrefnost}\makeatother
@@ -123,51 +150,98 @@ lppl copyright 2010-2011 by FC <florent.chervet@free.fr>
\newcommand*\CTANhrefnost[2][/contrib/]{\href{\CTANbaseurl#1#2}{\nolinkurl{\CTANdisplay#1#2}}}
\let\loadclass\LoadClass
\def\LoadClass#1{\loadclass[abstracton]{scrartcl}\let\scrmaketitle\maketitle\AtEndOfClass{\let\maketitle\scrmaketitle}}
-\PassOptionsToPackage{svgnames}{xcolor}
+{\makeatletter{\endlinechar`\^^J\obeyspaces
+ \gdef\ErrorUpdate#1=#2,{\@ifpackagelater{#1}{#2}{}{\let\CheckDate\errmessage\toks@\expandafter{\the\toks@
+ \thisfile-documentation: updates required !
+ 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}}
+\PassOptionsToPackage{svgnames,table}{xcolor}
\PassOptionsToPackage{hyperfootnotes}{hyperref}
\documentclass[a4paper,oneside]{ltxdoc}
-\AtBeginDocument{
- \DeleteShortVerb{\|}
- \csname @ifpackagelater\endcsname{interfaces}{2011/01/19}{}
- {\PackageError{tabu-pdf-documentation}
- {interfaces must be later\MessageBreak
- than 2011/01/19 to compile this\MessageBreak
- documentation. Please update your packages}\@ehd}}
+\AtBeginDocument{\tracingnesting=1 \DeleteShortVerb{\|}\catcode164=14}
\usepackage[latin1]{inputenc}
\usepackage[T1]{fontenc}
-\usepackage{etoolbox,geometry,graphicx,xcolor,lastpage,lmodern,bbding,hologo,relsize,moresize,manfnt,pifont,xspace,numprint,amsmath}
-\usepackage[official]{eurosym}
-\usepackage[expansion=all,stretch=20,shrink=60]{microtype}
-\usepackage{tocloft,titlesec,hypbmsec,fancyhdr,enumitem,multirow,makecell,booktabs,delarray,ragged2e,colortbl,marginnote,shapepar,needspace}
-\heavyrulewidth=.7pt
-\usepackage{holtxdoc,bookmark}
-\usepackage{longtable}
-\usepackage{tabularx}\tracingtabularx
-\usepackage{enumitem-zref}
-\usepackage[verbose]{linegoal}[2010/12/07]
-\usepackage{interfaces}[2011/01/19]
-\usetikz{basic,chains,positioning}
+\usepackage{ltxnew,etoolbox,geometry,graphicx,xcolor,needspace,ragged2e} % general tools
+\usepackage{lmodern,bbding,hologo,relsize,moresize,manfnt,pifont,upgreek} % fonts
+\usepackage[official]{eurosym} % font
+\ifx y\microtypeYN %
+ \usepackage[expansion=all,stretch=20,shrink=60]{microtype}\fi % font (microtype)
+\usepackage{xspace,tocloft,titlesec,fancyhdr,lastpage,enumitem,marginnote} % paragraphs & pages management
+\usepackage{holtxdoc,bookmark,hypbmsec,enumitem-zref} % hyper-links (before tabularx...)
+\usepackage{array,delarray,longtable,colortbl,multirow,makecell,booktabs} % tabulars
+\usepackage{tabularx}\tracingtabularx % tabularx
+\usepackage{amsmath,amsopn} % mathematics \DeclareMathOperator in amsopn
+\usepackage[a]{esvect} % mathematics : for nice vectors arrows
+\usepackage{numprint,xfrac,siunitx} % numbers / units / fractions
+\usepackage{embedfile} % .dtx enclosed in .pdf
+\usepackage{fancyvrb}\fvset{gobble=0,listparameters={\topsep=0pt}} % verbatim
+\usepackage{interfaces} % interfaces (à tester aussi avant \documentclass)
+\usetikz{basic,chains,positioning} % pgf / TikZ
\usepackage{embedfile}
-\RequirePackage{amsopn,amsmath}% \DeclareMathOperator
+\RequirePackage{amsopn,amsmath}%
\RequirePackage[a]{esvect}% for vectors
\DeclareMathOperator*\Div{div}
\DeclareMathOperator*\Rot{\vv{\text{rot}}}
+\DeclareMathOperator*\Min{Min}
+\DeclareMathOperator*\Max{Max}
\newrobustcmd*\dpartial[2]{\displaystyle\genfrac{}{}{}{}{\partial\mkern.2\thinmuskip#1}{\partial\mkern.2\thinmuskip#2}}
\newrobustcmd*\dtotal[2]{\displaystyle\genfrac{}{}{}{}{\text d\mkern.2\thinmuskip#1}{\text d\mkern.2\thinmuskip#2}}
+\newrobustcmd*\abs[1]{\left\lvert#1\right\rvert}
\usepackage{expl3,l3keys2e,siunitx}
\usepackage{xfrac}
+\usepackage{listings}
+\lstset{
+ gobble=1,
+ language=[LaTeX]TeX,
+ basicstyle=\ttfamily,
+ breaklines=true,
+ upquote=true,
+% prebreak={\%\,\ding{229}},
+ backgroundcolor=\color[gray]{0.90},
+ keywordstyle=\color{blue}\bfseries,
+ keywordstyle=[2]{\color{ForestGreen}},
+ commentstyle=\ttfamily\color{violet},
+ keywordstyle=[3]{\color{black}\bfseries},
+ keywordstyle=[4]{\color{red}\bfseries},
+ keywordstyle=[5]{\color{blue}\bfseries},
+ keywordstyle=[6]{\color{green}\bfseries},
+ keywordstyle=[7]{\color{yellow}\bfseries},
+ %extendedchars={true},
+ alsoletter={&},
+morekeywords=[1]{
+ \lstdefinestyle,
+ \lstinputlisting,\lstset,
+ \color,
+ \geometry,\lasthline,\firsthline,
+ \cmidrule,\toprule,\bottomrule,
+ \everyrow,\tabulinestyle,\tabureset,\savetabu,\usetabu,\preamble,
+ \taburulecolor,\taburowcolors},
+morekeywords=[2]{
+ tabular,
+ caption,
+ table,
+ tabu},
+morekeywords=[3]{
+ &},
+morekeywords=[4]{red},
+morekeywords=[5]{blue},
+morekeywords=[6]{green},
+morekeywords=[7]{yellow},
+}
\csname endofdump\endcsname
\CodelineNumbered
\usepackage{fancyvrb}\fvset{gobble=1,listparameters={\topsep=0pt}}
\usepackage[linegoal]{tabu}\tracingtabu=2
-\tabulinestyle{dash=\hbox{$\mkern2mu\scriptscriptstyle\cdotp\mkern2mu$}}
+\newtabulinestyle{dash=on1pt off1pt}
\lastlinefit999
\geometry{top=0pt,includeheadfoot,headheight=.6cm,headsep=.6cm,bottom=.6cm,footskip=.5cm,left=4cm,right=1.5cm}
\hypersetup{%
pdftitle={tabu},
pdfsubject={a simple line parser for TeX},
pdfauthor={Florent CHERVET},
- colorlinks,linkcolor=reflink,urlcolor=CornflowerBlue,
+ colorlinks,linkcolor=reflink,urlcolor=refurl,
pdfstartview=FitH,pdfpagemode=UseOutlines,
pdfkeywords={tex, e-tex, latex, package, tabular, array, halign, tabularx, longtable, color, colortbl, alignment},
}
@@ -178,7 +252,7 @@ lppl copyright 2010-2011 by FC <florent.chervet@free.fr>
%</driver>
% \fi
%
-% \CheckSum{5239}
+% \CheckSum{7717}
%
% \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
@@ -208,7 +282,7 @@ lppl copyright 2010-2011 by FC <florent.chervet@free.fr>
% \DoNotIndex{\@fileswfalse,\@gobble,\@ifstar,\@unexpandable@protect}
% \DoNotIndex{\AtBeginDocument,\AtEndDocument,\begingroup,\endgroup}
% \DoNotIndex{\frenchspacing,\MessageBreak,\newif,\PackageWarningNoLine,\@addtopreamble,\@depth,\@height,\@width,\@firstofone,\@frameb@x,\@lastchclass,\@M,\m,\@nextchar,\@startpbox}
-% \DoNotIndex{\protect,\string,\xdef,\ifx,\texttt,\@biblabel,\bibitem,\@tempa,\{,\},\^,\ ,\DeclareOption,\CT@end,\CT@arc@,\count@,\col@sep,\endgraf,\dimexpr,\fbox,\fboxsep,\g@addto@macro}
+% \DoNotIndex{\protect,\string,\xdef,\ifx,\texttt,\@biblabel,\bibitem,\@tempa,\{,\},\^,\ ,\DeclareOption,\CT@end,\CT@arc@,\CT@drsc@,\count@,\col@sep,\endgraf,\dimexpr,\fbox,\fboxsep,\g@addto@macro}
% \DoNotIndex{\z@,\wd,\vrule,\voidb@x,\verb,\bibitem,\NC@rewrite@,\NC@list,\NC@do,\NC@,\nobreak,\number,\showbox,\tabu@AtEnd,\tabu@getnbc@ls,\tabu@s@nitizetext}
% \DoNotIndex{\FrameCommand,\MakeFramed,\FrameRestore,\hskip,\hfil,\hfill,\hsize,\hspace,\hss,\hbox,\hb@xt@,\endMakeFramed,\escapechar,\tabu@s@veX,\tabu@sett@rget,\tabu@stack}
% \DoNotIndex{\do,\date,\if@tempswa,\@tempdima,\@tempboxa,\@tempswatrue,\@tempswafalse,\ifdefined,\ifhmode,\ifmmode,\cr}
@@ -221,9 +295,14 @@ lppl copyright 2010-2011 by FC <florent.chervet@free.fr>
% \makeatletter
% \newrobustcmd\ClearPage{\@ifstar\clearpage{}}
% \providecommand\lsstyle{}
-% \makeatletter
+% \newrobustcmd*\TabU[1][\pkgcolor]{\quitvmode\hbox{{#1{\larger[3]\usefont{U}{eur}mn\char"1C}$_\aleph \mkern.1666mu b\,$\rotatebox[origin=c]{-90}{\sf\smaller U}}}\xspaceverb}
+% \newrobustcmd*\TABU[1][\pkgcolor]{\quitvmode\hbox{{#1{\larger[8]\usefont{U}{eur}mn\char"1C}$_\aleph \mkern.1666mu b\,$\rotatebox[origin=c]{-90}{\sf\smaller U}}}\xspaceverb}
+% \colorlet{reflink}{CornflowerBlue!40!Indigo}
+% \colorlet{pkgcolor}{reflink}
+% \colorlet{refurl}{CornflowerBlue}
+% \def\pkgcolor{\texorpdfstring{\color{pkgcolor}}{}}
% \catcode`\§ \active \def§{\@ifnextchar §{\par\nobreak\vskip-2\parskip}{\par\nobreak\vskip-\parskip}}
-% \def\thispackage{\xpackage{{\pkgcolor\thisfile}}\Xspace}
+% \def\thispackage{\xpackage{{\TabU}}\Xspace}
% \def\Xpackage#1{\href{http://www.ctan.org/tex-archive/help/Catalogue/entries/#1.html}{\xpackage{#1}}}
% \def\Underbrace#1_#2{$\underbrace{\vtop to2ex{}\hbox{#1}}_{\footnotesize\hbox{#2}}$}
%\def\FV@DefineCommandChars #1#2#3{%
@@ -236,15 +315,15 @@ lppl copyright 2010-2011 by FC <florent.chervet@free.fr>
%}
% \parindent\z@\parskip.4\baselineskip\topsep\parskip\partopsep\z@\leftmargini=2.5cm
% \widowpenalty=5000\clubpenalty=8000
-% \newrobustcmd*\macrocodecolor{\color{macrocode}}\definecolor{macrocode}{rgb}{0.05,0.02,0.07}
-% \def\macro@font{\changefont{fam=lmtt,size-=1pt,color=macrocode,spread=1}\let\AltMacroFont\macro@font}
-% \def\MacroFont{\changefont{fam=lmtt,color=macrocode}}
+% \newrobustcmd*\macrocodecolor{\color{macrocode}}\definecolor{macrocode}{rgb}{0.07,0.03,0.10}
+% \def\macro@font{\def\Cr@scale{.87}\changefont{fam=pcrs,siz=10pt,ser=m,color=macrocode,spread=1}\let\AltMacroFont\macro@font}
+% \def\MacroFont{\changefont{fam=pcrs,siz=10pt,ser=b,color=macrocode}}
% \def\texorpdf#1#2{\texorpdfstring{#1{#2}}{#2}}
% \let\ltxthinspace\, \def\,{\texorpdfstring\ltxthinspace{}}
% \def\textitbf#1{\textbf{\itshape#1}}\let\textbfit\textitbf
% \DefineVerbatimEnvironment{VerbLines}{Verbatim}{frame=lines,framesep=6pt,fontfamily=\ttdefault,fontseries=m}
% \DefineVerbatimEnvironment{VerbLines*}{Verbatim}{frame=lines,framesep=6pt,fontfamily=\ttdefault,fontseries=m,commandchars=$()}
-% \DefineVerbatimEnvironment{Verb}{Verbatim}{fontfamily=\ttdefault,fontseries=m}
+% \DefineVerbatimEnvironment{Verbat}{Verbatim}{fontfamily=\ttdefault,fontseries=m}
% \DefineVerbatimEnvironment{Verb*}{Verbatim}{fontfamily=\ttdefault,fontseries=m,commandchars=$()}
% \renewrobustcmd*\mathversion[1]{^^A
% \expandafter\ifx\csname mv@#1\endcsname\relax
@@ -266,12 +345,22 @@ lppl copyright 2010-2011 by FC <florent.chervet@free.fr>
% \def\smex{\leavevmode\hb@xt@2em{\hfil$\longrightarrow$\hfil}}
% \def\ttdefault{lmvtt}
% \renewrobustcmd\#[1]{{\usefont{T1}{pcr}{bx}{n}\char`\##1}}
-% \renewrobustcmd*\cs[2][]{\mbox{\ttfamily#1\expandafter\@gobble\string\\#2}}
-% \newrobustcmd*\csbf[2][]{\textbf{\cs[{#1}]{#2}}}
-% \newrobustcmd\textttbf[1]{\textbf{\texttt{#1}}}
+% \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*\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}}
+% \newcommand\env{\texorpdfstring \env@ \env@pdf}
+% \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}
+% \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}}
-% \colorlet{pkgcolor}{teal} \def\pkgcolor{\texorpdfstring{\color{pkgcolor}}{}}
% \definecolor{copper}{rgb}{0.67,0.33,0.00} \newcommand\copper{\color{copper}}
% \definecolor{dg}{rgb}{0.02,0.29,0.00} \newcommand\dg{\color{dg}}
% \definecolor{db}{rgb}{0,0,0.502} \newcommand\db{\color{db}}
@@ -281,50 +370,53 @@ lppl copyright 2010-2011 by FC <florent.chervet@free.fr>
% \newrobustcmd\bk{\color{black}}\newcommand\md{\mdseries}
% \newrobustcmd\ie{\emph{ie.}}
% \newcommand\textt[1]{\texorpdf\texttt{#1}}
-% \newrobustcmd\texttbf[2][]{\texttt{\bfseries#1#2}}
+% \newcommand\texttbf[1]{\texorpdf\textbf{\textt{#1}}}
% \newcommand\cellstrut{}\let\cellstrut\bottopstrut
% \newrobustcmd\etc{{\bk\emph{etc.}}}
% \def\M{\@ifstar{\M@i\@firstofone}{\M@i\meta}}
-% \def\M@i#1{\@ifnextchar[^^A]
-% {\M@square#1}
-% {\@ifnextchar(^^A)
-% {\M@paren#1}
-% {\M@brace#1}}^^A
-% }
-% \def\M@square#1[#2]{\M@Bracket[{#1{#2}}]}
-% \def\M@paren#1(#2){\M@Bracket({#1{#2}})}
-% \def\M@brace#1#2{\M@Bracket\{{#1{#2}}\}}
+% \def\M@i#1{\@ifnextchar[\M@square
+% {\ifx (\@let@token^^A)
+% \expandafter\M@paren
+% \else\ifx |\@let@token
+% \expandafter\expandafter\expandafter\M@bar
+% \else \expandafter\expandafter\expandafter\M@brace
+% \fi\fi#1}}
+% \def\M@square #1[#2]{\M@Bracket[{#1{#2}}]}
+% \def\M@paren #1(#2){\M@Bracket({#1{#2}})}
+% \def\M@bar #1|#2|{\M@Bracket\textbar{#1{#2}}\textbar}
+% \def\M@brace #1#2{\M@Bracket\{{#1{#2}}\}}
% \def\M@Bracket#1#2#3{{\ttfamily#1#2#3}}
% \newrobustcmd*\thisyear{\begingroup
% \def\thisyear##1/##2\@nil{\endgroup
% \oldstylenums{\ifnum##1=2010\else 2010\,\textendash\,\fi ##1}^^A
% }\expandafter\thisyear\thisdate\@nil
% }
+%
+% \newrobustcmd*\csanchor[2][]{^^A
+% \immediate\write\@mainaux{\csgdef{tabu@declcs.\string\detokenize{#2}}{}}^^A
+% \raisedhyperdef[14pt]{declcs}{#2}{\cs[{#1}]{#2}}^^A
+% }
% \renewrobustcmd\declcs[2][]{^^A
% \if@nobreak \par\nobreak
% \else \par\addvspace\parskip
% \Needspace{.08\textheight}\fi
-% \noindent\changefont{size+=2.5pt,spread=1,fam=\ttdefault}^^A
-% \newcommand*\csanchor[2][]{\raisedhyperdef[14pt]{declcs}{##2}{\cs[{##1}]{##2}}}^^A
-% \hspace{-\leftmargini}^^A
-% \def\*{\unskip\,\texttt{*}}^^A
-% \begin{tabu}{|l|}^^A
-% \hline
+% \changefont{size+=2.5pt,spread=1,fam=\ttdefault}^^A
+% \def\*{\unskip\,\texttt{*}}\noindent
+% \hskip-\leftmargini
+% \begin{tabu}{|l|}\hline
% \expandafter\SpecialUsageIndex\csname #2\endcsname
-% \csanchor[{#1}]{#2}^^A
-% }^^A
+% \csanchor[{#1}]{#2}}
% \renewcommand\enddeclcs{%
-% \crcr \hline
-% \end{tabu}%
-% \nobreak \par \nobreak
-% \noindent
+% \crcr \hline \end{tabu}\nobreak
+% \par \nobreak \noindent
% \ignorespacesafterend
% }
-% \newrobustcmd*\csref[2][]{\hyperref{}{declcs}{#2}{\cs[{#1}]{#2}}}
-% \def\declmargin{\hspace*{\declmarginwidth}}
-% \def\declmarginwidth{\dimexpr-\leftmargini+\arrayrulewidth+\tabcolsep}
+% \def\declmargin{\hspace*\declmarginwidth }
+% \def\declmarginwidth{\dimexpr -\leftmargini +\arrayrulewidth +\tabcolsep\relax}
+%
% \pretocmd\textasteriskcentered{\usefont{OMS}{cmsy}mn}{}{}
-% \newrobustcmd*\abs[1]{\left\lvert#1\right\rvert}
+%
+% \newsavebox\tempbox
%
% \bookmarksetup{open=true,openlevel=2}
% \pagesetup{%
@@ -351,7 +443,7 @@ lppl copyright 2010-2011 by FC <florent.chervet@free.fr>
% left=\declmarginwidth,
% top=\medskipamount,
% bottom=\smallskipamount,
-% font=\normalfont\Large\bfseries,
+% font=\normalfont\LARGE\bfseries,
% bookmark={bold,color=[rgb]{0.02,0.05,.2}},
% break=\goodbreak}
% \sectionformat\subsection{%
@@ -371,62 +463,73 @@ lppl copyright 2010-2011 by FC <florent.chervet@free.fr>
% \setitemize{itemsep=\parskip,topsep=0pt,labelsep=1em,parsep=0pt,beginpenalty=10000}
% \tikzset{every picture/.add style={}{/utils/exec=\changefont{spread=1}}}
% \newrobustcmd*\IMPLEMENTATION{%
-% \newgeometry{top=0.8cm,headheight=.5cm,headsep=.3cm,bottom=1.2cm,footskip=.5cm,left=5cm,right=.5cm}
+% ^^A\geometry{top=0pt,includeheadfoot,headheight=.6cm,headsep=.6cm,bottom=.6cm,footskip=.5cm,left=4cm,right=1.5cm}
+% \newgeometry{top=0.8cm,headheight=.5cm,headsep=.3cm,bottom=1.2cm,footskip=.5cm,left=35mm,right=3mm}
% \pagesetup*{
-% left/offset+=1cm,right/offset-=1cm,
-% head/left=\moveleft1cm\vbox to\z@{\vss\setbox0=\null\ht0=\z@\wd0=\paperwidth\dp0=\headheight\rlap{\colorbox{GhostWhite}{\box0}}}\vskip-\headheight t\,a\,b\,u\,\ \ i\,m\,p\,l\,e\,m\,e\,n\,t\,a\,t\,i\,o\,n,
+% left/offset-=5mm,right/offset-=12mm,
+% head/left=\moveleft1cm\vbox to\z@{\vss\setbox0=\null\ht0=\z@\wd0=\paperwidth\dp0=\headheight\rlap{\colorbox{GhostWhite}{\box0}}}\vskip-\headheight \TabU\ \ i\,m\,p\,l\,e\,m\,e\,n\,t\,a\,t\,i\,o\,n,
% }%
% \clearpage
% \tocsetup{depth-=1}
% \sectionformat\section{bookmark/color=black}\sectionformat\subsection{bookmark/color=black}
% \bookmarksetup{bold*,openlevel=3} \hfuzz=3mm
-% \section(Implementation)[\mdseries\scshape\pmb{Implementation}]{Implementation} \label{sec:implementation}}
+% \section(Technical notice and Implementation)[\mdseries\scshape\pmb{Technical notice and Implementation}]{\textlarger{Technical Notice and Implementation}}\label{implementation}}
% \let\plainllap\llap
-% \newrobustcmd\macro@llap[1]{\global\let\llap\plainllap\setbox0\hbox{#1}^^A
-% \ifdim\wd0>4.4cm\hbox to\z@{\hss\hbox to4.4cm{#1\hss}}^^A
-% \edef\@tempa{\the\everypar\hskip\dimexpr\the\wd0-4.4cm\relax\global\everypar{}}%
-% \global\everypar\expandafter{\@tempa}^^A
-% \else\hbox to\z@{\hss#1}\fi
-% \setbox\z@\box\voidb@x}
-% \pretocmd\macro{\if@nobreak\else\Needspace{2\baselineskip}\fi
-% \MacrocodeTopsep\z@skip \MacroTopsep\z@skip \parsep\z@ \topsep\z@ \itemsep\z@ \partopsep\z@
-% \let\llap\macro@llap}{}{}
-% \apptocmd\endmacro{\goodbreak\vskip.3\parskip}{}{}
-%
-% \colorlet{reflink}{DarkSlateBlue}
+% \newrobustcmd\macro@llap[1]{{\global\let\llap\plainllap
+% \setbox0=\hbox\bgroup \raisedhyperdef{macro}{\saved@macroname}{#1}\egroup
+% \ifdim\wd0>32mm
+% \hbox to\z@ \bgroup\hss \hbox to32mm{\unhcopy0\hss}\egroup
+% \edef\@tempa{\hskip\dimexpr\the\wd0-32mm}\global\everypar\expandafter{\the\expandafter\everypar
+% \@tempa \global\everypar{}}^^A
+% \else \llap{\unhbox0}\fi}}
+% \AtBeginEnvironment{macro}{\if@nobreak\else\Needspace{2\baselineskip}\fi
+% \MacrocodeTopsep\z@skip \MacroTopsep\z@skip \parsep\z@ \topsep\z@ \itemsep\z@ \partopsep\z@
+% \let\llap\macro@llap}
+% \AtEndEnvironment{macro}{\goodbreak\vskip.3\parskip}
% \newrobustcmd*\stform{\ifincsname\else\expandafter\@stform\fi}
% \newrobustcmd*\@stform{\@ifnextchar*{\@@stform[]\textasteriskcentered\@gobble}\@@stform}
% \newrobustcmd*\@@stform[2][\string]{\textttbf{#1#2}\Xspace}
-% \newrobustcmd\Xspace{\ifnum\catcode`\ =\active\else\expandafter\xspace\fi}
+% \newrobustcmd*\xspaceverb{\ifnum\catcode`\ =\active\else\expandafter\xspace\fi}
+% \new\let\Xspace \xspaceverb
%
% \makeatother
%
% \deffootnote{1em}{0pt}{\rlap{\textsuperscript{\thefootnotemark}}\kern1em}
%
-% \title{\vspace*{-28pt}\href{http://www.tex.ac.uk/tex-archive/help/Catalogue/entries/tabu.html}{\HUGE\bfseries\sffamily t\,a\,b\,u}\vspace*{6pt}}
+% \newtabulinestyle{ a =.7pt on 3pt Crimson off4pt yellow,
+% b =.7pt on 3pt LawnGreen off3pt,
+% c =1.4pt on 3pt DarkSlateBlue off3pt,
+% test =1pt blue,
+% testdash =.7pt on1.2pt off 2pt blue,
+% }
+%
+% \title{\vspace*{-28pt}\href{http://www.tex.ac.uk/tex-archive/help/Catalogue/entries/tabu.html}{\scalebox{2}{\TABU[]}}\vspace*{6pt}}
% \AtBeginShipoutNext{\AtBeginShipoutUpperLeft{%
% \tikz[remember picture,overlay]{
% \coordinate (upper west) at (current page.north west);
% \coordinate (upper east) at (current page.north east);
-% \node at ($(upper west)+(3cm,-4.5cm)$) [semitransparent,anchor=north west,rotate=30] {
-% \begin{tabu}to 5cm{*4{|>{\smaller\noindent\pkgcolor}X[c$]}|} \tabucline-
-% 1 & 2 & 3 & 4 \\ \tabucline-
-% 5 & 6 & 7 \\ \tabucline{-3}
-% 8 & 9 \\ \tabucline{-2}
-% 10 \\ \tabucline{-1}
-% \end{tabu}};
-% \node at ($(upper east)+(-.5cm,-4cm)$) [semitransparent,anchor=north east,rotate=-35] {
-% \begin{tabu}to 5cm{*4{|>{\smaller\noindent\pkgcolor}X[$c]}|} \tabucline{4-}
-% \multicolumn3{c|}{} & \alpha \\ \tabucline{3-}
-% \multicolumn2{c|}{} & \beta & \gamma \\ \tabucline{2-}
-% \multicolumn1{c|}{} & \delta & \epsilon & \zeta \\ \tabucline{-}
-% \eta & \theta & \iota & \kappa \\ \tabucline-
-% \end{tabu}};
-% }}}
+% \node at ($(upper west)+(3cm,-4.5cm)$) [anchor=north west,rotate=30] {{\tabulinestyle{a}\tabulinesep=5pt \mathversion{bold}\color{teal}
+% \begin{tabu}to 5cm{*4{|>{\smaller}X[c$]}|} \tabucline[c]-
+% \multicolumn1{|c}{1} & \multicolumn1c{2} & \multicolumn1c{3} & 4 \\ \tabucline[c]-
+% \multicolumn1{|c}{5} & \multicolumn1c{6} & 7 \\ \tabucline[c]{-3}
+% \multicolumn1{|c}{8} & 9 \\ \tabucline[c]{-2}
+% 10 \\ \tabucline[c]{-1}
+% \end{tabu}}};
+% \node at ($(upper east)+(-.5cm,-4cm)$) [anchor=north east,rotate=-35] {{
+% \tabulinestyle{a}
+% \tabulinesep=5pt \mathversion{bold}
+% \begin{tabu}to 5cm{|*4{>{\smaller\pkgcolor}X[$mc]}|} \tabucline[b]{4-}
+% \multicolumn3{c|}{} & \alpha \\ \tabucline[b]{3-}
+% \multicolumn2{c|}{} & \beta & \gamma \\ \tabucline[b]{2-}
+% \multicolumn1{c|}{} & \delta & \epsilon & \zeta \\ \tabucline[b]{-}
+% \eta & \theta & \iota & \kappa \\ \tabucline[b]-
+% \end{tabu}}};
+% }}}
%
% \date{}
% \author{\small\thisdate~--~\hyperref[\thisversion]{version \thisversion}}
-% \subtitle{\begin{tabu}{X[c]} tabu\, and\, longtabu \\[1ex] \LARGE Flexible \LaTeX{} tabulars\\ \small\FC \end{tabu}\vspace*{-12pt}}
+% \subtitle{\begin{tabu}{X[c]}\Large tabu\, and\, longtabu \\[1ex] \LARGE Flexible \LaTeX{} tabulars\\ \small\FC \end{tabu}\vspace*{-12pt}}
+%
% \maketitle
%
% {\makeatletter\let\@thefnmark\@empty\let\@makefntext\@firstofone
@@ -448,22 +551,25 @@ lppl copyright 2010-2011 by FC <florent.chervet@free.fr>
% This package defines a single environment \textt{tabu} to make all kinds of tabulars in text or in math mode
% provided that they do not split across pages.
%
-% Starting from version 1.5, the environment \textt{longtabu} is provided to make tabulars that can stretch out
-% on several pages. \textt{longtabu} works like \textt{tabu} and is defined only if the package
-% \Xpackage{longtable} is loaded.
+% An environment \textt{longtabu} -- based on D. Carlisle \Xpackage{longtable} package --
+% is also provided to make tabulars that can stretch out on several pages, while keeping
+% some features (not all of them) of the \env*{tabu}.
%
% \textt{tabu} is more flexible that \textt{tabular}, \textt{tabular*}, \textt{tabularx}
% and \textt{array} and extends the possibilities. All tabulars in this document were made
-% with the \textt{tabu} environment. Widths computations for \textt{tabu X} columns is
-% \refitem{item:convergence optimisation}[optimised] compared to \Xpackage{tabularx} implementation.
-% Last (but not least) \textt{tabu} is fully compatible with any package that provides commands
-% to format tabulars. Indeed, \textt{tabu} does not modify any of the macros of \xfile{array.sty}.
+% with the \env*{tabu}, \emph{of course}... The implementation is optimised to minimise the
+% measurements required to put all together.
+%
+% \TabU likes colors too, with special lines that are able to keep the alignment of the surrounded
+% text... and also like numbers with the possibility to embed \Xpackage{siunitx} \textt S (or \textt s)
+% columns.
+% \TabU does not modify any of the macro defined by \xfile{array.sty} or in the \LaTeX{}
+% kernel\footnote{Inside the \env*{tabu} a few macros are modified... this was compulsory !}.
+% \medskip
%
-% \thispackage requires \eTeX{} and the standard package \xfile{array.sty}. Natural widths of columns
-% are computed by (but not printed by) the code of \Xpackage{varwidth} by D. Arseneau (for the cases of
-% \hyperref[X columns with tabu spread]{\textt X columns in \textt{tabu spread}} and
-% \refitem{tabu X columns,2}[negativ width coefficients]\footnote{The documentation is compiled with
-% \hyperref[enumitem-zref]{\xpackage{enumitem-zref}}}). Finally \textt{longtabu} is based on \textt{longtable}.
+% \TabU requires \eTeX{} and the standard package \xfile{array.sty}. Natural widths of columns
+% are computed (but not printed ) by the code of \Xpackage{varwidth} by D. Arseneau.
+% Finally \env{longtabu} is based on \Xpackage{longtable}.
%
% \end{abstract}}
%
@@ -482,6 +588,7 @@ lppl copyright 2010-2011 by FC <florent.chervet@free.fr>
% section/leaders=\leaders\hbox{$\m@th\mkern1mu\hbox{$\mathbf\ldotp$}\mkern1mu$}\hfill,
% section/dotsep,
% subsection/skip=0pt plus2pt minus 2pt,
+% subsection/numwidth+=5pt,
% subsubsection/font=\slshape,
% subsubsection/pagenumbers=off,
% subsubsection/skip-=1pt,subsubsection/numwidth-=4pt,
@@ -492,7 +599,6 @@ lppl copyright 2010-2011 by FC <florent.chervet@free.fr>
% \tableofcontents
% }
%
-% \clearpage
% \begingroup
% ^^A\geometry{top=0pt,includeheadfoot,headheight=.6cm,headsep=.6cm,bottom=.6cm,footskip=.5cm,left=4cm,right=1.5cm}
% \newgeometry{top=0pt,includeheadfoot,headheight=.6cm,headsep=.6cm,bottom=.6cm,footskip=.5cm,left=1.5cm,right=1cm}
@@ -501,11 +607,12 @@ lppl copyright 2010-2011 by FC <florent.chervet@free.fr>
% \changefont{spread*=1.1}
% \phantomsection \label{Summary}
% \addcontentsline{toc}{section}{Summary of the features provided by \textt{\pkgcolor t\,a\,b\,u}}
-% \def\arraystretch{1}\enlargethispage{2\baselineskip}\vspace*{-9mm}
-% \tabcolsep=3pt
-% \begin{tabu}{>{\ttfamily\bfseries}X[-1]X} \toprule
+% \def\arraystretch{1}\vspace*{-9mm}
+% \tabcolsep=3pt \tabulinesep=.5mm \def\dash{\hbox{$\scriptscriptstyle\cdotp$}}
+% \begin{longtabu}{>{\ttfamily\bfseries}X[-1]X[J]} \toprule
% \rowfont{\larger\bfseries\lsstyle}
-% \multicolumn2c{Summary of the features provided by \,{\sffamily\pkgcolor t\,a\,b\,u}} \\ \tabucline[dash]-
+% \multicolumn2c{Summary of the features provided by \thispackage}
+% \\ \tabucline[\dash]- \endhead
% \hyperref[tabu.sec]{tabu} &
% is like \textt{tabular} in text mode and like \textt{array} \hyperref[math mode.sec]{in math mode} when there is no
% \textt X column in its preamble
@@ -514,106 +621,553 @@ lppl copyright 2010-2011 by FC <florent.chervet@free.fr>
% is like \textt{longtable} with the possibility to use \textt{tabu X} columns and vertical lines
% with the extended syntax.
% \\
-% \hyperref[Vertical lines]{\texttbf\textbar[width,color]} &
-% vertical lines have an optional parameter.
-% \\
% \M*{tabu} to \meta{dimen} &
% specifies the target width of the whole tabular. This is like \textt{tabular\textasteriskcentered}\,
-% with an automatic stretchability that can be overwritten with \textt{@\M*{\cs{extracolsep}\M*{dimen}}}
+% with an automatic stretchability that can be overwritten with \textt{@\M*{\cs\extracolsep\M*{dimen}}}
% in front of the preamble.
% \\
% \M*{tabu} spread \meta{dimen} &
% has no equivalent in \LaTeX: the final width is \meta{dimen} wider than the
% natural width that can be obtained with \textt{spread 0pt}.
-% \\ \tabucline[dash]-
+% \\ \tabucline[\dash]-
+% \hyperref[Vertical lines]{\texttbf\textbar[width,color]} &
+% vertical lines have an optional parameter.
+% \\ \tabucline[\dash]-
% \hyperref[tabu X columns]{X[coef,align,type]} \par X[coef,align,type,\$] &
% \textt X columns widths are adjusted in order for the whole tabular to fit the
% target width. The target width is a dimension either:
% \begin{itempunct}[label=\ding{223}]
% \item directly specified with \textt{\M*{tabu} to\meta{dimen}}
% \item computed from the natural width: \textt{\M*{tabu} spread\meta{dimen}}
-% \item by default \cs{linewidth} (or \cs{linegoal} with the \hyperref[subsec:linegoal package option]{\textt{linegoal} package option}).
+% \item by default \cs\linewidth (or \cs\linegoal with the \hyperref[subsec:linegoal package option]{\textt{linegoal} package option}).
% \end{itempunct}
% \textt{coef} scales the widths of the \textt X columns, if there are more than one \textt X column. \par
% \textt{align} is either \textt r, \textt c, \textt l\, or\, \textt j\, (or \hyperref{}{declcs}{rowfont}{\textt{R C L J}})
% and \textt{type}\, can be \textt p (default), \textt m\, or\, \textt b.\par
-% \textt{X[\$]}\, makes a math \textt X column (\ie \textt{>\M*{\$}X<\M*{\$}})
+% \textt{X[\$]}\, makes a math \textt X column (\ie \, \textt{>\M*{\$}X<\M*{\$}})\par
+% \textt{X[\$\$}] display math \textt X column: \textt{>\M*{\$\cs\displaystyle}X<\M*{\$}}
% \\
% \refitem{tabu X columns,2}[{X[$-$coef,align,type]}] &
-% \textt X columns widths are first computed with the absolute value: $\mathversion{bold}\abs{\textt{coef}}$.\par
+% \textt X columns widths are first computed with the absolute value: $\mathversion{bold}\abs{\textt{coef}}$.
% Then the width is made narrower down to the natural width of the column if possible.\par
-% In any case, the final width does not exceed the one obtained with \textt{X$\mathversion{bold}\left[\abs{\textt{coef}}\right]$}. \par
-% The final \textt{tabu} can be narrower than its \textt{target} if:
-% \begin{itempunct}
-% \item all \textt{coefs} are negativ,\, and
-% \item no target has been specified (\ie the default target is used).
-% \end{itempunct}
-% In this case, \textt{tabu} behaves as if it was said:\, \textt{\M*{tabu} spread 0pt}.
-% \\ \tabucline[dash]-
-% \csref{everyrow}\M*{code} & Allows to add horizontal lines automatically for every row.\par
+% In any case, the final width does not exceed the one obtained with \textt{X$\mathversion{bold}\left[\abs{\textt{coef}}\right]$}.
+% \\
+% \textt{X\M*[X options]\M*{S\M*[S options]}} &
+% Embed a \Xpackage{siunitx} \textt S column into a \env{tabu}-\textt X column.
+% \\ \tabucline[\dash]-
+% \cs\everyrow\M*{code} & Allows to add horizontal lines automatically for every row.\par
% The settings can be changed inside the \textt{tabu}
-% \\ \tabucline[dash]-
-% \csref{rowfont}\M*[align]\M*{font spec} &
+% \\ \tabucline[\dash]-
+% \cs\rowfont\M*[align]\M*{font spec} &
% Modify the font and optionally the alignment of each cell in one row.
-% \\ \tabucline[dash]-
-% \csref{tabulinesep}$=$\meta{dimen} &
-% More control on vertical spacing of lines in a way very close to \Xpackage{cellspace}.
+% \\ \tabucline[\dash]-
+% \cs\tabulinesep$=$\meta{dimen} &
+% More control on vertical spacing of lines in a way very close to \Xpackage{cellspace}'s method (dynamic vertical spacing adjustment).
% \\
-% \csref{extrarowsep}$=$\meta{dimen} &
-% In addition to \cs{extrarowheight}, \thispackage provides \cs{extrarowdepth}.
-% But \csref{tabulinesep} generally gives better results.
-% \\ \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}.
+% \cs\extrarowsep$=$\meta{dimen} &
+% Control vertical spacing (\cs\extrarowheight and \cs\extrarowdepth): fixed vertical spacing adjustment.\par
+% \cs\tabulinesep generally gives better results.
+% \\ \tabucline[\dash]-
+% \cs\tabudecimal\M*{\cs\usermacro} & a help to align numbers easily inside a column.
+% \\ \tabucline[\dash]-
+% \cs\savetabu\M*{user-name} &
+% Saves the \textt{tabu} preamble and its parameters.
+% The command must appear at the end of a line.
% \\
-% \csref{usetabu}\M*{user-name} &
-% Makes a \textt{tabu} of exactly the same shape as the one saved with \cs{savetabu}.
+% \cs\usetabu\M*{user-name} &
+% Makes a \textt{tabu} of exactly the same shape as the one saved with \cs\savetabu.
% All parameters (\textt{target}, \textt{preamble}, \textt{stretch} \etc) are restored.\par
% This command is put alone in the preamble in place of the columns specifications.
% \\
-% \csref{preamble}\M*{user-name} &
-% Makes a \textt{tabu} with the same preamble as the one saved with \cs{savetabu}.\par
-% The \textt{preamble} only is restored, not the \textt{target} nor any other parameter.\par
+% \cs\preamble\M*{user-name} &
+% Makes a \textt{tabu} with the same preamble as the one saved with \cs\savetabu.
+% The only \textt{preamble} is restored, not the \textt{target} nor any other parameter.\par
% This command is put alone in the preamble in place of the columns specifications.
-% \\ \tabucline[dash]-
-% \csref{tabuphantomline} & inserts a phantom (\ie invisible) line inside the \textt{tabu}\par
-% May be usefull with \cs{multicolumn} in some cases.
-% \\ \tabucline[dash]-
-% \csref{tabucline}\M*[spec]\M*{start-stop} & Draws a line comparable to \cs{hline}. The line \meta{spec} can contain
+% \\ \tabucline[\dash]-
+% \cs\tabulinestyle\M*{line spec} & Sets the current line style to be used for \texttbf\textbar\, and \cs\tabucline
+% \\
+% \cs\newtabulinestyle\M*{name=spec,...} & Defines a line style for use with \cs\tabucline\M*[name] or with \texttbf\textbar\M*[name]
+% \\
+% \cs\tabucline\M*[spec]\M*{start-stop} & Draws a line comparable to \cs\hline. The line \meta{spec} can contain
% information for making a dash or dotted line (f.ex. \M*[on 3pt off 6pt]) and a color name.\par
-% The line spec can also be defined with \cs{tabulinestyle}
-% \\
-% \csref{tabulinestyle}\M*{name=spec,...} & Defines a line style for use with \cs{tabucline}\M*[name] or with \texttbf\textbar\M*[name]
-% \\ \tabucline[dash]-
-% \begin{tabu}{@{}X[-1]} \csref{tracingtabu} \\ \cs{tracingtabu}=2\end{tabu} &
+% The line spec can also be defined with \cs\newtabulinestyle
+% \\ \tabucline[\dash]-
+% \cs\taburulecolor\M*|dbl rule sep|\M*{rule color} & sets the color for rules (\cs\hline, \cs\firsthline ...)
+% \\ \tabucline[\dash]-
+% \cs\taburowcolors\M*[skip]\meta{number}\M*{first .. last} & Sets the color series to make alternate background colors for rows
+% \\ \tabucline[\dash]-
+% \cs\tabuphantomline & inserts a phantom (\ie invisible) line inside the \textt{tabu}\par
+% May be usefull with \cs\multicolumn in some cases.
+% \\ \tabucline[\dash]-
+% \cs\tracingtabu$=0, 1, 2, 3, 4$
+% &
% Reports informations in the \xext{log} file about the steps of the algorithm for \textt{tabu X} columns,
-% and the informations saved by \cs{savetabu}.
+% and the informations saved by \cs\savetabu.
% \\ \bottomrule
+% \end{longtabu}
+%
+% \clearpage \endgroup
+%
+%
+% \section{Examples and counterexamples}
+%
+% {\tabulinestyle{2pt on 3pt pkgcolor off4pt yellow!50}\tabulinesep=1mm
+% \declmargin\begin{tabu}to\dimexpr\linewidth-\declmarginwidth{|X[c]|}\tabucline-
+% \indent\bfseries\larger\lk Let's begin in colors ! \\ \tabucline-
% \end{tabu}
+% }
%
-% \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.
+% \TabU provides facilities to put horizontal and vertical leaders in a tabular. The package \Xpackage{xcolor}
+% must be loaded of course. Background colors for cells are left to package \Xpackage{colortbl} which is fully
+% compatible with \TabU.
%
+% \subsection{``Locally global'' settings and their scopes}
+%
+% \TabU \marginnote{\llap{\begin{tabu}{r}\cs\tabulinestyle \\ \cs\taburulecolor \\ \cs\taburowcolors \\ \cs\everyrow \end{tabu}}}
+% observes \TeX{} grouping levels for the settings of rule colors (\cs\taburulecolor) and styles (\cs\tabulinestyle),
+% and \cs\everyrow. There is however a subtility for nested \env{tabu} environments as described in this example:
+%
+% {\smaller
+% \begin{lstlisting}[caption={Locally global settings and their scopes}]
+% \taburulecolor |gray!50|{red} \arrayrulewidth=1pt
+% {
+% \taburulecolor |yellow|{blue}
+% \begin{tabu}{|X|X|} \hline
+% Here the lines & are drawn in blue \\ \taburulecolor{green} \hline
+% But starting from here & they are green coloured ! \\ \hline
+% And now a nested tabu & \begin{tabu}{X} \firsthline\hline
+% guess what colour \\ \hline
+% is used for rules ?\\ \lasthline\hline
+% \end{tabu} \\ \hline
+% \end{tabu}
+% % Inside the group, rule colors are blue
+% }
+% % After the group, rule colors are red again !
+% \begin{tabu}{X}\hline\hline\indent\end{tabu}
+% \end{lstlisting}}
+%
+%
+% {\taburulecolor |gray!50|{red}\tracingtabu=0 \arrayrulewidth=1pt
+% {
+% \taburulecolor|yellow|{blue}\tabulinesep=1mm
+% \begin{tabu}{|X|X|} \hline
+% \tikzlabel{start}
+% Here the lines & are drawn in blue \\ \taburulecolor{green} \hline
+% But starting from here & they are green coloured ! \\ \hline
+% \tikzlabel{nested}
+% And now a nested \env{tabu} & \extrarowsep=2mm\begin{tabu}{|X|} \firsthline\hline
+% guess what colour \\ \hline
+% \tikzlabel{inner} is used for rules ?\\ \lasthline\hline
+% \end{tabu} \\ \hline
+% \end{tabu}
+% % Inside the group, rule colors are blue
+% }
+% % After the group, rule colors are red again !
+% \begin{tabu}{X}\hline\hline\indent\end{tabu}
+% }
+% \tikz[remember picture,overlay]{
+% \draw [->] ([xshift=-1cm]start) -- ([xshift=-\tabcolsep]start);
+% \node at ([xshift=-1cm]start) [anchor=east,font=\smaller] {\begin{tabu}{c} Color of the \\ \TeX{} group\end{tabu}};
+% \draw [->,yshift=4mm] ([xshift=-1cm]nested) -- ([xshift=-\tabcolsep]nested);
+% \node at ([xshift=-1cm]nested) [anchor=east,font=\smaller] {\begin{tabu}{c} Color of the last \\ end-of-line setting\end{tabu}};
+% \coordinate (A) at ([xshift=-1cm]nested);
+% \coordinate (B) at (A |- inner);
+% \draw [->] (B) -- ([xshift=-\tabcolsep]inner);
+% \node at (B) [anchor=east,font=\smaller]{\begin{tabu}{c} Color of the\\ \TeX{} group\end{tabu}};
+% }
+% The ``rules'' are the following:
+%
+% \begin{itemize}[leftmargin=*]
+% \item If outside of a \env*{tabu}, the settings are local to the \TeX{} group. Every tabular drawn inside this group
+% will inherit from the settings of that group.
+% \item If \cs\taburulecolor (or \cs\everyrow or \cs\tabulinestyle) is used inside a cell of the tabular, this is the same:
+% the settings a local to that cell, and any nested tabular will inherit from the setting of that cell.
+% \item When used after the end of a row, the settings are globally changed from that point until the end of the tabular,
+% or until a new setting is set at the end of a further row (\TeX nically, this is done inside a \cs\noalign group).
+% But a nested \env{tabu} does not inherit from this ``global'' setting, and inherits from the settings of the \TeX{}
+% group instead.
+% \end{itemize}
+%
+% If \cs\arrayrulecolor\, or\, \cs\doublerulesepcolor\, (from package \Xpackage{colortbl}) are used instead
+% of\, \cs\taburulecolor\, then colors are globally overwritten.
%
% \clearpage
-% \endgroup
+%
+% A counterexample from the \Xpackage{xcolor} package: \cs\rowcolors does not like
+% \cs\cline, \cs\cmidrule etc.\footnote{Because color changes are done at \cs\everycr,
+% which is not exactly the same as \TabU \cs\everyrow !}
+%
+% {\smaller
+% \setbox\tempbox=\vbox{\linewidth.65\linewidth \hsize\linewidth
+% \begin{lstlisting}
+% \rowcolors{2}{green!25}{yellow!50}
+% \begin{tabular}{cc} \toprule
+% \repeatcell2{
+% rows=5,
+% text/col1=test,
+% text/col2=row \number\rownum} \\
+% test & other row \number\rownum \\ \cmidrule{1-2}
+% test & other row \number\rownum \\
+% test & other row \number\rownum \\ \bottomrule
+% \end{tabular}
+% \end{lstlisting}}
+%
+% \begin{tabu}{X[2mc]X[1mc]}
+% \indent\copy\tempbox
+% &
+% \rowcolors{2}{green!25}{yellow!50}
+% \begin{tabular}{cc} \toprule
+% \repeatcell2{
+% rows=5,
+% text/col1=test,
+% text/col2=row \number\rownum} \\
+% test & other row \number\rownum \\ \cmidrule{1-2}
+% test & other row \number\rownum \tikzlabel{rownum} \\
+% test & other row \number\rownum \\ \bottomrule
+% \end{tabular}
+% \end{tabu}
+% }
+%
+% The \cs\rownum counter is not reliable in the case of \cs\cline or \cs\cmidrule. \tikzlabel{rownumstart}
+% \tikz[remember picture,overlay]{
+% \draw [->,gray] (rownumstart) -| (rownum);
+% }
+%
+% In addition, the first coloured row is yellow, while one could have expected it green...
+%
+% For \TabU color changes are called at \cs\everyrow:
+%
+% {\smaller
+% \setbox\tempbox=\vbox{\linewidth.65\linewidth \hsize\linewidth
+% \begin{lstlisting}
+% \taburowcolors [2] 2{green!25 .. yellow!50}
+% \begin{tabu}{*2{X[c]}} \toprule
+% \repeatcell2{
+% rows=5,
+% text/col1=test,
+% text/col2=row \thetaburow} \\
+% test & other row \thetaburow \\ \cmidrule{1-2}
+% test & other row \thetaburow \\
+% test & other row \thetaburow \\ \bottomrule
+% \end{tabu}
+% \end{lstlisting}}
+%
+% \begin{tabu}{X[2mc]X[mc]}
+% \indent\copy\tempbox
+% &
+% \taburowcolors [2] 2{green!25 .. yellow!50}
+% \begin{tabu}spread 0pt {*2{X[-1c]}} \toprule
+% \repeatcell2{
+% rows=5,
+% text/col1=test,
+% text/col2=row \thetaburow} \\
+% test & other row \thetaburow \\ \cmidrule{1-2}
+% test & other row \thetaburow \\
+% test & other row \thetaburow \\ \bottomrule
+% \end{tabu}
+% \end{tabu}
+%
+% }
+%
+% \thispackage does not use ``real'' alternate colors but colorseries provided by package \Xpackage{xcolor}.
+% This allow some gradations:
+%
+% \setbox\tempbox=\vbox{\linewidth=.65\linewidth\hsize\linewidth\smaller
+% \begin{lstlisting}
+% \taburowcolors 5{SkyBlue!65 .. Gold!60}
+% \begin{tabu}{X[-1]X}
+% \repeatcell 2{
+% rows=10,
+% text/col1=test,
+% text/col2={Row number
+% \row$=$\thetaburow},
+% }
+% \end{tabu}
+% \end{lstlisting}}
+%
+% {
+% \begin{tabu}{X[2mc]X[mc]}
+% \indent\copy\tempbox
+% &
+% \taburowcolors 5{SkyBlue!65 .. Gold!60}
+% \begin{tabu}{X[-1]X}
+% \repeatcell 2{
+% rows=10,
+% text/col1=test,
+% text/col2={Row number \row$=$\thetaburow},
+% }
+% \end{tabu}
+% \end{tabu}
+% }
+%
+% \subsection{\textt X column widths computation}
+%
+% The new algorithm implemented in version \thisversion{} requires only one measure of the width of the table
+% in any case. \marginnote{\tikz{\node [inner sep=0pt,outer sep=0pt,rotate=45,fill=yellow!30]
+% {\color{FireBrick}\tabcolsep=0pt\begin{tabu}{l} Example provided by \\ M. Manuel Kuehner\end{tabu}};}}
+% This speeds up the convergence of the algorithm.
+%
+% {
+% \centering
+% {\smaller
+% \begin{lstlisting}
+% \begin{tabu} to 140mm {|X[1,l] | X[2,c] | X[3,c] | X[1,r]|}
+% |\dotfill | & Text & Text & Text \\
+% Text & Text & Text & Text
+% \end{tabu}
+% \end{lstlisting}}
+%
+% \begin{tabu} to 140mm{|X[1,l] | X[2,c] | X[3,c] | X[1,r]|} \savetabu{X columns widths}
+% |\dotfill | &Text &Text &Text \\
+% Text &Text &Text &Text
+% \end{tabu}
+%
+% \tabulinestyle{1pt Blue}
+% \begin{tabu}to 140mm{\preamble{X columns widths}} \tabucline-
+% \rowfont[c]{\smaller}
+% 1\textt X$=17.5mm$ & 2\textt X $=35mm$&3\textt X $=52.5mm$ &1\textt X $=17.5mm$ \\ \tabucline-
+% \end{tabu}\par
+% }
+%
+% $$X=\left( 140mm - 8\times \cs\tabcolsep - 5\times \cs\arrayrulewidth \right) / 7 = 17.4896mm$$
+%
+%
+% \Needspace{4\baselineskip}
+% \subsection(Verbatim material){Inserting Verbatim material (\xpackage{fancyvrb})}
+%
+% Though the content of the \env*{tabu} is collected for measuring purpose, it is possible to insert
+% verbatim material with the \env{tabu\stform*} variant of the environment. The content is then carefully
+% collected and re-scanned (with \cs\scantokens). During the process, the \texttbf @ letter is read with the category
+% code it has been given at the entry inside the environment (it is possible to say \cs\makeatletter before \cs\begin\M*{tabu\stform*}).
+%
+% Example:
+%
+% {\makeatletter
+% \begin{tabu*}{*2{X[p]}}
+% It is possible to insert Verbatim material with some \Verb+\csname+
+% \Verb+ control sequences \endcsname+
+% inside a \env{tabu} and inside \textt X columns. Negativ coefficients work well too, adjusting
+% the width of the \textt X column to the natural width if it is finally less than the width
+% computed with the absolute value of the coefficient.\par
+% A complete \Verb+Verbatim+ environment is also admissible.\par
+% But you must use the star form of the environment: \env{tabu\stform*} which uses \cs\scantokens.
+% &
+% \begin{Verbatim}[commandchars={$[]},listparameters={\topsep=-\ht\@arstrutbox}]
+% Verbatim environments must be put
+% alone on their lines (in the input
+% file) for nothing is allowed
+% after $cs[begin]{Verbatim} or
+% $cs[end]{Verbatim}.
+% Another point to know is that
+% \begin and \end control sequences
+% should match otherwise, you must
+% enclose the Verbatim environment
+% inside braces.
+% This is related to the fact that tabu
+% collects its body, and looks for
+% matching pairs of \begin ... \end !
+% \end{Verbatim}
+% \end{tabu*}
+% }
+%
+% \env{tabu\stform*} is useless when nested inside another tabular. The star form of the environment should be used
+% only for the outermost table ! Comments are removed, unless the \% character is given a category code of 12
+% (or 11) before the entry inside the environment.
+%
+% {\smaller
+% \begin{lstlisting}
+% \tabulinestyle{on2pt Crimson!60 off3pt yellow!50} \tabulinesep=1mm
+% \makeatletter \@makeother\%
+% \begin{tabu*}spread 0pt {|X[-1]X|} \tabucline-
+% This is a small \Verb+\Verbatim+\par
+% insertion
+% &
+% \begin{Verbatim}[listparameters={\topsep=-\ht\strutbox}]
+% And this is a complete % with some comments
+% Verbatim environment % every now and then
+% \end{Verbatim}
+% \\ \tabucline-
+% \end{tabu*}
+% \end{lstlisting}}
+%
+% {
+% \tabulinestyle{on2pt Crimson!60 off2pt yellow!50} \tabulinesep=1mm
+% \makeatletter
+% \begin{tabu*} spread 0pt {|X[-1]|X|} \tabucline-
+% Here a small \Verb+\Verbatim+\par
+% insertion
+% &
+% \begin{Verbatim}[gobble=1,listparameters={\topsep=-\ht\strutbox},commandchars=$()]
+% And this is a complete $@percentchar with some comments
+% Verbatim environment $@percentchar every now and then
+% \end{Verbatim}
+% \\ \tabucline-
+% \end{tabu*}
+% }
+%
+%
+%
+% It's not possible to insert a \textt{lstlisting} environment presently, but you can save such an environment in a \cs\vbox
+% and insert it inside the \env{tabu} of course.
+%
+% \subsection{Maths inside \textt{tabu X} columns}
+%
+% {
+% \setbox\tempbox=\vbox{\linewidth=.6\linewidth\hsize\linewidth\smaller
+% \begin{lstlisting}
+% $\begin{tabu}spread .5in |{*3{X[$c]}}|
+% \alpha & \beta & \gamma \\
+% \sum_i \frac{a_i}{x_i} & 0 & \cdot \\
+% \end{tabu}$
+% \end{lstlisting}}
+%
+% \begin{tabu}{X[m]X[-1m]}
+% \indent\copy\tempbox
+% &
+% $\begin{tabu}spread .5in |{*3{X[$c]}}|
+% \alpha & \beta & \gamma \\
+% \sum_i \frac{a_i}{x_i} & 0 & \cdot \\
+% \end{tabu}$ \\
+% \multicolumn2c{\lk\textt{X\M*[\$]} columns}
+% \end{tabu}
+% }
+%
+% {
+% \setbox\tempbox=\vbox{\linewidth=.6\linewidth\hsize\linewidth\smaller
+% \begin{lstlisting}
+% $\begin{tabu}spread .5in |{*3{X[$$c]}}|
+% \alpha & \beta & \gamma \\
+% \sum_i \frac{a_i}{x_i} & 0 & \cdot \\
+% \end{tabu}$
+% \end{lstlisting}}
+%
+% \begin{tabu}{X[m]X[-1m]}
+% \indent\copy\tempbox
+% &
+% $\begin{tabu}spread .5in |{*3{X[$$c]}}|
+% \alpha & \beta & \gamma \\
+% \sum_i \frac{a_i}{x_i} & 0 & \cdot \\
+% \end{tabu}$ \\
+% \multicolumn2c{\lk\textt{X\M*[\$\$]} columns}
+% \end{tabu}
+% }
+%
+%
+% \subsection(siunitx S columns inside tabu X columns){Embedding \xpackage{sunitx} \textt S columns inside \textt X columns}
+%
+% A \textt S column from \Xpackage{siunitx} can be embedded into a \textt X column of \thispackage... with the following limitations:
+% \begin{itemize}[leftmargin=2em]
+% \item The \textt X column must be centered: \textt{X[c]} to keep the alignment,
+% \item The optional alignment parameter of \cs\rowfont must not be used.
+% \end{itemize}
+%
+% {
+% \tabulinestyle{1pt GreenYellow}
+%
+% \setbox\tempbox=\vbox{\linewidth=.65\linewidth\hsize\linewidth\smaller
+% \begin{lstlisting}
+% \newcolumntype Y{S[group-four-digits=true,
+% round-mode=places,
+% round-precision=2,
+% round-integer-to-decimal=true,
+% per-mode=symbol,
+% detect-all]}
+% \tabucolumn Y
+% \tabulinestyle{1pt GreenYellow}
+% \begin{tabu}spread 8pt{|*2{Y|}c} \tabucline-
+% \rowfont\bfseries
+% {January} &{February} &... \\
+% \tabucline[1pt on2pt GreenYellow]-
+% 12.324 &745.32 &... \\
+% 21.13 &0 &... \\
+% 213.3245 &12.342 &... \\
+% 2143.12 &324.325 &... \\\tabucline-
+% \end{tabu}
+% \end{lstlisting}}
+%
+% \newcolumntype Y{S[group-four-digits=true,
+% round-mode=places,
+% round-precision=2,
+% round-integer-to-decimal=true,
+% per-mode=symbol,
+% detect-all]}
+% \tabucolumn Y
+% \begin{tabu}{X[m]X[-1m]}
+% \indent\copy\tempbox
+% &
+% \begin{tabu}spread 8pt{|*2{Y|}c} \tabucline-
+% \rowfont\bfseries
+% {January} &{February} &... \\\tabucline[1pt on2pt GreenYellow]-
+% 12.324 &745.32 &... \\
+% 21.13 &0 &... \\
+% 213.3245 &12.342 &... \\
+% 2143.12 &324.325 &... \\\tabucline-
+% \multicolumn3c{\makecell[c]{Column widths are not \\ exactly the same}}
+% \end{tabu}
+% \end{tabu}
+%
+% \setbox\tempbox=\vbox{\linewidth=.58\linewidth\hsize\linewidth\smaller
+% \begin{lstlisting}
+% \newcolumntype Z{X[c]{%
+% S[group-four-digits=true,
+% round-mode=places,
+% round-precision=2,
+% round-integer-to-decimal=true,
+% per-mode=symbol]}}
+% \tabucolumn Z
+% \begin{tabu}spread 8pt{|*2{Z|}c} \tabucline-
+% \rowfont\bfseries
+% {January} &{February} &... \\
+% \tabucline[1pt on2pt GreenYellow]-
+% 12.324 &745.32 &... \\
+% 21.13 &0 &... \\
+% 213.3245 &12.342 &... \\
+% 2143.12 &324.325 &... \\\tabucline-
+% \end{tabu}
+% \end{lstlisting}}
+%
+% \newcolumntype Z{X[c]{S[group-four-digits=true,
+% round-mode=places,
+% round-precision=2,
+% round-integer-to-decimal=true,
+% add-decimal-zero,
+% per-mode=symbol]}}
+% \tabucolumn Z
+%
+% \begin{tabu}{X[m]X[-1m]}
+% \indent\copy\tempbox
+% &
+% \begin{tabu}spread 8pt{|*2{Z|}c} \tabucline-
+% \rowfont\bfseries
+% {January} &{February} &... \\\tabucline[1pt on2pt GreenYellow]-
+% 12.324 &745.32 &... \\
+% 21.13 &0 &... \\
+% 213.3245 &12.342 &... \\
+% 2143.12 &324.325 &... \\\tabucline-
+% \multicolumn3c{\makecell[c]{Column widths are \\ exactly the same}}
+% \end{tabu}
+% \end{tabu}
+% }
+%
+% \cs\tabucolumn is there to say \thispackage that the column type has to be treated
+% with a high priority in the rewritting process.
+%
+% Another possibility to print number is provided with \cs\tabudecimal.
+%
%
% \setitemize{leftmargin=3em}
% \section{The \textt{tabu} environment}
% \label{tabu.sec}
%
-%
% \subsection(tabu, tabu to, tabu spread){\textt{tabu}, \textt{tabu to} and \textt{tabu spread}}
%
-% {\let\red\relax
% \begin{declcs}{begin}\M*{tabu} \M*[pos] \M*{tabular preamble} \\
% \cs{begin}\M*{tabu} to \meta{dimen} \M*[pos] \M*{tabular preamble} \\
% \cs{begin}\M*{tabu} spread \meta{dimen} \M*[pos] \M*{tabular preamble} \\
-% \end{declcs}}
+% \end{declcs}
%
-% The \textt{tabu} environment behaves exactly like \textt{tabular}: the preamble
-% is parsed by the macros in \xfile{array.sty} with no modification.
+% The \textt{tabu} environment behaves mostly like \textt{tabular}: the preamble
+% is parsed by the macros in \xfile{array.sty} and some measures are performed before printing.
% \textt{tabu} improves \textt{tabular} and \textt{array}:
% \begin{itemize}
% \item \textbf{footnotes} and index words are allowed inside \textt{tabu}, unlike \xpackage{tabularx}, footnote links
@@ -689,7 +1243,7 @@ lppl copyright 2010-2011 by FC <florent.chervet@free.fr>
% However, \textt{tabu X} columns, \csref{rowfont}, \csref{verbatim} and \csref{tabudecimal} work inside \textt{longtabu}.
%
%
-% \subsection{\textt{tabu X} columns}
+% \subsection{\textt{tabu X} columns -- Mastering horizontal space}
% \label{tabu X columns}
%
% \textt{tabu X} columns can be viewed as an enhancement of \xpackage{tabularx} \textt X columns, but do not interact
@@ -721,7 +1275,8 @@ lppl copyright 2010-2011 by FC <florent.chervet@free.fr>
% \rowfont{\bfseries\ttfamily} Modifier & Meaning & Default \\
% \textt l, \textt c, \textt r, \textt j, \textt L, \textt C, \textt R, \textt J & left, centered, right, justified & \textt j \\
% \textt p, \textt m, \textt b & \textt X column is converted into \textt p, \textt m or \textt b column & \textt p \\
-% \$ & \textt{X[\$]} is a shortcut for:\, \textt{>\M*{\$}X<\M*{\$}} & \\
+% \$ & \textt{X\M*[\$]} is a shortcut for:\, \textt{>\M*{\$}X<\M*{\$}} & \\
+% \$\$ & \textt{X\M*[\$\$]} is a shortcut for:\, \textt{>\M*{\$\cs\displaystyle}X<\M*{\$}} & \\
% \end{tabu}
% \item \textt{tabu X} columns can be spanned with \cs{multicolum}.
% \item \textt{tabu X} columns can be used with ``\textt{tabu spread}'' for small tabulars.
@@ -832,28 +1387,44 @@ lppl copyright 2010-2011 by FC <florent.chervet@free.fr>
%
% \subsubsection{Negativ width coefficients for \textt X columns}
%
-% \begin{Verb}
-% \begin{tabu}{|[3pt ForestGreen]X[-1m]|X[c m]|[3pt ForestGreen]}
-% \tabucline[3pt ForestGreen]-
-% $\begin{tabu}({X[-1$]X[-1$c]}) % equivalent to spread 0pt
+% {\smaller
+% \begin{lstlisting}
+% \tabulinestyle{3pt ForestGreen}
+% \begin{tabu}{|X[-1m]|X[c m]|}
+% \tabucline- \savetabu{FirstNegativTest}
+% $\begin{tabu}({X[-1$]X[-1$c]})
% \alpha & \beta \\
% \gamma & \delta + \epsilon + \zeta + \eta + \theta
% \end{tabu}$
% &
% This is a tabu with negativ width coefficients for \textt X columns
-% \\ \tabucline[3pt ForestGreen]-
+% \\ \tabucline-
% \end{tabu}
-% \end{Verb}
+% \end{lstlisting}
+% }
%
-% {
-% \begin{tabu}{|[3pt ForestGreen]X[-1m]|X[c m]|[3pt ForestGreen]} \tabucline[3pt ForestGreen]- \savetabu{FirstNegativTest}
+% ^^A% \begin{Verbat}
+% ^^A% \begin{tabu}{|[3pt ForestGreen]X[-1m]|X[c m]|[3pt ForestGreen]}
+% ^^A% \tabucline[3pt ForestGreen]-
+% ^^A% $\begin{tabu}({X[-1$]X[-1$c]})
+% ^^A% \alpha & \beta \\
+% ^^A% \gamma & \delta + \epsilon + \zeta + \eta + \theta
+% ^^A% \end{tabu}$
+% ^^A% &
+% ^^A% This is a tabu with negativ width coefficients for \textt X columns
+% ^^A% \\ \tabucline[3pt ForestGreen]-
+% ^^A% \end{tabu}
+% ^^A% \end{Verbat}
+%
+% { \tabulinestyle{3pt ForestGreen}
+% \begin{tabu}{|X[-1m]|X[c m]|} \tabucline- \savetabu{FirstNegativTest}
% $\begin{tabu}({X[-1$]X[-1$c]})
% \alpha & \beta \\
% \gamma & \delta + \epsilon + \zeta + \eta + \theta
% \end{tabu}$
% &
% This is a tabu with negativ width coefficients for \textt X columns
-% \\ \tabucline[3pt ForestGreen]-
+% \\ \tabucline-
% \end{tabu}
%
% \tabulinesep=2pt
@@ -883,10 +1454,6 @@ lppl copyright 2010-2011 by FC <florent.chervet@free.fr>
% \end{tabu}
% \end{Verb*}
%
-% \begin{tabu}{|X|X|X[2]|} \tabucline-
-% \multicolumn2{|c|}{Hello} & World \\ \tabucline-
-% \end{tabu}
-%
% The correct result can be obtained by the mean of a phantom line, that will remain invisible
% unless your preamble contains special \texttbf @ or \texttbf ! columns that prints some text:
%
@@ -907,18 +1474,205 @@ lppl copyright 2010-2011 by FC <florent.chervet@free.fr>
% to append it \emph{at the end} of the \textt{tabu}, for it may introduce indesirable side effects on vertical alignment
% otherwise, when \textt{tabu} is nested inside another tabular.
%
+% In particular, \cs\tabuphantomline should not be followed by \cs\cr or \cs\\ or \cs\tabularnewline...
+%
+% The need for this command could disappear in a future release, but this requires
+% a complete new implementation of \cs\multicolumn...
+%
+%
+% \subsection{\cs{tabulinesep} and \cs{extrarowsep} -- Mastering vertical space}
+% \label{tabulinesep.subsec}
+%
+% \begin{declcs}{tabulinesep}$=$\meta{dimen} \\
+% \cs{tabulinesep}$=$\string^\meta{dimen} \\
+% \cs{tabulinesep}$=$\string_ \meta{dimen} \\
+% \cs{tabulinesep}$=$\string^\meta{dimen}\string_\meta{dimen} \\
+% \cs{tabulinesep}$=$\string_\meta{dimen}\string^\meta{dimen}
+% \end{declcs}
+%
+% \cs\tabulinesep sets the \emph{minimal } vertical space allowed between the cell content and the
+% cell border. The macro may be prefixed by \cs\global (even inside a \cs\noalign group)\footnote{However
+% \cs\tabulinesep is not a dimension ! You can't test, for example, \cs{ifdim} \cs\tabulinesep$>0pt$ !
+% Test \cs\abovetabulinesep and \cs\belowtabulinesep instead, if needed.}.
+%
+% It is possible to set the ``top limit'' (a \TeX{} dimension called \cs\abovetabulinesep) and the
+% ``bottom limit'' independently with the syntaxes:\par\nobreak
+%
+% \begin{tabu}{X[-1]X}
+% \cs\tabulinesep=\string^\meta{dimen} & sets \cs\abovetabulinesep \\
+% \cs\tabulinesep=\string_\meta{dimen} & sets \cs\belowtabulinesep \\
+% \cs\tabulinesep=\string_\meta{dimen}\string^\meta{dimen} & sets \cs\belowtabulinesep and \cs\abovetabulinesep.
+% \end{tabu}
+%
+% These parameters can be used in text and math modes to give more vertical space between lines,
+% especially when using math formulae.
+%
+% Examples \textcolor{gray}{(with \cs\tracingtabu$=3$ and \Xpackage{interfaces}-\cs\papergraduate to see the struts)}:
+%
+% \begin{tikzpicture}
+%
+% \papergraduate (0,0) (158mm,32mm);
+%
+% \node at (5mm,5mm) [anchor=south west,inner sep=0pt]
+% {{\tabulinesep=4pt\tabustrutrule=0pt\extrarowsep0pt
+% \def\test#1{\tabulinesep=#1\tracingtabu=3 \ifdim\abovetabulinesep>0pt \tabustrutrule=2pt\fi
+% \begin{tabu}{|*2{X[-1c$]|}} \hline
+% \dpartial \Phi \theta & \dtotal \theta t \\ \hline
+% \end{tabu}}%
+% \begin{tabu} to 15cm{@{}|[test]*3{X[cm]|[test]}} \tabucline[test]-
+% \test{0mm}
+% &
+% \test{1mm}
+% &
+% \test{3mm}
+% \\ \tabucline[testdash]-
+% \cs\tabulinesep$=0mm$ & \cs\tabulinesep$=1mm$ & \cs\tabulinesep$=3mm$
+% \\ \tabucline[test]-
+% \end{tabu}
+% }
+% };
+% \end{tikzpicture}
+%
+% \cs\tabulinesep is a soft parameter, and leads to rows which does not share the same height.
+%
+% \begin{declcs}{extrarowsep}$=$\meta{dimen} \\
+% \cs{extrarowsep}$=$\string^\meta{dimen} \\
+% \cs{extrarowsep}$=$\string_ \meta{dimen} \\
+% \cs{extrarowsep}$=$\string^\meta{dimen}\string_\meta{dimen} \\
+% \cs{extrarowsep}$=$\string_\meta{dimen}\string^\meta{dimen}
+% \end{declcs}
+%
+% \cs\extrarowsep is an extra vertical space which is added to each row, inconditionally. \xfile{array.sty}
+% provides the \TeX{} dimension \cs\extrarowheight and \thispackage provides \cs\extrarowdepth in addition.
+%
+% As a result, the rows can share the same height/depth but the spacing is not dynamic. \cs\tabulinesep
+% can be used even with positive values for \cs\extrarowsep, for \env{tabu} inserts only one strut per row
+% and vertical spacing computations are possible in all cases.
+%
+% The macro can be prefixed by \cs\global as well, even inside a \cs\noalign group\footnote{However \cs\extrarowsep is not a dimension !
+% You can't test, for example, \cs{ifdim} \cs\extrarowsep$>0pt$ !
+% Test \cs\extrarowheight and \cs\extrarowdepth instead, if needed.}.
+%
+% Set \cs\extrarowheight and \cs\extrarowdepth to different values, with the syntaxes:\par\nobreak
+% \begin{tabu}{X[-1]X}
+% \cs\extrarowsep=\string^\meta{dimen} &\begin{tabu}{@{}l} sets \cs\extrarowheight \\ \cs\extrarowdepth is unchanged\end{tabu} \\
+% \cs\extrarowsep=\string_\meta{dimen} &\begin{tabu}{@{}l} sets \cs\extrarowdepth \\ \cs\extrarowheight is unchanged\end{tabu} \\
+% \cs\extrarowsep=\string_\meta{dimen}\string^\meta{dimen} &sets \cs\extrarowdepth and \cs\extrarowheight.
+% \end{tabu}
+%
+% Both \cs\extrarowheight and \cs\extrarowdepth are scaled by \cs\arraystretch (a scaling \emph{macro}\footnote{\cs\arraystretch is not a dimension
+% but a macro that stores a scaling factor.} of \xfile{array.sty})
+% if \cs\arraystretch$>1$...
+%
+% These parameters can be used in text and math modes.
+%
+% Examples \textcolor{gray}{(with \cs\tracingtabu$=3$ and \Xpackage{interfaces}-\cs\papergraduate to see the struts)}:
+%
+% {
+% \def\arraystretch{1}
+% \def\smalltest#1#2{\tracingtabu=3 \begin{tabu}{#1} \hline #2 \\ \hline \end{tabu}}
+%
+% \def\test#1{{\tabulinesep=1mm\extrarowsep=0pt\tracingtabu=0
+% \begin{tabu}to 15cm{@{}|[test]*3{>{\tabulinesep=0pt\extrarowsep=#1}X[mc]|[test]}>{\tabulinesep=0pt\extrarowsep=#1}X[1.3mc]|[test]}
+% \tabucline[test]-
+% \rowfont\bfseries
+% Standard \textt c column & \textt{X[-1,c]} columns & Math mode & Mixed: \textt{X[-1c]X[-1c\$]}
+% \\ \tabucline[test]-
+% \smalltest{*2c}{One & Two \\ \hline Three & Four }
+% &
+% \smalltest{*2{X[-1,c]}}{One & Two \\ \hline Three & Four }
+% &
+% $\smalltest{*2c}{\alpha & \beta \\ \hline \dfrac \Phi \theta & \Gamma_x^t}$
+% &
+% \smalltest{X[-1c]X[-1c$]}{First & \dpartial \Phi \theta \\ \hline Second & \dtotal \theta t}
+% \\ \tabucline[testdash]-
+% \multicolumn4{|[test]c|[test]}{\cs{extrarowsep}=$#1$}
+% \\ \tabucline[test]-
+% \end{tabu}
+% }}
+%
+% \tikz{
+% \papergraduate [xcolor=ForestGreen,ycolor=Maroon,opacity=.1,text opacity=.9] (0,0) (158mm,46mm);
+% \node at (5mm,5mm) [anchor=south west,inner sep=0pt] {\test{3mm}};
+% }
+%
+% \tikz{
+% \papergraduate[xcolor=ForestGreen,ycolor=Maroon,opacity=.1,text opacity=.9] (0,0) (158mm,40mm);
+% \node at (5mm,5mm) [anchor=south west,inner sep=0pt] {\test{0mm}};
+% }
+% }
+%
+%
+%
+% \subsection{\textt{tabu} in math mode}
+% \label{math mode.sec}
+%
+% {
+% \tabulinesep=3pt
+% \begin{tabu} to\linewidth{XX[-1$]} \toprule
+% On the left, you can see the famous Maxwell-Lorentz equations for electromagnetic field in vacuum,
+% publicated in \oldstylenums{1873}.
+% &
+% \hfil\arraycolsep=3pt
+% \begin{tabu}({rl}.
+% \Div\vv E &= \dfrac \rho {\epsilon_0} \\
+% \Div\vv B &= 0 \\
+% \Rot\vv E &= - \dpartial{\vv B} t \\
+% \Rot\vv B &= \mu_0 \vv j + \mu_0 \epsilon_0\, \dpartial{\vv E} t
+% \end{tabu}
+% \\ \bottomrule
+% \end{tabu}}
+%
+% In this example, the big \textt{tabu} is: \cs{begin}\M*{tabu} to\cs\linewidth\M*{XX[-1\$]}.
+%
+% The nested \textt{tabu} (in math mode) uses \xpackage{delarray} shortcut: its preamble is: \Verb+\begin{tabu}({rl}.+
+%
+% \cs\tabulinesep has been set to \texttbf{3pt}.
+%
+% Horizontal rules are \Xpackage{booktabs} \cs\toprule and \cs\bottomrule.
+%
+%
+% \begin{tabu}{@{}*3{X[c]@{}}} \toprule \savetabu{math}
+% \rowfont{\bfseries\ttfamily} array & tabu & tabu spread $1em$ \\ \midrule
+% $\begin{array} [t] |{cc}|
+% \alpha & \beta \\
+% \gamma & \delta
+% \end{array}$
+% &
+% $\begin{tabu} |{cc}|
+% \alpha & \beta \\
+% \gamma & \delta
+% \end{tabu}$
+% &
+% $\begin{tabu} spread 1em |{cc}|
+% \alpha & \beta \\
+% \gamma & \delta
+% \end{tabu}$
+% \\ \bottomrule
+% \end{tabu}
+%
%
-% \subsubsection{Nesting \textt{tabu}{\texorpdf\small s} with \textt X columns}
+% Here, vertical lines are made with \xpackage{delarray} shortcuts:\hfill
+% \verb+$\begin{tabu} spread 1em |{cc}|+
%
-% This section should contain some examples but I've no time presently...
+% \begin{tabu}{\usetabu{math}}
+% \multicolumn2{@{}l}{Vertical lines inside the tabular preamble gives:}
+% &
+% $\begin{tabu} spread 1em [c]{|cc|}
+% \alpha & \beta \\
+% \gamma & \delta
+% \end{tabu}$
+% \tabuphantomline
+% \end{tabu}
%
-% However, this document has plenty of nested \textt{tabu}{\smaller s}!
+% \bigskip
+% {\raggedleft\footnotesize\lk This was an example of \csref{savetabu}...\csref{usetabu} to keep the alignment.\par}
%
%
-% \subsection{Lines inside \textt{tabu}}
+% \section{Lines leaders and colors inside \env{tabu}}
% \label{Lines inside tabu}
%
-% \subsubsection{First important remarks}
+% \subsection{First important remark}
%
% The features provided in this section are quite experimental: they are not generally taken for good typography.
% You can use \xpackage{tabu} with package \xpackage{booktabs} for example, which provides properly designed
@@ -928,7 +1682,7 @@ lppl copyright 2010-2011 by FC <florent.chervet@free.fr>
% Lines in \textt{tabu} printed in this document are mostly made with \xpackage{booktabs}.
%
%
-% \subsubsection(Vertical lines){Vertical lines: \textt\textbar\ has an optional parameter}
+% \subsection(Vertical lines){Vertical lines: \textt\textbar\ has an optional parameter}
% \label{Vertical lines}
%
% Inside \textt{tabu} environment, the vertical line marker \textt\textbar\ has an \emph{optional} argument
@@ -938,45 +1692,247 @@ lppl copyright 2010-2011 by FC <florent.chervet@free.fr>
% The width of the line if specified, must come before the color name and... as for \textt X columns
% parameters, commas are optional.
%
-% Example:
+% Example:\par\nobreak
%
-% {\tabcolsep=3pt
-% \begin{tabu}{@{}X[-1mc]X[m]X[2ml]@{}} \toprule
+% {\tabcolsep=3pt\def\margintext#1{\noalign{\vtop to0pt{\marginnote{\rotatebox{45}{\ttfamily\small #1}}[-2cm]\vss}}}
+% \begin{tabu*}{@{}X[-1mc]X[m]X[-2ml]@{}} \toprule
% \begin{tabu}{||[5pt]|c|c||[5pt]|}
% Hello & World
% \end{tabu}
% &
-% The \textt{tabu} you see on left was made with the code displayed on the right.
+% The \env{tabu} you see on the left was made with the code on the right.
% &
-% \verbatim{^^A
-% \begin{tabu}{||[5pt]|c|c||[5pt]|}^^@
-% Hello & World^^@
-% \end{tabu}}
-% \\ \midrule
-% \begin{tabu}{||[5pt,red]|c|c||[5pt blue]|}
+% \begin{Verbatim}
+% \begin{tabu}{||[5pt]|c|c||[5pt]|}
+% Hello & World
+% \end{tabu}
+% \end{Verbatim}
+% \\ \midrule \margintext{\begin{tabu}{c}Use {\pkgcolor\env{tabu\stform*}}\\ to insert \textt{Verbatim}\\ environments !\end{tabu}}
+% \begin{tabu}{||[5pt red]|c|c||[5pt Indigo]|}
% Hello & World
% \end{tabu}
% &
-% The \textt{tabu} you see on left was made with the code displayed on the right.
+% The \env{tabu} you see on the left was made with the code on the right.
% &
-% \verbatim{^^A
-% \begin{tabu}{||[5pt,red]|c|c||[5pt blue]|}^^@
-% Hello & World^^@
-% \end{tabu}}
+% \begin{Verbatim}
+% \begin{tabu}{||[5pt red]|c|c||[5pt Indigo]|}
+% Hello & World
+% \end{tabu}
+% \end{Verbatim}
% \\ \bottomrule
-% \multicolumn{3}{r}{\scriptsize\lk This example was printed inside a \textt{tabu} whose preamble is: \textt{X[$-$1m]X[m]X[2m]}.}
-% \end{tabu}}
+% \multicolumn3{r}{\scriptsize\lk This example was printed inside a \env{tabu\stform*} whose preamble is: \textt{X[$-$1m]\,X[m]\,X[-2m]}}
+% \end{tabu*}
+% }
+%
+% It is not a necessary to protect the optional argument with braces: \M*[\M*{...}].
+% because \thispackage takes care the \textt\textbar\ token to be rewritten
+% before any other column type (the same for \textt{tabu X} columns,\, and\, \Xpackage{siunitx} \textt S columns).
+% The rewritting process is divided into three stages under control inside a \env*{tabu}.
+%
+% \subsection{Multiple \cs{firsthline} and \cs{lasthline}}
+%
+% \begin{declcs}{firsthline}\M[extratabsurround] \qquad make multiple lines ! \\
+% \csanchor{firstline} \M[extratabsurround]\cs\hline \\
+% \csanchor{lasthline}\M[extratabsurround] \\
+% \csanchor{lastline} \M[extratabsurround]\cs\hline
+% \end{declcs}
+%
+% \cs\firsthline and \cs\lasthline are defined in \xfile{array.sty} and
+% can be used to preserve the alignment of text, when using horizontal lines.
+% Besides, the optional argument can be used to change (locally) the \cs\extratabsurround dimension.
+%
+% The example of \xpackage{array} documentation is:
+%
+% {\centering
+% \begin{tabu}to 10.5cm{|[test]*2{X[mc]|[test]}} \tabucline[test]-
+% Tables
+% \begin{tabu}[t]{c}
+% with no\\ line \\ commands \\ used
+% \end{tabu}
+% versus tables
+% \begin{tabu}[t]{|c|}
+% \firsthline
+% with some \\ line \\ commands \\
+% \lasthline
+% \end{tabu} used.
+% &
+% Tables
+% \begin{tabu}[t]{c}
+% with no\\ line \\ commands \\ used
+% \end{tabu}
+% versus tables
+% \begin{tabu}[t]{|c|}
+% \hline
+% with some \\ line \\ commands \\
+% \hline
+% \end{tabu} used.
+% \\ \tabucline[.7pt on1.5mm Crimson off3mm blue]-
+% \rowfont[c]{}
+% with \cs{firsthline} and \cs{lasthline} & with \cs{hline} \par (text alignment is not preserved)
+% \\ \tabucline[test]-
+% \end{tabu}
+% \par}
+%
+% Now with \textt{tabu} you can make double, triple (or more) \cs\firsthline or \cs\lasthline as in:\par\nobreak
+%
+% {\centering
+% \tabulinesep=1mm
+% \begin{tabu*}{|[test]@{}X[-.5m]@{}|[test]X[2m]@{}|[test]m{4.5cm}|[test]} \tabucline[test]-
+% \tikz{\node [rotate=65,inner sep=0pt,outer sep=0pt]
+% {\begin{tabu}{c}Top \\ alignment\end{tabu}};}
+% &
+% \begin{Verbatim}[commandchars=$()]
+% Tables
+% \begin{tabu}[($bf$red(t))]{c}
+% with no\\ line \\ commands \\ used
+% \end{tabu}
+% versus tables
+% \begin{tabu}[($bf$red(t))]{|c|}
+% ($db(\firsthline))\hline\hline\hline
+% with some \\ line \\ commands \\
+% ($db(\lasthline))\hline\hline\hline
+% \end{tabu} used.
+% \end{Verbatim}
+% &
+% Tables
+% \begin{tabu}[t]{c}
+% with no\\ line \\ commands \\ used
+% \end{tabu}
+% versus tables
+% \begin{tabu}[t]{|c|}
+% \firsthline\hline\hline\hline
+% with some \\ line \\ commands \\
+% \lasthline\hline\hline\hline
+% \end{tabu} used.%
+% \\ \tabucline[testdash]-
+% \tikz{\node [rotate=65,inner sep=0pt,outer sep=0pt]
+% {\begin{tabu}{c}Bottom \\ alignment\end{tabu}};}
+% &
+% \begin{Verbatim}[commandchars=$()]
+% Tables
+% \begin{tabu}[($bf$red(t))]{c}
+% with no\\ line \\ commands \\ used
+% \end{tabu}
+% versus tables
+% \begin{tabu}[($bf$red(b))]{|c|}
+% ($db(\firsthline))\hline\hline\hline
+% with some \\ line \\ commands \\
+% ($db(\lasthline))\hline\hline\hline
+% \end{tabu} used.
+% \end{Verbatim}
+% &
+% Tables
+% \begin{tabu}[t]{c}
+% with no\\ line \\ commands \\ used
+% \end{tabu}
+% versus tables \tracingtabu=3
+% \begin{tabu}[b]{|c|}
+% \firsthline\hline\hline\hline
+% with some \\ line \\ \tikzlabel{extratabstrut}commands \\
+% \lasthline\hline\hline\hline
+% \end{tabu} used.%
+% \\ \tabucline[test]-
+% \end{tabu*}
+% \par}
+%
+% \begin{tabu}{X[-1]X[-1r]X[-1]}
+% \cs\firsthline \cs\firsthline \cs\firsthline &is equivalent to: &\cs\firsthline \cs\hline \cs\hline \\
+% &and also to: &\cs\firstline \cs\hline \cs\hline \cs\hline
+% \end{tabu}
+%
+% But the optional argument must come in \emph{first position}: \cs{firsthline}\M*[extratabsurround] ...
+%
+% The same for \cs\lastline.
+%
+% In \textcolor{yellow}{yellow} you can see the \cs\extratabsurround strut, because \cs\tracingtabu$=3$ for this \env{tabu}
+% \tikz[remember picture,overlay]{\draw [->,thick,gray] (0,0) -- (1,0) |- ([yshift=-3mm]extratabstrut);}
+%
+%
+% \subsection(Lines styles){More style for lines}
+%
+% \begin{declcs}{taburulecolor}\M{rule color} \\
+% \cs{taburulecolor}\M|double rule sep color|\M{rule color}
+% \end{declcs}
+%
+% \cs\taburulecolor sets (in a ``locally-global'' way) the color to be used for \cs\hline, \cs\firsthline, \cs\lasthline and
+% also vertical lines if the standard line style is used (the standard line style is active after \cs\tabulinestyle\M*{} or after
+% \cs\tabureset).
+%
+% The optional parameter enclosed by vertical bars: \texttbf\textbar \meta{double rule sep color}\texttbf\textbar \, is the color
+% to set between two adjacents rules. If not specified, double (or triple...) rules are separated by a vertical space (\cs\vskip).
+%
+% {\smaller
+% \setbox\tempbox=\vbox{\linewidth=.55\linewidth \hsize\linewidth
+% \begin{lstlisting}
+% \taburulecolor |lime|{DarkSlateBlue}
+% \arrayrulewidth=1mm \doublerulesep=2mm
+% Here is
+% \begin{tabu}spread 0pt {X[-1]}
+% \firsthline\hline
+% a tabu \\
+% environment \\
+% made with \\ \lasthline[5mm]\hline\hline
+% \end{tabu} \TabU package !\par
+% And the next paragraph follows...
+% \end{lstlisting}}
+%
+% \begin{tabu}{X[mc]X[-1mc]}
+% \indent\copy\tempbox
+% &
+% \taburulecolor |lime|{DarkSlateBlue}
+% \arrayrulewidth=1mm \doublerulesep=2mm
+% Here is
+% \begin{tabu}spread 0pt {X[-1]} \firsthline\hline
+% a \env{tabu} \\
+% environment \\
+% made with \\ \lasthline[5mm]\hline\hline
+% \end{tabu} \TabU package !\par
+% And the next paragraph follows...
+% \end{tabu}
+% }
+%
+% \begin{declcs}{tabulinestyle}\M{line style specification}
+% \end{declcs}
+%
+% \cs\tabulinestyle sets the line style for vertical (\texttbf\textbar) and horizontal lines
+% (\ie \cs\tabucline: \cs\hline, \cs\firsthline etc. are not modified by \cs\tabulinestyle)
+%
+% The line specification is of the form:\par\nobreak
+% \begin{tabu*}{X[c]}
+% \Verb+ 3pt rule color on 4pt dash color off 5pt gap color+ \\
+% \Verb+ rule color on 4pt dash color off 5pt gap color+ \\
+% \Verb+ on 4pt dash color off 6pt gap color+ \\
+% \Verb+ 3pt rule color+ \\
+% \Verb+ on 4pt dash color+ \\
+% \Verb+ off 5pt+ \\
+% \Verb+ 3pt+ \\
+% \Verb+ Named style defined by+ \cs\newtabulinestyle
+% \end{tabu*}
+%
+% Well... any parameter is optional. Obviouly the \textt{rule color} is the same as the \textt{dash color} and
+% the former overwrites the latter if both are given.
+%
+% Your color names can contain spaces but:
+% \begin{itemize}[leftmargin=2em]
+% \item If the first character in the line specification is not a letter, then it is taken as a dimension: the thickness of the line.
+% Otherwise, the default thikness is used \ie \cs\arrayrulewidth.
+% \item Your color names must not contain any series of characters that match one the patterns: \\
+% \indent\begin{tabu}{*2{X[c]}} \textt{on}\textttbf? & \textt{off}\textttbf?\end{tabu}
+% where \texttbf? is a character of category 12 (possibly preceded by spaces).
+% I don't think this is a real limitation...
+% \end{itemize}
+%
+%
+% \begin{declcs}{newtabulinestyle}\M{style=line spec., style=line spec., ...}\textsuperscript{babel}
+% \end{declcs}
+%
+% This command defines a line style to be used in the first optional argument of \cs\tabucline (horizal lines)
+% or the optional argument of \texttbf\textbar (vertical lines) or with \cs\tabulinestyle (locally-global style).
+%
+% Style names and color names are \xpackage{babel}-protected.
%
-% Note that it is always a good idea to protect the optional argument with braces: \M*[\M*{...}].
-% But it's not necessary because \thispackage takes care the \textt\textbar\ token to be rewritten
-% before any other column type (just after \stform* however, for obvious reasons). But if you
-% use the optional argument for the vertical line into a user-defined column type
-% (declared with \cs{newcolumntype} for example), you can get an error. In this case,
-% it is compulsory to protect the optional argument by braces. Finally, it's not very often
-% that a user-column type contains a vertical bar...
%
%
-% \subsubsection(Horizontal lines){More style for horizontal lines: \cs{tabucline}}
%
% \begin{declcs}{tabucline}\M[style or spec.]\M*{start-end}\\
% \end{declcs}
@@ -994,223 +1950,350 @@ lppl copyright 2010-2011 by FC <florent.chervet@free.fr>
%
%
%
-% Any parameter can be omitted. \tabulinestyle{tabucline=.4pt on2pt off1.5pt}
+% Any parameter can be omitted. \newtabulinestyle{tabucline=.4pt on2pt off1.5pt}
%
-% {\parskip=0pt\topsep=0pt
+% {\parskip=0pt\topsep=0pt \tabulinesep=1.5mm
% \begin{center}\def\margintext#1{\noalign{\vtop to0pt{\marginnote{\ttfamily\small #1}[-1.8ex]\vss}}}^^A
% \begin{tabu}{|[1.5pt]|>{\ttfamily}X[-1]X||[1.5pt]} \tabucline[\heavyrulewidth]- \savetabu{tabucline}
-% \cs{tabucline}\M*[1pt on 1.5pt off 2pt]\M*{1-4} & draws a horizontal dashed line of width \textt{1pt}. Dashes are
+% \cs\tabucline\M*[1pt on 1.5pt off 2pt]\M*{1-4} & draws a horizontal dashed line of width \textt{1pt}. Dashes are
% \textt{1.5pt} long and gap width is \textt{2pt}. The line is drawn
% between columns 1 and 4. Here there are only 2 columns and the line
% stops at column 2. \\ \tabucline[1pt on 1.5pt off 2pt]{1-4} \margintext{[1pt on 1.5pt off 2pt]}
-% \cs{tabucline}\M*[1.5pt]\M*{-} & draws a horizontal solid line of width \textt{1.5pt} between the first
+% \cs\tabucline\M*[1.5pt]\M*{-} & draws a horizontal solid line of width \textt{1.5pt} between the first
% and the last column. \\ \tabucline[1.5pt]{-} \margintext{[1.5pt]}
-% \cs{tabucline}\M*{2-} & \spaceskip=\fontdimen2\font plus1em\relax draws a horizontal solid line of width \cs{arrayrulewidth} between the second
+% \cs\tabucline\M*{2-} & \spaceskip=\fontdimen2\font plus1em\relax draws a horizontal solid line of width \cs{arrayrulewidth} between the second
% column and the last one.\\ \tabucline{2-} \margintext{default}
-% \cs{tabucline}\M*[on 2pt red]\M*{-5} & draws a horizontal dashed line between columns 1 and 5
+% \cs\tabucline\M*[on 2pt red]\M*{-5} & draws a horizontal dashed line between columns 1 and 5
% of width \cs{arrayrulewidth}. Dashed are
% \textt{2pt} long and gap width is \textt{4pt} (the default).
% \\ \tabucline[on 2pt red]{-5} \margintext{[on 2pt red]}
% \end{tabu}
% \end{center}}
%
-% \begin{declcs}{tabucline\stform*}\M[style or spec.]\M*{start-end}
-% \end{declcs}
-%
-% For fine tuning, the star form \cs{tabucline}\stform* can be used to keep the vertical lines that might
-% cross the horizontal line. As a consequence, the content of special \textt @ of \textt ! columns
-% will interrupt the horizontal line either. This might be usefull when \cs{extrarowheight} is high.
-% Example:
-%
-% {\makeatletter
-% \AtBeginShipoutNext{\AtBeginShipoutUpperLeft{\tikz[remember picture,overlay]{
-% \node at (tabucline*) [xshift=-2cm,yshift=0cm,font=\ttfamily\smaller,text width=3cm]
-% { \dbend \\[1.5ex]
-% Starting from
-% \hyperref[2.0]{version 2.0} use
-% preferably the vertical
-% spacing adjustment
-% parameters provided by
-% \csref{tabulinesep} and
-% \csref{extrarowsep}. };}}}
-%
-% \begin{tabu}{*3{X[mc]}}
-% \extrarowheight=8pt
-% \begin{tabu}[c]{|[1pt]X|X|[1pt]} \tabucline- \tikzlabel{tabucline*}
-% Hello & world \\ \tabucline[1pt on 2pt off 2pt,blue]-
-% Hello & world \\ \tabucline-
-% \end{tabu}
-% &
-% \extrarowheight=8pt
-% \begin{tabu}[c]{|[1pt]X|X|[1pt]} \tabucline*-
-% Hello & world \\ \tabucline*[1pt on 2pt off 2pt blue]-
-% Hello & world \\ \tabucline*-
+% \begin{tabu}{@{}X[-2,c]@{}X[c]@{}} \tabucline[\heavyrulewidth]- \tabucline[\hbox{$\scriptstyle\star$}]- \toprule
+% \rowfont[c]{\bfseries}
+% Define the line style &Use the line style \\\midrule
+% \cs\newtabulinestyle\M*{myline=0.4pt on 2.5pt off 1pt red} &\cs\tabucline\M*[myline]\M*{-} \\\tabucline[\heavyrulewidth on 2.5pt off 1pt red]-
+% \multicolumn2c{Or use a leader or a box to make a leader with it} \\
+% \multicolumn2c{directly in the argument of \cs\tabucline} \\
+% \multicolumn2c{\cs\tabucline\M*[\cs\hbox\M*{\$\cs\scriptstyle\cs\star\$}]\M*{1-3}}
+% \\\bottomrule \tabucline[\hbox{$\scriptstyle\star$}]- \tabucline[\heavyrulewidth]-
% \end{tabu}
-% &
-% \extrarowheight=8pt
-% \begin{tabu}[c]{|[1pt]X|X|[1pt]} \firsthline
-% Hello & world \\ \hline
-% Hello & world \\ \lasthline
-% \end{tabu} \\
-% \extrarowheight=0pt
-% \cs{tabucline}
-% & \cs{tabucline}\stform*
-% & \cs{firsthline} and \cs{hline} and \cs{lasthline} \\
-% \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}\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...
%
-% \begin{declcs}{tabulinestyle}\M{style=spec., style=spec., style=spec. ...}
-% \end{declcs}
%
-% This command defines a line style to be used in the first optional argument of \cs{tabucline}:
%
-% \begin{tabu}{@{}X[-2,c]@{}X[c]@{}} \tabucline[\heavyrulewidth]- \tabucline[\hbox{$\scriptstyle\star$}]- \toprule
-% \rowfont[c]{\bfseries} Define the line style & Use the line style \\ \midrule
-% \cs{tabulinestyle}\M*{myline=0.4pt on 1.5pt off 1pt red} & \cs{tabucline}\M*[myline]\M*{-} \\ \tabucline[\heavyrulewidth on 1pt off 2pt red]-
-% \cs{tabulinestyle}\M*{myleader=\cs{hbox}\M*{\$\cs{scriptstyle}\cs{star}\$}} & \cs{tabucline}\M*[myleader]\M*{1-3} \\
-% \multicolumn{2}{c}{This way it is easy to change dashed lines into solid ones} \\ \bottomrule \tabucline[\hbox{$\scriptstyle\star$}]- \tabucline[\heavyrulewidth]-
-% \end{tabu}
+%
%
% \begin{tabu}{*{3}{X[cm]}}
% \tabcolsep=2pt
% \begin{tabu}{|l|l|} \tabucline[.4pt on 1pt off 3pt]{-}
-% \multicolumn{2}{|c|}{Dashed or dotted} \\ \tabucline[1pt on2pt off1pt]{-}
-% And below & is the default \\ \tabucline[on 4pt]-
+% \multicolumn2{|c|}{Dashed or dotted} \\\tabucline[1pt on2pt off1pt]{-}
+% And below &is the default \\\tabucline[on 4pt]-
% \end{tabu}
% &
% \tabcolsep=2pt
% \begin{tabu}{|c|c|} \tabucline[.4pt off 2pt]{-}
-% Dash & Gap \\ \tabucline[10pt on2pt off 1pt]{1-1}
-% \multicolumn{2}{|c|}{This one was thick} \\ \tabucline[3pt]-
+% Dash &Gap \\\tabucline[10pt on2pt off 1pt]{1-2}
+% \multicolumn2{|c|}{This one was thick} \\\tabucline[3pt]-
% \end{tabu}
% &
% \tabcolsep=2pt
% \begin{tabu}{|X[cm]|X[cm]|X[2cm]|} \tabucline[.4pt on6pt off 2pt]{-}
-% Dash & Gap... & ...or leader \\ \tabucline[\hbox{\small\kern1pt\ScissorRight\vrule width3.4pt depth-5pt height5.4pt\kern1pt\vrule width3.4pt depth-5pt height5.4pt\kern1pt}]-
-% \multicolumn{3}{|c|}{Interesting ?} \\ \tabucline-
+% Dash &Gap... &...or leader
+% \\\tabucline[\hbox{\small\kern1pt\ScissorRight\vrule width3.4pt depth-5pt height5.4pt\kern1pt\vrule width3.4pt depth-5pt height5.4pt\kern1pt}]-
+% \multicolumn3{|c|}{Interesting ?} \\\tabucline-
% \end{tabu}
% \end{tabu}
% \nobreak\par\nobreak\vspace*{\bigskipamount}\nobreak
%
-% \small
-% \hfil\Shapepar{\nutshape}{Now we stop it because things are becoming too ugly and go to have a look at \textt{tabu} in mathematical mode...}\hfil\null
%
-% \normalsize
+% \subsection{Automatic horizontal lines and row colors}
%
+% \begin{declcs}{everyrow}\M*{code}
+% \end{declcs}
%
-% \subsection{\textt{tabu} in math mode}
-% \label{math mode.sec}
+% \cs\everyrow can be used to insert horizontal lines automatically:
%
-% {
+% {\smaller
+% \begin{lstlisting}
+% \begin{tabu}to .5\linewidth{cX[2mc]X} \tabucline[1pt]-
+% \everyrow{\tabucline[on 2pt]-}
+% This is &a small example &of a \textt{tabu} \\
+% which &automatically &inserts \\
+% a horizontal &line after &each of its row \everyrow{} \\ \tabucline[1pt]-
+% \end{tabu}
+% \end{lstlisting}
+%
+% \centering
% \tabulinesep=3pt
-% \begin{tabu} to\linewidth{X[1.5]X[l$]} \toprule
-% On the left, you can see the famous Maxwell-Lorentz equations for electromagnetic field in vacuum,
-% publicated in \oldstylenums{1873}.
+% \begin{tabu}to .5\linewidth{cX[2c]X} \tabucline[1pt]- \everyrow{\tabucline[on 2pt]-}
+% This is &a small example &of a \textt{tabu} \\
+% which &automatically &inserts \\
+% a horizontal &line after &each of its row \everyrow{} \\\tabucline[1pt]-
+% \end{tabu}\par}
+%
+% \cs\everyrow can be used in \textt{longtabu} as well. The syntax is like \cs\everycr: a token-like syntax,
+% and braces are mandatory:\quad \cs\everyrow\M*{argument}.
+%
+% \begin{declcs}{taburowcolors}\M*[first line]\meta{number}\M*{first .. last}
+% \end{declcs}
+%
+% \cs\taburowcolors sets the alternate colors to be used on every row of the tabular.
+% The command can be used before a \env*{tabu} or inside it, at the end of a row.
+%
+% The optional parameter \M*[first line] tells the first row from which background colors
+% are starting -- this optional parameter has no effect when \cs\taburowcolors is used at the
+% end of a row: background are starting immediately in this case.
+%
+% \meta{number} is the number of colors in the color series. If not specified, it defaults
+% to $2$ (for alternate rows color).
+%
+% Finally \meta{first} and \meta{last} are the first and the last colors in the colorseries.
+%
+%
+% Example:
+%
+% {
+% \setbox\tempbox=\vbox{\linewidth=.55\linewidth\hsize\linewidth\smaller
+% \begin{lstlisting}
+% \taburowcolors[2] 3{Crimson!30 ..
+% ForestGreen!40}
+% \taburulecolor |GreenYellow|{OrangeRed}
+% \arrayrulewidth=1pt \doublerulesep=1.5pt
+% \everyrow{\hline\hline}
+% \begin{tabu} {X[-1]X}
+% This is &just a test \\
+% and i think &it will \\
+% look &rather bad \\
+% for &i've not \\
+% chosen &the colors \\
+% with care. &i can't \\
+% say &less... \\
+% \taburowcolors 2{Crimson .. ForestGreen}
+% 1 &This is Crimson \\
+% 2 &This is ForestGreen \\
+% 3 &This is Crimson \\
+% 4 &This is ForestGreen \\
+% \end{tabu}
+% \end{lstlisting}}
+%
+% \begin{tabu}{X[m]X[-1m]}
+% \indent\copy\tempbox
% &
-% \hfil\arraycolsep=3pt
-% \begin{tabu}({rl}.
-% \Div\vv E &= \dfrac \rho {\epsilon_0} \\
-% \Div\vv B &= 0 \\
-% \Rot\vv E &= - \dpartial{\vv B} t \\
-% \Rot\vv B &= \mu_0 \vv j + \mu_0 \epsilon_0\, \dpartial{\vv E} t
+% \taburowcolors[2]3{Crimson!30 .. ForestGreen!40}
+% \taburulecolor |GreenYellow|{OrangeRed}
+% \arrayrulewidth=1pt \doublerulesep=1.5pt
+% \everyrow{\hline\hline}
+% \begin{tabu}{X[-1]X}
+% This is &just a test \\
+% and i think &it will \\
+% look &rather bad \\
+% for &i've not \\
+% chosen &the colors \\
+% with care. &i can't \\
+% say &less... \\
+% \taburowcolors 2{Crimson .. ForestGreen}
+% 1 &This is Crimson \\
+% 2 &This is ForestGreen \\
+% 3 &This is Crimson \\
+% 4 &This is ForestGreen \\
% \end{tabu}
-% \\ \bottomrule
-% \end{tabu}}
+% \end{tabu}
+% }
%
-% In this example, the big \textt{tabu} is: \cs{begin}\M*{tabu} to\cs{linewidth}\M*{X[1.5]X[l\$]}.
+% \begin{declcs}{tabureset}
+% \end{declcs}
%
-% The nested \textt{tabu} (in math mode) uses \xpackage{delarray} shortcut: its preamble is:
-% \begin{Verb}
-% \begin{tabu}({rl}.
-% \end{Verb}
+% To go back to ``standard'' parameters, \thispackage provides the command \cs\tabureset which basically does:
%
-% \csref{tabulinesep} has been set to \texttbf{3pt}.
+% \begin{tabu}{||[on 3pt pkgcolor off 3pt]XXX|[on 3pt pkgcolor off3pt]|}
+% \cs\tabulinesep$=0pt$ &\cs\extrarowsep$=0pt$ &\cs\extratabsurround$=0pt$ \\
+% \cs\tabulinestyle\M*{} &\cs\everyrow\M*{} &\cs\taburulecolor\M*||\M*{} \\
+% \cs\taburowcolors\M*{} & &
+% \end{tabu}
%
-% Horizontal rules are \xpackage{booktabs} \cs{toprule}, \cs{midrule} and \cs{bottomrule}.
%
+% \section(row font and alignment){Modifying the font and the alignment in one row: \cs{rowfont}}
%
-% \begin{tabu}{@{}*3{X[c]@{}}} \toprule \savetabu{math}
-% \rowfont{\bfseries} \textt{array} & \textt{tabu} & \textt{tabu spread 1em} \\ \midrule
-% $\begin{array}[t]|{cc}|
-% \alpha & \beta \\
-% \gamma & \delta
-% \end{array}$
-% &
-% $\begin{tabu}|{cc}|
-% \alpha & \beta \\
-% \gamma & \delta
-% \end{tabu}$
-% &
-% $\begin{tabu} spread 1em|{cc}|
-% \alpha & \beta \\
-% \gamma & \delta
-% \end{tabu}$
-% \\ \bottomrule
+% \begin{declcs}{rowfont}\M[alignment]\M*{font specification}
+% \end{declcs}
+%
+% Inside a \textt{tabu} environment, you can modify the font for each cell in a row.
+% \cs{rowfont} has priority over column font specification, exactly like \cs{rowcolor} (package \xpackage{colortbl})
+% has priority over \cs{columncolor}.
+%
+% The alignment of each cell in one row can also be changed to: \topsep=0pt
+% \begin{center}
+% \begin{tabu}{>{\ttfamily}r@{\,$=$\,}lc>{\ttfamily}r}
+% l &left &{\qquad\smaller or\, for \xpackage{ragged2e} settings: } &L \\
+% c &center & &C \\
+% r &right & &R \\
+% j &justify & &J \\
% \end{tabu}
+% \end{center}
%
+% Any other value for the optional \meta{alignment} parameter is silently ignored. If \xpackage{ragged2e} is not loaded,
+% \textt L\, \textt R\, \textt C\, and\, \textt J\, are synonymous with the lowercase equivalent.
%
-% Here, vertical lines are made with \xpackage{delarray} shortcuts:\hfill
-% \verb+$\begin{tabu} spread 1em |{cc}|+
+% \begin{Verb*}
+% \begin{tabu}{|X|X[-1]|} \tabucline-
+% ($db(\rowfont))[c]\bfseries
+% This &Is \\\tabucline[on 2pt,blue]-
+% \xpackage{tabu} &package \\\tabucline[off 2pt blue]-
+% ($db(\rowfont))[r]\itshape
+% for &\textt{tabu} and \textt{longtabu} \\\tabucline-
+% \end{tabu}
+% \end{Verb*}
%
-% \begin{tabu}{\usetabu{math}}
-% \multicolumn2{@{}l}{Vertical lines inside the tabular preamble gives:}
-% &
-% $\begin{tabu} spread 1em[c]{|cc|}
-% \alpha & \beta \\
-% \gamma & \delta
-% \end{tabu}$
-% \tabuphantomline
+% \begin{tabu}{|X|X[-1]|}\tabucline-
+% \rowfont[c]\bfseries
+% This &Is \\\tabucline[on 2pt,blue]-
+% \xpackage{tabu} &package \\\tabucline[off 2pt blue]-
+% \rowfont[r]\itshape
+% for &\textt{tabu} and \textt{longtabu} \\\tabucline-
% \end{tabu}
%
-% \bigskip
-% {\raggedleft\footnotesize\lk This was an example of \csref{savetabu}...\csref{usetabu} to keep the alignment.\par}
%
+% \section(Saving and restoring tabu)[Saving and restoring a \env{tabu}: \cs{savetabu}, \cs{usetabu} and \cs{preamble}]{Saving and restoring a \env{tabu}}
+%
+% \begin{declcs}{savetabu}\M{user-name}
+% \end{declcs}
+%
+% The command \cs{savetabu} can be used at the end of any line of a \textt{tabu} environment to save the
+% parameters of a \env*{tabu}. The saving is always global.
+% This allows to easily make tabulars which share exactly the same shape throughout your document.
+% This can also be used as a kind of \textt{tabbing} environment which is able to remember the tabs positions...
+%
+% If the \meta{user-name} has been used before, an info is displayed in the \xext{log} file and the
+% previous settings are overwritten.
%
-% \subsection{Verbatim inside \textt{tabu} with \textt X columns}
-% \label{Verbatim inside tabu}
+% With the \cs\tracingtabu$>0$, informations about the saved parameters are reported in the \xext{log} file.
%
-% The process of computing \textt X columns widths implies to make ``trials'': this means that
-% the tabular is first printed in internal mode, inside a box which is measured until the target
-% width is reached. Such trials require to collect the content of the \textt{tabu} environment.
-% Therefore, the category codes of the characters read in the environment are fixed, and \cs{verb}
-% commands are not allowed.
+% Recalling saved parameters are done with \cs\usetabu (complete recovery) or \cs\preamble (partial recovery of
+% the preamble only).
%
-% \begin{declcs}{verbatim}\M{general text}
+% \begin{declcs}{usetabu}\M{user-name}
% \end{declcs}
%
-% To get round this limitation, \textt{tabu} provides the command \cs{verbatim} which allows to put
-% some pieces of verbatim text inside a \textt{tabu}: it is based on \eTeX{} \cs{scantokens} primitive
-% and is defined only inside the \textt{tabu} environment. \cs{verbatim} has some other limitations
-% you must know:
+% \cs\usetabu is the complement of \cs\savetabu: it can be put alone in the \env{tabu} preamble instead
+% of the usual columns specifications to restore any previous settings saved with \cs\savetabu.
%
+% The \meta{user-name} must exist otherwise, you get an error.
%
-% \begin{tabu}to\linewidth{>{\ttfamily\centering}p{3cm}p{\dimexpr\linewidth-3cm-4\tabcolsep}} \toprule
-% \verb+^^@+ &can be used to get a carriage return inside \cs{verbatim} \\
-% \verb+^+ &consequently \verb+^+ is a normal subscript character \\
-% \verb+{+ \verb+}+ &curly braces must be equilibrated \\
-% \% &The percent character\, \%\, is for commentaries: the content of the
-% environment is collected before \cs{verbatim} does its job, therefore commentaries are
-% removed...
-% \\\bottomrule
-% \end{tabu}
+% \cs\usetabu is a help to \textbf{make several tabulars of exactly the same shape, same target,
+% same preamble.} The only parameter that can be changed is the optional vertical position parameter
+% for the whole tabular.
+%
+% \cs\usetabu does not work with \hyperref[longtabu.sec]{\env{longtabu}}.
+%
+% \Needspace{2\baselineskip}
+%
+% \cs\usetabu locally restores:\nobreak
+% \begin{itemize}
+% \item the preamble\footnote{The complete \cs\halign-preamble is restored.}.
+% \item the vertical position \M*[c],\, \M*[b]\, or\, \M*[t], unless another position is specified.
+% \item the target width of the \env{tabu} in points: the saved target width does not contain
+% any control sequence: it is fixed and stored in points.
+% \item the width of \textt{tabu X} columns: those widths are not calculated any more -- even in the case
+% of negativ coefficients -- and \textt X columns are directly transformed into
+% \textt p, \textt m or \textt b columns of the same widths as the ones that where calculated
+% at the time of \cs\savetabu
+% \item \cs\tabcolsep (or \cs\arraycolsep in math mode)\, \cs\extrarowheight,\, \cs\extrarowdepth,\, \cs\arraystretch\, and\, \cs\extratabsurround
+% \item \cs\arrayrulewidth,\, \cs\doublerulesep\, and the parameters for \cs\everyrow\, \cs\taburulecolor,\, \cs\tabulinestyle,\, and\,
+% \cs\taburowcolors
+% \item \cs\minrowclearance,\, (package \Xpackage{colortbl})
+% \end{itemize}
%
-% If you need more verbatim inside a \textt{tabu} environment:
+% \cs\abovetabulinesep\,and\, \cs\belowtabulinesep are not restored, because they are related to the
+% content of the tabular rather than to its shape.
+% \medskip
+%
+% Example:
+%
+% {\smaller
+% \begin{lstlisting}
+% \tabcolsep=12pt \extrarowsep=1mm
+% \tabulinestyle{on 1pt ForestGreen}
+% \begin{tabu}to .7\linewidth{|XXX|X[c]|} \savetabu{mytabu} \tabucline-
+% This & is & tabu & package \\ \tabucline-
+% \end{tabu}
+% \end{lstlisting}}
+%
+% \begin{center}
+% \tabcolsep=12pt\extrarowsep=1mm \tabulinestyle{on 4pt ForestGreen}
+% \begin{tabu}to .7\linewidth{|XXX|X[c]|} \savetabu{mytabu}
+% \tabucline-
+% This & is & tabu & package \\ \tabucline-
+% \end{tabu}
+% \end{center}
+%
+% \Needspace{3\baselineskip}
+%
+% {\smaller
+% \begin{lstlisting}
+% \tabureset
+% \begin{tabu}{\usetabu{mytabu}} \tabucline-
+% \multicolumn3{|c}{This is tabu} & package \\ \tabucline-
+% \tabuphantomline
+% \end{tabu}
+% \end{lstlisting}}
+%
+% \begin{center}
+% \tabureset
+% \begin{tabu}{\usetabu{mytabu}} \tabucline-
+% \multicolumn3{|c|}{This is tabu} & package \\ \tabucline-
+% \tabuphantomline
+% \end{tabu}
+% \end{center}
+%
+%
+% If one day you use \textt{tabu}, you will have the idea to restore a \textt{tabu} while modifying its target,
+% or adding new columns... \cs{savetabu} and \cs{usetabu} have not been thought for this purpose, and you may
+% have unexpected results.
+%
+% \begin{declcs}{preamble}\M{user-name}
+% \end{declcs}
+%
+% \cs\preamble can also be used after \cs\savetabu. This is a variant of \cs\usetabu that locally restores:
% \begin{itemize}
-% \item you should avoid the use of \textt X columns
-% \item or if you really want to use \textt X columns, you must save your verbatim text before the \textt{tabu},
-% for example with the \textt{SaveVerbatim} environment provided by the package \xpackage{fancyvrb}.
+% \item the \env{tabu} (or \env{longtabu}) preamble.
+% \item the vertical position \M*[c],\, \M*[b]\, or\, \M*[t] (or \M*[c],\, \M*[l]\, or\, \M*[r] for \env{longtabu}),
+% unless another position is specified.
+% \item the \env{tabu} / \env{longtabu} target width, unless another target is specified.
% \end{itemize}
+% Any other tabular parameter is not restored.
%
+% Put \cs\preamble\M{user-name} alone inside the \env{tabu} (or \env{longtabu}) preamble in place of the usual
+% columns specifications.
+%
+% \cs\preamble works exactly as if you defined a \hyperref[Custom environments]{custom environment} for \env{tabu}.
%
+% \cs\preamble works with \hyperref[longtabu.sec]{\textt{longtabu}}.
+%
+% Example (continued...):
+%
+% {\smaller
+% \begin{lstlisting}
+% \tabulinestyle{1pt off1pt}
+% \begin{tabu} to\linewidth{\preamble{mytabu}} \tabucline-
+% This &is &tabu &package \\ \tabucline-
+% \end{tabu}
+% \end{lstlisting}}
+%
+% {\tabulinestyle{1pt off1pt}
+% \begin{tabu} to\linewidth{\preamble{mytabu}} \tabucline-
+% This &is &\textt{tabu} &package \\\tabucline-
+% \end{tabu}
+% }
+%
+% \cs\tabcolsep, rule colors etc. are not restored from \cs\savetabu: the only \env{tabu} preamble is restored.
+%
+% \section{Some other features}
%
% \subsection(Numbers in tabu){Printing numbers inside \textt{tabu} with \xpackage{numprint} and \xpackage{siunitx}}
%
-% \subsubsection{Just make it easy !}
+% \subsubsection{\cs{tabudecimal}}
%
% \thispackage provides a \emph{facility} to print numbers inside columns. This facility is not
% implemented to replace \xpackage{siunitx} \textt S and \textt s columns or \xpackage{numprint}
@@ -1250,16 +2333,18 @@ lppl copyright 2010-2011 by FC <florent.chervet@free.fr>
% \def\usermacro#1{\numprint[\officialeuro]{\zap@space #1 \@empty}}
% \makeatother
%
-%
-% \begin{tabu}{XX}
-% \multicolumn{2}{l}{\verbatim{\begin{tabu}{|[GreenYellow]*2{>{\tabudecimal\usermacro}X[r]|[GreenYellow]}}}} \\
-% \verbatim{
-% \rowfont[c]{\bf} January & February \\ ^^@
-% 12.324 & 745.32 \\ ^^@
-% 21.13 & 0 \\ ^^@
-% 213.3245 & 12.342 \\ ^^@
-% 2143.12 & 324.325 \\ ^^@
-% \end{tabu}}
+% \begin{tabu*}{XX}
+% ^^A\multicolumn2l{\Verb+\begin{tabu}{|[GreenYellow]*2{>{\tabudecimal\usermacro}X[r]|[GreenYellow]}}+} \\ ^^A ICI PROBLEME
+% {
+% \begin{Verbatim}
+% \rowfont[c]{\bf} January & February \\
+% 12.324 & 745.32 \\
+% 21.13 & 0 \\
+% 213.3245 & 12.342 \\
+% 2143.12 & 324.325 \\
+% \end{tabu}
+% \end{Verbatim}
+% }
% &
% \begin{tabu}{|[GreenYellow]*2{>{\tabudecimal\usermacro}X[r]|[GreenYellow]}c} \tabucline[1pt GreenYellow]-
% \rowfont[c]\bf January &February & ...\\ \tabucline[1pt on2pt GreenYellow]-
@@ -1268,7 +2353,7 @@ lppl copyright 2010-2011 by FC <florent.chervet@free.fr>
% 213.3245 &12.342 & ... \\
% 2143.12 &324.325 & ... \\ \tabucline[1pt GreenYellow]-
% \end{tabu}
-% \end{tabu}
+% \end{tabu*}
%
% \medbreak
%
@@ -1319,9 +2404,9 @@ lppl copyright 2010-2011 by FC <florent.chervet@free.fr>
% \subsection{Paragraph indentation}
% \label{Paragraph indentation.subsec}
%
-% \textt{tabu} takes care of paragraph indentation when it is used with \textt X columns and its default target,
+% \env{tabu} takes care of paragraph indentation when it is used with \textt X columns and its default target,
% no matter if it has been loaded or not with the \textt{linegoal} option.
-% Example with \LaTeX{} default: \cs{parindent} $=20$pt.
+% Example with \LaTeX{} default: \cs\parindent $=20$pt.
%
% {\parindent=20pt \let\tabudefaulttarget \linewidth
%
@@ -1364,8 +2449,8 @@ lppl copyright 2010-2011 by FC <florent.chervet@free.fr>
% {\ttfamily \ifcurrentenvir{tabu}{\pkgcolor\lsstyle}{}\currentenvirname}
% with \xpackage{delarray} shortcuts for #1 around.}
%
-% \tabcolsep=10pt
-% \begin{tabu}to 12cm{|[pkgcolor]*2{>{\extrarowsep=0pt}X|[pkgcolor]}} \tabucline[pkgcolor]-
+% \tabcolsep=10pt \tabulinesep=3mm \tabulinestyle{.7pt pkgcolor}
+% \begin{tabu}to 12cm{|*2{X|}} \tabucline-
% \begin{tabu}({X}) \tikzlabel{tabularx overfull}
% \text{parenthesis} \end{tabu}
% &
@@ -1378,372 +2463,12 @@ lppl copyright 2010-2011 by FC <florent.chervet@free.fr>
% &
% \begin{tabularx}{\linewidth}[t]\{{X}\}
% \text{curly brackets} \end{tabularx}
-% \\ \tabucline[pkgcolor]-
-% \end{tabu}
-%
-% }
-%
-% \section{Automatic horizontal lines: \cs{everyrow}}
-%
-% \begin{declcs}{everyrow}
-% \end{declcs}
-%
-% \cs{everyrow} can be used to insert horizontal lines automatically:
-%
-% {
-% \begin{Verb*}
-% \begin{tabu}.5\linewidth{cX[2c]X} \tabucline[1pt]- ($db(\everyrow)){\tabucline[on 2pt]-}
-% This is &a small example &of a \textt{tabu} \\
-% which &automatically &inserts \\
-% a horizontal &line after &each of its row ($db(\everyrow)){} \\ \tabucline[1pt]-
-% \end{tabu}
-% \end{Verb*}
-%
-% \centering
-% \tabulinesep=3pt
-% \begin{tabu}to .5\linewidth{cX[2c]X} \tabucline[1pt]- \everyrow{\tabucline[on 2pt]-}
-% This is & a small example & of a \textt{tabu} \\
-% which & automatically & inserts \\
-% a horizontal & line after & each of its row \everyrow{} \\ \tabucline[1pt]-
-% \end{tabu}\par}
-%
-% \cs{everyrow} can be used in \textt{longtabu} as well.
-%
-%
-%
-%
-% \section(row font and alignment){Modifying the font and the alignment in one row: \cs{rowfont}}
-%
-% \begin{declcs}{rowfont}\M[alignment]\M*{font specification}
-% \end{declcs}
-%
-% Inside a \textt{tabu} environment, you can modify the font for each cell in a row.
-% \cs{rowfont} has priority over column font specification, exactly like \cs{rowcolor} (package \xpackage{colortbl})
-% has priority over \cs{columncolor}.
-%
-% The alignment of each cell in one row can also be changed to: \topsep=0pt
-% \begin{center}
-% \begin{tabu}{>{\ttfamily}r@{\,$=$\,}lc>{\ttfamily}r}
-% l &left &{\qquad\smaller or\, for \xpackage{ragged2e} settings: } &L \\
-% c &center & &C \\
-% r &right & &R \\
-% j &justify & &J \\
-% \end{tabu}
-% \end{center}
-%
-% Any other value for the optional \meta{alignment} parameter is silently ignored. If \xpackage{ragged2e} is not loaded,
-% \textt L\, \textt R\, \textt C\, and\, \textt J\, are synonymous with the lowercase equivalent.
-%
-% \begin{Verb*}
-% \begin{tabu}{|X|X[-1]|} \tabucline-
-% ($db(\rowfont))[c]\bfseries
-% This &Is \\\tabucline[on 2pt,blue]-
-% \xpackage{tabu} &package \\\tabucline[off 2pt blue]-
-% ($db(\rowfont))[r]\itshape
-% for &\textt{tabu} and \textt{longtabu} \\\tabucline-
-% \end{tabu}
-% \end{Verb*}
-%
-% \begin{tabu}{|X|X[-1]|}\tabucline-
-% \rowfont[c]\bfseries
-% This &Is \\\tabucline[on 2pt,blue]-
-% \xpackage{tabu} &package \\\tabucline[off 2pt blue]-
-% \rowfont[r]\itshape
-% for &\textt{tabu} and \textt{longtabu} \\\tabucline-
+% \\ \tabucline-
% \end{tabu}
%
-% \ClearPage
-% \section(Vertical spacing of lines){Controlling vertical spacing of lines: \cs{extrarowsep} \,and\, \cs{tabulinesep}}
-% \label{vertical spacing.sec}
-%
-%
-% \subsection{\cs{extrarowheight}\, \cs{extrarowdepth}\, and\, \cs{extrarowsep}}
-% \label{extrarowsep.subsec}
-%
-% \begin{declcs}{extrarowheight}$=$\meta{dimen} \\
-% \csanchor{extrarowdepth}$=$\meta{dimen}
-% \end{declcs}
-%
-% \cs{extrarowheight} is a dimension defined in \xfile{array.sty} whose purpose is to add -- inconditionally --
-% some more height to each line in a tabular.
-% Similarly, \cs{extrarowdepth} (defined in \xfile{tabu.sty}) is added -- inconditionally as well -- to the depth of each line.
-%
-% Both \cs{extrarowheight} and \cs{extrarowdepth} are scaled by \cs{arraystretch}\footnote{\cs{arraystretch} is not a dimension
-% but a macro that stores a scaling factor.} if \cs{arraystretch}$>1$.
-%
-% \begin{declcs}{extrarowsep}$=$\meta{dimen}
-% \end{declcs}
-%
-% \cs{extrarowsep} makes the assignment for both \csref{extrarowheight} and \csref{extrarowdepth}.
-% The macro can be prefixed by \cs{global}\footnote{However \cs{extrarowsep} is not a dimension !
-% You can't test, for example, \cs{ifdim}\cs{extrarowsep}$>0pt$ ! Test \cs{extrarowheight} and \cs{extrarowdepth} instead, if needed.}.
-%
-% Examples \textcolor{gray}{(with \cs{tabustrutrule}$=2pt$ to see the struts)}:\enlargethispage\baselineskip
-%
-% \tabulinestyle{test=1pt blue,testdash=.7pt on1.2pt off 2pt blue}
-%
-% {
-% \def\arraystretch{1}\tabustrutrule=0pt
-% \def\smalltest#1#2{\begin{tabu}{#1} \hline #2 \\ \hline \end{tabu}}
-%
-% \def\test#1{{\tabustrutrule=0pt\tabulinesep=2pt\extrarowsep=0pt
-% \begin{tabu}to 15cm{@{}|[test]*3{>{\tabustrutrule=2pt\tabulinesep=0pt\extrarowsep=#1}X[mc]|[test]}>{\tabustrutrule=2pt\tabulinesep=0pt\extrarowsep=#1}X[1.3mc]|[test]}
-% \tabucline[test]-
-% \rowfont\bfseries
-% Standard \textt c column & \textt{X[-1,c]} columns & Math mode & Mixed: \textt{X[-1c]X[-1c\$]}
-% \\ \tabucline[test]-
-% \smalltest{*2c}{One & Two \\ \hline Three & Four }
-% &
-% \smalltest{*2{X[-1,c]}}{One & Two \\ \hline Three & Four }
-% &
-% $\smalltest{*2c}{\alpha & \beta \\ \hline \dfrac \Phi \theta & \Gamma_x^t}$
-% &
-% \smalltest{X[-1c]X[-1c$]}{First & \dpartial \Phi \theta \\ \hline Second & \dtotal \theta t}
-% \\ \tabucline[testdash]-
-% \multicolumn4{|[test]c|[test]}{\cs{extrarowsep}=$#1$}
-% \\ \tabucline[test]-
-% \end{tabu}
-% }}
-%
-% \tikz{
-% \papergraduate [xcolor=ForestGreen,ycolor=Maroon,opacity=.3] (0,0) (158mm,46mm);
-% \node at (5mm,5mm) [anchor=south west,inner sep=0pt] {\test{3mm}};
-% }
-% ^^A\pagebreak
-%
-% \tikz{
-% \papergraduate[xcolor=ForestGreen,ycolor=Maroon,opacity=.3] (0,0) (158mm,40mm);
-% \node at (5mm,5mm) [anchor=south west,inner sep=0pt] {\test{0mm}};
-% }
+% {\hfill\scriptsize\lk Here \cs\tabulinesep$=3mm$\par}
% }
%
-%
-% \subsection{\cs{abovetabulinesep}\, \cs{belowtabulinesep}\, and\, \cs{tabulinesep}}
-% \label{tabulinesep.subsec}
-%
-% \begin{declcs}{abovetabulinesep}$=$\meta{dimen} \\
-% \csanchor{belowtabulinesep}$=$\meta{dimen}
-% \end{declcs}
-%
-% \cs{abovetabulinesep} is the \emph{minimal} vertical space allowed between the cell content
-% and the cell top border. Setting this dimension to a positive value will insert -- conditionally,
-% depending on the cell content -- a vertical space above the cell content.
-%
-% \cs{belowtabulinesep} is conversely the minimal vertical space allowed to the bottom border of the cell.
-% When \cs{belowtabulinesep}$>0pt$ a vertical space is inserted -- conditionnally, depending on the cell
-% content -- below the cell content.
-%
-% \begin{declcs}{tabulinesep}$=$\meta{dimen}
-% \end{declcs}
-%
-% \cs{tabulinesep} makes the assignment for both \csref{abovetabulinesep} and \csref{belowtabulinesep}.
-% The macro can be prefixed by \cs{global}\footnote{However \cs{tabulinesep} is not a dimension !
-% You can't test, for example, \cs{ifdim}\cs{tabulinesep}$>0pt$ !
-% Test \cs{abovetabulinesep} and \cs{belowtabulinesep} instead, if needed.}.
-%
-% This parameter can be used in text and math modes to give more vertical space between lines,
-% especially when using math formulae.
-%
-% Examples \textcolor{gray}{(with \cs{tabustrutrule}$=2pt$ to see the struts)}:
-%
-%
-%\begin{tikzpicture}
-%
-% \papergraduate (0,0) (158mm,32mm);
-%
-% \node at (5mm,5mm) [anchor=south west,inner sep=0pt]
-% {{\tabulinesep=4pt\tabustrutrule=0pt\extrarowsep0pt
-% \def\test#1{\tabulinesep=#1 \ifdim\abovetabulinesep>0pt \tabustrutrule=2pt\fi
-% \begin{tabu}{|*2{X[-1c$]|}} \hline
-% \dpartial \Phi \theta & \dtotal \theta t \\ \hline
-% \end{tabu}}%
-% \begin{tabu} to 15cm{@{}|[test]*3{X[cm]|[test]}} \tabucline[test]-
-% \test{0mm}
-% &
-% \test{1mm}
-% &
-% \test{3mm}
-% \\ \tabucline[testdash]-
-% \cs{tabulinesep}$=0mm$ & \cs{tabulinesep}$=1mm$ & \cs{tabulinesep}$=3mm$
-% \\ \tabucline[test]-
-% \end{tabu}
-% }
-% };
-% \end{tikzpicture}
-%
-% \centerline{Now you can compare with \csref{extrarowsep}:}
-%
-% \begin{tikzpicture}
-%
-% \papergraduate (0,0) (158mm,29mm);
-%
-% \node at (5mm,5mm) [anchor=south west,inner sep=0pt]
-% {{\tabulinesep=4pt\tabustrutrule=0pt\extrarowsep0pt
-% \def\test#1{\tabulinesep=0pt\extrarowsep=#1 \ifdim\extrarowdepth>0pt \tabustrutrule=2pt\fi
-% \begin{tabu}{|*2{X[-1c$]|}} \hline
-% \dpartial \Phi \theta & \dtotal \theta t \\ \hline
-% \end{tabu}}%
-% \begin{tabu} to 15cm{@{}|[test]*3{X[cm]|[test]}} \tabucline[test]-
-% \test{0mm}
-% &
-% \test{1mm}
-% &
-% \test{3mm}
-% \\ \tabucline[testdash]-
-% \cs{extrarowsep}$=0mm$ & \cs{extrarowsep}$=1mm$ & \cs{extrarowsep}$=3mm$
-% \\ \tabucline[test]-
-% \end{tabu}
-% }
-% };
-% \end{tikzpicture}
-%
-%
-%
-%
-%
-% Presently (version 2.1), non zero value for \cs{tabulinesep} does not work properly with \cs{firsthline} and \cs{lasthline},
-% but you may use \cs{hline}, \csref{tabucline} and \Xpackage{booktabs} \cs{toprule}, \cs{midrule} and \cs{bottomrule}.
-%
-%
-%
-%
-% \begin{declcs}{tabustrutrule}$=$\meta{dimen}
-% \end{declcs}
-%
-% For debugging purpose only (or to learn how this works): \cs{tabustrutrule} behaves like \TeX{} \cs{overfullrule}
-% and allows to see the struts introduced inside the cells to control the vertical spacing between lines.
-% Struts are only inserted inside paragraph columns (\textt p,\, \textt m,\, \textt b\, columns and also
-% \textt X columns which are paragraph columns as well).
-%
-% Normally, those struts are rules of width \textt{0pt}.
-%
-%
-% \section(Saving and restoring tabu){Saving and restoring a \textt{tabu}: \cs{savetabu}, \cs{usetabu} and \cs{preamble}}
-%
-% \begin{declcs}{savetabu}\M{user-name}
-% \end{declcs}
-%
-% The command \cs{savetabu} can be used at the end of any line of a \textt{tabu} environment to save the
-% target width (or the spread), the columns specifications (tabular preamble) and the widths of
-% \textt{tabu X} columns (if there is any).
-% This possibility allows to easily make tabulars which share exactly the same shape
-% throughout your document. This can also be used as a kind of \textt{tabbing} environment
-% which is able to remember the tabs positions.
-%
-% If the \meta{user-name} has been used before, an info is displayed in the \xext{log} file and the
-% previous settings are overwritten.
-%
-% With the \hyperref[debugshow]{\textt{debugshow} package option} (or \csref{tracingtabu}) the informations
-% saved by \cs{savetabu} are reported in the \xext{log} file.
-%
-%
-% \begin{declcs}{usetabu}\M{user-name}
-% \end{declcs}
-%
-% \cs{usetabu} is the complement of \cs{savetabu}: it can be put alone in the \textt{tabu}
-% preamble instead of the usual columns specifications
-% to restore any previous settings saved with \cs{savetabu}.
-% The \meta{user-name} must exist otherwise, you get an error.
-% \cs{usetabu} is a help to \textbf{make several tabulars of exactly the same shape, same target,
-% same preamble.} The only parameter that can be changed is the optional vertical position parameter
-% for the whole tabular.
-%
-% \cs{usetabu} does not work with \hyperref[longtabu.sec]{\textt{longtabu}}.
-%
-% \needspace{2\baselineskip}
-%
-% \cs{usetabu} locally restores:\nobreak
-% \begin{itemize}
-% \item the preamble\footnote{The complete \cs{halign}-preamble is restored.}.
-% \item the vertical position \M*[c],\, \M*[b]\, or\, \M*[t], unless another position is specified.
-% \item the target width of the \textt{tabu} in points: the saved target width does not contain
-% any control sequence: it is fixed and stored in points.
-% \item the width of \textt{tabu X} columns: those widths are not calculated any more, even in the case
-% of negativ coefficients and \textt{X} columns are directly transformed into
-% \textt p, \textt m or \textt b columns of the same widths as the ones that where calculated
-% at the time of \cs{savetabu}
-% \item \cs{tabcolsep} (or \cs{arraycolsep} in math mode) and \cs{arraystretch}
-% \item \cs{arrayrulewidth},\hfil \cs{doublerulesep},\hfil \cs{extrarowheight},\hfil \csref{extrarowdepth},\hfil \linebreak
-% and \, \cs{extratabsurround}.
-% \item \cs{minrowclearance},\, \cs{arrayrulecolor} \, and \, \cs{doublerulesepcolor} \, (package \Xpackage{colortbl})
-% \end{itemize}
-%
-% \csref{abovetabulinesep}\,and\, \csref{belowtabulinesep} are not restored, because they are related to the
-% content of the tabular rather than to its shape, and\, \csref{tabustrutrule}\, is not restored because of
-% its ``debugging'' nature.
-% \medskip
-%
-% Example:
-%
-% \begin{Verb*}
-% \extrarowheight=5pt\tabcolsep=12pt\arrayrulecolor{ForestGreen}
-% \begin{tabu}to .7\linewidth{|XXX|X[c]|} ($db(\savetabu)){mytabu} \tabucline*[on1pt]-
-% This & is & tabu & package \\ \tabucline*[on1pt]-
-% \end{tabu}
-% \arrayrulecolor{black}
-% \end{Verb*}
-%
-% \begin{center}
-% \tabulinestyle{myline=on1pt}\extrarowheight=5pt\tabcolsep=12pt\arrayrulecolor{ForestGreen}
-% \begin{tabu}to .7\linewidth{|XXX|X[c]|} \savetabu{mytabu} \tabucline*[myline]-
-% This & is & tabu & package \\ \tabucline*[myline]-
-% \end{tabu}
-% \arrayrulecolor{black}
-% \end{center}
-%
-% \begin{Verb*}
-% \begin{tabu}{($db(\usetabu)){mytabu}} \tabucline*[on1pt]-
-% \multicolumn3{|c}{This is tabu} & package \\ \tabucline*[on1pt]-
-% \tabuphantomline
-% \end{tabu}
-% \end{Verb*}
-%
-% \begin{center}
-% \begin{tabu}{\usetabu{mytabu}} \tabucline*[myline]-
-% \multicolumn3{|c|}{This is tabu} & package \\ \tabucline*[myline]-
-% \tabuphantomline
-% \end{tabu}
-% \end{center}
-%
-%
-% If one day you use \textt{tabu}, you will have the idea to restore a \textt{tabu} while modifying its target,
-% or adding new columns... \cs{savetabu} and \cs{usetabu} have not been thought for this purpose, and you may
-% have unexpected results.
-%
-% \begin{declcs}{preamble}\M{user-name}
-% \end{declcs}
-%
-% \cs{preamble} can also be used after \csref{savetabu}. This is a variant of \cs{usetabu} that locally restores:
-% \begin{itemize}
-% \item the \textt{tabu} (or \textt{longtabu}) preamble.
-% \item the vertical position \M*[c],\, \M*[b]\, or\, \M*[t] (or \M*[c],\, \M*[l]\, or\, \M*[r] for \textt{longtabu}),
-% unless another position is specified.
-% \item the \textt{tabu} / \textt{longtabu} target width, unless another target is specified.
-% \end{itemize}
-% Any other tabular parameter is not restored.
-%
-% Put \cs{preamble}\M{user-name} alone inside the \textt{tabu} (or \textt{longtabu}) preamble in place of the usual
-% columns specifications.
-%
-% \cs{preamble} works exactly as if you defined a \hyperref[Custom environments]{custom environment} for \textt{tabu}.
-%
-% \cs{preamble} works with \hyperref[longtabu.sec]{\textt{longtabu}}.
-%
-% Example (continued...):
-%
-% \begin{Verb*}
-% \begin{tabu} to\linewidth{($db(\preamble)){mytabu}} \tabucline[1pt off1pt]-
-% This &is &tabu &package \\\tabucline[1pt off1pt]-
-% \end{tabu}
-% \end{Verb*}
-%
-% \begin{tabu} to\linewidth{\preamble{mytabu}} \tabucline[1pt off1pt]-
-% This &is &\textt{tabu} &package \\\tabucline[1pt off1pt]-
-% \end{tabu}
-%
-% \cs{arrayrulecolor}, \cs{tabcolsep} \etc. are not restored from \cs{savetabu}.
-%
-%
% \section(Differences: tabu, tabular, tabularx, longtable){Differences between \textt{tabu},\, \textt{tabular},\, \textt{tabularx} and \textt{longtable}}
%
% \subsection{Paragraph indentation}
@@ -1755,11 +2480,11 @@ lppl copyright 2010-2011 by FC <florent.chervet@free.fr>
%
% Unlike \textt{tabularx}, it is possible to define your own environment using \textt{tabu}:
%
-% \begin{Verb}
+% \begin{Verbat}
% \newenvironment{foo}
% {\begin{tabu}{X[1.2]|[1pt gray]X}}
% {\end{tabu}}
-% \end{Verb}
+% \end{Verbat}
%
% \newenvironment{footabu}
% {\begin{tabu}{@{}X[1.2]|[1pt,gray]X@{}}}
@@ -1840,7 +2565,7 @@ lppl copyright 2010-2011 by FC <florent.chervet@free.fr>
% \end{tikzpicture}
%
% For more details, see the \nameref{Flow chart of expansion}.
-% \pagebreak
+%
%
% \cs{@mkpream} works in two times inside a (semi-simple) group:
%
@@ -1859,7 +2584,8 @@ lppl copyright 2010-2011 by FC <florent.chervet@free.fr>
% With \textt{tabular}, and \xpackage{siunitx} \textt S column, the {\descfont\mdseries\itshape rewritting process}
% is as follow:\nobreak
%
-% \begin{SaveVerbatim}{siunitx}
+% \begin{tabu*}{@{}X[m]X[m1.2]@{}}
+% \begin{Verbatim}
% \documentclass{minimal}
% \usepackage{numprint,siunitx,xcolor}
% \usepackage{tabu}
@@ -1874,10 +2600,7 @@ lppl copyright 2010-2011 by FC <florent.chervet@free.fr>
% \end{tabu}
%
% \end{document}
-% \end{SaveVerbatim}
-%
-% \begin{tabu}{@{}X[m]X[m1.2]@{}}
-% \UseVerbatim{siunitx}
+% \end{Verbatim}
% &
% Inside \textt{tabular}:
% \begin{enumerate}[label=\arabic*),topsep=\parskip,itemsep=.5\parskip,leftmargin=3em]
@@ -1897,7 +2620,7 @@ lppl copyright 2010-2011 by FC <florent.chervet@free.fr>
% \item Rewrite \textt S
% \item Rewrite \textt n \smex not found because \textt S was rewritten before, according to \xpackage{siunitx} definition.
% \end{enumerate}
-% \end{tabu}
+% \end{tabu*}
%
% The process of rewritting columns is usually longer inside \textt{tabu} than inside \textt{tabular},
% but conversely \textt{tabu} with \textt X columns is optimised compared to \textt{tabularx},
@@ -1924,14 +2647,14 @@ lppl copyright 2010-2011 by FC <florent.chervet@free.fr>
% Well, just avoid to nest new column types definitions !
%
%
-% \clearpage
+% \ClearPage
% \section{The package options}
%
% \subsection(The debugshow option){The \textt{debugshow} package option}
-% \label{debugshow}
+% \label{debugshow}\label{debugshow package option}
%
% \begin{declcs}{tracingtabu} \\
-% \cs{tracingtabu}\,=\,2
+% \cs{tracingtabu}\,=\,1, 2, 3 or 4
% \end{declcs}
%
% The control sequence \cs{tracingtabu} has the same effect as the \textt{debugshow} option:
@@ -1942,6 +2665,12 @@ lppl copyright 2010-2011 by FC <florent.chervet@free.fr>
% is used.
% \end{itemize}
%
+% \begin{tabu}{X[-1]X}
+% \cs\tracingtabu$=2$ & gives more information on the measures of the natural widths. \\
+% \cs\tracingtabu$=3$ & shows the struts inserted inside the \env*{tabu} and gives more information about
+% the measures of the height and depth of every row. \\
+% \cs\tracingtabu$=4$ & displays information on the insertions made by \cs\tabucline.
+% \end{tabu}
%
% Typical information in the \xext{log} file:
%
@@ -1964,7 +2693,10 @@ lppl copyright 2010-2011 by FC <florent.chervet@free.fr>
% The final width of each \textt X column is the product of \textt{tabu X} by its width coefficient.
% \end{enumerate}
%
-% \cs{tracingtabu}=2 gives even more information about the measuring of natural widths of columns.
+% \subsection(The delarray option){The \textt{delarray} package option}
+%
+% \textt{delarray} option has the single effect to load \xfile{delarray.sty} for delimiters shortcuts
+% around \textt{tabu}. Delimiters shortcuts work both in math and text mode.
%
% \subsection(The linegoal option){The \textt{linegoal} package option}
% \label{subsec:linegoal package option}
@@ -1982,42 +2714,6 @@ lppl copyright 2010-2011 by FC <florent.chervet@free.fr>
%
% In any case, specifying the target overwrites the default: \cs{begin}\M*{tabu} to\cs{linewidth}
%
-% \subsection(The delarray option){The \textt{delarray} package option}
-%
-% \textt{delarray} option has the single effect to load \xfile{delarray.sty} for delimiters shortcuts
-% around \textt{tabu}. Delimiters shortcuts work both in math and text mode.
-%
-%
-% \subsection(The light option){The \textt{light} package option}
-% \label{sec:light package option}
-%
-%
-% When you enter a \textt{tabu} environment, two macros amongst the smallest possible of \xfile{array.sty}
-% are modified:
-% these are \cs{prepnext@tok}, which is expanded while \cs{@mkpream} builds the \cs{halign} preamble
-% and \cs{save@decl} to avoid inversion of tokens in text mode (see \nameref{subsec:inversion of tokens}).
-%
-% Modification of \cs{prepnext@tok} is loaded only inside the \textt{tabu} environment, while
-% the modification of \cs{save@decl} is loaded only inside the group in which \cs{@mkpream} works: this is
-% very very local to \textt{tabu} and cannot interfere with any other tabular !
-%
-% \cs{prepnext@tok} could have been loaded inside the \cs{@mkpream} group as well, but then \cs{rowfont}
-% would not have worked inside \textt{array} or \textt{tabular} nested into a \textt{tabu}. Thus the choice.
-%
-% As you see, these modifications do no modify \textt{tabular}, \textt{tabular*}, \textt{tabularx}, \textt{longtable}
-% \etc \etc \etc
-%
-% If for some reason you prefer the original macros of \xfile{array.sty}, then you can load \thispackage with
-% the ``\textt{light}'' option.
-% As a consequence: \cs{rowfont},\, \cs{tabucline}\, and\, \cs{everyrow} will not be available,
-% and vertical lines \texttt\textbar\ will not have an optional argument for their widths and color.
-% However, \textt{tabu X} columns will work normally.
-%
-% ^^A\medskip
-% ^^A As the author of \thispackage, I often use the \textt{light} option when implementing \textt{tabu}, for the
-% ^^A\xext{log} file is lighter too...
-%
-%
% \section(Corrections){Corrections of some bugs \textmd{\emph{(available only inside \textt{\upshape tabu})}}}
%
% \subsection(delarray compatibility){Correction for \xpackage{colortbl} and \xpackage{arydshln}: compatibility with \xpackage{delarray}}
@@ -2029,11 +2725,20 @@ lppl copyright 2010-2011 by FC <florent.chervet@free.fr>
% Those control sequences are used by the \xpackage{delarray} package to put variable size delimiters around the array:
%
% {\centering\tabcolsep=12pt
-% \begin{tabu}{X[-1m]X[-1mc]X[-1m]}
-% \verbatim{\begin{tabu}\{{X}.^^@ ...^^@ \end{tabu}} &
-% is like: &
-% \verbatim{\left\{ \begin{tabu}{X}^^@ ...^^@ \end{tabu} \right.}
-% \end{tabu}\par}
+% \begin{tabu*}{X[-1m]X[-1mc]X[-1m]}
+% \begin{Verbatim}
+% \begin{tabu} \{{X}.
+% ...
+% \end{tabu}
+% \end{Verbatim}
+% &
+% is like: &
+% \begin{Verbatim}
+% \left\{\begin{tabu}{X}
+% ...
+% \end{tabu} \right.
+% \end{Verbatim}
+% \end{tabu*}\par}
%
%
% \subsection(arydshln @ columns){Correction for \xpackage{arydshln}: \texttbf @ columns}
@@ -2050,8 +2755,6 @@ lppl copyright 2010-2011 by FC <florent.chervet@free.fr>
%
% \nprounddigits{0}
% \begin{itemize}[leftmargin=*,label=\ding{223}]
-% \item Implement \cs{tabulineskiplimit} in a manner close to \xpackage{tabls} \cs{tabulinesep}
-% or \xpackage{cellspace} \textt S columns-modifier.
% \item Make double \cs{tabucline} compatible with \xpackage{colortbl} \cs{doublerulesepcolor}
% \item Multiple \cs{tabucline} between different columns: extended specs: \\
% \cs{tabucline}\M[line spec]\M*{start-stop, start-stop}\M[line spec]\M*{start-stop} ...
@@ -2059,7 +2762,6 @@ lppl copyright 2010-2011 by FC <florent.chervet@free.fr>
% I compiled a \textt{longtabu} of 56 pages on my PC with \cs{LTchunksize} $ = $ \numprint{2000} without problem.
% Presently \cs{LTchunksize} is set to \numprint{10000} during trials when \textt{longtabu} contains \textt{X columns}.
% \item Make \cs{tabucline} work with page breaks (one line on the top of the page, one line on the bottom of the previous).
-% \item An environment ``\textt{calstabu}'' based on the \Xpackage{cals} package but with the syntax of \textt{tabular} if possible...
% \end{itemize}
%
% \raggedbottom
@@ -2070,15 +2772,359 @@ lppl copyright 2010-2011 by FC <florent.chervet@free.fr>
%
% \IMPLEMENTATION
%
-% \subsection{Identification, requirements and options}
+% \subsection{Drawing a tabular - The \TabU approach}
+% \label{tabu approach}
+%
+% \TabU has a different approach than almost any other package providing facilities for tabulars.
+% \Xpackage{colortbl} and \Xpackage{arydshln} both put the cells contents into a box for measuring
+% purpose, and then use the dimensions of each box to make their setups:
+% \begin{description}
+% \item [\xpackage{colortbl}] needs the dimensions of the box to put a rule in the background of the cell,
+% \item [\xpackage{arydshln}] needs the dimensions to set the length of its leaders (dash lines).
+% \end{description}
+%
+% This is achieved by modifying the macros defined in \xfile{array.sty} to insert columns inside the \cs\halign preamble.
+%
+% Instead, \TabU proceeds as follow:
+% \begin{enumerate}[label=\arabic*.,name=tabu philosophy,nolistsep,leftmargin=2em]
+% \item It first measures (if there are some negative width coefficients, or if \env{tabu spread} is used) the natural widths of the cells / the columns,
+% \item Then it always measures the height and depth of each cell / row,
+% \item Thereafter, the tabular is printed exactly as if \xfile{array.sty} was entitle to print it: no ``extra'' boxing of the cells material.
+% The measurements have been stored and can be used to set the struts (only one per row) and the lengths of vertical leaders.
+% \item No macros of \xfile{array.sty} is modified at stage \refitem{tabu philosophy,3}
+% \end{enumerate}
+%
+% \TabU material inserted in the tabular for vertical leaders, \cs\rowfont etc. is put inside the special ``free'' tokens
+% provided by \xfile{array.sty}:
+% \begin{itemize}[leftmargin=2em]
+% \item A vertical leader is put inside a \,\texttbf !\, column:\, \texttbf{!\M*{vertical leader}}
+% \item Changing font and alignment in one row requires some setup in \,\texttbf >\, tokens:\, \textttbf{>\M*{rowfont material}}.
+% \end{itemize}
+%
+% This way, the commands of \xfile{array.sty} that build each column definition (or preamble, in the sense of \cs\halign) are never modified.
+%
+% \subsection{Algorithms}
+% \label{algorithms}
+%
+% \subsubsection{\env{tabu to} target}
+% \label{algorithms tabu to}
%
-% The package namespace is \textttbf{\macrocodecolor tabu@}.
+% The algorithm of \cs\tabu@arith computes the desired widths to reach the target. In any case, only one measure of
+% the tabular is required to get the widths for all columns. Here we describe the method with an example and some equations
+% too to show that this handle all cases in generality.
%
+% \paragraph{Notations and initialisation of \textt X}
+%
+% In the case of \env{tabu to} the target $T=300$ is given : it is the target specified by the user or the default \env{tabu}
+% target which is \cs\linewidth$-$\meta{parindent correction} or \cs\linegoal. Each \textt X column has a width
+% coefficient which is given too (or default to $1$). The coefficients are: $c_1, c_2, \dots c_n$.
+%
+% $X$ is the main dimension that drives the withs of all columns with a non negative coefficient, and limit the widths
+% of columns with a negative coefficient.
+%
+% Then we have first:
+%
+% \newtabulinestyle{dash=on2pt off2pt} \tabulinesep=1mm
+% \begin{tabu}{|X[2c]|*7{X[$c]}|[dash]*2{X[$c]}|} \tabucline-
+% Coef $c_i$ & &c_1 &c_2 &c_3 &c_4 &c_5 &c_6 &\sum &\Delta \\\tabucline[dash]-
+% & &-1 &-2 &-5 &-2 &2 &3 &15 & \\\tabucline-
+% Target $T$ &300 & & & & & & & & \\\tabucline-
+% \end{tabu}
+%
+%
+% Some coefficients are negative and we have to measure the natural widths of the corresponding columns, for columns
+% always have a width:
+% $$
+% \lambda_i = \begin{tabu}spread0pt \{{lX[-1]}. c_i \cdot X & if $c_i>0$ \\
+% \Min\left(\abs{c_i} \cdot X , \nu_i\right) & if $c_i<0$ \quad with \quad $\nu_i \leq T \quad \forall i$
+% \end{tabu}
+% $$
+%
+% $\nu_i$ is the ``natural width of the column'' in the sense that it is the maximum of the natural widths of each cell
+% in the $ith$ \textt X column, limited to the \env{tabu} target: $\nu_i \leq T \quad \forall i$.
+% \newcommand*\wdtable{\mbox{wd(table)}}
+%
+% The whole width of the tabular is always:
+% $$ \wdtable = \sum_i \lambda_i + \text{incompressible material} \begin{tabu}spread0pt \{{!{\text\textbullet}X[-1]}.
+% \cs\tabcolsep \\
+% vertical lines/leaders thickness \\
+% non \textt X columns
+% \end{tabu}$$
+% and should finally be equal to $T$, by the correct computation of the $\lambda_i$.
+%
+%
+% So what is $X$ at first ? Columns that have a non negative coefficients always have a width equal to $\lambda_i = c_i \cdot X$
+% therefore, if we only have non negative coefficients, we can safely set:
+% $$ X = \dfrac T{\displaystyle\sum_i c_i}$$
+%
+% then: \quad $\sum_i \lambda_i = \sum_i c_i \cdot X \geq T$ \quad at the first trial. But this is not the same if some coefficients are negative,
+% because in this case the column width $\lambda_i$ can shrink until its natural width $\nu_i$ and may be until to $0pt$ ! And then if every column
+% has a negative coefficient, one of them can have a width close to the target $T$. We have to ensure that the first measure of the natural widths
+% does not limit them artificially:
+% $$ \begin{tabu}{rl} \forall i \quad c_i<0 \implies & \abs{c_i} \cdot X \geq T \\
+% \exists\, c_i >0 \implies & \sum\limits_{\substack{ i\\ c_i >0}} c_i \cdot X \geq T
+% \end{tabu}$$
+% And finally, for the measure:
+% $\displaystyle X = \Max\left[\Max\limits_{\substack{i\\ c_i<0}} \dfrac T{\abs{c_i}} ; \dfrac T{\sum\limits_{\substack{i \\ c_i>0}} c_i }\right]$
+%
+% \tabulinesep=1.5mm
+% \begin{tabu}{|X[2c]|*7{X[$c]}|[dash]*2{X[$c]}|} \tabucline-
+% Coef $c_i$ & &c_1 &c_2 &c_3 &c_4 &c_5 &c_6 &\sum &\Delta \\\tabucline[dash]-
+% & &-1 &-2 &-5 &-2 &2 &3 &15 & \\\tabucline-
+% Target $T$ &300 & & & & & & & & \\\tabucline-
+% $X$ &\cellcolor{lime}300 & & & & & & & & \\\tabucline-
+% $\nu_i$ & &10 &300 &80 &80 & & & & \\\tabucline[dash]-
+% $\lambda_i$ & &10 &300 &80 &80 &600 &900 &1970 &1800 \\\tabucline-
+% \end{tabu}
+%
+% \paragraph{First step of the algorithm: reducing the width}
+%
+% After having measured the table we get: $\wdtable = 2100$. The \emph{incompressible material} is \, $2100-1970 = 130$ \, wide and
+% the gap to the target is \, $\Delta=2100-300=1800$.
+%
+% We now choose a new value for $X$:
+% $$ \sum_i \lambda_i = \sum_i \Min_{\substack{i\\ c_i<0}}\left(\nu_i ; c_i\cdot X\right) + \sum_{\substack{i\\ c_i>0}} c_i\cdot X \leq \sum_i \abs{c_i}\cdot X$$
+% Let's try \, $X' = \dfrac{\sum\limits_i \lambda_i - \Delta}{\sum\limits_i \abs{c_i}}$ \, so that \,
+% $\sum\limits_i \lambda'_i \leq \sum\limits_i \abs{c_i}\cdot X' \leq \sum\limits_i \lambda_i -\Delta $ :
+%
+% \begin{tabu}{|X[2c]|*7{X[$c]}|[dash]*2{X[$c]}|} \tabucline-
+% Coef $c_i$ & &c_1 &c_2 &c_3 &c_4 &c_5 &c_6 &\sum &\Delta \\\tabucline[dash]-
+% & &-1 &-2 &-5 &-2 &2 &3 &15 & \\\tabucline-
+% Target $T$ &300 & & & & & & & & \\\tabucline-
+% $X$ &300 & & & & & & & & \\\tabucline-
+% $\nu_i$ & &10 &300 &80 &80 & & & & \\\tabucline[dash]-
+% $\lambda_i$ & &10 &300 &80 &80 &600 &900 &1970 &1800 \\\tabucline-
+% $X'$ &\cellcolor{lime} 11.33 & & & & & & & & \\\tabucline-
+% \end{tabu}
+% $X' = \dfrac{1970 - 1800}{15} = \dfrac{170}{15} = 11.33$ \quad Note that the computation of $X'$ does not involve any measurement.
+%
+%
+% \begin{tabu}{|X[2c]|*7{X[$r]}|[dash]>\bf X[$r]X[$r]|} \tabucline-
+% \rowfont[c]{}
+% Coef $c_i$ & &c_1 &c_2 &c_3 &c_4 &c_5 &c_6 &\sum &\Delta \\\tabucline[dash]-
+% & &-1 &-2 &-5 &-2 &2 &3 &15 & \\\tabucline-
+% Target $T$ &300 & & & & & & & & \\\tabucline-
+% $X$ &300 & & & & & & & & \\\tabucline-
+% $\nu_i$ & &10 &300 &80 &80 & & & & \\\tabucline[dash]-
+% $\lambda_i$ & &10 &300 &80 &80 &600 &900 &1970 &1800 \\\tabucline-
+% $X'$ &\cellcolor{lime} 11.33 & & & & & & & & \\\tabucline[dash]-
+% $\lambda'_i$ & &10,00 &22,67 &56,67 &22,67 &22,67 &34,00 &168,67 &\cellcolor{lime}-1.33 \\\tabucline-
+% \end{tabu}
+%
+% Here we are in the case where the table width:
+% $$\begin{tabu}{rl} \wdtable = &\sum\limits_i \lambda_i + \text{incompressible material} = T + \Delta \\
+% \implies & \sum\limits_i \lambda'_i + \text{incompressible material} \leq \sum\limits_i \lambda_i -\Delta + I = T
+% \end{tabu}$$
+%
+% Without any measure, we can say that the final table width will be less than the target, if we choose $X'$. The free space to
+% share among the \textt X columns (computed with $X'$) is now $\Delta' = T - (\sum_i \lambda'_i + I) = 300 - (168.67 + 130) = -1.33$,
+% where $I$ is the incompressible material.
+%
+% \paragraph{Giving space}
+%
+% We say that a column is \emph{saturated} (\ie full) if its natural width is greater than $\abs{c_i}\cdot X$, or
+% all the same that $\lambda_i < \nu_i$. We also will consider that the columns with $c_i>0$ have a ``natural width''
+% which is always equal to $c_i\cdot X$: in other words, a column with a non negative coefficient is always \emph{saturated}.
+%
+% Giving space (or ``refunding'' space) to the columns must be done in priority to the \emph{saturated} columns. If all columns
+% are finally underfull, then we will distribute the extra space to each, according a distribution rule. But this case can only
+% occur if \, $\forall i\quad c_i<0$ \, because we first choosed $X$ so that:
+% $$ X \geq \frac T{\sum\limits_{\substack{i\\ c_i>0}} c_i}$$
+% and hence, the sum of the widths of the ``non negative'' columns exceeds the target.
+%
+% Let's rank the columns widths:
+%
+% \begin{tikzpicture}[yscale=.4]
+%
+% \draw (0,10) rectangle ++ (8,.5) node (H) {} node [above] {$\lambda'_1$};
+% \draw [dash pattern=on2pt off2pt] (H) rectangle ++ (2,-.5) node [above,yshift=6pt] {$\nu_1$};
+%
+% \draw (0,8) rectangle ++ (7,.5) node (H) {} node [above] {$\lambda'_2$};
+% \draw [dash pattern=on2pt off2pt] (H) rectangle ++ (2,-.5) node [above,yshift=6pt] {$\nu_2$};
+%
+% \draw (0,6) rectangle ++ (4,.5) node (H) {} node [above] {$\lambda'_3$};
+% \draw [dash pattern=on2pt off2pt] (H) rectangle ++ (2,-.5) node [above,yshift=6pt] {$\nu_3$};
+%
+% \draw [dash pattern=on2pt off2pt] (0,4) rectangle ++ (2,.5) node (H) {} node [above] {$\nu_4$};
+% \draw (H) rectangle ++ (1,-.5) node [above,yshift=4pt] {$\abs{c_4} X$};
+%
+% \node at (11,10) [anchor=north west] {\begin{tabu}{l} we first give space \\ to the saturated columns \\ $1$, $2$ and $3$\end{tabu}};
+%
+% \end{tikzpicture}
+%
+% Because of the saturation, the total amount of space to give: \, $\abs\Delta$ \, shall be shared among the columns
+% according to their widths coefficients. We shall not give too much space: the columns shall remain saturated. Let
+% $0 < \epsilon \leq \abs\Delta'$ the amount of space to give, then after the operation:
+% \begin{align*}
+% \lambda_1" + \lambda_2" + \lambda_3" &= \lambda'_1 + \lambda'_2 + \lambda'_3 + \epsilon \\
+% &= \abs{c_1} X' + \abs{c_2} X' + \abs{c_3} X' + \epsilon
+% \end{align*}
+%
+% Let's say $ X" = X' + \dfrac {\abs\Delta'} {\sum\limits_{\substack{i \\ c_i \text{saturated}}} \abs{c_i}}$ \, then it's possible,
+% without any measure, to compute:
+% $$\sum\limits_{\substack{i \\ c_i \text{saturated}}} \lambda"_i+\nu_4 \,\leq\, \sum\limits_{\substack{i \\ c_i \text{saturated}}} \abs{c_i}\cdot X" +\nu_4 \,\leq\, \sum\limits_i \abs{c_i}X'+\Delta' = \sum\limits_i\lambda'_i+\Delta'\leq T-I$$
+%
+% Or for clarity: \quad $ \sum\limits_i \lambda_i" + I = \wdtable \, \leq \, T$ and the new free space to share is now :
+% $$\Delta" = \abs{ T - \left(\sum\limits_i \lambda"_i + I \right) }$$
+%
+% At each step of the computation, and without any measure but the first, $X$ grows, $\Delta$ decreases, and finally the target is reached for $X$ such that $\Delta \leq \text{hfuzz}$.
+%
+% \begin{tabu}{|X[2c]|*7{X[$r]}|[dash]>\bf X[$r]X[$r]|} \tabucline-
+% \rowfont[c]{}
+% Coef $c_i$ & &c_1 &c_2 &c_3 &c_4 &c_5 &c_6 &\sum &\Delta \\\tabucline[dash]-
+% & &-1 &-2 &-5 &-2 &2 &3 &15 & \\\tabucline-
+% Target $T$ &300 & & & & & & & & \\\tabucline-
+% $X$ &300 & & & & & & & & \\\tabucline-
+% $\nu_i$ & &10 &300 &80 &80 & & & & \\\tabucline[dash]-
+% $\lambda_i$ & &10 &300 &80 &80 &600 &900 &1970 &1800 \\\tabucline-
+% $X'$ &11.33 & & & & & & & & \\\tabucline[dash]-
+% $\lambda'_i$ & &10,00 &22,67 &56,67 &22,67 &22,67 &34,00 &168,67 &-1.33 \\\tabucline-
+% $X"$ &\cellcolor{lime} 11.43 & & & & & & & & \\\tabucline[dash]-
+% $\lambda"_i$ & &10,00 &22,86 &57,14 &22,86 &22,86 &34,29 &170,00 &\cellcolor{GreenYellow}0 \\\tabucline-
+% \end{tabu}
+%
+% \bigskip
+%
+% Now if the width of the table is less that the target, because 1) every column has a negative coefficient and 2) their natural
+% widths are so small than the tabular don't fill the wanted horizontal space, the algorithm artificially raise the natural widths,
+% according to a linear distribution:
+% $$ \lambda'_i = \lambda_i + \Delta \cdot \dfrac{\lambda_i}{\sum\limits_i \lambda_i} = \nu_i + \Delta \cdot \dfrac{\nu_i}{\sum\limits_i \nu_i}
+% = \nu_i \cdot \left(1+\dfrac{\Delta}{\sum\limits_i \nu_i}\right)$$
+%
+% \subsubsection{\env{tabu spread} dimen}
+% \label{algorithms tabu spread}
+%
+% The case of \env{tabu spread} is interesting and quite complex...
+%
+% Here, the aim of the game is to give a target to the table, depending on its natural width.
+% \env{tabu} has a default target (\cs\linewidth in general, but it is possible to \cs\let\cs\tabudefaulttarget
+% to another value... for example \cs\linegoal) which is a maximum for the final target of \env{tabu spread}.
+% The case where the spread is $0pt$ is not simpler nor more difficult.
+%
+% If every column has a negative coefficient, it's rather easy because either the table exceeds the target, and then the new target
+% will be the default target (the \emph{maximum}), or the table width is less than the default target and we fix the new target
+% to be that width $+$ the spread, in the limit of the default target.
+%
+% The condition that must hold on coefficient is not restritive if every column has a negative coefficient because if you say,
+% for example: \, $X = \Max\limits_i \dfrac{\nu_i}{\abs{c_i}}$ \, then:
+% $$ \sum\limits_i \lambda_i = \sum\limits_i \Min \left(\nu_i ; \abs{c_i}\cdot X\right)$$
+% is true. It's always possible to find a $X$ such that the behaviour anounced in the documentation is observed !
+%
+% Then let's get some non negative coefficients. The natural widths of such columns must be measured, but the natural
+% width of the tabular is not the same, for the proportions between column widths -- expressed by their positive coefficient $c_i$
+% -- must be respected.
+%
+% The real natural width of the tabular, which observe the proportions between columns with a non negative coefficient is:
+% $$ \wdtable + \Max\limits_{\substack{i \\ c_i>0}} \left(\dfrac{\nu_i}{c_i}\right)\times \sum\limits_{\substack{i \\ c_i>0}} c_i - \sum_{\substack{i\\c_i>0}} \nu_i > \wdtable$$
+%
+% This quantity is computed, \TabU adds the \textt{spread} and fix the new target to the sum, in the limit of the default target.
+%
+% Then $X$ is initialized such that:
+% $\displaystyle X = \Max\left[\Max\limits_{\substack{i\\ c_i<0}} \dfrac T{\abs{c_i}} ; \dfrac T{\sum\limits_{\substack{i \\ c_i>0}} c_i }\right]$
+%
+% and the algorithm described in the former section works, without any new measurement of the tabular.
+%
+%
+% \begin{minipage}{.9\linewidth}
+% Unless this was not possible or deemed inconvenient for clarity, the code is presented in the same
+% order it executes.
+% \end{minipage}
+%
+% \subsection{The \env{tabu} strategies}
+%
+% {
+% \tabulinesep=1mm
+% \begin{tabu}{|X[-2c]|*2{X[-3$c]>{\smaller}X[3]|}} \hline
+% \rowfont\bfseries
+% &\multicolumn2{c|}{Not nested (outer)} &\multicolumn2{c|}{Nested} \\
+% \rowfont[c]{\ifmmode\else\ttfamily\fi}
+% &\cs{count@} &condition &\cs{count@} &condition \\\tabucline[on2pt off2pt]-
+% & & &0 &outer is in mode $0$ \\
+% \tiny\cs{tabu@endrewrite}
+% &3 &no \textt X column &1 &no \textt X column \\
+% &4 &\textt X columns &3 &\textt X column \\\tabucline[on2pt off2pt]-
+% & & &0 &outer in mode $0\,\Rightarrow$ print \\
+% \tiny\cs{tabu@select}
+% & & &1 &outer in mode $3$ \\
+% & & &2 &from $1$ in \cs{tabu@endrewrite} if outer in mode $4$ \\
+% &3 \text{ or } 4 &needs trials &3 \text{ or } 4 &needs trials \\\tabucline[on2pt off2pt]-
+% &0 &print out & & \\
+% & & &1 &Exit in vertical measure\par (outer in mode 3) \\
+% \tiny\cs{tabu@strategy}
+% & & &2 &Exit with a rule\par (outer in mode 4) \\
+% &3 &Vertical measure & & \\ &4 &Horizontal measure &4 &Horizontal measure\par (nested in coef$<0$ or spread) \\\hline
+% \end{tabu}
+% }
+%
+% \begin{tikzpicture}[every node/.add style={}{outer sep=2mm},yscale=1.5,xscale=1.4,framed]
+%
+% \node at (5,1.5) [font=\itshape] {Path followed by the outermost \env{tabu}};
+%
+% \node (X) {\textt X column ?};
+%
+% \path (X) -- ++ (2,1) node (endrew4) {4} -- ++ (2,0) node (select4) {4}
+% -- ++(2,0) node (strat4) {4} -- ++(0,-1) node (arith) {arithmetic} -- (strat4) -- ++ (2,0) node (to3) {3} -- ++(2,-1) node (to0) {0};
+%
+% \draw [->] (X) -- (endrew4) node [midway,left] {yes};
+% \draw [->] (endrew4) -- (select4);
+% \draw [->] (select4) -- (strat4);
+% \draw [<->] (strat4) -- (arith);
+% \draw [->] (strat4) -- (to3);
+% \draw [->] (to3) -- (to0);
+%
+% \path (X) -- ++(2,-1) node (endrew3) {3} -- ++(2,0) node (select3) {3} -- ++(2,0) node (strat3) {3};
+% \draw [->] (X) -- (endrew3) node [midway,left] {no};
+% \draw [->] (endrew3) -- (select3);
+% \draw [->] (select3) -- (strat3);
+% \draw [->] (strat3) -- (to0);
+%
+% \node at (2,-1.5) {\cs{tabu@endrewrite}};
+% \node at (4,-1.5) {\cs{tabu@select}};
+% \node at (7,-1.5) {\cs{tabu@strategy}};
+%
+% \end{tikzpicture}
+%
+% \begin{tikzpicture}[every node/.add style={}{outer sep=2mm},yscale=1.5,xscale=1.4,framed]
+%
+% \node at (5,2) [font=\itshape] {Path followed by a nested \env{tabu}};
+%
+% \node (X) {\textt X column ?};
+%
+% \path (X) -- ++ (2,1) node (endrew4) {4} -- ++ (2,0) node (select4) {4}
+% -- ++(2,0) node (strat4) {4} -- ++(0,-1) node (arith) {arithmetic} -- (strat4) -- ++ (1.5,.3) node (to1) [anchor=west] {1 (outer in mode 3)}
+% -- (strat4) -- ++ (1.5,-.3) node (to2) [anchor=west] {2 (outer in mode 4)};
+%
+% \draw [->] (X) -- (endrew4) node [midway,left] {yes};
+% \draw [->] (endrew4) -- (select4);
+% \draw [->] (select4) -- (strat4);
+% \draw [<->] (strat4) -- (arith);
+% \draw [->] (strat4) -- (to1); \draw [->] (strat4) -- (to2);
+%
+% \path (X) -- ++(2,-1) node (endrew1) {1} -- ++ (1.5,.3) node (select1) [anchor=west] {1 (outer in mode 3)}
+% -- (endrew1) -- ++(1.5,-.3) node (select2) [anchor=west] {2 (outer in mode 4)};
+%
+% \draw [->] (X) -- (endrew1);
+% \draw [->] (endrew1) -- (select1);
+% \draw [->] (endrew1) -- (select2);
+%
+% \draw [->] (X) -- (endrew1) node [midway,left] {no};
+%
+% \node at (2,-1.7) {\cs{tabu@endrewrite}};
+% \node at (4,-1.7) {\cs{tabu@select}};
+% \node at (7,-1.7) {\cs{tabu@strategy}};
+%
+% \end{tikzpicture}
+%
+%
+% \subsection{Identification and Requirements}
+% \label{Identification and Requirements}
+%
+% \TabU requires \xfile{array.sty} and \xfile{varwidth.sty}. The package namespace is \textttbf{\pkgcolor tabu@}.
%
% \begin{macrocode}
%<*package>
\NeedsTeXFormat{LaTeX2e}[2005/12/01]
-\ProvidesPackage{tabu}[2011/01/19 v2.1 - flexible LaTeX tabulars (FC)]
+\ProvidesPackage{tabu}[2011/02/13 v2.3 - flexible LaTeX tabulars (FC)]
\RequirePackage{array}[2008/09/09]
\RequirePackage{varwidth}[2009/03/30]
% \end{macrocode}
@@ -2086,152 +3132,264 @@ lppl copyright 2010-2011 by FC <florent.chervet@free.fr>
% Minimal catcode acertaining for loading \thispackage in good conditions:
%
% \begin{macrocode}
-\AtEndOfPackage{\tabu@AtEnd\let\tabu@AtEnd\@undefined}
+\AtEndOfPackage{\tabu@AtEnd \let\tabu@AtEnd \@undefined}
\let\tabu@AtEnd\@empty
-\def\TMP@EnsureCode#1#2{%
- \edef\tabu@AtEnd{%
- \tabu@AtEnd
- \catcode#1 \the\catcode#1\relax
- }%
- \catcode#1 #2\relax
+\def\TMP@EnsureCode#1={%
+ \edef\tabu@AtEnd{\tabu@AtEnd
+ \catcode#1 \the\catcode#1}%
+ \catcode#1=%
}% \TMP@EnsureCode
-\TMP@EnsureCode{33}{12} % !
-\TMP@EnsureCode{124}{12}% |
-\TMP@EnsureCode{0}{12}% ^^@
-\TMP@EnsureCode{36}{3}% $ = math shift
+\TMP@EnsureCode 33 = 12 % !
+\TMP@EnsureCode 58 = 12 % : (for siunitx)
+\TMP@EnsureCode124 = 12 % |
+\TMP@EnsureCode 36 = 3 % $ = math shift
+\TMP@EnsureCode 38 = 4 % & = tab alignmment character
+\TMP@EnsureCode 32 = 10 % space
+\TMP@EnsureCode 94 = 7 % ^
+\TMP@EnsureCode 95 = 8 % _
% \end{macrocode}
%
-% \begin{macro}{\tracingtabu (debugshow option)}
%
-% \cs{tracingtabu} is the same as option \textt{debugshow}.
+% \subsection{Flow chart of expansion}
+% \label{Flow chart of expansion}
%
-% \begin{macrocode}
-\def\tracingtabu{\begingroup\@ifnextchar=%
- {\afterassignment\tabu@tracing\count@}
- {\afterassignment\tabu@tracing\count@1\relax}}
-\def\tabu@tracing{\expandafter\endgroup
- \expandafter\tabu@tr@cing\number\count@\@nil
-}% \tabu@tracing
-\def\tabu@tr@cing #1\@nil{%
- \ifnum#1>\z@
- \let\tabu@message \message \let\tabu@message@save \tabu@tracing@save
- \ifdefined \pdfelapsedtime
- \def\tabu@timerstart {\edef\tabu@starttime{\the\pdfelapsedtime}}%
- \let\tabu@elapsedtime \tabu@message@etime \fi
- \ifnum#1>\@ne \let\tabu@debug \message
- \else \let\tabu@debug \@gobble \fi
- \else
- \let\tabu@message \@gobble
- \let\tabu@message@save \@gobble
- \let\tabu@debug \@gobble
- \let\tabu@timerstart \relax
- \fi
-}% \tabu@tr@cing
-\tracingtabu=\z@
-\DeclareOption{debugshow}{\AtEndOfPackage{\tracingtabu=2\relax}}
-% \end{macrocode}
-% \end{macro}
+% \subsubsection(case: tabu, tabu to and tabu spread){General case: tabu, tabu to and tabu spread}
%
-% \begin{macro}{linegoal (package option)}
+% {
+% \hskip-\evensidemargin
+% \begin{tikzpicture}[yscale=.4,xscale=.6,framed,
+% start chain, every join/.style={->,thin,black,solid},node distance=.5cm and .5cm,
+% every node/.style={black}]
+% \node [on chain,draw] (begintabu) at (0,0) {\cs{begin}\M*{tabu}} node [anchor=west] at (begintabu.east) {(\cs{begingroup})}
+% node [on chain=going below,join] (tabu) {\cs{tabu}}
+% node [on chain=going right,join] (tabudesc) {$\begin{tabu}\{{>{$}l<{$}}.
+% defines \cs{@halignto} and sets \cs{tabu@target} \\
+% load \cs{NC@rewrite@X} for \textt{tabu} \textt X columns \\
+% load special setup (\xpackage{arydshln} fixes, \cs{rowfont}, \cs{centering} etc)
+% \end{tabu}$}
+% node [on chain=going below,join] (tabu@begin) {\cs{tabu@begin}}
+% node [on chain] (tabu@begindesc) {$\begin{tabu}\{{>{$}l<{$}}.
+% if \cs{tabu@target} $> 0$ then prepare \\
+% \textt{@\M*{\cs{extracolsep}\M*{\cs{@flushglue}}}}
+% \end{tabu}$};
+% \chainin (tabu@begin)
+% node [on chain=going below] (H) {}
+% node [on chain=going below,join=with tabu@begin] (toarray) {\cs{tabular} or \cs{array} if in math mode};
+% \draw [densely dotted,gray,very thick] (begintabu.west |- H) -- (tabu@begindesc.east |- H) coordinate (H);
+% \path [fill=AliceBlue] (begintabu.north -| H) rectangle ($(H)+(1,0)$) coordinate (bluebox)
+% node [midway,rotate=-90] {\large\thispackage};
%
-% \begin{macrocode}
-\let\tabudefaulttarget \linewidth
-\DeclareOption{linegoal}{%
- \AtEndOfPackage{%
- \RequirePackage{linegoal}[2010/12/07]%
- \let\tabudefaulttarget \linegoal% \linegoal is \linewidth if not pdfTeX
-}}
-% \end{macrocode}
-% \end{macro}
+% { [start chain=array]
+% \node [on chain] at (begintabu |- toarray) [yshift=-2.5cm] (@array) {\cs{@array}};
+% \draw [->] (toarray.west) -| (@array);
+% \node [on chain=going right,join,fill=GhostWhite,draw=gray,dashed] (@arraydesc)
+% {\begin{tabu}\{{l}.
+% creates the \cs{@arstrutbox} \\
+% \cs{begingroup} \\
+% \quad \cs{@mkpream}: parse the preamble to create \cs{@preamble} \\
+% \quad \cs{xdef} \cs{@preamble} macro \\
+% \cs{endgroup}\\
+% \cs{@arrayleft}\\
+% \cs{vtop} or \cs{vbox} or \cs{vcenter} \cs{bgroup} ... \cs{halign}\{ preamble...
+% \end{tabu}}
+% node [on chain=going below] (H) {};
+% }
+% { [start chain=endtabu]
+% \node [on chain] (end{tabu}) at (begintabu |- H) {\cs{end}\M*{tabu}}
+% node [on chain=going below,join] (endtabu) {\cs{endtabu}}
+% node [on chain=going right,join] (endtabular) {\cs{endtabular}}
+% node [on chain=going right,join] (endarray) {\cs{endarray}}
+% node [on chain=going right,join] (endarraydesc) {\begin{tabu}\{{l}. end of \cs{halign} \\ end of \cs{vtop}, \cs{vbox} or \cs{vcenter}\end{tabu}};
+% \chainin (endtabular)
+% node [on chain=going below,node distance=.7cm] (H) {};
+% \node at (H -| endarraydesc.west) [anchor=west] (endtabulardesc) {\begin{tabu}\{{l}. end of math group \\ end of \cs{hbox}\end{tabu}};
+% \draw [->] (endtabular) |- (endtabulardesc) node [near end,above] {\small if in text mode};
+% \draw [->] (endtabu.north east) to [bend left,looseness=.5] node [midway,above] {\small if in math mode} (endarray.north);
+% \node at (endtabulardesc.south -| begintabu) [yshift=-.5cm] (endgroup) {\cs{endgroup}} node at (endgroup.east) [anchor=west] {end of envir};
+% \draw [->] (endtabu) -- (endgroup);
+% }
+% \path [fill=LightGoldenrodYellow] (bluebox) rectangle ($(endtabulardesc.south -| bluebox)-(1,0)$)
+% node [midway,rotate=-90] {\large\xpackage{array}};
+% \end{tikzpicture}
+% }
%
-% \begin{macro}{delarray (package option)}
+% \paragraph(tabu to with X column){\textt{tabu to} with \textt X column}
%
-% \begin{macrocode}
-\DeclareOption{delarray}{%
- \AtEndOfPackage{\RequirePackage{delarray}}%
-}
-% \end{macrocode}
-% \end{macro}
+% The important part of the job is made inside the dashed box above: \cs{@mkpream}
+% expands the columns definitions, which can be user defined. Hopefully, it does its
+% job inside a group, therefore a user-column can set a macro to be expanded
+% \cs{aftergroup}. This implementation allows much modifications in the tabular preparation,
+% without any change in the macros of \xfile{array.sty}.
%
-% \begin{macro}{light (package option)}
+% When a \textt{tabu X} column is found in the preamble by \cs{@mkpream}, \textt{tabu} changes his strategy: the macro
+% \cs{tabu@prep@TRIAL} is set to be expanded \cs{aftergroup} that is, just after the preamble (\cs{@preamble}) has been built.
+% This macro does some setup for \textt{tabu} trials to reach the target with variable \textt X column widths and gobbles
+% everything until the next \cs{bgroup} which corresponds to the \cs{vtop}, \cs{vbox} or \cs{vcenter} for the whole tabular.
+% This part of \cs{@array} is stored into \cs{tabu@Xfinish} to be expanded after the last trial gave satisfaction
+% to reach the \textt{tabu} target. Then \cs{tabu@collect} is expanded to find the end of the \textt{tabu} environment,
+% temporarily storing the environment content into a token register.
%
-% \begin{macrocode}
-\DeclareOption{light}{%
- \AtEndOfPackage{%
- \let\tabu@prepnext@tok \prepnext@tok \let\tabu@save@decl \save@decl
- \let\tabu@rowfont \tabu@norowfont \let\tabucline \tabu@nocline
- \let\tabu@firstcline \relax \let\tabu@lines \relax
- \let\tabu@setup@everycr\relax \let\tabu@multicolumn \multicolumn
- }
-}
-\def\tabu@norowfont{\PackageError{tabu}
- {\string\rowfont\space is not available with option `light'}\@ehd}
-\def\tabu@nocline{\PackageError{tabu}
- {\string\tabucline\space is not available with option `light'}\@ehd}
-% \end{macrocode}
-% \end{macro}
+% The last part of \cs{@array} until \cs{halign} is expanded inside a \cs{vbox}
+% which is stored into the box register \cs{tabu@box} for measuring purpose. \cs{halign} ends by \cs{endarray}
+% which stops the \cs{tabu@box} as well, and then \cs{tabu@arith} is expanded to compute the gap between the
+% width of \cs{tabu@box} and the target, and \cs{tabucolX} (the dimension that correspond to \textt{X[1]})
+% is updated accordingly.
%
-% \begin{macrocode}
-\ProcessOptions
-% \end{macrocode}
+% The trials are ``protected'' by\, \M*{\cs{ifnum}0=`}\cs{fi}\, : they occur in a group that will be closed
+% at the very begining of \cs{tabu@Xfinish}, when the final tabular will be printed actually.
+% This protection is absolutely necessary to be able to collect
+% the environment body in the case of nested \textt{tabu} with \textt X columns. This is related to \TeX{}
+% mechanism of expansion inside \cs{halign} (\TeX{} stops reading when it encounters a \& \textt{alignment tab character}
+% and goes backward expanding anything that were not expanded before).
%
-% At Begin Document,a fix for \xpackage{arydshln} and \xpackage{colortbl} comptability with \xpackage{delarray}
-% shortcuts available inside \textt{tabu}: requirement for this fix is checked by \cs{tabu@fix@arrayright}.
%
-% Then the switch \cs{iftabu@colortbl} is set.
+% {\hskip-1cm
+% \begin{tikzpicture}[yscale=.4,xscale=.6,framed,
+% start chain=going below,node distance=.3cm and .5cm,
+% every join/.style={->,thin,black,solid},every node/.style={black}]
%
-% Finally, \cs{longtabu} is defined only if the \xpackage{longtable} package is detected.
+% \node [on chain] (begingroup) at (0,0) {\cs{begingroup}}
+% node [on chain=going right] (@mkpream) {\cs{@mkpream}}
+% node [on chain,join] {Finds a \textt X column}
+% node [on chain,join] {rewrite \textt X column}
+% {[start branch] node [on chain] {\begin{tabu}\{{l}. Parse the optional parameter for \textt X\\ Set \cs{aftergroup}\cs{tabu@prep@TRIAL}\end{tabu}}
+% }
+% node [on chain,join] {... \cs{@mkpream} ...}
+% {[start branch] node [on chain,join] {builds the \cs{halign} preamble}}
+% node [on chain,join] {\cs{xdef}\cs{@preamble}}
+% node [on chain,join] (endgroup) {\cs{endgroup}}
+% node [on chain] (H) {};
+% \node (tabu@prep@TRIAL) at (begingroup |- H) {\cs{tabu@prep@TRIAL}};
+% \draw [->] (endgroup.west) -| (tabu@prep@TRIAL.north) node [midway,left] {\ssmall\begin{tabu}{c} triggered by\\ \cs{aftergroup}\end{tabu}};
+% \chainin (tabu@prep@TRIAL);
+% { [start branch] \node [on chain,join] {\cs{tabu@setup@TRIAL}}
+% node [on chain,join] {\begin{tabu}\{{l}.
+% Neutralisation of \cs{write} \\
+% Protection for: \begin{tabu}{!{\textbullet}l}
+% footnotes \\ counters \\ index
+% \end{tabu}
+% \end{tabu}};
+% }
+% \node [on chain] (H) {}
+% node [on chain,join=with tabu@prep@TRIAL] (tabu@arrayleft@measure) {\cs{tabu@arrayleft@measure}}
+% node [on chain=going right,join] {\begin{tabu}\{{l}. prepares \cs{tabu@Xfinish} \\ Collect the \textt{tabu} body\end{tabu}}
+% node [on chain,join] (tabu@TRIAL) {\cs{tabu@TRIAL}}
+% {[start branch] node [on chain,join] {\begin{tabu}{l} Expands \cs{halign} into a \cs{vbox} \end{tabu}}
+% }
+% node [on chain,join] {\cs{tabu@endTRIAL}}
+% {[start branch] node [on chain,join] {\cs{endarray}}
+% }
+% node [on chain,join] (tabu@arith) {\begin{tabu}{c} \cs{tabu@arith}\\ \cs{wd}\M*{tabu}$-$\cs{tabu@target} $<$ \cs{hfuzz} ?\end{tabu}}
+% node [on chain=going right,node distance=1cm] (tabu@Xfinish) {\cs{tabu@Xfinish}};
+% \draw (tabu@arith) [->] -- (tabu@Xfinish) node [midway,above,blue] {Yes};
+% \draw [->] (tabu@arith.west) |- (tabu@TRIAL) node (No) [very near start,left] {{\small\begin{tabu}.{r}\} Updates \\ \cs{tabucolX}\end{tabu}} \textcolor{red}{No}};
+%
+% \end{tikzpicture}}
+%
+%
+% \subsubsection(tabu spread with X column){\textt{tabu spread} with \textt X column}
+%
+% In the case of ``\textt{tabu spread}'' with \textt X columns, the process is the same
+% as the one described for ``\textt{tabu to}'' with \textt X columns. However, the first
+% trial is different because we have first to measure the \emph{natural width} of the
+% tabular.
+% The process is the following:
+% \begin{itemize}[label=\small\textbullet]
+% \item \cs\tabu@target is first set to \cs\linewidth (or \cs\linegoal with the \textt{linegoal} package option).
+% \item The \textt X column corresponds to a \cs\vbox with \cs\hsize fixed to \cs\tabu@target.
+% \item Inside this \cs\vbox the cell content is written into a \cs\hbox whose width is limited to \cs\tabu@target.
+% This \cs\hbox is captured into the box register \cs\tabu@box.
+% \item At the end of the cell, the \cs\badness of the \cs\hbox is checked:
+% \begin{itemize}[label=\textendash,leftmargin=*]
+% \item if the \cs\badness is $> 1000$ then the text is too long and ``\textt{tabu spread}''
+% is useless: \textt{tabu to \cs{tabu@target}} give the same result.
+% \item Otherwise, we get the natural width of the cell content by: \\
+% \cs\setbox \cs\tabu@box \cs\hbox \M*{\cs\unhbox \cs\tabu@box}
+% \end{itemize}
+% \item At the end of the first trial, \cs{tabu@spreadarith} checks if:
+% $$ \text{width(tabular)} + \text{spread} < \cs\linewidth \text{ (or \cs\linegoal)}$$
+% \begin{itemize}[label=\textendash,leftmargin=*]
+% \item if not, then \textt{tabu to}\cs{tabu@target} give the same result
+% \item Otherwise, the target for \textt{tabu to} will be:
+% $$\hskip-\leftmargin
+% \text{width(tabular)} + \text{spread} - \sum_i \text{natural widths X}_i
+% +\underbrace{\text{Max}_i\left(\dfrac{\text{natural width X}_i}{\text{coef}_i}\right)\times \sum_i\text{coef}_i}
+% _{\text{\begin{tabu}{c} minimal natural width that can be obtained \\ with the given coefs\end{tabu}}}
+% $$
+% \end{itemize}
+% And the next trial will be done as if the user called ``\textt{tabu to}'' with this target.
+% \end{itemize}
%
-% \begin{macrocode}
-\AtBeginDocument{%
- \expandafter\in@ \expandafter\@arrayright\expandafter{\endarray}%
- \ifin@ \let\tabu@endarray \endarray
- \else \tabu@fix@arrayright \fi % <fix for colortbl & arydshln (delarray)>
- \@ifpackageloaded{colortbl} \tabu@colortbltrue \tabu@colortblfalse
- \@ifpackageloaded{arydshln}{}
- {\let\tabu@adl@fix \relax \let\tabu@adl@endTRIAL \@empty}%
- \@ifpackageloaded{longtable}{}{\let\longtabu \tabu@nolongtabu}%
- \@ifpackageloaded{cellspace} \tabu@warn@cellspace \relax
-}
-\def\tabu@warn@cellspace{%
- \PackageWarning{tabu}{%
- Package cellspace has some limitations \MessageBreak
- And redefines some macros of array.sty.\MessageBreak
- Please use \string\tabulinesep\space to control\MessageBreak
- vertical spacing of lines inside tabu environnement}%
-}% \tabu@warn@cellspace
-% \end{macrocode}
%
% \subsection{Some constants}
+% \label{Some constants}
+%¤<package>%% Constants --------------------------------------------------------
%
-% \begin{macro}{\tabu@cnt}
+% Here we define the constants used by \thispackage: \TeX{} registers and a few \emph{helper} macros.
+%
+% When working inside a tabular (\ie \cs\halign) each cell is a \TeX{} group. Probably the most important
+% property of each register defined here is whether it is global or not. A \emph{local} register does not
+% suffer, never, any global assignment.
%
-% Used in in \cs{tabu@arith} (the number of trials) and \cs{tabu@prepnext@tok} (for \cs{rowfont}).
+% \subsubsection(TeX registers){\TeX{} registers}
+%
+% \begin{macro}{taburow}
+%
+% \LaTeX{} counter that globally stores the value of the current row. It is updated at \cs\everyrow,
+% rather than at \cs\everycr\footnote{Package \xpackage{xcolor} defines the \cs\rownum \TeX{} counter,
+% which is globally updated at \cs\everycr. Hence this \cs\rownum counter is not reliable in case
+% the user invokes \cs\cline or \cs\cmidrule for example...}.
+% \cs\thetaburow expands to the (arabic) number.
+%
+% This counter can be read by the user, but she \textbf{must not change its value} because it is
+% used internally to store the height/depth of every row, for vertical spacing adjustment (and
+% vertical leaders).
%
% \begin{macro}{\tabu@nbcols}
%
-% A counter that save the number of columns of the \textt{tabu}.
+% \TeX{} counter that -- locally -- saves the total number of columns of the \textt{tabu}. Special \texttbf @ \, and \,\texttbf ! \,
+% columns are not counted (they are not \emph{real} columns for \cs\halign, but only insertions into the preamble).
+%
+% The value is used by \cs\tabucline to ensure that the leader does not jut out over the last column...
+%
+% \begin{macro}{\tabu@cnt}
+%
+% \TeX{} counter that -- locally -- stores the number of trials. Incidentally, it is also temporarily used
+% to parse the width coefficient for \textt X columns, during the rewritting process.
+%
+% \begin{macro}{\tabu@Xcol}
%
-% \begin{macro}{\tabu@X@cols}
+% \TeX{} counter that -- locally -- stores the number of \textt{tabu X} columns. Defined while rewritting
+% the \textt X token, it is used in the specification of the width of the column (\cs\tabu@hsize\M*{Rank of the X column}\M*{coef}).
%
-% Used only when \textt{tabu X} columns are used with ``\textt{tabu spread}''.
+% It is also used to store the natural width of \textt X columns (in the cases of a negativ coefficient or if \textt{tabu spread}
+% is used).
%
+% \begin{macro}{\tabu@alloc}
% \begin{macro}{\tabu@nested}
%
-% A counter that stores the deepness of nested \textt{tabu}'s.
+% A global counter whose initial value ($-1$) is incremented for each nested tabular. The end of the outermost tabular globally
+% resets the value to $-1$. \cs\tabu@nested stores locally the value of \cs\tabu@alloc and is therefore the ``index'' of the current
+% tabular (the one that is actually in construction).
+%
+% This influences the initialisation process (cf. \cs\tabu@setup and \cs\tabu@init).
%
% \begin{macro}{\tabu@start}
% \begin{macro}{\tabu@stop}
%
-% Counters used for \csref{tabucline} to get the starting and ending columns.
+% They are used locally by \cs\tabucline\, and\, \cs\everyrow\, while parsing the parameters:
+% this is, for clarity, the local name for \cs\@tempcnta and \cs\@tempcntb.
%
% \begin{macrocode}
-\newcount \tabu@cnt
+\newcount \c@taburow \def\thetaburow {\number\c@taburow}
\newcount \tabu@nbcols
-\newcount \tabu@X@cols
+\newcount \tabu@cnt
+\newcount \tabu@Xcol
+\let\tabu@start \@tempcnta
+\let\tabu@stop \@tempcntb
+\newcount \tabu@alloc \tabu@alloc=\m@ne
\newcount \tabu@nested
-\newcount \tabu@start
-\newcount \tabu@stop
+\def\tabu@alloc@{\global\advance\tabu@alloc \@ne \tabu@nested\tabu@alloc}
% \end{macrocode}
% \end{macro}
% \end{macro}
@@ -2239,429 +3397,1124 @@ lppl copyright 2010-2011 by FC <florent.chervet@free.fr>
% \end{macro}
% \end{macro}
% \end{macro}
-%
+% \end{macro}
+% \end{macro}
%
% \begin{macro}{\tabu@target}
%
-% Stores the \textt{tabu} target (either ``\textt{to}'' or ``\textt{spread}'').
+% \TeX{} dimen that -- locally -- stores the \env{tabu} target (either ``\textt{to}'' or ``\textt{spread}'').
%
% \begin{macro}{\tabu@spreadtarget}
+%
+% \TeX{} dimen that -- locally -- stores the \env{tabu} spread given by the user.
+%
% \begin{macro}{\tabu@naturalX}
%
-% Used only when \textt{tabu X} columns are used with ``\textt{tabu spread}'',
-% or with negativ coefficients.
+% \TeX{} dimen that -- globally -- stores the total natural widths of the \textt X columns,
+% in the cases of negativ coefficients and/or \textt{tabu spread}. The value is reset to $0pt$
+% at \cs\everyrow, and \emph{maxima/minima} are stored into the macro \cs\tabu@naturalXmin
+% and \cs\tabu@naturalXmax: those are required for the algorithm of \textt{tabu spread} (\cs\tabu@spreadarith).
+%
+% \begin{macro}{\tabucolX}
+%
+% \TeX{} dimen that -- locally -- stores the width corresponding to the preamble token \textt{X[1]}:
+% the standard width of \textt X columns.
+%
+% \begin{macro}{\tabu@DELTA}
+%
+% This is for clarity, the local name of \cs\@tempdimc in \cs\tabu@arith.
+%
+% \begin{macro}{\tabu@thick}
+% \begin{macro}{\tabu@on}
+% \begin{macro}{\tabu@off}
+%
+% They are used locally by \cs\tabu@getline, while parsing the parameters for a line specification.
+% This is for clarity, the local name for \cs\@tempdima, \cs\@tempdimb and \cs\@tempdimc.
%
% \begin{macrocode}
\newdimen \tabu@target
\newdimen \tabu@spreadtarget
\newdimen \tabu@naturalX
+\newdimen \tabucolX
+\let\tabu@DELTA \@tempdimc
+\let\tabu@thick \@tempdima
+\let\tabu@on \@tempdimb
+\let\tabu@off \@tempdimc
% \end{macrocode}
% \end{macro}
% \end{macro}
% \end{macro}
+% \end{macro}
+% \end{macro}
+% \end{macro}
+% \end{macro}
+% \end{macro}
%
+% \begin{macro}{\tabu@Xsum}
%
-% \begin{macro}{\tabucolX}
+% \TeX{} dimen that -- locally -- stores the sum of all width coefficients for \textt X columns.
+% This is required to fix the initial value for \cs\tabucolX and then in the algorithms (\cs\tabu@arith and
+% \cs\tabu@arithnegcoef).
%
-% The dimen corresponding to the preamble token \textt{X[1]}: the standard width of \textt X columns.
+% \begin{macrocode}
+\newdimen \tabu@Xsum
+% \end{macrocode}
+% \end{macro}
%
-% \begin{macro}{\tabu@X@sum}
+% \begin{macro}{\extrarowdepth}
+%
+% \xfile{array.sty} defines \cs\extrarowheight as a \TeX{} dimen register: the extra height
+% to be finally added to each row of a table. \thispackage defines \cs\extrarowdepth in addition:
+% the \emph{extra depth}. Though \cs\extrarowheight and \cs\extrarowdepth can be set by the user,
+% the official interface is \cs\extrarowsep.
+%
+% \begin{macro}{\abovetabulinesep}
+% \begin{macro}{\belowtabulinesep}
+%
+% \TeX{} dimensions \cs\abovetabulinesep and \cs\belowtabulinesep store the minimum allowed vertical space
+% between the contents of the cells and their borders. Their values are ignored if non positive. Though they
+% can be set by the user, the official interface is \cs\tabulinesep.
%
-% Stores the sum of all width coefficients for \textt X columns.
+% The philosophy and the technics are similar to the one provided by the \Xpackage{cellspace} package.
+% However, limitations of \xpackage{cellspace} are lifted (nested \env{tabu} environments, use of colors...
+% see the \refitem{cellspace limitations}[\xpackage{cellspace} limitations] in the revision history). \thispackage
+% inserts only one strut per line, whose name is \cs\@arstrut.
%
-% \begin{macro}{\tabucolX@error}
+% \begin{macro}{\tabustrutrule}
%
-% In case of \textt X columns too narrow.
+% The \TeX{} dimen \cs\tabustrutrule is here only for debugging purpose: its value must be $0pt$.
+% It behaves mostly like \TeX{} primitive \cs\overfullrule, and allow to see the struts introduced in the tabular,
+% and to control vertical spacing. Setting \cs\tabustrutrule to a positive value has no effect unless \cs\tracingtabu
+% is $\geq 3$. The official interface is \cs\tracingtabu$=3$.
%
% \begin{macrocode}
-\newdimen \tabucolX
-\newdimen \tabu@X@sum
-\newdimen \tabucolX@error \tabucolX@error=1em
+\newdimen \extrarowdepth
+\newdimen \abovetabulinesep
+\newdimen \belowtabulinesep
+\newdimen \tabustrutrule \tabustrutrule \z@
% \end{macrocode}
% \end{macro}
% \end{macro}
% \end{macro}
+% \end{macro}
%
-% \begin{macro}{\abovetabulinesep}
-% \begin{macro}{\belowtabulinesep}
-% \begin{macro}{\extrarowdepth}
-% \begin{macro}{\tabustrutrule}
+% \begin{macro}{\tabu@thebody}
+%
+% This token stores -- locally -- the collected content of the \env*{tabu} during the measuring process.
%
-% The two dimensions \cs{abovetabulinesep} and \cs{belowtabulinesep} allow to control
-% vertical spacing of lines inside a \textt{tabu} in a way similar to the philosophy of
-% \Xpackage{cellspace}. However, limitations of \xpackage{cellspace} are lifted
-% (nested \textt{tabu} environments, use of colors... see the
-% \refitem{cellspace limitations}[\xpackage{cellspace} limitations] in the revision history).
+% \begin{macro}{\tabu@footnotes}
%
-% The dimen \cs{tabustrutrule} is here only for debugging purpose: its value must be \textt{0pt}.
-% It behaves like \TeX{} \cs{overfullrule} to see the struts introduced to control the
-% vertical spacing of lines.
+% Token that globally stores the footnotes inside the \env*{tabu}, for \cs\insert does not work
+% inside such a level of groupings...
%
% \begin{macrocode}
-\newdimen \abovetabulinesep
-\newdimen \belowtabulinesep
-\newdimen \extrarowdepth
-\newdimen \tabustrutrule \tabustrutrule \z@
+\newtoks \tabu@thebody
+\newtoks \tabu@footnotes
+% \end{macrocode}
+% \end{macro}
+% \end{macro}
+%
+% \begin{macro}{\tabu@box}
+%
+% Stores -- loally -- the whole \env{tabu} when an attempt to adjust \textt X columns is performed.
+%
+% \begin{macro}{\tabu@arstrutbox}
+%
+% While the \cs\@arstrutbox may redefined globally at the end of each line (for vertical spacing adjustment),
+% we define a new box and \cs\let\cs\@arstrutbox to be that box inside the \env*{tabu}.
+%
+% Hence, the \cs\@arstrutbox used by other tabular environment does not suffer any modification.
+%
+% \begin{macro}{\tabu@hleads}
+% \begin{macro}{\tabu@vleads}
+%
+% Those boxes are used to built horizontal and vertical leaders. In order not to rebuilt
+% the boxes every time a leader is inserted, the box is globally defined if a line style is
+% specified (\emph{via} \texttbf\textbar\M[line style]\, or \cs\tabucline\M[line style]\M*{...}\,
+% or \cs\tabulinestyle\M*{line style}.
+%
+% \begin{macrocode}
+\newsavebox \tabu@box
+\newsavebox \tabu@arstrutbox
+\newsavebox \tabu@hleads
+\newsavebox \tabu@vleads
% \end{macrocode}
% \end{macro}
% \end{macro}
% \end{macro}
% \end{macro}
%
+% \subsubsection{Switches}
%
-% \begin{macro}{\iftabu@measuring}
+% \begin{macro}{\iftabu@colortbl}
%
-% This switch is set to \textt{true} by \cs{tabu@arith} if the trial did not reached the target.
+% The global switch \cs\iftabu@colortbl is used by \cs\rowfont when modifying the alignments, because
+% \xpackage{colortbl} changes the glues put inside the \cs\halign preamble to make standard alignments.
+% This switch is set At Begin Document.
%
-% It is also temporarily set to true when the first \textt X column is encountered in the \textt{tabu} preamble,
-% at the time \cs{@mkpream} scans it to built the \cs{halign} preamble. The first \textt X column found
-% actually triggers some special setup to be expanded before \cs{halign} (see the \hyperref[Flow chart of expansion]{flow chart...})
+% \begin{macro}{\iftabu@siunitx}
%
-% \begin{macro}{\iftabu@spread}
+% Global switch set \cs\AtBeginDocument. \textt{true} if \Xpackage{siunitx} package is detected.
%
-% A switch whether ``\textt{tabu spread}'' is used or not.
+% \begin{macro}{\iftabu@measuring}
+%
+% This switch is somewhat \emph{magic} in the sense that it has several meanings... It is temporarily set
+% to \textt{true} by \cs\tabu@arith in the trial group, to say that the \env{tabu} did not reach its target yet.
+% It is also set to \textt{true} in the \cs\@mkpream group when the first \textt X column is encountered in the
+% preamble. Finally, it is true in the trial\textbf{S} group when the outermost tabular is in strategy number $2$
+% or number $3$.
%
-% \begin{macro}{\iftabu@firstcline}
+% \begin{macro}{\iftabu@spread}
%
-% A switch to adapt \cs{tabucline} automatically if it comes first in the \textt{tabu} (similar to \cs{firsthline}).
+% A switch whether ``\textt{tabu spread}'' is used or not. A nested \env{tabu} inside a \textt X column whose coefficient
+% is negative has a default target set to \textt{spread 0pt}.
%
% \begin{macro}{\iftabu@negcoef}
%
% A switch set to true in case of negativ coef (natural width if less than \textt{X[coef]}).
%
+% \begin{macro}{\iftabu@everyrow}
+%
+% A very important global switch: \textt{true} when outside any \env{tabu} environment, \textt{true} as well when inside a cell
+% of a \env{tabu}, but globally set to \textt{false} at \cs\everycr and therefore inside any \cs\noalign command. This allows to
+% insert leaders (by \cs\omit\cs\span\cs\omit\cs\cr\cs\noalign\M*{...}) or first/last line corrections only once, even if \cs\everycr
+% is executed more than once.
+%
+% \begin{macro}{\iftabu@long}
+%
+% Finally the swith \cs\iftabu@long is set to \textt{true} inside \env{longtabu} and to false inside \env{tabu}.
+% This is convenient because some setup are slightly different between \env{tabu} and \env{longtabu}.
+%
% \begin{macrocode}
+\newif \iftabu@colortbl
+\newif \iftabu@siunitx
\newif \iftabu@measuring
\newif \iftabu@spread
\newif \iftabu@negcoef
-\newif \iftabu@firstcline
\newif \iftabu@everyrow
-\def\tabu@everyrowtrue{\global\let\iftabu@everyrow \iftrue}
+\def\tabu@everyrowtrue {\global\let\iftabu@everyrow \iftrue}
\def\tabu@everyrowfalse{\global\let\iftabu@everyrow \iffalse}
+\newif \iftabu@long
% \end{macrocode}
% \end{macro}
% \end{macro}
% \end{macro}
% \end{macro}
+% \end{macro}
+% \end{macro}
+% \end{macro}
%
+% \begin{macro}{\iftabuscantokens}
+% \begin{macro}{\tabu@rescan}
%
-% \begin{macro}{\tabu@box}
+% \cs\iftabuscantokens is the switch for whether or not \env{tabu} will use \cs\scantokens.
+% Though the user can set \cs\iftabuscantokens
+% to \cs\iftrue or \cs\iffalse, the official interface is \env{tabu\stform*}.
%
-% Stores the whole \textt{tabu} when an attempt to adjust \textt X columns is performed.
+% It does not make sense to use \cs\scantokens in a nested \env{tabu}: only the outermost \env{tabu}
+% can use \cs\scantokens, for the environment body must be collected with care !
%
-% It is also used by \cs{tabucline} to save the \cs{@arstrutbox} when inserting a horizontal line.
+% \cs\tabu@rescan is the helper macro for scanning tokens.
%
% \begin{macrocode}
-\newsavebox \tabu@box
-\chardef \tabu@arstrutbox=\@arstrutbox
-\let\tabu@vcenter \vcenter
+\newif \iftabuscantokens
+\def\tabu@rescan {\tabu@verbatim \scantokens }
% \end{macrocode}
% \end{macro}
+% \end{macro}
+%
+% \subsubsection{Some helper macros}
+%¤<package>%% Utilities (for internal usage) -----------------------------------
%
% \begin{macro}{\tabu@gobblespace}
+% \begin{macro}{\tabu@gobbletoken}
%
-% A macro which is needed when scanning tokens with \cs{futurelet}.
+% Two macros which are needed when scanning tokens with \cs\futurelet.
%
-% \begin{macro}{\tabu@gobbleopt}
+% \begin{macro}{\tabu@gobbleX}
%
-% A macro that gobbles an optional argument.
+% This gobbles the character number 10 in ASCII (\verb+^^J+ in \TeX{}).
%
% \begin{macro}{\tabu@ifenvir}
%
-% Check if the current environment is \textt{tabu} or \textt{longtabu} (for \cs{multicolumn}).
+% Checks if the current environment is \env{tabu} or \env{longtabu} (for \cs\multicolumn inside \env{tabu}).
+%
+% \begin{macro}{\tabu@modulo}
+%
+% Computes the modulo (for \cs\taburowcolors). The method is taken from H.O. \Xpackage{intcalc} package.
%
% \begin{macrocode}
-\def\tabu@gobblespace#1 {#1}
-\def\tabu@gobbleopt#1{\@ifnextchar [{\tabu@gobble@pt{#1}}{#1}}%]
-\def\tabu@gobble@pt#1[#2]{#1}
-\def\tabu@ifenvir {%
- \csname @\expandafter\ifx\csname\@currenvir\endcsname\tabu
- first\else\expandafter\ifx\csname\@currenvir\endcsname\longtabu
- first\else second\fi\fi oftwo\endcsname
+\def\tabu@gobblespace #1 {#1}
+\def\tabu@gobbletoken #1#2{#1}
+\def\tabu@gobbleX{\futurelet\@let@token \tabu@gobblex}
+\def\tabu@gobblex{\if ^^J\noexpand\@let@token \expandafter\@gobble
+ \else\ifx \@sptoken\@let@token
+ \expandafter\tabu@gobblespace\expandafter\tabu@gobbleX
+ \fi\fi
+}% \tabu@gobblex
+\def\tabu@X{^^J}
+{\obeyspaces
+\global\let\tabu@spxiii= % saves an active space (for \ifx)
+\gdef\tabu@@spxiii{ }}
+\def\tabu@ifenvir {% only for \multicolumn
+ \expandafter\tabu@if@nvir\csname\@currenvir\endcsname
}% \tabu@ifenvir
+\def\tabu@if@nvir #1{\csname @\ifx\tabu#1first\else
+ \ifx\longtabu#1first\else
+ second\fi\fi oftwo\endcsname
+}% \tabu@ifenvir
+\def\tabu@modulo #1#2{\numexpr\ifnum\numexpr#1=\z@ 0\else #1-(#1-(#2-1)/2)/(#2)*(#2)\fi}
+% \end{macrocode}
+% \end{macro}
+% \end{macro}
+% \end{macro}
+% \end{macro}
+%
+% \begin{macro}{\tabu@strtrim}
+%
+% Trimming spaces at low cost...
+%
+% \begin{macrocode}
+{\catcode`\&=3
+\gdef\tabu@strtrim #1{% #1 = control sequence to trim
+ \ifodd 1\ifx #1\@empty \else \ifx #1\space \else 0\fi \fi
+ \let\tabu@c@l@r \@empty \let#1\@empty
+ \else \expandafter \tabu@trimspaces #1&#1\@nnil
+ \fi
+}% \tabu@strtrim
+\gdef\tabu@trimspaces #1&#2\@nnil{\let\tabu@c@l@r=#2\tabu@firstspace .#1& &#2}%
+\gdef\tabu@firstspace #1#2#3 &{\tabu@lastspace #2#3&}
+\gdef\tabu@lastspace #1&#2&#3{\def #3{#1}%
+ \ifx #3\tabu@c@l@r \def\tabu@c@l@r{\protect\color{#1}}\expandafter\remove@to@nnil \fi
+ \tabu@trimspaces #1&#3\@nnil}
+}% \catcode
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\tabu@sanitizearg}
+%
+% Sanitize an argument (\xpackage{babel} compliant).
+%
+% \begin{macrocode}
+\def\tabu@sanitizearg #1#2{{%
+ \csname \ifcsname if@safe@actives\endcsname % <babel>
+ @safe@activestrue\else
+ relax\fi \endcsname
+ \edef#2{#1}\tabu@strtrim#2\@onelevel@sanitize#2%
+ \expandafter}\expandafter\def\expandafter#2\expandafter{#2}%
+}% \tabu@sanitizearg
% \end{macrocode}
% \end{macro}
+%
+% \begin{macro}{\tabu@textbar}
+%
+% The character \texttbf\textbar \, may have a special category code inside the document,
+% depending on the language setting or for example, \texttbf\textbar\, can be the delimiter
+% shortcut for verbatim. We use \cs\scantokens to allow an \cs\ifx test even if the category
+% code of \texttbf\textbar\, changes along the compilation.
+%
+% \begin{macrocode}
+\def\tabu@textbar #1{\begingroup \endlinechar\m@ne \scantokens{\def\:{|}}%
+ \expandafter\endgroup \expandafter#1\:% !!! semi simple group !!!
+}% \tabu@textbar
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\tabu@everyrow@bgroup}
+% \begin{macro}{\tabu@everyrow@egroup}
+%
+% Commands like \cs\everyrow, \cs\taburulecolor, \cs\tabulinestyle, \cs\taburowcolors can be expanded
+% either in a cell or outside a \env*{tabu} or at the end of a row, inside a \cs\noalign group.
+%
+% To avoid the insertion of an empty math atom (equivalent to \cs\hbox to$0pt$\M*{}) we open a semi-simple
+% group rather than a math group if not in \cs\noalign. \cs\toks@ is used to define the local-to-the-\TeX{}-group
+% setting (post-fixed by \textt{@L}).
+%
+% \begin{macrocode}
+\def\tabu@everyrow@bgroup{\iftabu@everyrow \begingroup \else \noalign{\ifnum0=`}\fi \fi}
+\def\tabu@everyrow@egroup{%
+ \iftabu@everyrow \expandafter \endgroup \the\toks@
+ \else \ifnum0=`{\fi}%
+ \fi
+}% \tabu@everyrow@egroup
+% \end{macrocode}
% \end{macro}
% \end{macro}
%
+% \subsubsection{Rebuild the \cs{@arstrutbox}}
+%
+% \begin{macro}{\tabu@arstrut}
+% \begin{macro}{\tabu@rearstrut}
+%
+% The macros rebuilds the \cs\@arstrutbox (a \cs\hbox). With the \emph{debug} variants
+% when \cs\tracingtabu$=3$ and \cs\tabustrutrule$>0$.
+%
+% \begin{macrocode}
+\def\tabu@arstrut {\global\setbox\@arstrutbox \hbox{\vrule
+ height \arraystretch \dimexpr\ht\strutbox+\extrarowheight
+ depth \arraystretch \dimexpr\dp\strutbox+\extrarowdepth
+ width \z@}%
+}% \tabu@arstrut
+\def\tabu@rearstrut {%
+ \@tempdima \arraystretch\dimexpr\ht\strutbox+\extrarowheight \relax
+ \@tempdimb \arraystretch\dimexpr\dp\strutbox+\extrarowdepth \relax
+ \ifodd 1\ifdim \ht\@arstrutbox=\@tempdima
+ \ifdim \dp\@arstrutbox=\@tempdimb 0 \fi\fi
+ \tabu@mkarstrut
+ \fi
+}% \tabu@rearstrut
+% \end{macrocode}
+% \end{macro}
+% \end{macro}
+%
+% \begin{macro}{\tabu@DBG@arstrut}
+%
+% This is the ``debug'' version of \cs\tabu@arstrut: used when
+% \cs\tracingtabu $=3$ or more to show the struts inserted in the tabular.
+%
+% \begin{macrocode}
+\def\tabu@@DBG #1{\ifdim\tabustrutrule>\z@ \color{#1}\fi}
+\def\tabu@DBG@arstrut {\global\setbox\@arstrutbox
+ \hbox to\z@{\hbox to\z@{\hss
+ {\tabu@DBG{cyan}\vrule
+ height \arraystretch \dimexpr\ht\strutbox+\extrarowheight
+ depth \z@
+ width \tabustrutrule}\kern-\tabustrutrule
+ {\tabu@DBG{pink}\vrule
+ height \z@
+ depth \arraystretch \dimexpr\dp\strutbox+\extrarowdepth
+ width \tabustrutrule}}}%
+}% \tabu@DBG@arstrut
+% \end{macrocode}
+% \end{macro}
+%
% \begin{macro}{\tabu@save@decl}
%
% No inversion on tokens in the \text{tabu} preamble, when not in math mode.
%
% \begin{macrocode}
-\def\tabu@save@decl{%
- \toks\count@ =\expandafter{\the\toks\expandafter\count@ \@nextchar}%
-}% \tabu@save@decl
+\def\tabu@save@decl{\toks\count@ \expandafter{\the\toks\expandafter\count@
+ \@nextchar}}%
+\def\tabu@savedecl{\ifcat$\d@llarend\else
+ \let\save@decl \tabu@save@decl \fi % no inversion of tokens in text mode
+}% \tabu@savedecl
% \end{macrocode}
% \end{macro}
%
+% \subsubsection{Disable some commands during trials}
%
-% \begin{macro}{\tabu@newcolumntype}
+% \begin{macro}{\tabuDisableCommands}
%
-% A helper macro to create new column types for \textt{tabu}.
+% Following the model of \xpackage{hyperref} \cs\pdfstringdefDisableCommands,
+% \cs\tabuDisableCommands allow the user to change the definition of some commands
+% during the trial loops, by the mean of a hook to be expanded by \cs\tabu@setstrategy.
%
-% The column types are not appended to \cs{NC@list} in order to keep them local to \textt{tabu}.
+% \begin{macrocode}
+\newcommand*\tabuDisableCommands {\g@addto@macro\tabu@trialh@@k }
+\let\tabu@trialh@@k \@empty
+% \end{macrocode}
+% \end{macro}
%
-% \begin{macro}{\tabu@privatecolumntype}
+% \begin{macro}{\tabu@nowrite}
%
-% Columns types defined with \cs{tabu@privatecolumntype} are "mounted" only inside the \cs{@mkpream} group
-% of \textt{tabu}.
+% A trick (from the \TeX-book) to forbidd \cs\write when a trial is done on the \cs\halign.
+%
+% \begin{macro}{\tabu@noxfootnotes}
+%
+% Disable footnotes during trials.
%
% \begin{macrocode}
-\def\tabu@newcolumntype #1{%
- \expandafter\tabu@new@columntype
- \csname NC@find@\string#1\expandafter\endcsname
- \csname NC@rewrite@\string#1\endcsname
- {#1}%
-}% \tabu@newcolumntype
-\def\tabu@new@columntype #1#2#3{%
- \def#1##1#3{\NC@{##1}}%
- \let#2\relax \newcommand*#2%
-}% \tabu@new@columntype
-\def\tabu@privatecolumntype #1{%
- \expandafter\tabu@private@columntype
- \csname NC@find@\string#1\expandafter\endcsname
- \csname NC@rewrite@\string#1\expandafter\endcsname
- \csname tabu@NC@find@\string#1\expandafter\endcsname
- \csname tabu@NC@rewrite@\string#1\endcsname
- {#1}%
-}% \tabu@privatecolumntype
-\def\tabu@private@columntype#1#2#3#4{%
- \g@addto@macro\tabu@privatecolumns{\let#1#3\let#2#4}%
- \tabu@new@columntype#3#4%
-}% \tabu@private@columntype
-\let\tabu@privatecolumns \@empty
+\def\tabu@nowrite #1#{{\afterassignment}\toks@}
+\let\tabu@write\write
+\let\tabu@immediate\immediate
+\def\tabu@WRITE{\begingroup
+ \def\immediate\write{\aftergroup\endgroup
+ \tabu@immediate\tabu@write}%
+}% \tabu@WRITE
+\expandafter\def\expandafter\tabu@GenericError\expandafter{%
+ \expandafter\tabu@WRITE\GenericError}
+\def\tabu@warn{\tabu@WRITE\PackageWarning{tabu}}
+\def\tabu@noxfootnote [#1]{\@gobble}
% \end{macrocode}
% \end{macro}
% \end{macro}
%
+% \begin{macro}{\tabu@nocolor}
+% \begin{macro}{\tabu@norowcolor}
%
-% \begin{macro}{X (private column type)}
+% For optimisation purpose, color changes are deactivated during trials,
+% for they do not affect the measures.
%
-% This is the rewrite macro for \textt{tabu X} columns.
-% Such a column has an optional argument: the width coefficient for the \textt{tabu X} column
-% whose default value is 1, and may be some alignments parameters.
-% The coefficient is used in the expression: \textt{p\M*{\cs{dimexpr}\meta{coef}\cs{tabucolX}}}
+% \begin{macrocode}
+\def\tabu@nocolor #1#{\@gobble}
+\newcommand*\tabu@norowcolor[2][]{}
+% \end{macrocode}
+% \end{macro}
+% \end{macro}
+%
+% \subsubsection{\xpackage{siunitx} \textt S and s columns management}
+%
+% \begin{macro}{\tabu@maybesiunitx}
%
+% A macro that encloses the definition of \cs\tabu@celllalign, in order to check if the column is a \xpackage{siunitx}
+% \textt S (or \textt s) column, and neutralise the setup of \cs\rowfont in this case, for \xpackage{siunitx} provides
+% its own \textt{key=value} options to set fonts inside \textt S (or \textt s) columns.
% \begin{macrocode}
-\tabu@privatecolumntype X[1][]{\tabu@rewrite@X{#1}%
- \let\@halignto \relax
- \expandafter \NC@find \tabucolX@rw}
+\def\tabu@maybesiunitx #1{\def\tabu@temp{#1}%
+ \futurelet\@let@token \tabu@m@ybesiunitx}
+\def\tabu@m@ybesiunitx #1{\def\tabu@m@ybesiunitx {%
+ \ifx #1\@let@token \let\tabu@cellleft \@empty \let\tabu@cellright \@empty \fi
+ \tabu@temp}% \tabu@m@ybesiunitx
+}\expandafter\tabu@m@ybesiunitx \csname siunitx_table_collect_begin:Nn\endcsname
+\def\tabu@celllalign@def #1{\def\tabu@celllalign{\tabu@maybesiunitx{#1}}}%
% \end{macrocode}
% \end{macro}
%
-% The next part of the definition (\cs{tabu@rewrite@X}) can be found page \pageref{tabu X column definition}.
%
-% \begin{macro}{\usetabu (private column type)}
+% \subsection{Rules, colors and vertical adjustment}
+% \label{Rules, colors and vertical adjustment}
%
-% \cs{usetabu} is defined as a \textt{tabu} new column type: loaded only inside the \cs{@mkpream}
-% group inside the \textt{tabu} environment.
+% \subsubsection{\cs{extrarowsep} and \cs{tabulinesep}}
+%¤<package>%% Fixed vertical spacing adjustment: \extrarowsep ------------------
+%
+% \begin{macro}{\extrarowsep}
+%
+% \cs\extrarowsep makes the assignment for both \cs\extrarowheight and \cs\extrarowdepth.
+%
+% The macro may be prefixed by \cs\global.
%
% \begin{macrocode}
-\tabu@privatecolumntype \usetabu [1]{%
- \ifx\\#1\\\tabu@saveerr{}\else
- \@ifundefined{tabu@saved@\string#1}
- {\tabu@saveerr{#1}}
- {\let\tabu@rewrite@X \tabu@rewrite@Xrestore
- \csname tabu@saved@\string#1\expandafter\endcsname\expandafter\z@}%
- \fi
-}% \NC@rewrite@\usetabu
+\newcommand*\extrarowsep{\edef\tabu@C@extra{\the\numexpr\tabu@C@extra+1}%
+ \iftabu@everyrow \aftergroup\tabu@Gextra
+ \else \aftergroup\tabu@n@Gextra
+ \fi
+ \@ifnextchar={\tabu@gobbletoken\tabu@extra} \tabu@extra
+}% \extrarowsep
+\def\tabu@extra {\@ifnextchar_%
+ {\tabu@gobbletoken{\tabu@setextra\extrarowheight \extrarowdepth}}
+ {\ifx ^\@let@token \def\tabu@temp{%
+ \tabu@gobbletoken{\tabu@setextra\extrarowdepth \extrarowheight}}%
+ \else \let\tabu@temp \@empty
+ \afterassignment \tabu@setextrasep \extrarowdepth
+ \fi \tabu@temp}%
+}% \tabu@extra
+\def\tabu@setextra #1#2{\def\tabu@temp{\tabu@extr@#1#2}\afterassignment\tabu@temp#2}
+\def\tabu@extr@ #1#2{\@ifnextchar^%
+ {\tabu@gobbletoken{\tabu@setextra\extrarowdepth \extrarowheight}}
+ {\ifx _\@let@token \def\tabu@temp{%
+ \tabu@gobbletoken{\tabu@setextra\extrarowheight \extrarowdepth}}%
+ \else \let\tabu@temp \@empty
+ \tabu@Gsave \tabu@G@extra \tabu@C@extra \extrarowheight \extrarowdepth
+ \fi \tabu@temp}%
+}% \tabu@extr@
+\def\tabu@setextrasep {\extrarowheight=\extrarowdepth
+ \tabu@Gsave \tabu@G@extra \tabu@C@extra \extrarowheight \extrarowdepth
+}% \tabu@setextrasep
+\def\tabu@Gextra{\ifx \tabu@G@extra\@empty \else {\tabu@Rextra}\fi}
+\def\tabu@n@Gextra{\ifx \tabu@G@extra\@empty \else \noalign{\tabu@Rextra}\fi}
+\def\tabu@Rextra{\tabu@Grestore \tabu@G@extra \tabu@C@extra}
+\let\tabu@C@extra \z@
+\let\tabu@G@extra \@empty
% \end{macrocode}
% \end{macro}
%
-% \begin{macro}{\preamble (private column type)}
+%¤<package>%% Dynamic vertical spacing adjustment: \tabulinesep ----------------
%
-% \cs{preamble} is defined as a \textt{tabu} new column type: loaded only inside the \cs{@mkpream}
-% group inside the \textt{tabu} environment.
+% \begin{macro}{\tabulinesep}
+%
+% \cs\tabulinesep makes the assignment for both \cs\abovetabulinesep and \cs\belowtabulinesep.
+%
+% The macro may be prefixed by \cs\global.
%
% \begin{macrocode}
-\tabu@privatecolumntype \preamble [1]{%
- \ifx\\#1\\\tabu@saveerr{}\else
- \@ifundefined{tabu@saved@\string#1}
- {\tabu@saveerr{#1}}
- {\csname tabu@saved@\string#1\expandafter\endcsname\expandafter\@ne}%
- \fi
-}% \NC@rewrite@\preamble
+\newcommand*\tabulinesep{\edef\tabu@C@linesep{\the\numexpr\tabu@C@linesep+1}%
+ \iftabu@everyrow \aftergroup\tabu@Glinesep
+ \else \aftergroup\tabu@n@Glinesep
+ \fi
+ \@ifnextchar={\tabu@gobbletoken\tabu@linesep} \tabu@linesep
+}% \tabulinesep
+\def\tabu@linesep {\@ifnextchar_%
+ {\tabu@gobbletoken{\tabu@setsep\abovetabulinesep \belowtabulinesep}}
+ {\ifx ^\@let@token \def\tabu@temp{%
+ \tabu@gobbletoken{\tabu@setsep\belowtabulinesep \abovetabulinesep}}%
+ \else \let\tabu@temp \@empty
+ \afterassignment \tabu@setlinesep \abovetabulinesep
+ \fi \tabu@temp}%
+}% \tabu@linesep
+\def\tabu@setsep #1#2{\def\tabu@temp{\tabu@sets@p#1#2}\afterassignment\tabu@temp#2}
+\def\tabu@sets@p #1#2{\@ifnextchar^%
+ {\tabu@gobbletoken{\tabu@setsep\belowtabulinesep \abovetabulinesep}}
+ {\ifx _\@let@token \def\tabu@temp{%
+ \tabu@gobbletoken{\tabu@setsep\abovetabulinesep \belowtabulinesep}}%
+ \else \let\tabu@temp \@empty
+ \tabu@Gsave \tabu@G@linesep \tabu@C@linesep \abovetabulinesep \belowtabulinesep
+ \fi \tabu@temp}%
+}% \tabu@sets@p
+\def\tabu@setlinesep {\belowtabulinesep=\abovetabulinesep
+ \tabu@Gsave \tabu@G@linesep \tabu@C@linesep \abovetabulinesep \belowtabulinesep
+}% \tabu@setlinesep
+\def\tabu@Glinesep{\ifx \tabu@G@linesep\@empty \else {\tabu@Rlinesep}\fi}
+\def\tabu@n@Glinesep{\ifx \tabu@G@linesep\@empty \else \noalign{\tabu@Rlinesep}\fi}
+\def\tabu@Rlinesep{\tabu@Grestore \tabu@G@linesep \tabu@C@linesep}
+\let\tabu@C@linesep \z@
+\let\tabu@G@linesep \@empty
% \end{macrocode}
% \end{macro}
%
-% \begin{macro}{\tabu@rewritefirst (new column type)}
+%¤<package>%% \global\extrarowsep and \global\tabulinesep -------------------
%
-% This new column type is not really a column type! It is always added to a \textt{tabu} preamble
-% in order to do some setup before any other column is rewritten by \cs{@mkpream}.
+% \begin{macro}{\tabu@Gsave}
+% \begin{macro}{\tabu@Grestore}
+%
+% Utility macros to implement the possibility to prefix a macro by \cs\global.
%
-% Thus, \cs{NC@do}\cs{tabu@rewritefirst} is added \textbf{at the beginning of} \cs{NC@list}
-% at the entry of a (not nested) \textt{tabu} environment.
+% \begin{macrocode}
+\def\tabu@Gsave #1#2#3#4{\xdef#1{#1%
+ \toks#2{\toks\the\currentgrouplevel{\global#3\the#3\global#4\the#4}}}%
+}% \tabu@Gsave
+\def\tabu@Grestore#1#2{%\ifdim \baselineskip=\z@\noalign\fi
+ \toks#2{}#1\toks\currentgrouplevel\expandafter{\expandafter}\the\toks#2\relax
+ \ifcat$\the\toks\currentgrouplevel$\else
+ \global\let#1\@empty \global\let#2\z@
+ \the\toks\currentgrouplevel
+ \fi
+}% \tabu@Grestore
+% \end{macrocode}
+% \end{macro}
+% \end{macro}
+%
+% \subsubsection{Setting code for every row}
+%¤<package>%% Setting code for every row ---------------------------------------
+%
+% \begin{macro}{\everyrow}
%
-% This ``column type'' sets up the new column type \cs{tabu@rewritelast} which is added to
-% \textbf{at the end of} \cs{NC@list}, and defines the token \texttt X to be rewritten by
-% \cs{tabu@NC@rewrite@X} (in case \xpackage{tabularx} is used with \thispackage, this modification
-% of the \textt X column occurs only inside the group where \cs{@mkpream} does its job).
+% As long as \env{tabu} needs to execute some code at \cs\everycr,
+% it's not difficult to provide a command to give the user the opportunity to execute
+% its own arbitrary code. However, \cs\everyrow will be used almost only with \cs\hline
+% (or \cs\tabucline or \cs\midrule).
+%
+% \cs\everyrow can be changed anywhere inside the \env{tabu}: at the end of a row, or even
+% inside a cell.
+%
+% The \textt{rows} \LaTeX{} counter \textt{taburow} \textt{must not be changed by the user!}.
+%
+% The settings are saved in a ``locally-global'' way...
%
% \begin{macrocode}
-\tabu@newcolumntype \tabu@rewritefirst{%
- \tabu@X@cols \z@
- \let\tabu@dimexpr \relax
- \let\tabu@savepreamble \relax
- \let\NC@rewrite@X \tabu@NC@rewrite@X
- \gdef\tabu@global@temp {\tabu@savepreamble}%
- \aftergroup \tabu@global@temp
- \let\tabu@islast \relax
- \tabu@privatecolumns
- \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\expandafter\NC@list \expandafter\NC@do \expandafter X%
- \tabu@NC@list \NC@do X\NC@do\tabu@rewritemiddle}%
- \ifcat$\d@llarend\else
- \let\save@decl \tabu@save@decl \fi % no inversion of tokens in text mode
- \NC@find \tabu@rewritemiddle
-}% NC@rewrite@\tabu@rewritefirst
-\def\tabu@savepreamble{%
- \NC@list\expandafter{\tabu@NC@list}%
- \let\tabu@savedpreamble \@preamble
- \ifdim \tabustrutrule>\z@
- \setbox\@arstrutbox\hbox{\vrule
- \@height \ht\@arstrutbox
- \@width \tabustrutrule
- \@depth \dp\@arstrutbox}%
- \fi
- \ifdim \extrarowdepth>\z@
- \setbox\@arstrutbox\hbox{\vrule
- \@height \ht\@arstrutbox
- \@width \tabustrutrule
- \@depth \dimexpr\dp\@arstrutbox+\arraystretch\extrarowdepth}%
- \fi
-}% \tabu@savepreamble
+\newcommand*\everyrow{\tabu@everyrow@bgroup
+ \tabu@start \z@ \tabu@stop \z@ \tabu@evrstartstop
+}% \everyrow
+\def\tabu@evrstartstop {\@ifnextchar^%
+ {\afterassignment \tabu@evrstartstop \tabu@stop=}%
+ {\ifx ^\@let@token
+ \afterassignment\tabu@evrstartstop \tabu@start=%
+ \else \afterassignment\tabu@everyr@w \toks@
+ \fi}%
+}% \tabu@evrstartstop
+\def\tabu@everyr@w {%
+ \xdef\tabu@everyrow{%
+ \noexpand\tabu@everyrowfalse
+ \let\noalign \relax
+ \noexpand\tabu@rowfontreset
+ \iftabu@colortbl \noexpand\tabu@rc@ \fi % \taburowcolors
+ \let\noexpand\tabu@docline \noexpand\tabu@docline@evr
+ \the\toks@
+ \noexpand\tabu@evrh@@k
+ \noexpand\tabu@rearstrut
+ \global\advance\c@taburow \@ne}%
+ \iftabu@everyrow \toks@\expandafter
+ {\expandafter\def\expandafter\tabu@evr@L\expandafter{\the\toks@}}%
+ \else \xdef\tabu@evr@G{\the\toks@}%
+ \fi
+ \tabu@everyrow@egroup
+}% \tabu@everyr@w
+\def\tabu@evr {\def\tabu@evrh@@k} % for internal use only
+\tabu@evr{}
% \end{macrocode}
% \end{macro}
%
-% \begin{macro}{\tabu@rewritelast (new column type)}
+% \subsubsection{Setting line styles and colors}
+%¤<package>%% line style and leaders -------------------------------------------
%
-% This new column type is rewritten after \textt X columns, because it is declared by
-% when the column \cs{tabu@rewritefirst} is actually rewritten. In the case where \cs{tabu@target}
-% is $>0$ (either because of ``\textt{tabu to}'' or ``\textt{tabu spread}'' has been called)
-% and if there is no \textt X column, then \textt{@\M*{\cs{extracolsep}\cs{@flushglue}}} is added
-% at the beginning of the preamble.
+% \begin{macro}{\newtabulinestyle}
%
-% To avoid duplicate margin in the \textt{tabu} we have to test the next token in the preamble.
-% If the next token is \textt\textbar\ or \textt !\ then no margin must be added and
-% \textt{@\M*{\cs{extracolsep}\cs{@flushglue}}} can be inserted at the beginning of the preamble.
+% \cs\newtabulinestyle\M*{style=spec.,style=spec,style=spec}
%
-% Otherwise, we must insert \textt{!\M*{\cs{extracolsep}\cs{@flushglue}}} in order to keep the margin.
+% All the job is done by \cs\tabu@getline. New line style specification are always defined globally,
+% and can be overwritten without warning...
%
-% \cs{tabu@rewritelast} column type is loaded by \cs{tabu@rewritefirst} column type, only inside the \cs{@mkpream}
-% group inside the \textt{tabu} environment.
+% \begin{macrocode}
+\newcommand*\newtabulinestyle [1]{%
+ {\@for \@tempa :=#1\do{\expandafter\tabu@newlinestyle \@tempa==\@nil}}%
+}% \newtabulinestyle
+\def\tabu@newlinestyle #1=#2=#3\@nil{\tabu@getline {#2}%
+ \tabu@sanitizearg {#1}\@tempa
+ \ifodd 1\ifx \@tempa\@empty \ifdefined\tabu@linestyle@ 0 \fi\fi
+ \global\expandafter\let
+ \csname tabu@linestyle@\@tempa \endcsname =\tabu@thestyle \fi
+}% \tabu@newlinestyle
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\tabulinestyle}
+%
+% \cs\tabulinestyle\M*{style name}\, or\, \cs\tabulinestyle{line specs / leader}
+%
+% The job is done by \cs\tabu@getline. The settings as usual, are stored in a ``locally-global'' way...
%
% \begin{macrocode}
-\tabu@newcolumntype \tabu@rewritemiddle{%
- \NC@list\expandafter{\tabu@NC@list \NC@do\tabu@endrewrite \NC@do\tabu@rewritelast}%
- \tabu@checklast
-}% \NC@rewrite@\tabu@rewritemiddle
-\def\tabu@checklast#1\relax{%
- \def\tabu@temp{#1}%
- \ifx \tabu@temp\tabu@islast
- \expandafter\tabu@lastrewrite
- \else \let\tabu@islast \tabu@temp
- \expandafter\NC@find \expandafter\tabu@rewritelast
- \fi
- #1\relax
-}% \tabu@checklast
-\tabu@newcolumntype \tabu@rewritelast{\NC@find \tabu@endrewrite}
-\tabu@newcolumntype \tabu@endrewrite{\tabu@checklast}
-\def\tabu@lastrewrite{%
- \let\tabu@next \NC@find
- \ifx \@halignto\relax % found a X column
- \edef\tabu@global@X{\tabu@global@X \tabu@X@cols\the\tabu@X@cols\relax}%
- \ifx \tabu@halignto\relax % X column measure
- \tabu@global@Xnested
- \iftabu@negcoef \aftergroup\tabu@negcoeftrue \fi
- \aftergroup \tabu@prep@TRIAL
- \else \aftergroup \tabu@setup@everycr
- \fi
- \else
- \aftergroup \tabu@setup@everycr
- \ifdim \tabu@target=\z@ \else
- \let\tabu@next \tabu@extracolsep \fi % <need \extracolsep ?>
- \fi
- \let\@halignto \tabu@halignto
- \tabu@next
-}% \tabu@lastrewrite
-\def\tabu@extracolsep{\futurelet\tabu@temp \tabu@extracol@sep}
-\def\tabu@extracol@sep{%
- \ifx \tabu@temp\@sptoken
- \expandafter\tabu@gobblespace \expandafter\tabu@extracol@sep
- \else
- {\endlinechar\m@ne\scantokens{\let\x |}%
- \expandafter}\ifx \x\tabu@temp
- \def\tabu@next {\NC@find @{\extracolsep\@flushglue}}\else
- {\endlinechar\m@ne\scantokens{\let\x !}%
- \expandafter}\ifx \x\tabu@temp
- \def\tabu@next {\NC@find @{\extracolsep\@flushglue}}\else
- \def\tabu@next {\NC@find !{\extracolsep\@flushglue}}\fi\fi
- \expandafter\tabu@next
- \fi
-}% \tabu@extracol@sep
-\def\tabu@global@Xnested{\expandafter\tabu@global@X@nested
- \csname tabu@global@X\the\tabu@nested\endcsname}
-\def\tabu@global@X@nested#1{%
- \global\let#1\tabu@global@X
- \aftergroup\let \aftergroup\tabu@global@X \aftergroup#1%
-}% \tabu@global@Xnested
+\newcommand*\tabulinestyle [1]{\tabu@everyrow@bgroup \tabu@getline{#1}%
+ \iftabu@everyrow
+ \toks@\expandafter{\expandafter \def \expandafter
+ \tabu@ls@L\expandafter{\tabu@thestyle}}%
+ \gdef\tabu@ls@{\tabu@ls@L}%
+ \else
+ \global\let\tabu@ls@G \tabu@thestyle
+ \gdef\tabu@ls@{\tabu@ls@G}%
+ \fi
+ \tabu@everyrow@egroup
+}% \tabulinestyle
% \end{macrocode}
% \end{macro}
%
-% \begin{macro}{\tabu@rewrite@multicolumn}
+% \begin{macro}{\taburulecolor}
+%
+% \Xpackage{colortbl} provides \cs\arrayrulecolor, but the definition is global and must be
+% restores manually after the table. \cs\taburulecolor works with the same scheme as \cs\everyrow:
+% even if the definition of the rules colors must be global (because we it can be changed inside the tabular)
+% the value is not restored globally at the end of the environment.
+%
+% Instead, \cs\tabu@arc@L stores locally the color definition (\ie its definition is relative to
+% the group level before the entry inside the \env{tabu} environment).
%
-% A special rewrite to allow \texttbf\textbar\M*[...] in \cs{multicolumn} preamble inside \textt{tabu} environment.
+% This is the same for \cs\doublerulesepcolor (which may be given as an optional argument to
+% \cs\taburulecolor): \Xpackage{colortbl} makes the definition global, while \thispackage keeps
+% grouping level into mind (``locally-global'' settings).
%
% \begin{macrocode}
-\tabu@newcolumntype \tabu@rewrite@multicolumn{%
- \aftergroup\endgroup % after \@mkpream group (restores \multispan)
- \tabu@lines \NC@list\expandafter{\the\expandafter\NC@list \tabu@NC@list}%
- \ifcat$\d@llarend\else
- \let\save@decl \tabu@save@decl \fi % no inversion of tokens in text mode
- \NC@find
-}% \tabu@rewrite@multicolumn
-\def\tabu@multicolumn{\tabu@ifenvir \tabu@multic@lumn \tabu@multicolumnORI}
-\def\tabu@multic@lumn#1#2{\multispan{#1}\begingroup
- \NC@list{\NC@do \tabu@rewrite@multicolumn}%
- \expandafter\@gobbletwo % gobbles \multispan{#1}
- \tabu@multicolumnORI{#1}{\tabu@rewrite@multicolumn #2}%
-}% \tabu@multic@lumn
+\newcommand*\taburulecolor{\tabu@everyrow@bgroup \tabu@textbar \tabu@rulecolor}
+\def\tabu@rulecolor #1{\toks@{}%
+ \def\tabu@temp #1##1#1{\tabu@ruledrsc{##1}}\@ifnextchar #1%
+ \tabu@temp
+ \tabu@rulearc
+}% \tabu@rulecolor
+\def\tabu@ruledrsc #1{\edef\tabu@temp{#1}\tabu@strtrim\tabu@temp
+ \ifx \tabu@temp\@empty \def\tabu@temp{\tabu@rule@drsc@ {}{}}%
+ \else \edef\tabu@temp{\noexpand\tabu@rule@drsc@ {}{\tabu@temp}}%
+ \fi
+ \tabu@temp
+}% \tabu@ruledrsc@
+\def\tabu@ruledrsc@ #1#{\tabu@rule@drsc@ {#1}}
+\def\tabu@rule@drsc@ #1#2{%
+ \iftabu@everyrow
+ \ifx \\#1#2\\\toks@{\let\CT@drsc@ \relax}%
+ \else \toks@{\def\CT@drsc@{\color #1{#2}}}%
+ \fi
+ \else
+ \ifx \\#1#2\\\global\let\CT@drsc@ \relax
+ \else \gdef\CT@drsc@{\color #1{#2}}%
+ \fi
+ \fi
+ \tabu@rulearc
+}% \tabu@rule@drsc@
+\def\tabu@rulearc #1#{\tabu@rule@arc@ {#1}}
+\def\tabu@rule@arc@ #1#2{%
+ \iftabu@everyrow
+ \ifx \\#1#2\\\toks@\expandafter{\the\toks@ \def\CT@arc@{}}%
+ \else \toks@\expandafter{\the\toks@ \def\CT@arc@{\color #1{#2}}}%
+ \fi
+ \toks@\expandafter{\the\toks@
+ \let\tabu@arc@L \CT@arc@
+ \let\tabu@drsc@L \CT@drsc@}%
+ \else
+ \ifx \\#1#2\\\gdef\CT@arc@{}%
+ \else \gdef\CT@arc@{\color #1{#2}}%
+ \fi
+ \global\let\tabu@arc@G \CT@arc@
+ \global\let\tabu@drsc@G \CT@drsc@
+ \fi
+ \tabu@everyrow@egroup
+}% \tabu@rule@arc@
% \end{macrocode}
% \end{macro}
%
+% \begin{macro}{\taburowcolors}
%
-% \begin{macro}{\iftabu@colortbl}
+% \cs\taburowcolors \M*{number}\meta{number}\M*{first color .. last color}
%
-% The switch \cs{iftabu@colortbl} is used by \cs{rowfont} when modifying the alignment, because
-% \xpackage{colortbl} changes the glue put inside the \cs{halign} preamble to make standard alignments.
-% This switch is set At Begin Document.
+% The aim of the game is to define the process that will be executed at \cs\everyrow.
+%
+% After that, the usual process for ``locally-global'' settings is plugged
+% into \cs\tabu@cleanup and \cs\tabu@reset...
%
% \begin{macrocode}
-\newif\iftabu@colortbl
+\def\taburowcolors {\tabu@everyrow@bgroup \@testopt \tabu@rowcolors 1}
+\def\tabu@rowcolors [#1]#2#{\tabu@rowc@lors{#1}{#2}}
+\def\tabu@rowc@lors #1#2#3{%
+ \toks@{}\@defaultunits \count@ =\number0#2\relax \@nnil
+ \@defaultunits \tabu@start =\number0#1\relax \@nnil
+ \ifnum \count@<\tw@ \count@=\tw@ \fi
+ \advance\tabu@start \m@ne
+ \ifnum \tabu@start<\z@ \tabu@start \z@ \fi
+ \tabu@rowcolorseries #3\in@..\in@ \@nnil
+}% \tabu@rowcolors
+\def\tabu@rowcolorseries #1..#2\in@ #3\@nnil {%
+ \ifx \in@#1\relax
+ \iftabu@everyrow \toks@{\def\tabu@rc@{}\let\tabu@rc@L \tabu@rc@}%
+ \else \gdef\tabu@rc@{}\global\let\tabu@rc@G \tabu@rc@
+ \fi
+ \else
+ \ifx \\#2\\\tabu@rowcolorserieserror \fi
+ \tabu@sanitizearg{#1}\tabu@temp
+ \tabu@sanitizearg{#2}\@tempa
+ \advance\count@ \m@ne
+ \iftabu@everyrow
+ \def\tabu@rc@ ##1##2##3##4{\def\tabu@rc@{%
+ \ifnum ##2=\c@taburow
+ \definecolorseries{tabu@rcseries@\the\tabu@nested}{rgb}{last}{##3}{##4}\fi
+ \ifnum \c@taburow<##2 \else
+ \ifnum \tabu@modulo {\c@taburow-##2}{##1+1}=\z@
+ \resetcolorseries[{##1}]{tabu@rcseries@\the\tabu@nested}\fi
+ \xglobal\colorlet{tabu@rc@\the\tabu@nested}{tabu@rcseries@\the\tabu@nested!!+}%
+ \rowcolor{tabu@rc@\the\tabu@nested}\fi}%
+ }\edef\x{\noexpand\tabu@rc@ {\the\count@}
+ {\the\tabu@start}
+ {\tabu@temp}
+ {\@tempa}%
+ }\x
+ \toks@\expandafter{\expandafter\def\expandafter\tabu@rc@\expandafter{\tabu@rc@}}%
+ \toks@\expandafter{\the\toks@ \let\tabu@rc@L \tabu@rc@}%
+ \else % inside \noalign
+ \definecolorseries{tabu@rcseries@\the\tabu@nested}{rgb}{last}{\tabu@temp}{\@tempa}%
+ \expandafter\resetcolorseries\expandafter[\the\count@]{tabu@rcseries@\the\tabu@nested}%
+ \xglobal\colorlet{tabu@rc@\the\tabu@nested}{tabu@rcseries@\the\tabu@nested!!+}%
+ \let\noalign \relax \rowcolor{tabu@rc@\the\tabu@nested}%
+ \def\tabu@rc@ ##1##2{\gdef\tabu@rc@{%
+ \ifnum \tabu@modulo {\c@taburow-##2}{##1+1}=\@ne
+ \resetcolorseries[{##1}]{tabu@rcseries@\the\tabu@nested}\fi
+ \xglobal\colorlet{tabu@rc@\the\tabu@nested}{tabu@rcseries@\the\tabu@nested!!+}%
+ \rowcolor{tabu@rc@\the\tabu@nested}}%
+ }\edef\x{\noexpand\tabu@rc@{\the\count@}{\the\c@taburow}}\x
+ \global\let\tabu@rc@G \tabu@rc@
+ \fi
+ \fi
+ \tabu@everyrow@egroup
+}% \tabu@rowcolorseries
+\tabuDisableCommands {\let\tabu@rc@ \@empty }
+\def\tabu@rowcolorserieserror {\PackageError{tabu}
+ {Invalid syntax for \string\taburowcolors
+ \MessageBreak Please look at the documentation!}\@ehd
+}% \tabu@rowcolorserieserror
% \end{macrocode}
% \end{macro}
%
+% \begin{macro}{\tabureset}
%
-% \begin{macro}{\tabu@nowrite}
+% Simply -- and locally -- reset the default values for \cs\tabulinesep (0pt), \cs\extrarowsep (0pt), \cs\extratabsurround (0pt),
+% \cs\tabulinestyle\M*{}, \cs\everyrow\M*{} and \cs\taburulecolor\M*[]\M*{}.
+%
+% \begin{macrocode}
+\newcommand*\tabureset {%
+ \tabulinesep=\z@ \extrarowsep=\z@ \extratabsurround=\z@
+ \tabulinestyle{}\everyrow{}\taburulecolor||{}\taburowcolors{}%
+}% \tabureset
+% \end{macrocode}
+% \end{macro}
+%
+% \subsubsection{Parsing line styles}
+%
+%¤<package>%% Parsing the line styles ------------------------------------------
+%
+% \begin{macro}{\tabu@getline}
+%
+% This macro parses a line specification argument of the form:
+%
+% \centerline{\ttfamily 3pt BlanchedAlmond on 4pt Crimsom off 2pt ForestGreen}
+%
+% Note that \text{Crimson} will overwrite \textt{BlanchedAlmond} in this case: the color
+% for the line dash may be specified after the line width or after the line dash length.
+%
+% The process uses \cs\scantokens on the argument given by the user, which is first
+% expanded in a context where the \xpackage{babel} switch \cs{if@save@actives} is set to \textt{true}.
+% Then \cs\scantokens is used on the argument in a group where the letter ``\texttbf o'' is active,
+% and defined to be a macro which rewrites the line specification. Incidentally, the comma is active too,
+% and expands to a space. This way the initial argument is ``genetically modified'', so that it becomes
+% very easy to assign dimensions (thickness, dash length and gap length) and colors separately.
+%
+% For example: \textt{3pt BlanchedAlmond on 4pt Crimson} will be expanded in a context where
+% ``\texttbf o'' is active (and equal to \cs\tabu@oxiii, the \textt{xiii} suffix means ``active'' \ie \cs\catcode$=13$).
+%
+% Then the ``\textttbf o'' in \textt{BlanchedAlm\texttbf ond} is rewritten as follow:
+% \begin{enumerate}
+% \item ``\texttbf o'' sees ``\texttbf n'' after itself, then it expands \cs\tabu@onxiii.
+% \item \cs\tabu@onxiii sees a character whose catcode is not other, then the rewritting process is aborted,
+% and ``\texttbf{ond}'' is rewritten as ``\texttbf{ond}'' where the ``\texttbf o'' is not active but the usual letter ``\texttbf o''.
+% \end{enumerate}
%
-% A trick (from the \TeX-book) to forbidd \cs{write} when a trial is done on the \cs{halign}.
+% The next ``\texttbf o'' is rewritten as follow:
+% \begin{enumerate}
+% \item ``\texttbf o'' sees ``\texttbf n'' after itself, then it expands \cs\tabu@onxiii.
+% \item \cs\tabu@onxiii sees a space (which is active): it calls back itself again,
+% \item \cs\tabu@onxiii sees a character whose catcode is other: then the sequence ``\texttbf{on\textvisiblespace 3}''
+% is rewritten as:\\
+% ``\cs\tabu@ \cs\tabu@on =4pt Crimson''
+% \end{enumerate}
+%
+% Finally the whole argument is rewritten as:
+%
+% {\centering
+% \cs\tabu@ \cs\tabu@thick =3pt BlanchedAlmond \cs\tabu@ \cs\tabu@on =4pt Crimson \cs\tabu@ \cs\tabu@ \par}
+%
+% Define \cs\tabu@ as an appropriate macro which uses \cs\afterassignment to:
+% \begin{enumerate}
+% \item Assign the corresponding dimension (thickness, dash length or gap length).
+% \item Collect the rest until the next \cs\tabu@, trim spaces and check if the color exists.
+% \end{enumerate}
+%
+% Limitation: A color name must not contain a sequence that matches on of the patterns:
+%
+% \begin{tabu}{XcX}
+% ...\texttbf{on}\meta{a character of category 12}... & or & ...\texttbf{off}\meta{a character of category 12}...
+% \end{tabu}
+%
+% But this ``limitation'' is not too heavy, I suppose...
+%
+% The result is \cs\tabu@thestyle: a \textt{tabu} line style to be used to rewrite a \texttbf\textbar\, column,
+% for \cs\tabucline.
+%
+% We use locally the \LaTeX{} defined dimen registers \cs\@tempdima, \cs\@tempdimb and \cs\@tempdimc.
+% For clarity, their names are \cs\tabu@thick, \cs\tabu@on and \cs\tabu@off here...
%
% \begin{macrocode}
-\def\tabu@nowrite#1#{{\afterassignment}\toks@}
-\let\tabu@write\write
-\let\tabu@immediate\immediate
-\protected\def\tabu@GenericError{\begingroup
- \def\immediate\write{\aftergroup\endgroup
- \tabu@immediate\tabu@write}\tabu@GenericErrorORI}%
-\let\tabu@GenericErrorORI \GenericError
-\protected\def\tabu@warn{\begingroup
- \def\immediate\write{\aftergroup\endgroup
- \tabu@immediate\tabu@write}\PackageWarning{tabu}}
+\def\tabu@getline #1{\begingroup
+ \csname \ifcsname if@safe@actives\endcsname % <babel>
+ @safe@activestrue\else
+ relax\fi \endcsname
+ \edef\tabu@temp{#1}\tabu@sanitizearg{#1}\@tempa
+ \let\tabu@thestyle \relax
+ \ifcsname tabu@linestyle@\@tempa \endcsname
+ \edef\tabu@thestyle{\endgroup
+ \def\tabu@thestyle{\expandafter\noexpand
+ \csname tabu@linestyle@\@tempa\endcsname}%
+ }\tabu@thestyle
+ \else \expandafter\tabu@definestyle \tabu@temp \@nil
+ \fi
+}% \tabu@getline
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\tabu@definestyle}
+%
+% Here is the \cs\scantokens stuff.
+%
+% \begin{macrocode}
+\def\tabu@definestyle #1#2\@nil {\endlinechar \m@ne \makeatletter
+ \tabu@thick \maxdimen \tabu@on \maxdimen \tabu@off \maxdimen
+ \let\tabu@c@lon \@undefined \let\tabu@c@loff \@undefined
+ \ifodd 1\ifcat .#1\else\ifcat\relax #1\else 0\fi\fi % catcode 12 or non expandable cs
+ \def\tabu@temp{\tabu@getparam{thick}}%
+ \else \def\tabu@temp{\tabu@getparam{thick}\maxdimen}%
+ \fi
+ {%
+ \let\tabu@ \relax
+ \def\:{\obeyspaces \tabu@oXIII \tabu@commaXIII \edef\:}% (space active \: happy ;-))
+ \scantokens{\:{\tabu@temp #1#2 \tabu@\tabu@}}%
+ \expandafter}\expandafter
+ \def\expandafter\:\expandafter{\:}% line spec rewritten now ;-)
+ \def\;{\def\:}%
+ \scantokens\expandafter{\expandafter\;\expandafter{\:}}% space is now inactive (catcode 10)
+ \let\tabu@ \tabu@getcolor \:% all arguments are ready now ;-)
+ \ifdefined\tabu@c@lon \else \let\tabu@c@lon\@empty \fi
+ \ifx \tabu@c@lon\@empty \def\tabu@c@lon{\CT@arc@}\fi
+ \ifdefined\tabu@c@loff \else \let\tabu@c@loff \@empty \fi
+ \ifdim \tabu@on=\maxdimen \ifdim \tabu@off<\maxdimen
+ \tabu@on \tabulineon \fi\fi
+ \ifdim \tabu@off=\maxdimen \ifdim \tabu@on<\maxdimen
+ \tabu@off \tabulineoff \fi\fi
+ \ifodd 1\ifdim \tabu@off=\maxdimen \ifdim \tabu@on=\maxdimen 0 \fi\fi
+ \in@true % <leaders>
+ \else \in@false % <rule>
+ \fi
+ \ifdim\tabu@thick=\maxdimen \def\tabu@thick{\arrayrulewidth}%
+ \else \edef\tabu@thick{\the\tabu@thick}%
+ \fi
+ \edef \tabu@thestyle ##1##2{\endgroup
+ \def\tabu@thestyle{%
+ \ifin@ \noexpand\tabu@leadersstyle {\tabu@thick}
+ {\the\tabu@on}{##1}
+ {\the\tabu@off}{##2}%
+ \else \noexpand\tabu@rulesstyle
+ {##1\vrule width \tabu@thick}%
+ {##1\leaders \hrule height \tabu@thick \hfil}%
+ \fi}%
+ }\expandafter \expandafter
+ \expandafter \tabu@thestyle \expandafter
+ \expandafter \expandafter
+ {\expandafter\tabu@c@lon\expandafter}\expandafter{\tabu@c@loff}%
+}% \tabu@definestyle
+% \end{macrocode}
+% \end{macro}
+% \begin{macro}{\tabu@onxiii}
+% \begin{macro}{\tabu@ofxiii}
+% \begin{macro}{\tabu@offiii}
+%
+% We have to define the active ``\texttbf o'' character, which looks for the next tokens,
+% trying to find a pattern like \texttbf{on}\meta{category 12} or \texttbf{off}\meta{category 12}
+% (possibly with -- active -- spaces between \textt{on} or \textt{off} and the next character of catcode 12).
+%
+% \begin{macrocode}
+{\catcode`\O=\active \lccode`\O=`\o \catcode`\,=\active
+ \lowercase{\gdef\tabu@oXIII {\catcode`\o=\active \let O=\tabu@oxiii}}
+ \gdef\tabu@commaXIII {\catcode`\,=\active \let ,=\space}
+}% \catcode
+\def\tabu@oxiii #1{%
+ \ifcase \ifx n#1\z@ \else
+ \ifx f#1\@ne\else
+ \tw@ \fi\fi
+ \expandafter\tabu@onxiii
+ \or \expandafter\tabu@ofxiii
+ \else o%
+ \fi#1}%
+\def\tabu@onxiii #1#2{%
+ \ifcase \ifx !#2\tw@ \else
+ \ifcat.\noexpand#2\z@ \else
+ \ifx \tabu@spxiii#2\@ne\else
+ \tw@ \fi\fi\fi
+ \tabu@getparam{on}#2\expandafter\@gobble
+ \or \expandafter\tabu@onxiii % (space is active)
+ \else o\expandafter\@firstofone
+ \fi{#1#2}}%
+\def\tabu@ofxiii #1#2{%
+ \ifx #2f\expandafter\tabu@offxiii
+ \else o\expandafter\@firstofone
+ \fi{#1#2}}
+\def\tabu@offxiii #1#2{%
+ \ifcase \ifx !#2\tw@ \else
+ \ifcat.\noexpand#2\z@ \else
+ \ifx\tabu@spxiii#2\@ne \else
+ \tw@ \fi\fi\fi
+ \tabu@getparam{off}#2\expandafter\@gobble
+ \or \expandafter\tabu@offxiii % (space is active)
+ \else o\expandafter\@firstofone
+ \fi{#1#2}}
+% \end{macrocode}
+% \end{macro}
+% \end{macro}
+% \end{macro}
+% \end{macro}
+%
+% \begin{macro}{\tabu@getparam}
+%
+% The rewritten stuff.
+%
+% \begin{macrocode}
+\def\tabu@getparam #1{\tabu@ \csname tabu@#1\endcsname=}
% \end{macrocode}
% \end{macro}
%
-% \subsection{\cs{tabu}, \cs{endtabu}, \cs{longtabu} and \cs{endlontabu}}
+% \begin{macro}{\tabu@getcolor}
+%
+% \cs\tabu@ \cs\tabu@on =\meta{3pt} \textt{Crimson}\cs\tabu@
+%
+% \cs\tabu@getcolor first makes the assignment to \cs\tabu@on and then looks for the color
+% name which might have been placed before the next \cs\tabu@.
+%
+% \begin{macrocode}
+\def\tabu@getcolor #1{% \tabu@ <- \tabu@getcolor after \edef
+ \ifx \tabu@#1\else % no more spec
+ \let\tabu@theparam=#1\afterassignment \tabu@getc@l@r #1\fi
+}% \tabu@getcolor
+\def\tabu@getc@l@r #1\tabu@ {%
+ \def\tabu@temp{#1}\tabu@strtrim \tabu@temp
+ \ifx \tabu@temp\@empty
+ \else%\ifcsname \string\color@\tabu@temp \endcsname % if the color exists
+ \ifx \tabu@theparam \tabu@off \let\tabu@c@loff \tabu@c@l@r
+ \else \let\tabu@c@lon \tabu@c@l@r
+ \fi
+ %\else \tabu@warncolour{\tabu@temp}%
+ \fi%\fi
+ \tabu@ % next spec
+}% \tabu@getc@l@r
+\def\tabu@warncolour #1{\PackageWarning{tabu}
+ {Color #1 is not defined. Default color used}%
+}% \tabu@warncolour
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\tabu@leadersstyle}
+% \begin{macro}{\tabu@rulesstyle}
+%
+% When a style is executed, it expands either \cs\tabu@leadersstyle or \cs\tabu@rulesstyle depending on whether or
+% not it contains leaders (dashed lines) or simple rules (solid lines):
+% \TeX{} internals allow to insert solid lines easily inside a tabular, while inserting leaders is more complex.
+%
+% \cs\tabu@leadersstyle eventually rebuilds the (horizontal and vertical) leaders boxes, and then define two macros:
+% \cs\tabu@thevleaders and \cs\tabu@thehleades, suitable to draw vertical and horizontal lines respectively.
+% Incidentally, \cs\tabu@leaders is defined to be the parameters for the leaders.
+%
+% \cs\tabu@rulesstyle only defines the two macros \cs\tabu@thevrule and \cs\tabu@thehrule. The control sequence
+% \cs\tabu@leaders is undefined so that we know if the style contains a leader or a rule.
+%
+% \begin{macrocode}
+\def\tabu@leadersstyle #1#2#3#4#5{\def\tabu@leaders{{#1}{#2}{#3}{#4}{#5}}%
+ \ifx \tabu@leaders\tabu@leaders@G \else
+ \tabu@LEADERS{#1}{#2}{#3}{#4}{#5}\fi
+}% \tabu@leadersstyle
+\def\tabu@rulesstyle #1#2{\let\tabu@leaders \@undefined
+ \gdef\tabu@thevrule{#1}\gdef\tabu@thehrule{#2}%
+}% \tabu@rulesstyle
+% \end{macrocode}
+% \end{macro}
+% \end{macro}
+%
+%¤<package>%% The leaders boxes ------------------------------------------------
+% \begin{macro}{\tabu@LEADERS}
+%
+% Here the two leaders boxes \cs\tabu@hleads and \cs\tabu@vleads are built, as well as the leaders macros
+% \cs\tabu@thehleaders and \cs\tabu@thevleaders.
+%
+% \begin{macrocode}
+\def\tabu@LEADERS #1#2#3#4#5{%% width, dash, dash color, gap, gap color
+ {\let\color \tabu@color % => during trials -> \color = \tabu@nocolor
+ {% % but the leaders boxes should have colors !
+ \def\@therule{\vrule}\def\@thick{height}\def\@length{width}%
+ \def\@box{\hbox}\def\@unbox{\unhbox}\def\@elt{\wd}%
+ \def\@skip{\hskip}\def\@ss{\hss}\def\tabu@leads{\tabu@hleads}%
+ \tabu@l@@d@rs {#1}{#2}{#3}{#4}{#5}%
+ \global\let\tabu@thehleaders \tabu@theleaders
+ }%
+ {%
+ \def\@therule{\hrule}\def\@thick{width}\def\@length{height}%
+ \def\@box{\vbox}\def\@unbox{\unvbox}\def\@elt{\ht}%
+ \def\@skip{\vskip}\def\@ss{\vss}\def\tabu@leads{\tabu@vleads}%
+ \tabu@l@@d@rs {#1}{#2}{#3}{#4}{#5}%
+ \global\let\tabu@thevleaders \tabu@theleaders
+ }%
+ \gdef\tabu@leaders@G{{#1}{#2}{#3}{#4}{#5}}%
+ }%
+}% \tabu@LEADERS
+\def\tabu@therule #1#2{\@therule \@thick#1\@length\dimexpr#2/2 \@depth\z@}
+\def\tabu@l@@d@rs #1#2#3#4#5{%% width, dash, dash color, gap, gap color
+ \global\setbox \tabu@leads=\@box{%
+ {#3\tabu@therule{#1}{#2}}%
+ \ifx\\#5\\\@skip#4\else{#5\tabu@therule{#1}{#4*2}}\fi
+ {#3\tabu@therule{#1}{#2}}}%
+ \global\setbox\tabu@leads=\@box to\@elt\tabu@leads{\@ss
+ {#3\tabu@therule{#1}{#2}}\@unbox\tabu@leads}%
+ \edef\tabu@theleaders ##1{\def\noexpand\tabu@theleaders {%
+ {##1\tabu@therule{#1}{#2}}%
+ \xleaders \copy\tabu@leads \@ss
+ \tabu@therule{0pt}{-#2}{##1\tabu@therule{#1}{#2}}}%
+ }\tabu@theleaders{#3}%
+}% \tabu@l@@d@rs
+% \end{macrocode}
+% \end{macro}
+%
+%
+% \subsection{The entry inside \textt{tabu}}
+%
+% \subsubsection{\cs{tabu}, \cs{endtabu}, \cs{longtabu} and \cs{endlontabu}}
+%¤<package>%% \tabu \endtabu \tabu* \longtabu \endlongtabu \longtabu* ----------
%
% \begin{macro}{\tabu}
%
@@ -2672,521 +4525,569 @@ lppl copyright 2010-2011 by FC <florent.chervet@free.fr>
% \cs{endtabu} is \cs{endtabular} or \cs{endarray} in math mode.
%
% \begin{macrocode}
-\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{%
+\newcommand*\tabu {\tabu@longfalse
+ \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
+ \tabu@spreadfalse \tabu@negcoeffalse \tabu@settarget
+}% {tabu}
+\let\tabu@tabular \tabular % <For LyX: some users redefine \tabular...>
+\expandafter\def\csname tabu*\endcsname{\tabuscantokenstrue \tabu}
+\newcommand*\longtabu {\tabu@longtrue
\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\LT@startpbox \tabu@LT@startpbox % \everypar{ array strut } instead of { array strut }
- \tabu@setup \tabu@settarget
-}% \longtabu
+ \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
+}% {longtabu}
+\expandafter\def\csname longtabu*\endcsname{\tabuscantokenstrue \longtabu}
\def\tabu@nolongtabu{\PackageError{tabu}
{longtabu requires the longtable package}\@ehd}
% \end{macrocode}
% \end{macro}
% \end{macro}
%
-% \begin{macro}{\tabu@setup}
-%
-% This macro sets the \textt{tabu X} column definition at the beginning of the \textt{tabu} environment.
-%
-% \begin{macrocode}
-\def\tabu@setup{%
- \tabu@adl@fix \let\endarray \tabu@endarray % <fix> colortbl & arydshln (delarray)
- \let\tabu@global@X \@empty
- \ifx \verbatim\tabu@sanitizetext % <nested tabu>
- \advance\tabu@nested \@ne
- \def\tabu@aligndefault{t}\let\tabudefaulttarget \linewidth
- \else
- \tabu@timerstart \global\tabu@footnotes{}\tabu@nested \z@
- \let\tabu@multicolumnORI \multicolumn \let\multicolumn \tabu@multicolumn
- \def\tabu@aligndefault{c}\edef\tabu@hfuzz {\the\hfuzz}%
- \ifdim\parindent>\z@ \ifx\linewidth\tabudefaulttarget
- \everypar\expandafter{% % correction for indentation
- \the\everypar\everypar\expandafter{\the\everypar}%
- \setbox\z@=\lastbox
- \ifdim\wd\z@>\z@ \advance\linewidth -\wd\z@\fi
- \box\z@
- }%
- \fi\fi
- \fi
- \ifcase 0\ifdim\abovetabulinesep>\z@ 1\else\ifdim\belowtabulinesep>\z@ 1\fi\fi
- \let\tabu@celllalign \@empty \let\tabu@cellralign \@empty
- \else \def\tabu@celllalign{\tabu@verticalmeasure}%
- \def\tabu@cellralign{\tabu@verticalspacing}%
- \fi
- \tabu@setup@saveglobal
- \let\@footnotetext \tabu@footnotetext \let\@xfootnotetext \tabu@xfootnotetext
- \let\@xfootnote \tabu@xfootnote \let\centering \tabu@centering
- \let\raggedright \tabu@raggedright \let\raggedleft \tabu@raggedleft
- \tabu@trivlist %<restore \\=\@normalcr inside lists>
- \def\tabudecimal {\tabu@tabudecimal}\let\verbatim \tabu@sanitizetext
- \let\fbox \tabu@fbox \let\color@b@x \tabu@color@b@x
- \let\rowfont \tabu@rowfont
- \let\prepnext@tok \tabu@prepnext@tok %<for \rowfont and \tabucline>
- \everycr{}\let\tabu@everycr \everycr
- \tabu@spreadfalse \tabu@measuringfalse \tabu@negcoeffalse
- \edef\tabu@NC@list{\the\NC@list}\NC@list{\NC@do \tabu@rewritefirst}%
-}% \tabu@setup
-\def\tabu@setup@saveglobal{{%
- \toks@\expandafter{\tabu@everyrow@hook}%
- \expandafter\xdef\csname tabu@global@\the\tabu@nested\endcsname{%
- \gdef\noexpand\tabu@everyrow@hook {\the\toks@}%
- \noexpand\tabu@everyrowtrue
- \ifcase \tabu@nested
- \noexpand\the \tabu@footnotes
- \else
- \global\tabu@X@cols \the\tabu@X@cols\relax
- \global\tabu@naturalX \the\tabu@naturalX\relax
- \gdef\noexpand\tabu@naturalX@min {\tabu@naturalX@min}%
- \gdef\noexpand\tabu@naturalX@max {\tabu@naturalX@max}%
- \fi}}%
- \expandafter\aftergroup\csname tabu@global@\the\tabu@nested\endcsname
-}% \tabu@setup@saveglobal
-% \end{macrocode}
-% \end{macro}
-%
+% \subsubsection{Setting the \textt{tabu} target}
+%¤<package>%% Read the target and then : \tabular or \@array ------------------
%
% \begin{macro}{\tabu@settarget}
% \begin{macro}{\tabu@begin}
%
-% The macro sets \cs{tabu@target} (a dimen) to the value specified for ``\textt{tabu to}'' or ``\textt{tabu spread}''.
+% The macro sets \cs\tabu@target (a dimen) to the value specified for ``\textt{tabu to}'' or ``\textt{tabu spread}''.
%
% \begin{macrocode}
-\def\tabu@settarget{\futurelet\@let@token \tabu@sett@rget}
-\def\tabu@sett@rget{\tabu@target\z@
- \ifcase \ifx \bgroup\@let@token 0\else
- \ifx [\@let@token 0\else
- \ifx \@sptoken\@let@token 1\else
- \if t\@let@token 2\else
- \if s\@let@token 3\else
- \m@ne\fi\fi\fi\fi\fi\relax
+\def\tabu@settarget {\futurelet\@let@token \tabu@sett@rget }
+\def\tabu@sett@rget {\tabu@target \z@
+ \ifcase \ifx \bgroup\@let@token \z@ \else
+ \ifx \@sptoken\@let@token \@ne \else
+ \if t\@let@token \tw@ \else
+ \if s\@let@token \thr@@\else
+ \z@\fi\fi\fi\fi
\expandafter\tabu@begin
\or \expandafter\tabu@gobblespace\expandafter\tabu@settarget
\or \expandafter\tabu@to
\or \expandafter\tabu@spread
- \else \expandafter\tabu@begin
\fi
}% \tabu@sett@rget
\def\tabu@to to{\def\tabu@halignto{to}\tabu@gettarget}
\def\tabu@spread spread{\tabu@spreadtrue\def\tabu@halignto{spread}\tabu@gettarget}
-\def\tabu@gettarget {\afterassignment\tabu@linegoaltarget \tabu@target}
-\def\tabu@linegoaltarget {\futurelet\tabu@temp \tabu@linegoal@target}
-\def\tabu@linegoal@target {%
+\def\tabu@gettarget {\afterassignment\tabu@linegoaltarget \tabu@target }
+\def\tabu@linegoaltarget {\futurelet\tabu@temp \tabu@linegoalt@rget }
+\def\tabu@linegoalt@rget {%
\ifx \tabu@temp\LNGL@setlinegoal
\LNGL@setlinegoal \expandafter \@firstoftwo \fi % @gobbles \LNGL@setlinegoal
\tabu@begin
-}% \tabu@linegoal@target
+}% \tabu@linegoalt@rget
\def\tabu@begin #1#{%
- \edef\tabu@halignto{\ifdim\tabu@target>\z@ \tabu@halignto\the\tabu@target\fi}%
- \@testopt \tabu@@begin \tabu@aligndefault #1\@nil
+ \iftabu@measuring \expandafter\tabu@nestedmeasure \fi
+ \ifdim \tabu@target=\z@ \let\tabu@halignto \@empty
+ \else \edef\tabu@halignto{\tabu@halignto\the\tabu@target}%
+ \fi
+ \@testopt \tabu@tabu@ \tabu@aligndefault #1\@nil
}% \tabu@begin
-\def\tabu@@begin [#1]#2\@nil#3{%
- \tabu@preparesave{#3}% <for \savetabu>
- \def\tabu@align {#1}%
- \tabu@ [\tabu@align]#2{\tabu@rewritefirst #3}%
-}% \tabu@@begin
+\long\def\tabu@tabu@ [#1]#2\@nil #3{\tabu@setup
+ \def\tabu@align {#1}\def\tabu@savedpream{\NC@find #3}%
+ \tabu@ [\tabu@align ]#2{#3\tabu@rewritefirst }%
+}% \tabu@tabu@
+\def\tabu@nestedmeasure {%
+ \ifodd 1\iftabu@spread \else \ifdim\tabu@target=\z@ \else 0 \fi\fi\relax
+ \tabu@spreadtrue
+ \else \begingroup \iffalse{\fi \ifnum0=`}\fi
+ \toks@{}\def\tabu@stack{b}%
+ \expandafter\tabu@collectbody\expandafter\tabu@quickrule
+ \expandafter\endgroup
+ \fi
+}% \tabu@nestedmeasure
+\def\tabu@quickrule {\indent\vrule height\z@ depth\z@ width\tabu@target}
% \end{macrocode}
% \end{macro}
% \end{macro}
%
-% \begin{macro}{\tabu@preparesave}
+%¤<package>%% \tabu@setup \tabu@init \tabu@indent
+% \begin{macro}{\tabu@setup}
+% \begin{macro}{\tabu@init}
+% \begin{macro}{\tabu@indent}
%
-% This macro temporarily saves the \textt{tabu} preamble and the settings
-% for \cs{arrayrulewidth}, \cs{extrarowheight} \etc.
+% \cs{tabu@init} is expanded only when \textt{tabu} is not nested.
+% In this case, and if \cs\parindent$>0$, and if \cs\tabudefaulttarget$=$\cs\linewidth,
+% the correction of the default target for paragraph indentation is executed
+% (see \hyperref[Paragraph indentation.subsec]{paragraph indentation}).
%
-% Those values are retrieved by \cs{savetabu}, if invoked inside the \textt{tabu}.
+% \begin{macrocode}
+\def\tabu@setup{\tabu@alloc@
+ \ifcase \tabu@nested
+ \ifmmode \else \ifdim\tabu@target=\z@ \let\tabu@afterendpar \par \fi\fi
+ \def\tabu@aligndefault{c}\tabu@init \tabu@indent
+ \else % <nested tabu>
+ \def\tabu@aligndefault{t}\let\tabudefaulttarget \linewidth
+ \fi
+ \let\tabu@thetarget \tabudefaulttarget \let\tabu@restored \@undefined
+ \edef\tabu@NC@list{\the\NC@list}\NC@list{\NC@do \tabu@rewritefirst}%
+ \everycr{}\let\@startpbox \tabu@startpbox % for nested tabu inside longtabu...
+ \let\@endpbox \tabu@endpbox % idem " " " " " "
+ \let\@tabarray \tabu@tabarray % idem " " " " " "
+ \tabu@setcleanup \tabu@setreset
+}% \tabu@setup
+\def\tabu@init{\tabu@starttimer \tabu@measuringfalse
+ \edef\tabu@hfuzz {\the\dimexpr\hfuzz+1sp}\global\tabu@footnotes{}%
+ \let\firsthline \tabu@firsthline \let\lasthline \tabu@lasthline
+ \let\firstline \tabu@firstline \let\lastline \tabu@lastline
+ \let\hline \tabu@hline \let\@xhline \tabu@xhline
+ \let\color \tabu@color \let\@arstrutbox \tabu@arstrutbox
+ \tabu@trivlist %<restore \\=\@normalcr inside lists>
+ \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\tabudecimal \tabu@tabudecimal \let\Centering \tabu@Centering
+ \let\RaggedRight \tabu@RaggedRight \let\RaggedLeft \tabu@RaggedLeft
+ \let\justifying \tabu@justifying \let\rowfont \tabu@rowfont
+ \let\fbox \tabu@fbox \let\color@b@x \tabu@color@b@x
+ \let\tabu@@everycr \everycr \let\tabu@@everypar \everypar
+ \let\tabu@prepnext@tokORI \prepnext@tok\let\prepnext@tok \tabu@prepnext@tok
+ \let\tabu@multicolumnORI\multicolumn \let\multicolumn \tabu@multicolumn
+ \let\tabu@startpbox \@startpbox % for nested tabu inside longtabu pfff !!!
+ \let\tabu@endpbox \@endpbox % idem " " " " " " "
+ \let\tabu@tabarray \@tabarray % idem " " " " " " "
+ \tabu@adl@fix \let\endarray \tabu@endarray % <fix> colortbl & arydshln (delarray)
+ \iftabu@colortbl\CT@everycr\expandafter{\expandafter\iftabu@everyrow \the\CT@everycr \fi}\fi
+}% \tabu@init
+\def\tabu@indent{% correction for indentation
+ \ifdim \parindent>\z@\ifx \linewidth\tabudefaulttarget
+%
+ \everypar\expandafter{%
+ \the\everypar\everypar\expandafter{\the\everypar}%
+ \setbox\z@=\lastbox
+ \ifdim\wd\z@>\z@ \edef\tabu@thetarget
+ {\the\dimexpr -\wd\z@+\tabudefaulttarget}\fi
+ \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}
+% \end{macro}
+%
+% \begin{macro}{\tabu@setcleanup}
+%
+% We have to save locally (in the group of the environment) the current value of
+% the last global assignments to \cs\CT@arc@, \cs\CT@drsc@, \cs\tabu@ls@ etc.
+%
+% \begin{macro}{\tabu@cleanup}
+%
+% Restoration will be done globally after the box that contains the tabular by \cs\tabu@cleanup.
%
% \begin{macrocode}
-\def\tabu@preparesave #1{%
- \iftabu@colortbl \@temptokena{}%
- \tabu@prepare@save \CT@arc@
- \tabu@prepare@save \CT@drsc@
- \fi
- \edef\tabu@savedparam{%
- \ifmmode \col@sep \the\arraycolsep
- \else \col@sep \the\tabcolsep \fi\relax
- \arrayrulewidth \the\arrayrulewidth\relax
- \doublerulesep \the\doublerulesep\relax
- \extrarowheight \the\extrarowheight\relax
- \extrarowdepth \the\extrarowdepth\relax
- \extratabsurround \the\extratabsurround\relax
- \def\noexpand\arraystretch {\arraystretch}%
- \iftabu@colortbl \minrowclearance\the\minrowclearance\relax
- \the\@temptokena
- \fi}%
- \def\tabu@savedpream {\edef\tabu@halignto{to\the\tabu@target}\NC@find #1}%
-}% \tabu@preparesave
-\def\tabu@prepare@save #1{%
- \ifx\relax#1\else
- \@temptokena\expandafter{\the\expandafter\@temptokena
- \expandafter\def\expandafter#1\expandafter{#1}}\fi
-}% \tabu@prepare@save
-% \end{macrocode}
-% \end{macro}
-%
-%
-% \subsection{Footnotes inside \textt{tabu}}
+\def\tabu@setcleanup {% saves last global assignments
+ \ifodd 1\ifmmode \else \iftabu@long \else 0\fi\fi\relax
+ \def\tabu@aftergroupcleanup{%
+ \def\tabu@aftergroupcleanup{\aftergroup\tabu@cleanup}}%
+ \else
+ \def\tabu@aftergroupcleanup{%
+ \aftergroup\aftergroup\aftergroup\tabu@cleanup
+ \let\tabu@aftergroupcleanup \relax}%
+ \fi
+ \let\tabu@arc@Gsave \tabu@arc@G
+ \let\tabu@arc@G \tabu@arc@L % <init>
+ \let\tabu@drsc@Gsave \tabu@drsc@G
+ \let\tabu@drsc@G \tabu@drsc@L % <init>
+ \let\tabu@ls@Gsave \tabu@ls@G
+ \let\tabu@ls@G \tabu@ls@L % <init>
+ \let\tabu@rc@Gsave \tabu@rc@G
+ \let\tabu@rc@G \tabu@rc@L % <init>
+ \let\tabu@evr@Gsave \tabu@evr@G
+ \let\tabu@evr@G \tabu@evr@L % <init>
+ \let\tabu@celllalign@save \tabu@celllalign
+ \let\tabu@cellralign@save \tabu@cellralign
+ \let\tabu@cellleft@save \tabu@cellleft
+ \let\tabu@cellright@save \tabu@cellright
+ \let\tabu@@celllalign@save \tabu@@celllalign
+ \let\tabu@@cellralign@save \tabu@@cellralign
+ \let\tabu@@cellleft@save \tabu@@cellleft
+ \let\tabu@@cellright@save \tabu@@cellright
+ \let\tabu@rowfontreset@save \tabu@rowfontreset
+ \let\tabu@@rowfontreset@save\tabu@@rowfontreset
+ \let\tabu@rowfontreset \@empty
+ \edef\tabu@alloc@save {\the\tabu@alloc}% restore at \tabu@reset
+ \edef\c@taburow@save {\the\c@taburow}%
+ \edef\tabu@naturalX@save {\the\tabu@naturalX}%
+ \let\tabu@naturalXmin@save \tabu@naturalXmin
+ \let\tabu@naturalXmax@save \tabu@naturalXmax
+ \let\tabu@mkarstrut@save \tabu@mkarstrut
+ \edef\tabu@clarstrut{%
+ \extrarowheight \the\dimexpr \ht\@arstrutbox-\ht\strutbox \relax
+ \extrarowdepth \the\dimexpr \dp\@arstrutbox-\dp\strutbox \relax
+ \let\noexpand\@arraystretch \@ne \noexpand\tabu@rearstrut}%
+}% \tabu@setcleanup
+\def\tabu@cleanup {\begingroup
+ \globaldefs\@ne \tabu@everyrowtrue
+ \let\tabu@arc@G \tabu@arc@Gsave
+ \let\CT@arc@ \tabu@arc@G
+ \let\tabu@drsc@G \tabu@drsc@Gsave
+ \let\CT@drsc@ \tabu@drsc@G
+ \let\tabu@ls@G \tabu@ls@Gsave
+ \let\tabu@ls@ \tabu@ls@G
+ \let\tabu@rc@G \tabu@rc@Gsave
+ \let\tabu@rc@ \tabu@rc@G
+ \let\CT@do@color \relax
+ \let\tabu@evr@G \tabu@evr@Gsave
+ \let\tabu@celllalign \tabu@celllalign@save
+ \let\tabu@cellralign \tabu@cellralign@save
+ \let\tabu@cellleft \tabu@cellleft@save
+ \let\tabu@cellright \tabu@cellright@save
+ \let\tabu@@celllalign \tabu@@celllalign@save
+ \let\tabu@@cellralign \tabu@@cellralign@save
+ \let\tabu@@cellleft \tabu@@cellleft@save
+ \let\tabu@@cellright \tabu@@cellright@save
+ \let\tabu@rowfontreset \tabu@rowfontreset@save
+ \let\tabu@@rowfontreset \tabu@@rowfontreset@save
+ \tabu@naturalX =\tabu@naturalX@save
+ \let\tabu@naturalXmax \tabu@naturalXmax@save
+ \let\tabu@naturalXmin \tabu@naturalXmin@save
+ \let\tabu@mkarstrut \tabu@mkarstrut@save
+ \c@taburow =\c@taburow@save
+ \ifcase \tabu@nested \tabu@alloc \m@ne\fi
+ \endgroup % <end of \globaldefs>
+ \ifcase \tabu@nested
+ \the\tabu@footnotes \global\tabu@footnotes{}%
+ \tabu@afterendpar \tabu@elapsedtime
+ \fi
+ \tabu@clarstrut
+ \everyrow\expandafter {\tabu@evr@G}%
+}% \tabu@cleanup
+\let\tabu@afterendpar \relax
+% \end{macrocode}
+% \end{macro}
+% \end{macro}
%
-% \begin{macro}{\tabu@footnotes}
+% \begin{macro}{\tabu@setreset}
+%
+% At the beginning of each trial, we have to restore the current value that were active
+% at the entry in the \env*{tabu} (for they could have been globally overwritten inside the tabular).
+%
+% The same must occur when using \cs\usetabu as a preamble. Values are restored locally inside the
+% \env{tabu} box.
+%
+% \begin{macro}{\tabu@reset}
%
-% The (global) token that stores the footnotes inside \textt{tabu}:
+% \cs\tabu@setreset defines \cs\tabu@reset to be expanded at the beginning of each trial and
+% when \cs\usetabu is used.
%
% \begin{macrocode}
-\newtoks\tabu@footnotes
+\def\tabu@setreset {%
+ \edef\tabu@savedparams {% \relax for \tabu@message@save
+ \ifmmode \col@sep \the\arraycolsep
+ \else \col@sep \the\tabcolsep \fi \relax
+ \arrayrulewidth \the\arrayrulewidth \relax
+ \doublerulesep \the\doublerulesep \relax
+ \extratabsurround \the\extratabsurround \relax
+ \extrarowheight \the\extrarowheight \relax
+ \extrarowdepth \the\extrarowdepth \relax
+ \def\noexpand\arraystretch{\arraystretch}%
+ \ifdefined\minrowclearance \minrowclearance\the\minrowclearance\relax\fi}%
+ \begingroup
+ \@temptokena\expandafter{\tabu@savedparams}% => only for \savetabu / \usetabu
+ \ifx \tabu@arc@L\relax \else \tabu@setsave \tabu@arc@L \fi
+ \ifx \tabu@drsc@L\relax \else \tabu@setsave \tabu@drsc@L \fi
+ \tabu@setsave \tabu@ls@L \tabu@setsave \tabu@evr@L
+ \expandafter \endgroup \expandafter
+ \def\expandafter\tabu@saved@ \expandafter{\the\@temptokena
+ \let\tabu@arc@G \tabu@arc@L
+ \let\tabu@drsc@G \tabu@drsc@L
+ \let\tabu@ls@G \tabu@ls@L
+ \let\tabu@rc@G \tabu@rc@L
+ \let\tabu@evr@G \tabu@evr@L}%
+ \def\tabu@reset{\tabu@savedparams
+ \tabu@everyrowtrue \c@taburow \z@
+ \let\CT@arc@ \tabu@arc@L
+ \let\CT@drsc@ \tabu@drsc@L
+ \let\tabu@ls@ \tabu@ls@L
+ \let\tabu@rc@ \tabu@rc@L
+ \global\tabu@alloc \tabu@alloc@save
+ \everyrow\expandafter{\tabu@evr@L}}%
+}% \tabu@reset
+\def\tabu@setsave #1{\expandafter\tabu@sets@ve #1\@nil{#1}}
+\long\def\tabu@sets@ve #1\@nil #2{\@temptokena\expandafter{\the\@temptokena \def#2{#1}}}
% \end{macrocode}
% \end{macro}
%
-% \begin{macro}{\tabu@footenotetext}
%
-% The macros in case \xpackage{hyperref} is not used, or used with the option \textt{hyperfootnotes=false}:
+% \subsection{The rewritting process: inside the ``\cs{@mkpream} group''}
+%¤<package>%% The Rewritting Process -------------------------------------------
+%
+% \subsubsection{New column types and private (new) column types}
+%
+% \begin{macro}{\tabu@newcolumntype}
+%
+% A helper macro to create new column types for \textt{tabu}.
+%
+% The column types \textbf{are not appended} to \cs{NC@list} in order to keep them local to \textt{tabu}.
%
% \begin{macrocode}
-\long\def\tabu@footnotetext #1{%
- \edef\@tempa{\the\tabu@footnotes
- \noexpand\footnotetext [\the\csname c@\@mpfn\endcsname]}%
- \global\tabu@footnotes\expandafter{\@tempa {#1}}}%
-\long\def\tabu@xfootnotetext [#1]#2{%
- \global\tabu@footnotes\expandafter{\the\tabu@footnotes
- \footnotetext [{#1}]{#2}}}
-\let\tabu@xfootnote \@xfootnote
+\def\tabu@newcolumntype #1{%
+ \expandafter\tabu@new@columntype
+ \csname NC@find@\string#1\expandafter\endcsname
+ \csname NC@rewrite@\string#1\endcsname
+ {#1}%
+}% \tabu@newcolumntype
+\def\tabu@new@columntype #1#2#3{%
+ \def#1##1#3{\NC@{##1}}%
+ \let#2\relax \newcommand*#2%
+}% \tabu@new@columntype
% \end{macrocode}
% \end{macro}
%
-% \begin{macro}{\tabu@Hy@ftntext}
-% \begin{macro}{\tabu@Hy@xfootnote}
+% \begin{macro}{\tabu@privatecolumntype}
%
-% The macros in case \xpackage{hyperref} is loaded with the option \textt{hyperfootnotes=true}:
+% Columns types defined with \cs{tabu@privatecolumntype} are "mounted" only inside the \cs{@mkpream} group
+% of \textt{tabu}.
%
% \begin{macrocode}
-\long\def\tabu@Hy@ftntext{\tabu@Hy@ftntxt {\the \c@footnote }}
-\long\def\tabu@Hy@xfootnote [#1]{%
- \begingroup
- \value\@mpfn #1\relax
- \protected@xdef \@thefnmark {\thempfn}%
- \endgroup
- \@footnotemark \tabu@Hy@ftntxt {#1}%
-}% \tabu@Hy@xfootnote
-\long\def\tabu@Hy@ftntxt #1#2{%
- \edef\@tempa{%
- \the\tabu@footnotes
- \begingroup
- \value\@mpfn #1\relax
- \noexpand\protected@xdef
- \noexpand\@thefnmark{\noexpand\thempfn}%
- \expandafter\noexpand\expandafter\tabu@Hy@footnotetext
- \expandafter{%
- \Hy@footnote@currentHref
- }%
- }%
- \global\tabu@footnotes\expandafter{%
- \@tempa {#2}%
- \endgroup
- }%
-}% \tabu@Hy@ftntxt
-\long\def\tabu@Hy@footnotetext #1#2{%
- \H@@footnotetext{%
- \ifHy@nesting
- \hyper@@anchor {#1}{#2}%
- \else
- \Hy@raisedlink{%
- \hyper@@anchor {#1}{\relax}%
- }%
- \def\@currentHref {#1}%
- \let\@currentlabelname \@empty
- #2%
- \fi
- }%
-}% \tabu@Hy@footnotetext
-\AtBeginDocument{%
- \csname\ifcsname ifHy@hyperfootnotes\endcsname
- ifHy@hyperfootnotes\else iffalse\fi\endcsname
- \let\tabu@footnotetext \tabu@Hy@ftntext
- \let\tabu@xfootnote \tabu@Hy@xfootnote
- \fi
-}
+\def\tabu@privatecolumntype #1{%
+ \expandafter\tabu@private@columntype
+ \csname NC@find@\string#1\expandafter\endcsname
+ \csname NC@rewrite@\string#1\expandafter\endcsname
+ \csname tabu@NC@find@\string#1\expandafter\endcsname
+ \csname tabu@NC@rewrite@\string#1\endcsname
+ {#1}%
+}% \tabu@privatecolumntype
+\def\tabu@private@columntype#1#2#3#4{%
+ \g@addto@macro\tabu@privatecolumns{\let#1#3\let#2#4}%
+ \tabu@new@columntype#3#4%
+}% \tabu@private@columntype
+\let\tabu@privatecolumns \@empty
% \end{macrocode}
% \end{macro}
% \end{macro}
%
+% \subsubsection{High priority columns}
%
-% \clearpage
-% \subsection{Flow chart of expansion}
-% \label{Flow chart of expansion}
+% \begin{macro}{\tabucolumn}
%
-% \subsubsection(case: tabu, tabu to and tabu spread){General case: tabu, tabu to and tabu spread}
+% \cs\tabucolumn puts a user-defined column in high priority in the \env{tabu} rewritting process.
%
-% {
-% \hskip-\evensidemargin
-% \begin{tikzpicture}[yscale=.4,xscale=.6,framed,
-% start chain, every join/.style={->,thin,black,solid},node distance=.5cm and .5cm,
-% every node/.style={black}]
-% \node [on chain,draw] (begintabu) at (0,0) {\cs{begin}\M*{tabu}} node [anchor=west] at (begintabu.east) {(\cs{begingroup})}
-% node [on chain=going below,join] (tabu) {\cs{tabu}}
-% node [on chain=going right,join] (tabudesc) {$\begin{tabu}\{{>{$}l<{$}}.
-% defines \cs{@halignto} and sets \cs{tabu@target} \\
-% load \cs{NC@rewrite@X} for \textt{tabu} \textt X columns \\
-% load special setup (\xpackage{arydshln} fixes, \cs{rowfont}, \cs{centering} etc)
-% \end{tabu}$}
-% node [on chain=going below,join] (tabu@begin) {\cs{tabu@begin}}
-% node [on chain] (tabu@begindesc) {$\begin{tabu}\{{>{$}l<{$}}.
-% if \cs{tabu@target} $> 0$ then prepare \\
-% \textt{@\M*{\cs{extracolsep}\M*{\cs{@flushglue}}}}
-% \end{tabu}$};
-% \chainin (tabu@begin)
-% node [on chain=going below] (H) {}
-% node [on chain=going below,join=with tabu@begin] (toarray) {\cs{tabular} or \cs{array} if in math mode};
-% \draw [densely dotted,gray,very thick] (begintabu.west |- H) -- (tabu@begindesc.east |- H) coordinate (H);
-% \path [fill=AliceBlue] (begintabu.north -| H) rectangle ($(H)+(1,0)$) coordinate (bluebox)
-% node [midway,rotate=-90] {\large\thispackage};
-%
-% { [start chain=array]
-% \node [on chain] at (begintabu |- toarray) [yshift=-2.5cm] (@array) {\cs{@array}};
-% \draw [->] (toarray.west) -| (@array);
-% \node [on chain=going right,join,fill=GhostWhite,draw=gray,dashed] (@arraydesc)
-% {\begin{tabu}\{{l}.
-% creates the \cs{@arstrutbox} \\
-% \cs{begingroup} \\
-% \quad \cs{@mkpream}: parse the preamble to create \cs{@preamble} \\
-% \quad \cs{xdef} \cs{@preamble} macro \\
-% \cs{endgroup}\\
-% \cs{@arrayleft}\\
-% \cs{vtop} or \cs{vbox} or \cs{vcenter} \cs{bgroup} ... \cs{halign}\{ preamble...
-% \end{tabu}}
-% node [on chain=going below] (H) {};
-% }
-% { [start chain=endtabu]
-% \node [on chain] (end{tabu}) at (begintabu |- H) {\cs{end}\M*{tabu}}
-% node [on chain=going below,join] (endtabu) {\cs{endtabu}}
-% node [on chain=going right,join] (endtabular) {\cs{endtabular}}
-% node [on chain=going right,join] (endarray) {\cs{endarray}}
-% node [on chain=going right,join] (endarraydesc) {\begin{tabu}\{{l}. end of \cs{halign} \\ end of \cs{vtop}, \cs{vbox} or \cs{vcenter}\end{tabu}};
-% \chainin (endtabular)
-% node [on chain=going below,node distance=.7cm] (H) {};
-% \node at (H -| endarraydesc.west) [anchor=west] (endtabulardesc) {\begin{tabu}\{{l}. end of math group \\ end of \cs{hbox}\end{tabu}};
-% \draw [->] (endtabular) |- (endtabulardesc) node [near end,above] {\small if in text mode};
-% \draw [->] (endtabu.north east) to [bend left,looseness=.5] node [midway,above] {\small if in math mode} (endarray.north);
-% \node at (endtabulardesc.south -| begintabu) [yshift=-.5cm] (endgroup) {\cs{endgroup}} node at (endgroup.east) [anchor=west] {end of envir};
-% \draw [->] (endtabu) -- (endgroup);
-% }
-% \path [fill=LightGoldenrodYellow] (bluebox) rectangle ($(endtabulardesc.south -| bluebox)-(1,0)$)
-% node [midway,rotate=-90] {\large\xpackage{array}};
-% \end{tikzpicture}
-% }
+% \begin{macrocode}
+\newcommand*\tabucolumn [1]{\expandafter \def \expandafter
+ \tabu@highprioritycolumns\expandafter{\tabu@highprioritycolumns
+ \NC@do #1}}%
+\let\tabu@highprioritycolumns \@empty
+% \end{macrocode}
+% \end{macro}
%
-% \subsubsection(tabu to with X column){\textt{tabu to} with \textt X column}
%
-% The important part of the job is made inside the dashed box above: \cs{@mkpream}
-% expands the columns definitions, which can be user defined. Hopefully, it does its
-% job inside a group, therefore a user-column can set a macro to be expanded
-% \cs{aftergroup}. This implementation allows much modifications in the tabular preparation,
-% without any change in the macros of \xfile{array.sty}.
+% \subsubsection{Rewritting vertical lines and leaders}
+%¤<package>%% The | ``column'' : rewritting process --------------------------
%
-% When a \textt{tabu X} column is found in the preamble by \cs{@mkpream}, \textt{tabu} changes his strategy: the macro
-% \cs{tabu@prep@TRIAL} is set to be expanded \cs{aftergroup} that is, just after the preamble (\cs{@preamble}) has been built.
-% This macro does some setup for \textt{tabu} trials to reach the target with variable \textt X column widths and gobbles
-% everything until the next \cs{bgroup} which corresponds to the \cs{vtop}, \cs{vbox} or \cs{vcenter} for the whole tabular.
-% This part of \cs{@array} is stored into \cs{tabu@Xfinish} to be expanded after the last trial gave satisfaction
-% to reach the \textt{tabu} target. Then \cs{tabu@collect} is expanded to find the end of the \textt{tabu} environment,
-% temporarily storing the environment content into a token register.
+% \begin{macro}{| (private column type)}
%
-% The last part of \cs{@array} until \cs{halign} is expanded inside a \cs{vbox}
-% which is stored into the box register \cs{tabu@box} for measuring purpose. \cs{halign} ends by \cs{endarray}
-% which stops the \cs{tabu@box} as well, and then \cs{tabu@arith} is expanded to compute the gap between the
-% width of \cs{tabu@box} and the target, and \cs{tabucolX} (the dimension that correspond to \textt{X[1]})
-% is updated accordingly.
+% This is the rewrite macro for the \texttbf\textbar\ column type inside \textt{tabu} and \textt{longtabu}.
%
-% The trials are ``protected'' by\, \M*{\cs{ifnum}0=`}\cs{fi}\, : they occur in a group that will be closed
-% at the very begining of \cs{tabu@Xfinish}, when the final tabular will be printed actually.
-% This protection is absolutely necessary to be able to collect
-% the environment body in the case of nested \textt{tabu} with \textt X columns. This is related to \TeX{}
-% mechanism of expansion inside \cs{halign} (\TeX{} stops reading when it encounters a \& \textt{alignment tab character}
-% and goes backward expanding anything that were not expanded before).
+% Vertical lines are \textit{simply rewritten} as special \texttbf! columns.
%
+% \begin{macrocode}
+\tabu@privatecolumntype |{\tabu@rewritevline}
+\newcommand*\tabu@rewritevline[1][]{\tabu@vlinearg{#1}%
+ \expandafter \NC@find \tabu@rewritten}
+% \end{macrocode}
+% \end{macro}
%
-% {\hskip-1cm
-% \begin{tikzpicture}[yscale=.4,xscale=.6,framed,
-% start chain=going below,node distance=.3cm and .5cm,
-% every join/.style={->,thin,black,solid},every node/.style={black}]
+% \begin{macro}{\tabu@lines}
%
-% \node [on chain] (begingroup) at (0,0) {\cs{begingroup}}
-% node [on chain=going right] (@mkpream) {\cs{@mkpream}}
-% node [on chain,join] {Finds a \textt X column}
-% node [on chain,join] {rewrite \textt X column}
-% {[start branch] node [on chain] {\begin{tabu}\{{l}. Parse the optional parameter for \textt X\\ Set \cs{aftergroup}\cs{tabu@prep@TRIAL}\end{tabu}}
-% }
-% node [on chain,join] {... \cs{@mkpream} ...}
-% {[start branch] node [on chain,join] {builds the \cs{halign} preamble}}
-% node [on chain,join] {\cs{xdef}\cs{@preamble}}
-% node [on chain,join] (endgroup) {\cs{endgroup}}
-% node [on chain] (H) {};
-% \node (tabu@prep@TRIAL) at (begingroup |- H) {\cs{tabu@prep@TRIAL}};
-% \draw [->] (endgroup.west) -| (tabu@prep@TRIAL.north) node [midway,left] {\ssmall\begin{tabu}{c} triggered by\\ \cs{aftergroup}\end{tabu}};
-% \chainin (tabu@prep@TRIAL);
-% { [start branch] \node [on chain,join] {\cs{tabu@setup@TRIAL}}
-% node [on chain,join] {\begin{tabu}\{{l}.
-% Neutralisation of \cs{write} \\
-% Protection for: \begin{tabu}{!{\textbullet}l}
-% footnotes \\ counters \\ index
-% \end{tabu}
-% \end{tabu}};
-% }
-% \node [on chain] (H) {}
-% node [on chain,join=with tabu@prep@TRIAL] (tabu@arrayleft@measure) {\cs{tabu@arrayleft@measure}}
-% node [on chain=going right,join] {\begin{tabu}\{{l}. prepares \cs{tabu@Xfinish} \\ Collect the \textt{tabu} body\end{tabu}}
-% node [on chain,join] (tabu@TRIAL) {\cs{tabu@TRIAL}}
-% {[start branch] node [on chain,join] {\begin{tabu}{l} Expands \cs{halign} into a \cs{vbox} \end{tabu}}
-% }
-% node [on chain,join] {\cs{tabu@endTRIAL}}
-% {[start branch] node [on chain,join] {\cs{endarray}}
-% }
-% node [on chain,join] (tabu@arith) {\begin{tabu}{c} \cs{tabu@arith}\\ \cs{wd}\M*{tabu}$-$\cs{tabu@target} $<$ \cs{hfuzz} ?\end{tabu}}
-% node [on chain=going right,node distance=1cm] (tabu@Xfinish) {\cs{tabu@Xfinish}};
-% \draw (tabu@arith) [->] -- (tabu@Xfinish) node [midway,above,blue] {Yes};
-% \draw [->] (tabu@arith.west) |- (tabu@TRIAL) node (No) [very near start,left] {{\small\begin{tabu}.{r}\} Updates \\ \cs{tabucolX}\end{tabu}} \textcolor{red}{No}};
+% The \texttbf\textbar\, token for vertical lines may have a special
+% catcode. \xfile{array.sty} makes the test with \cs{if} and therefore,
+% it is catcode insensitiv. Here, we use \cs\scantokens and check if
+% \texttbf\textbar\, is not an \emph{other} character.
%
-% \end{tikzpicture}}
+% \begin{macrocode}
+\def\tabu@lines #1{%
+ \ifx|#1\else \tabu@privatecolumntype #1{\tabu@rewritevline}\fi
+ \NC@list\expandafter{\the\NC@list \NC@do #1}%
+}% \tabu@lines@
+% \end{macrocode}
+% \end{macro}
%
+% \begin{macro}{\tabu@vlinearg}
%
+% The macro that parses the optional argument of \textt\textbar\ vertical lines...
%
+% \begin{macrocode}
+\def\tabu@vlinearg #1{%
+ \ifx\\#1\\\def\tabu@thestyle {\tabu@ls@}%
+ \else\tabu@getline {#1}%
+ \fi
+ \def\tabu@rewritten ##1{\def\tabu@rewritten{!{##1\tabu@thevline}}%
+ }\expandafter\tabu@rewritten\expandafter{\tabu@thestyle}%
+ \expandafter \tabu@keepls \tabu@thestyle \@nil
+}% \tabu@vlinearg
+\def\tabu@keepls #1\@nil{%
+ \ifcat $\@cdr #1\@nil $%
+ \ifx \relax#1\else
+ \ifx \tabu@ls@#1\else
+ \let#1\relax
+ \xdef\tabu@mkpreambuffer{\tabu@mkpreambuffer
+ \tabu@savels\noexpand#1}\fi\fi\fi
+}% \tabu@keepls
+\def\tabu@thevline {\begingroup
+ \ifdefined\tabu@leaders
+ \setbox\@tempboxa=\vtop to\dimexpr
+ \ht\@arstrutbox+\dp\@arstrutbox{{\tabu@thevleaders}}%
+ \ht\@tempboxa=\ht\@arstrutbox \dp\@tempboxa=\dp\@arstrutbox
+ \box\@tempboxa
+ \else
+ \tabu@thevrule
+ \fi \endgroup
+}% \tabu@thevline
+\def\tabu@savels #1{%
+ \expandafter\let\csname\string#1\endcsname #1%
+ \expandafter\def\expandafter\tabu@reset\expandafter{\tabu@reset
+ \tabu@resetls#1}}%
+\def\tabu@resetls #1{\expandafter\let\expandafter#1\csname\string#1\endcsname}%
+% \end{macrocode}
+% \end{macro}
%
+% \subsubsection{Vertical lines and leaders in the \cs{multicolumn} preamble}
+%¤<package>%% \multicolumn inside tabu environment -----------------------------
%
-% \subsubsection(tabu spread with X column){\textt{tabu spread} with \textt X column}
+% \begin{macro}{\tabu@rewritemulticolumn}
%
-% In the case of ``\textt{tabu spread}'' with \textt X columns, the process is the same
-% as the one described for ``\textt{tabu to}'' with \textt X columns. However, the first
-% trial is different because we have first to measure the \emph{natural width} of the
-% tabular.
-% The process is the following:
-% \begin{itemize}[label=\small\textbullet]
-% \item \cs{tabu@target} is first set to \cs{linewidth} (or \cs{linegoal} with the \textt{linegoal} package option).
-% \item The \textt X column corresponds to a \cs{vbox} with \cs{hsize} fixed to \cs{tabu@target}.
-% \item Inside this \cs{vbox} the cell content is written into a \cs{hbox} whose width is limited to \cs{tabu@target}.
-% This \cs{hbox} is captured into the box register \cs{tabu@box}.
-% \item At the end of the cell, the \cs{badness} of the \cs{hbox} is checked:
-% \begin{itemize}[label=\textendash,leftmargin=*]
-% \item if the \cs{badness} is $> 1000$ then the text is too long and ``\textt{tabu spread}''
-% is useless: \textt{tabu to \cs{tabu@target}} give the same result.
-% \item Otherwise, we get the natural width of the cell content by: \\
-% \cs{setbox} \cs{tabu@box} \cs{hbox} \M*{\cs{unhbox} \cs{tabu@box}}
-% \end{itemize}
-% \item At the end of the first trial, \cs{tabu@spreadarith} checks if:
-% $$ \text{width(tabular)} + \text{spread} < \cs{linewidth} \text{ (or \cs{linegoal})}$$
-% \begin{itemize}[label=\textendash,leftmargin=*]
-% \item if not, then \textt{tabu to}\cs{tabu@target} give the same result
-% \item Otherwise, the target for \textt{tabu to} will be:
-% $$\hskip-\leftmargin
-% \text{width(tabular)} + \text{spread} - \sum_i \text{natural widths X}_i
-% +\underbrace{\text{Max}_i\left(\dfrac{\text{natural width X}_i}{\text{coef}_i}\right)\times \sum_i\text{coef}_i}
-% _{\text{\begin{tabu}{c} minimal natural width that can be obtained \\ with the given coefs\end{tabu}}}
-% $$
-% \end{itemize}
-% And the next trial will be done as if the user called ``\textt{tabu to}'' with this target.
-% \end{itemize}
+% A special rewrite to allow \texttbf\textbar\M*[...] in \cs\multicolumn preamble inside \env{tabu} environment.
%
+% As long as \cs\multicolumn begins with \cs\omit (via \cs\multispan) special care has to be taken:
+% everything shall be purely expandable until \cs\omit.
%
+% \cs\multicolumn is not an environment: no group is opened apart the \cs\@mkpream group.
+% We open a semi simple group for \cs\multicolumn when inside \env{tabu}, in order for the setup
+% to be local (in case a user would try to embed a \env{tabular} inside the argument of \cs\multicolumn...)
%
+% \begin{macrocode}
+\tabu@newcolumntype \tabu@rewritemulticolumn{%
+ \aftergroup \tabu@endrewritemulticolumn % after \@mkpream group
+ \NC@list{\NC@do *}\tabu@textbar \tabu@lines
+ \tabu@savedecl
+ \tabu@privatecolumns
+ \NC@list\expandafter{\the\expandafter\NC@list \tabu@NC@list}%
+ \let\tabu@savels \relax
+ \NC@find
+}% \tabu@rewritemulticolumn
+\def\tabu@endrewritemulticolumn{\gdef\tabu@mkpreambuffer{}\endgroup}
+\def\tabu@multicolumn{\tabu@ifenvir \tabu@multic@lumn \tabu@multicolumnORI}
+\long\def\tabu@multic@lumn #1#2#3{\multispan{#1}\begingroup
+ \tabu@everyrowtrue
+ \NC@list{\NC@do \tabu@rewritemulticolumn}%
+ \expandafter\@gobbletwo % gobbles \multispan{#1}
+ \tabu@multicolumnORI{#1}{\tabu@rewritemulticolumn #2}%
+ {\iftabuscantokens \tabu@rescan \else \expandafter\@firstofone \fi
+ {#3}}%
+}% \tabu@multic@lumn
+% \end{macrocode}
+% \end{macro}
%
-% \subsection{tabu X column definition}
+% \subsubsection{Rewritting \textt{tabu X} columns}
% \label{tabu X column definition}
+%¤<package>%% The X column(s): rewritting process -----------------------------
%
-% \begin{macro}{\tabu@rewrite@X}
-%
-% This macro is expanded by \cs{@mkpream} in case a \textt X column is found.
+% \begin{macro}{X (private column type)}
%
-% \cs{tabu@X@sum} (a dimen) store the sum of the width coefficients. For the first \textt{X column} found in the
-% preamble, a special setup occurs:
-% \begin{itemize}[itemsep=0pt,topsep=0pt,leftmargin=*]
-% \item the default target (either \cs{linewidth} or \cs{linegoal} if available) is set
-% if it has not been specified by the user.
-% \item \cs{@halignto} is \cs{let} to \cs{relax} to avoid its expansion in \cs{xdef}\cs{@preamble} just after \cs{@mkpream}.
-% Indeed as long as we have to measure the natural width of the tabular, \cs{@halign} must be empty for trial steps.
-% \item The rest of the setup is made \cs{aftergroup} (\ie after \cs{xdef}\cs{@preamble} which occurs inside a group) by \cs{tabu@prep@TRIAL}.
-% \end{itemize}
+% This is the rewrite macro for \textt{tabu X} columns.
+% Such a column has an optional argument: the width coefficient for the \textt{tabu X} column
+% whose default value is 1, and may be some alignments parameters.
+% The coefficient is used in the expression: \textt{p\M*{\cs{dimexpr}\meta{coef}\cs{tabucolX}}}
%
% \begin{macrocode}
-\def\tabu@rewrite@X #1{\tabu@Xarg {#1}%
- \expandafter\let\csname tabu@X\the\tabu@X@cols\endcsname \relax
- \iftabu@measuring % not the first X column found in preamble
- \edef\tabu@global@X {\tabu@global@X
- \def\csname tabu@X\the\tabu@X@cols\endcsname {\strip@pt\tabu@X@sum}%
- \advance\tabu@X@sum \the\tabu@X@sum\relax}%
- \else % first X column found in preamble
- \tabu@measuringtrue
- \iftabu@spread \tabu@spreadtarget\tabu@target \tabu@target\z@
- \else \tabu@spreadtarget \z@ \fi
- \ifdim\tabu@target=\z@
- \setlength\tabu@target \tabudefaulttarget
- \tabu@message{(tabu) Default target:
- \ifx\tabudefaulttarget\linewidth\string\linewidth
- \else\ifx\tabudefaulttarget\linegoal\string\linegoal
- \fi\fi=\the\tabu@target \on@line, page \the\c@page}\fi
- \tabu@message{\tabu@titles}%
- \edef\tabu@global@X {\tabu@global@X
- \def\csname tabu@X1\endcsname{\strip@pt\tabu@X@sum}%
- \tabu@X@sum \the\tabu@X@sum\relax
- \tabu@target \the\tabu@target\relax
- \tabu@spreadtarget \the\tabu@spreadtarget\relax}%
- \let\tabu@halignto \relax
- \fi
-}% \tabu@rewrite@X
-\let\tabu@@rewrite@X \tabu@rewrite@X
+\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
+ {\tabu@rewriteX@Ss{#1}}
+ {\tabu@nosiunitx{#1}}}
+\def\tabu@rewriteX@Ss #1#2{\@temptokena{}%
+ \@defaultunits \let\tabu@temp =#2\relax\@nnil
+ \ifodd 1\ifx S\tabu@temp \else \ifx s\tabu@temp \else 0 \fi\fi
+ \def\NC@find{\def\NC@find >####1####2<####3\relax{#1 {####1}{####3}%
+ }\expandafter\NC@find \the\@temptokena \relax
+ }\expandafter\NC@rewrite@S \@gobble #2\relax
+ \else \tabu@siunitxerror
+ \fi
+ \expandafter \NC@find \tabu@rewritten
+}% \tabu@rewriteX@Ss
+\def\tabu@siunitxerror {\PackageError{tabu}{Not a S nor s column !
+ \MessageBreak X column can only embed siunitx S or s columns}\@ehd
+}% \tabu@siunitxerror
% \end{macrocode}
+% \end{macro}
%
-% \begin{macro}{\tabu@rewrite@Xnested}
+% \begin{macro}{\tabu@rewriteX}
%
-% This macro replaces \cs{tabu@rewrite@X} when \textt{tabu} makes a trial for \textt X columns.
+% This macro is expanded by during the rewritting process in case a \textt X column is found.
%
-% \begin{macro}{\tabu@rewrite@Xrestore}
+% \cs\tabu@Xsum (a dimen) stores the sum of the (absolute) width coefficients.
%
-% This macro replaces \cs{tabu@rewrite@X} in the case of \cs{usetabu}.
+% For the first \textt{X column} found in the preamble, a special setup occurs:
+% \begin{itemize}[itemsep=0pt,topsep=0pt,leftmargin=*]
+% \item if the default target is used (no target specified or \textt{tabu spread} with \textt X columns),
+% the target: \cs\tabu@target is set to the default, with a message in the \xext{log} file.
+% \item \cs\@halignto is \cs\let to \cs\relax to avoid its expansion in \cs\xdef\cs\@preamble just after \cs\@mkpream.
+% Indeed as long as we have to measure the natural width of the tabular, \cs\@halign must be empty for trial steps.
+% \item The rest of the setup is made \cs\aftergroup (\ie after \cs\xdef\cs\@preamble which occurs inside a group) by \cs\tabu@prep@TRIAL.
+% \end{itemize}
%
% \begin{macrocode}
-\def\tabu@rewrite@Xnested #1{\in@ ${#1}\ifin@
- \def\tabucolX@rw {>{$}p{\tabucolX}<{$}}\else
- \def\tabucolX@rw {p{\tabucolX}}\fi}
-\def\tabu@rewrite@Xrestore #1{\tabu@gobbleopt{\def\tabucolX@rw{l}}}
+\def\tabu@rewriteX #1#2#3{\tabu@Xarg {#1}{#2}{#3}%
+ \iftabu@measuring
+ \else \tabu@measuringtrue % first X column found in the preamble
+ \let\@halignto \relax \let\tabu@halignto \relax
+ \iftabu@spread \tabu@spreadtarget \tabu@target \tabu@target \z@
+ \else \tabu@spreadtarget \z@ \fi
+ \ifdim \tabu@target=\z@
+ \setlength\tabu@target \tabu@thetarget
+ \tabu@message{\tabu@message@defaulttarget}%
+ \else \tabu@message{\tabu@message@target}\fi
+ \fi
+}% \tabu@rewriteX
% \end{macrocode}
% \end{macro}
-% \end{macro}
-% \end{macro}
%
+% \begin{macro}{\tabu@rewriteXrestore}
+%
+% This macro replaces \cs\tabu@rewriteX in the case of \cs{usetabu}.
+%
+% \begin{macrocode}
+\def\tabu@rewriteXrestore #1#2#3{\let\@halignto \relax
+ \def\tabu@rewritten{l}}
+% \end{macrocode}
+% \end{macro}
%
% \begin{macro}{\tabu@Xarg}
% \begin{macro}{\tabu@Xparse}
-% \begin{macro}{\tabucolX@do}
%
% A tedious (and fastidious) macro to parse the optional argument of \textt X columns. The aim is to built
-% \cs{tabucolX@rw} which expands to the column specification:
-%
-% {\centering \textt{>\M*{alignment} p \emph{or} m \emph{or} b \M*{\cs{dimexpr} coef \cs{tabucolX}\cs{relax}}}\par}
-%
-% After that \xfile{array.sty} make it easy:\, \cs{expandafter}\cs{NC@find}\cs{tabucolX@rw}
-%
-% \begin{macrocode}
-\def\tabu@Xarg#1{%
- \advance\tabu@X@cols \@ne
- \tabu@wdlet\tabu@X@cols \z@
- \ifx\\#1\\% <shortcut when no option>
- \tabu@X@sum \p@
- \edef\tabucolX@rw {p{\tabu@dimexpr{\the\tabu@X@cols}{\tabucolX}}}%
- \edef\tabu@temp {p{\the\tabucolX}}% <required for \usetabu>
- \else
- \tabu@X@sum \z@
- \let\tabucolX@align \@empty \let\tabucolX@rw \@empty
- \let\tabu@Xmath \@empty \let\tabu@temp \@empty
- \tabu@Xparse {}#1,\@nnil
- \fi
+% \cs\tabu@rewritten which expands to the column specification:
+%
+% {\centering \textt{>\M*{alignment} p \emph{or} m \emph{or} b \M*{\cs\dimexpr coef \cs\tabucolX\cs\relax}}\par}
+%
+% After that \xfile{array.sty} make it easy:\, \cs\expandafter\cs\NC@find\cs\tabu@rewritten
+%
+% \begin{macrocode}
+\def\tabu@Xarg #1#2#3{%
+ \advance\tabu@Xcol \@ne \let\tabu@Xlcr \@empty
+ \let\tabu@Xdisp \@empty \let\tabu@Xmath \@empty
+ \ifx\\#1\\% <shortcut when no option>
+ \def\tabu@rewritten{p}\tabucolX \p@ % <default coef = 1>
+ \else
+ \let\tabu@rewritten \@empty \let\tabu@temp \@empty \tabucolX \z@
+ \tabu@Xparse {}#1\relax
+ \fi
+ \tabu@Xrewritten{#2}{#3}%
}% \tabu@Xarg
\def\tabu@Xparse #1{\futurelet\@let@token \tabu@Xtest}
\expandafter\def\expandafter\tabu@Xparsespace\space{\tabu@Xparse{}}
\def\tabu@Xtest{%
- \ifcase \ifx \@nnil\@let@token \z@ \else
+ \ifcase \ifx \relax\@let@token \z@ \else
\if ,\@let@token \m@ne\else
\if p\@let@token 1\else
\if m\@let@token 2\else
@@ -3204,7 +5105,6 @@ lppl copyright 2010-2011 by FC <florent.chervet@free.fr>
\if -\@let@token 13\else
\ifcat $\@let@token 14\else
15\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\relax
- \tabucolX@do \expandafter \remove@to@nnil
\or \tabu@Xtype {p}%
\or \tabu@Xtype {m}%
\or \tabu@Xtype {b}%
@@ -3218,316 +5118,795 @@ lppl copyright 2010-2011 by FC <florent.chervet@free.fr>
\or \tabu@Xalign \justifying\tabu@justify
\or \expandafter \tabu@Xparsespace
\or \expandafter \tabu@Xcoef
- \or \let\tabu@Xmath=$\expandafter \tabu@Xparse
+ \or \expandafter \tabu@Xm@th
\or \tabu@Xcoef{}%
\else\expandafter \tabu@Xparse
\fi
}% \tabu@Xtest
-\def\tabu@Xalign#1#2{%
- \ifx \tabucolX@align\@empty \else \PackageWarning{tabu}
- {Duplicate horizontal alignment specification}\fi
- \ifdefined#1\def\tabucolX@align{#1}\else
- \def\tabucolX@align{#2}\fi
- \expandafter\tabu@Xparse
+\def\tabu@Xalign #1#2{%
+ \ifx \tabu@Xlcr\@empty \else \PackageWarning{tabu}
+ {Duplicate horizontal alignment specification}\fi
+ \ifdefined#1\def\tabu@Xlcr{#1}\let#1\relax
+ \else \def\tabu@Xlcr{#2}\let#2\relax\fi
+ \expandafter\tabu@Xparse
}% \tabu@Xalign
-\def\tabu@Xtype#1{%
- \ifx \tabucolX@rw\@empty \else \PackageWarning{tabu}
- {Duplicate vertical alignment specification}\fi
- \def\tabucolX@rw{#1}\expandafter\tabu@Xparse
+\def\tabu@Xtype #1{%
+ \ifx \tabu@rewritten\@empty \else \PackageWarning{tabu}
+ {Duplicate vertical alignment specification}\fi
+ \def\tabu@rewritten{#1}\expandafter\tabu@Xparse
}% \tabu@Xtype
\def\tabu@Xcoef#1{\edef\tabu@temp{\tabu@temp#1}%
- \afterassignment\tabu@Xc@ef \tabu@cnt\number\if-#10\fi
+ \afterassignment\tabu@Xc@ef \tabu@cnt\number\if-#10\fi
}% \tabu@Xcoef
-\def\tabu@Xc@ef{%
- \advance\tabu@X@sum \tabu@temp\the\tabu@cnt\p@
- \tabu@Xparse{}%
+\def\tabu@Xc@ef{\advance\tabucolX \tabu@temp\the\tabu@cnt\p@
+ \tabu@Xparse{}%
}% \tabu@Xc@ef
-\def\tabucolX@do{%
- \ifx\tabucolX@rw\@empty \def\tabucolX@rw{p}\fi
- \ifdim\tabu@X@sum<\z@ \tabu@negcoeftrue
- \tabu@X@sum \m@ne\tabu@X@sum
- \tabu@wdlet \tabu@X@cols \p@
- \else \ifdim \tabu@X@sum=\z@ \tabu@X@sum \p@ \fi
+\def\tabu@Xm@th #1{\futurelet \@let@token \tabu@Xd@sp}
+\def\tabu@Xd@sp{\let\tabu@Xmath=$%
+ \ifx $\@let@token \def\tabu@Xdisp{\displaystyle}%
+ \expandafter\tabu@Xparse
+ \else \expandafter\tabu@Xparse\expandafter{\expandafter}%
+ \fi
+}% \tabu@Xd@sp
+% \end{macrocode}
+% \end{macro}
+% \end{macro}
+%
+% \begin{macro}{\tabu@Xrewritten}
+%
+% Final step: the whole optional argument has been read, then builds
+% the rewritten column specification.
+%
+% \begin{macrocode}
+\def\tabu@Xrewritten {%
+ \ifx \tabu@rewritten\@empty \def\tabu@rewritten{p}\fi
+ \ifdim \tabucolX<\z@ \tabu@negcoeftrue
+ \else\ifdim \tabucolX=\z@ \tabucolX \p@
+ \fi\fi
+ \edef\tabu@temp{{\the\tabu@Xcol}{\tabu@strippt\tabucolX}}%
+ \edef\tabu@Xcoefs{\tabu@Xcoefs \tabu@ \tabu@temp}%
+ \edef\tabu@rewritten ##1##2{\def\noexpand\tabu@rewritten{%
+ >{\tabu@Xlcr \ifx$\tabu@Xmath$\tabu@Xdisp\fi ##1}%
+ \tabu@rewritten {\tabu@hsize \tabu@temp}%
+ <{##2\ifx$\tabu@Xmath$\fi}}%
+ }\tabu@rewritten
+}% \tabu@Xrewritten
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\tabu@hsize}
+%
+% \cs\tabu@hsize\M*{\textt X column number}\M*{\textt X column width coefficient}
+%
+% Depending on the sign of the coefficient, and of the stored value for the natural width
+% of the column the \textt X cell belongs to, \cs\tabu@hsize returns the wanted width for
+% the \emph{par-box} that contains the cell content.
+%
+% \begin{macrocode}
+\def\tabu@hsize #1#2{%
+ \ifdim #2\p@<\z@
+ \ifdim \tabucolX=\maxdimen \tabu@wd{#1}\else
+ \ifdim \tabu@wd{#1}<-#2\tabucolX \tabu@wd{#1}\else -#2\tabucolX\fi
+ \fi
+ \else #2\tabucolX
\fi
- \begingroup
- \toks@\expandafter {\tabucolX@align}%
- \edef\tabu@temp {\strip@pt\tabu@X@sum \tabucolX}%
- \edef\tabucolX@rw##1{%
- \ifx$\tabu@Xmath>{\noexpand\the\toks@ $}\else
- \ifx \tabucolX@align\@empty \else
- >{\noexpand\the\toks@}\fi\fi
- \tabucolX@rw{##1}%
- \ifx$\tabu@Xmath<{$}\fi}%
- \edef\x{\endgroup
- \def\noexpand\tabu@temp {\tabucolX@rw{\the\dimexpr\tabu@temp}}%
- \def\noexpand\tabucolX@rw{%
- \tabucolX@rw{\tabu@dimexpr{\the\tabu@X@cols}{\tabu@temp}}}%
- }\x
-}% \tabucolX@do
-\def\tabu@dimexpr#1#2{%
- \ifdim \tabu@wd{#1}>\p@
- \ifdim \tabu@wd{#1}<#2 \tabu@wd{#1}\else#2\fi\else #2\fi
-}% \tabu@dimexpr
-% \end{macrocode}
-% \end{macro}
-% \end{macro}
-% \end{macro}
-%
-%
-% \subsection(Before trials){Before trials to reach the target: setup after \cs{@mkpream}}
-%
-% \begin{macro}{\tabu@prep@TRIAL}
-%
-% \cs{@mkpream} does its job inside a semi-simple group. At the end, \cs{@preamble} is expanded with \cs{xdef}, and
-% the group is left: this triggers the expansion of \cs{tabu@prep@TRIAL} set \cs{aftergroup} by the first \textt X column
-% encountered in the preamble.
-%
-% We \cs{let} \cs{@halignto} to \cs{@empty}: it's a measurement, and put some protections. A group is opened with
-% the famous \M*{\cs{ifnum}0=`}\cs{fi} and control is given to \cs{tabu@arrayleft@measure}.
-%
-% \begin{macrocode}
-\def\tabu@prep@TRIAL{%
- \begingroup \iffalse{\fi \ifnum0=`}\fi
- \tabu@setup@TRIAL
- \tabucolX \tabu@target
- \ifcase 0\iftabu@negcoef \else\iftabu@spread \else 1\fi\fi
- \advance\tabu@X@cols \@ne
- \expandafter\let\csname tabu@X\the\tabu@X@cols\endcsname \@undefined
- \tabu@X@cols \z@
- \def\tabu@naturalX@max {\z@}%
- \def\tabu@naturalX@min {\z@}%
- \let\tabu@startpboxORI \@startpbox
- \let\@startpbox \tabu@measure@startpbox
- \fi
- \def\tabu@lasttry{\m@ne\p@}\tabu@cnt \z@ % number of trials
- \tabu@arrayleft@measure
-}% \tabu@prep@TRIAL
-% \end{macrocode}
-% \end{macro}
-%
-% \begin{macro}{\tabu@setup@TRIAL}
-% \begin{macrocode}
-\def\tabu@setup@TRIAL{\tabu@global@X \let\tabu@global@X \@empty
- \let\@halignto \@empty \tabu@naturalX \z@
- \tabu@savecounters \let\tabu@savecounters \relax
- \hbadness \@M \let\hbadness \@tempcnta
- \hfuzz \maxdimen \let\hfuzz \@tempdima
- \let\tabu@rewrite@X \tabu@rewrite@Xnested
- \let\savetabu \@gobble \let\everyrow \@gobble
- \let\tabudefaulttarget \linewidth
- \let\write \tabu@nowrite \let\GenericError \tabu@GenericError
- \long\def\@xfootnote[##1]##2{}\let\@footnotetext \@gobble
- \ifx\@arrayright\relax \let\@arrayright \@empty\fi
- \let\tabu@verticalmeasure \@empty
- \let\tabu@verticalspacing \@empty
- \tabu@TRIAL@hook
-}% \tabu@setup@TRIAL
+}% \tabu@hsize
+% \end{macrocode}
+% \end{macro}
+%
+% \subsubsection{Rewritting \cs{usetabu} and \cs{preamble}}
+%¤<package>%% \usetabu and \preamble: rewritting process ---------------------
+%
+% The rewritting process is very simple, when all the job has been done
+% cleverly at the time of \cs\savetabu !!
+%
+% The \cs\savetabu macro is a bit more complex...
+%
+% \begin{macro}{\usetabu (private column type)}
+%
+% \cs\usetabu is defined as a \env{tabu} new column type: loaded only inside the \cs\@mkpream
+% group inside the \env{tabu} environment.
+%
+% \begin{macrocode}
+\tabu@privatecolumntype \usetabu [1]{%
+ \ifx\\#1\\\tabu@saveerr{}\else
+ \@ifundefined{tabu@saved@\string#1}
+ {\tabu@saveerr{#1}}
+ {\let\tabu@rewriteX \tabu@rewriteXrestore
+ \csname tabu@saved@\string#1\expandafter\endcsname\expandafter\@ne}%
+ \fi
+}% \NC@rewrite@\usetabu
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\preamble (private column type)}
+%
+% \cs{preamble} is defined as a \textt{tabu} new column type: loaded only inside the \cs{@mkpream}
+% group inside the \textt{tabu} environment.
+%
+% \begin{macrocode}
+\tabu@privatecolumntype \preamble [1]{%
+ \ifx\\#1\\\tabu@saveerr{}\else
+ \@ifundefined{tabu@saved@\string#1}
+ {\tabu@saveerr{#1}}
+ {\csname tabu@saved@\string#1\expandafter\endcsname\expandafter\z@}%
+ \fi
+}% \NC@rewrite@\preamble
+% \end{macrocode}
+% \end{macro}
+%
+% \subsubsection{Controlling the rewritting process}
+%
+%¤<package>%% Controlling the rewritting process -------------------------------
+%
+% \begin{macro}{\tabu@rewritefirst}
+%
+% This new column type is not really a column type! It is always added to a \env{tabu} preamble
+% in order to do some setup before any other column is rewritten by \cs\@mkpream.
+%
+% Thus, \cs\NC@list is simply set to \M*{\cs{NC@do} \cs{tabu@rewritefirst}}. The rewritting of
+% \cs\tabu@rewritefirst will restore the original list \cs\NC@list.
+%
+% This ``column type'' sets:
+% \begin{itemize}
+% \item \cs\tabu@select to be expanded \cs\aftergroup (after the closing of the \cs\@mkpream group.
+% All the thick is there: all information collected during the rewritting of \textt X columns
+% (and vertical lines or leaders) can be \emph{reinjected} into the group below the \cs\@mkpream
+% group, by the mean of the \cs\tabu@mkpreambuffer (globally defined).
+% \item The private columns types are loaded by \cs\tabu@rewritefirst: they will be rewritten afterwards,
+% during the rewritting loop. This way, \textt X column definition for \env{tabu} are only available
+% during the rewritting process of the \env{tabu} preamble, making it possible (and easy) to
+% embed a \env{tabularx} inside a cell of a \env{tabu}.
+% \item \cs\save@decl is modified inside the \cs\@mkpream group, if \env{tabu} is in text mode.
+% \end{itemize}
+%
+% \begin{macrocode}
+\tabu@newcolumntype \tabu@rewritefirst{%
+ \iftabu@long \aftergroup \tabu@longpream % <the whole implementation is here !>
+ \else \aftergroup \tabu@pream
+ \fi
+ \let\tabu@ \relax \let\tabu@hsize \relax
+ \let\tabu@Xcoefs \@empty \let\tabu@savels \relax
+ \tabu@Xcol \z@ \tabu@cnt \tw@
+ \gdef\tabu@mkpreambuffer{\tabu@{}}\tabu@measuringfalse
+ \global\setbox\@arstrutbox \box\@arstrutbox
+ \NC@list{\NC@do *}\tabu@textbar \tabu@lines
+ \NC@list\expandafter{\the\NC@list \NC@do X}%
+ \iftabu@siunitx % <siunitx S and s columns>
+ \NC@list\expandafter{\the\NC@list \NC@do S\NC@do s}\fi
+ \NC@list\expandafter{\the\expandafter\NC@list \tabu@highprioritycolumns}%
+ \expandafter\def\expandafter\tabu@NC@list\expandafter{%
+ \the\expandafter\NC@list \tabu@NC@list}% % * | X S <original>
+ \NC@list\expandafter{\expandafter \NC@do \expandafter\usetabu
+ \expandafter \NC@do \expandafter\preamble
+ \the\NC@list \NC@do \tabu@rewritemiddle
+ \NC@do \tabu@rewritelast}%
+ \tabu@savedecl
+ \tabu@privatecolumns
+ \edef\tabu@prev{\the\@temptokena}\NC@find \tabu@rewritemiddle
+}% NC@rewrite@\tabu@rewritefirst
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\tabu@rewritemiddle}
+% \begin{macro}{\tabu@rewritelast}
+%
+% This new column type is rewritten after \textt X columns, because it is declared by
+% when the column \cs\tabu@rewritefirst is actually rewritten. In the case where \cs\tabu@target
+% is $>0$ (either because of ``\textt{tabu to}'' or ``\textt{tabu spread}'' has been called)
+% and if there is no \textt X column, then \textt{@\M*{\cs\extracolsep\cs{@flushglue}}} is added
+% at the beginning of the preamble.
+%
+% To avoid duplicate margin in the \textt{tabu} we have to test the next token in the preamble.
+% If the next token is \textt\textbar\ or \textt !\ then no margin must be added and
+% \textt{@\M*{\cs\extracolsep\cs{@flushglue}}} can be inserted at the beginning of the preamble.
+%
+% Otherwise, we must insert \textt{!\M*{\cs\extracolsep\cs{@flushglue}}} in order to keep the margin.
+%
+% \cs\tabu@rewritelast column type is loaded by \cs\tabu@rewritefirst column type, only inside the \cs\@mkpream
+% group inside the \textt{tabu} environment.
+%
+% \begin{macrocode}
+\tabu@newcolumntype \tabu@rewritemiddle{%
+ \edef\tabu@temp{\the\@temptokena}\NC@find \tabu@rewritelast
+}% \NC@rewrite@\tabu@rewritemiddle
+\tabu@newcolumntype \tabu@rewritelast{%
+ \ifx \tabu@temp\tabu@prev \advance\tabu@cnt \m@ne
+ \NC@list\expandafter{\tabu@NC@list \NC@do \tabu@rewritemiddle
+ \NC@do \tabu@rewritelast}%
+ \else \let\tabu@prev\tabu@temp
+ \fi
+ \ifcase \tabu@cnt \expandafter\tabu@endrewrite
+ \else \expandafter\NC@find \expandafter\tabu@rewritemiddle
+ \fi
+}% \NC@ewrite@\tabu@rewritelast
+% \end{macrocode}
+% \end{macro}
+% \end{macro}
+%
+% \subsubsection{The end of the rewritting process: determining the \env{tabu} strategy}
+%¤<package>%% Choosing the strategy --------------------------------------------
+%
+% \begin{macro}{\tabu@endrewrite}
+%
+% Determines the strategy to be executed \cs\aftergroup (at the closing of the \cs\@mkpream group):
+% \begin{enumerate}[label=\arabic*),first=0]
+% \item There is no real strategy: \env{tabu} behaves like \env{tabular}, there no \textt X column,
+% and no need to measure the vertical dimensions of the cells (no dynamic spacing, no vertical leader).
+% In case a target has been given to \env{tabu}, it behaves like \env{tabular*} and a infinite stretchability
+% is given to the column inter-space. This is done (if required) by \cs\tabu@extracolsep.
+% \item Measuring natural width of some (or all) columns is compulsory for \env{tabu spread} of \textt X columns
+% with negativ coefficients. Thereafter, the strategy nr 2 will bring into play.
+% \item Measuring the natural width is not necessary, or has been done before. But \env{tabu} contains \textt X columns
+% and trials have to be performed to reach the desired target, adjusting the \cs\tabucolX dimension accordingly.
+% Then, the strategy nr 3 may bring into play, if vertical measure is required.
+% \item Vertical measure of the cells is required, for vertical spacing adjustment or vertical leaders.
+% This step can be done only if the width are known.
+% \item [$>3$] The \env{tabu} is finished and ready to be printed !!
+% \end{enumerate}
+%
+% \begin{macrocode}
+\def\tabu@endrewrite {%
+ \let\tabu@temp \NC@find
+ \ifx \@arrayright\relax \let\@arrayright \@empty \fi
+ \count@=%
+ \ifx \@finalstrut\@gobble \z@ % outer in mode 0 print
+ \iftabu@measuring
+ \xdef\tabu@mkpreambuffer{\tabu@mkpreambuffer
+ \tabu@target \csname tabu@\the\tabu@nested.T\endcsname
+ \tabucolX \csname tabu@\the\tabu@nested.X\endcsname
+ \edef\@halignto {\ifx\@arrayright\@empty to\tabu@target\fi}}%
+ \fi
+ \else\iftabu@measuring 4 % X columns
+ \xdef\tabu@mkpreambuffer{\tabu@{\tabu@mkpreambuffer
+ \tabu@target \the\tabu@target
+ \tabu@spreadtarget \the\tabu@spreadtarget}%
+ \def\noexpand\tabu@Xcoefs{\tabu@Xcoefs}%
+ \edef\tabu@halignto{\ifx \@arrayright\@empty to\tabu@target\fi}}%
+ \let\tabu@Xcoefs \relax
+ \else\ifcase\tabu@nested \thr@@ % outer, no X
+ \global\let\tabu@afterendpar \relax
+ \else \@ne % inner, no X, outer in mode 1 or 2
+ \fi
+ \ifdefined\tabu@usetabu
+ \else \ifdim\tabu@target=\z@
+ \else \let\tabu@temp \tabu@extracolsep
+ \fi\fi
+ \fi
+ \fi
+ \xdef\tabu@mkpreambuffer{\count@ \the\count@ \tabu@mkpreambuffer}%
+ \tabu@temp
+}% \tabu@endrewrite
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\tabu@extracolsep}
+%
+% Inserts \cs\extracolsep\cs\@flushglue in front of the preamble, unless another value for
+% \cs\extracolsep has been specified.
+%
+% \cs\@flushglue is \textt{0pt plus 1fil}.
+%
+% \begin{macrocode}
+\def\tabu@extracolsep{\@defaultunits \expandafter\let
+ \expandafter\tabu@temp \expandafter=\the\@temptokena \relax\@nnil
+ \ifx \tabu@temp\@sptoken
+ \expandafter\tabu@gobblespace \expandafter\tabu@extracolsep
+ \else
+ \edef\tabu@temp{\noexpand\NC@find
+ \if |\noexpand\tabu@temp @%
+ \else\if !\noexpand\tabu@temp @%
+ \else !%
+ \fi\fi
+ {\noexpand\extracolsep\noexpand\@flushglue}}%
+ \fi
+ \tabu@temp
+}% \tabu@extrac@lsep
+% \end{macrocode}
+% \end{macro}
+%
+%
+% \subsection{Implementing the strategy at the exit of the \cs{@mkpream} group}
+% \label{implement the strategy}
+%¤<package>%% Implementing the strategy ----------------------------------------
+%
+% \subsubsection{\cs{tabu@select}}
+%
+% \begin{macro}{\tabu@pream}
+%
+% Triggered \cs\aftergroup by the rewritting of \cs\tabu@rewritefirst.
+%
+% The \cs\tabu@mkpreambuffer macro is expanded twice: first it injects \cs\count@ (the strategy number)
+% and \cs\tabu@nbcols, and redefines itself.
+%
+% Second -- and only if measurements are necessary -- it expands into the \emph{trials group}
+% to inject \cs\tabu@Xcoefs (the coefficients of \textt X columns), \cs\tabu@Xsum
+% (the sum of the absolute coefficients), \cs\tabu@target, \cs\tabu@spreadtarget, and
+% \cs\tabu@vertical, which is the number by which one have to increment the strategy number after
+% step $2$ (either $1$: then a last measure is done for the vertical dimensions, or $255$ then
+% the strategy number is $>3$ and \cs\tabu@strategy orders to finish.)
+%
+% \begin{macro}{\tabu@longpream}
+%
+% This is the \textt{long} version for \env{longtabu}: the material to collect
+% until \cs\@preamble is different !
+%
+% \begin{macrocode}
+\long\def\tabu@pream #1\@preamble {%
+ \let\tabu@ \tabu@@ \tabu@mkpreambuffer \tabu@aftergroupcleanup
+ \NC@list\expandafter {\tabu@NC@list}% in case of nesting...
+ \ifdefined\tabu@usetabu \tabu@usetabu \tabu@target \z@ \fi
+ \let\tabu@savedpreamble \@preamble
+ \global\let\tabu@elapsedtime \relax
+ \tabu@thebody ={#1\tabu@aftergroupcleanup}%
+ \tabu@thebody =\expandafter{\the\expandafter\tabu@thebody
+ \@preamble}%
+ \edef\tabuthepreamble {\the\tabu@thebody}% ( no @ allowed for \scantokens )
+ \tabu@select
+}% \tabu@pream
+\long\def\tabu@longpream #1\LT@bchunk #2\LT@bchunk{%
+ \let\tabu@ \tabu@@ \tabu@mkpreambuffer \tabu@aftergroupcleanup
+ \NC@list\expandafter {\tabu@NC@list}% in case of nesting...
+ \let\tabu@savedpreamble \@preamble
+ \global\let\tabu@elapsedtime \relax
+ \tabu@thebody ={#1\LT@bchunk #2\tabu@aftergroupcleanup \LT@bchunk}%
+ \edef\tabuthepreamble {\the\tabu@thebody}% ( no @ allowed for \scantokens )
+ \tabu@select
+}% \tabu@longpream
+% \end{macrocode}
+% \end{macro}
+% \end{macro}
+%
+% \begin{macro}{\tabu@select}
+%
+% Here we check if trials are required or not: depending on the value of \cs\count@ (set at \cs\tabu@endrewrite, and
+% \emph{injected} here by \cs\tabu@mkpreambuffer), on \cs\iftabu@measuring (nested trials).
+%
+% When trials are required, \cs\tabu@select give control to \cs\tabu@setstrategy (to prepare the neutralisation of commands, save counters etc).
+%
+% When trials are not required, we just have to expand \cs\tabuthepreamble, after having set up the \cs\everyrow stuff properly
+% (for vertical adjustment or vertical measure, if needed).
+%
+% \begin{macrocode}
+\def\tabu@select {%
+ \ifnum\tabu@nested>\z@ \tabuscantokensfalse \fi
+ \ifnum \count@=\@ne \iftabu@measuring \count@=\tw@ \fi\fi
+ \ifcase \count@
+ \global\let\tabu@elapsedtime \relax
+ \tabu@seteverycr
+ \expandafter \tabuthepreamble % vertical adjustment (inheritated from outer)
+ \or % exit in vertical measure + struts per cell because no X and outer in mode 3
+ \tabu@evr{\tabu@verticalinit}\tabu@celllalign@def{\tabu@verticalmeasure}%
+ \def\tabu@cellralign{\tabu@verticalspacing}%
+ \tabu@seteverycr
+ \expandafter \tabuthepreamble
+ \or % exit without measure because no X and outer in mode 4
+ \tabu@evr{}\tabu@celllalign@def{}\let\tabu@cellralign \@empty
+ \tabu@seteverycr
+ \expandafter \tabuthepreamble
+ \else % needs trials
+ \tabu@evr{}\tabu@celllalign@def{}\let\tabu@cellralign \@empty
+ \tabu@savecounters
+ \expandafter \tabu@setstrategy
+ \fi
+}% \tabu@select
+\def\tabu@@ {\gdef\tabu@mkpreambuffer}
+% \end{macrocode}
+% \end{macro}
+%
+% \subsubsection{General setup for trials: neutralisation of \cs{write} etc.}%
+%¤<package>%% Protections to set up before trials ------------------------------
+%
+% \begin{macro}{\tabu@setstrategy}
+%
+% This is the general setup for trials: the \env{tabu} will be expanded more than once,
+% thus some protections are set: the value of global counters are saved, footnotes
+% have a special setup, \cs\hbadness and \cs\hfuzz are neutralised etc.
+%
+% The initial value for \cs\tabucolX is computed with the coefficients stored
+% into \cs\tabu@Wvoefs:
+% \centerline{\cs{tabu@}\M*{coef1} \cs{tabu@}\M*{coef2} \cs{tabu@}\M*{coef3} etc.}
+%
+% is very suitable for loops on the column width coefficients (without the need of \cs\@for or whatsoever).
+%
+% \begin{macrocode}
+\def\tabu@setstrategy {\begingroup % <trials group>
+ \tabu@trialh@@k \tabu@cnt \z@ % number of trials
+ \hbadness \@M \let\hbadness \@tempcnta
+ \hfuzz \maxdimen \let\hfuzz \@tempdima
+ \let\write \tabu@nowrite\let\GenericError \tabu@GenericError
+ \let\savetabu \@gobble \let\tabudefaulttarget \linewidth
+ \let\@footnotetext \@gobble \let\@xfootnote \tabu@xfootnote
+ \let\color \tabu@nocolor\let\rowcolor \tabu@norowcolor
+ \let\tabu@aftergroupcleanup \relax % only after the last trial
+ \tabu@mkpreambuffer
+ \ifnum \count@>\thr@@ \let\@halignto \@empty \tabucolX@init
+ \def\tabu@lasttry{\m@ne\p@}\fi
+ \begingroup \iffalse{\fi \ifnum0=`}\fi
+ \toks@{}\def\tabu@stack{b}\iftabuscantokens \endlinechar=10 \obeyspaces \fi %
+ \tabu@collectbody \tabu@strategy %
+}% \tabu@setstrategy
\def\tabu@savecounters{%
- \def\@elt##1{\global\value{##1}\the\value{##1}\relax}%
- \edef\tabu@global@X {\cl@@ckpt}\let\@elt \relax
+ \def\@elt ##1{\csname c@##1\endcsname\the\csname c@##1\endcsname}%
+ \edef\tabu@clckpt {\begingroup \globaldefs=\@ne \cl@@ckpt \endgroup}\let\@elt \relax
}% \tabu@savecounters
+\def\tabucolX@init {% \tabucolX <= \tabu@target / (sum coefs > 0)
+ \dimen@ \z@ \tabu@Xsum \z@ \tabucolX \z@ \let\tabu@ \tabu@Xinit \tabu@Xcoefs
+ \ifdim \dimen@>\z@
+ \@tempdima \dimexpr \tabu@target *\p@/\dimen@ + \tabu@hfuzz\relax
+ \ifdim \tabucolX<\@tempdima \tabucolX \@tempdima \fi
+ \fi
+}% \tabucolX@init
+\def\tabu@Xinit #1#2{\tabu@Xcol #1 \advance \tabu@Xsum
+ \ifdim #2\p@>\z@ #2\p@ \advance\dimen@ #2\p@
+ \else -#2\p@ \tabu@negcoeftrue
+ \@tempdima \dimexpr \tabu@target*\p@/\dimexpr-#2\p@\relax \relax
+ \ifdim \tabucolX<\@tempdima \tabucolX \@tempdima \fi
+ \tabu@wddef{#1}{0pt}%
+ \fi
+}% \tabu@Xinit
% \end{macrocode}
% \end{macro}
%
-% \begin{macro}{\tabuDisableCommands}
+% \subsubsection{Collecting the \textt{tabu} body}
+%¤<package>%% Collecting the environment body ----------------------------------
+%
+% The macro collect the stuff inside \cs\@array: depending on the global vertical alignment
+% parameter for the whole tabular, the tabular is built inside a \cs\vbox, \cs\vtop or \cs\vcenter
+% (the default -- unless \env{tabu} is nested).
+%
+% At this time, we define \cs\tabu@trial (which inherits from the \cs\vbox, \cs\vtop or \cs\vcenter)
+% and \cs\tabu@Xfinish as well.
+%
+% \begin{macro}{\tabu@collectbody}
+% \begin{macro}{\tabu@endofcollect}
+%
+% The mechanism is the same as \hologo{AmS}-\cs\collect@body (also defined in \xfile{environ.sty}).
+% The content of the tabular is captured inside \cs\toks@, expanded by \cs\tabu@trial.
+%
+% \begin{macrocode}
+\long\def\tabu@collectbody #1#2\end #3{%
+ \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}%
+ \iftabuscantokens \def\tabu@endenvir{\let\endarray \@empty
+ \end{#3}\tabu@gobbleX}%
+ \else \def\tabu@endenvir{\end{#3}}\fi}%
+ \let\tabu@collectbody \tabu@endofcollect
+ \else\def\tabu@temp{#3}%
+ \ifx \tabu@temp\@empty \toks@\expandafter{\the\toks@ #2\end }%
+ \else \ifx\tabu@temp\tabu@@spxiii \toks@\expandafter{\the\toks@ #2\end #3}%
+ \else \ifx\tabu@temp\tabu@X \toks@\expandafter{\the\toks@ #2\end #3}%
+ \else \toks@\expandafter{\the\toks@ #2\end{#3}}%
+ \fi\fi\fi
+ \fi
+ \tabu@collectbody{#1}%
+}% \tabu@collectbody
+\long\def\tabu@pushbegins#1\begin#2{\ifx\end#2\else b\expandafter\tabu@pushbegins\fi}%
+\def\tabu@endofcollect #1{\ifnum0=`{}\fi
+ \expandafter\endgroup \the\toks@ #1%
+}% \tabu@endofcollect
+% \end{macrocode}
+% \end{macro}
+% \end{macro}
+%
+% \subsection{One trial after the other (\cs{tabu@strategy})}
+% \label{One trial after the other}
+%¤<package>%% The trials: switching between strategies -------------------------
+%
+% \subsubsection{Switching between the strategies}
%
+% \begin{macro}{\tabu@strategy}
%
+% This macro does some specific setup depending on the strategy ($1$, $2$ or $3$),
+% and orders to finish when all measurements are done.
+%
+% This consists in a switch (\cs{ifcase}) which is done before the trials by \cs\tabu@strategy,
+% and after the trials by \cs\tabu@endtrial.
%
% \begin{macrocode}
-\let\tabu@TRIAL@hook \@empty
-\newcommand\tabuDisableCommands[1]{\g@addto@macro\tabu@TRIAL@hook {#1}}
+\def\tabu@strategy {\relax % stops \count@ assignment !
+ \ifcase\count@ % case 0 = print with vertical adjustment (outer is finished)
+ \expandafter \tabu@endoftrials
+ \or % case 1 = exit in vertical measure (outer in mode 3)
+ \expandafter\xdef\csname tabu@\the\tabu@nested.T\endcsname{\the\tabu@target}%
+ \expandafter\xdef\csname tabu@\the\tabu@nested.X\endcsname{\the\tabucolX}%
+ \expandafter \tabu@endoftrials
+ \or % case 2 = exit with a rule replacing the table (outer in mode 4)
+ \expandafter \tabu@quickend
+ \or % case 3 = outer is in mode 3 because of no X
+ \begingroup
+ \tabu@evr{\tabu@verticalinit}\tabu@celllalign@def{\tabu@verticalmeasure}%
+ \def\tabu@cellralign{\tabu@verticalspacing}%
+ \expandafter \tabu@measuring
+ \else % case 4 = horizontal measure
+ \begingroup
+ \global\let\tabu@elapsedtime \tabu@message@etime
+ \long\def\multicolumn##1##2##3{\multispan{##1}}%
+ \let\tabu@startpboxORI \@startpbox
+ \iftabu@spread
+ \def\tabu@naturalXmax {\z@}%
+ \let\tabu@naturalXmin \tabu@naturalXmax
+ \tabu@evr{\global\tabu@naturalX \z@}%
+ \let\@startpbox \tabu@startpboxmeasure
+ \else\iftabu@negcoef
+ \let\@startpbox \tabu@startpboxmeasure
+ \else \let\@startpbox \tabu@startpboxquick
+ \fi\fi
+ \expandafter \tabu@measuring
+ \fi
+}% \tabu@strategy
% \end{macrocode}
% \end{macro}
%
+% \begin{macro}{\tabu@measuring}
+%
+% Expands \cs\tabu@trial with the whole content of the environment stored in \cs\toks@ by \cs\tabu@collectbody.
%
-% \subsection{One trial after another}
+% At the end of the trial, \cs\count@ will be reassigned to the value it had before the trial.
+% Then \cs\tabu@endtrial will choose the algorithm depending on the strategy number, and
+% set the new strategy number (into \cs\count@ again) for the next step.
%
-% \begin{macro}{\tabu@arrayleftmeasure}
+% \begin{macro}{\tabu@trial}
%
-% Measuring the whole tabular occurs just before \cs{@arrayleft}.
-% Hence the name of the macro: \cs{tabu@arrayleft@measure}.
+% This is the starting point of trials: \cs\halign is expanded here.
%
-% \begin{macro}{\tabu@TRIAL}
+% \begin{macro}{\tabu@longtrial}
%
-% \cs{halign} is temporarily expanded inside a \cs{vbox} which is captured in \cs{tabu@box}.
+% This is the long version of \cs\tabu@trial for \env{longtabu}. Almost the same apart for the
+% math group and the end (a \env{longtable} environment does not finish with \cs\endarray).
%
% \begin{macrocode}
-\def\tabu@arrayleftmeasure#1\bgroup{%
- \def\tabu@Xfinish{%
- \tabu@global@Xnested \ifnum0=`{}\fi\endgroup
- \ifdim \abovetabulinesep>\z@ \setbox\@arstrutbox\box\voidb@x
- \else\ifdim\belowtabulinesep>\z@ \setbox\@arstrutbox\box\voidb@x
- \fi\fi
- \tabu@global@X #1\bgroup}%
- \def\tabu@TRIAL {\setbox\tabu@box \hbox\bgroup $#1\bgroup
- \the\toks@ \tabu@endTRIAL}%
- \toks@{\tabu@setup@everycr
- \let\@preamble \tabu@savedpreamble}% <required for multicolumn>
- \tabu@collect
-}% \tabu@arrayleftmeasure
+\def\tabu@measuring{\expandafter \tabu@trial \expandafter
+ \count@ \the\count@ \tabu@endtrial
+}% \tabu@measuring
+\def\tabu@trial{\iftabu@long \tabu@longtrial \else \tabu@shorttrial \fi}
+\def\tabu@shorttrial {\setbox\tabu@box \hbox\bgroup \tabu@seteverycr
+ \ifx \tabu@savecounters\relax \else
+ \let\tabu@savecounters \relax \tabu@clckpt \fi
+ $\iftabuscantokens \tabu@rescan \else \expandafter\@secondoftwo \fi
+ \expandafter{\expandafter \tabuthepreamble
+ \the\tabu@thebody
+ \csname tabu@adl@endtrial\endcsname
+ \endarray}$\egroup % got \tabu@box
+}% \tabu@shorttrial
+\def\tabu@longtrial {\setbox\tabu@box \hbox\bgroup \tabu@seteverycr
+ \ifx \tabu@savecounters\relax \else
+ \let\tabu@savecounters \relax \tabu@clckpt \fi
+ \iftabuscantokens \tabu@rescan \else \expandafter\@secondoftwo \fi
+ \expandafter{\expandafter \tabuthepreamble
+ \the\tabu@thebody
+ \LT@echunk
+ \global\setbox\@ne \hbox{\unhbox\@ne}\kern\wd\@ne
+ \LT@get@widths}\egroup % got \tabu@box
+}% \tabu@longtrial
+\def\tabu@adl@endtrial{% <arydshln in nested trials - problem for global column counters!>
+ \crcr \noalign{\global\adl@ncol \tabu@nbcols}}% anything global is crap, junky and fails !
% \end{macrocode}
% \end{macro}
% \end{macro}
+% \end{macro}
%
-% \begin{macro}{\tabu@long@arrayleft@measure}
+% \begin{macro}{\tabu@seteverycr}
%
-% This is the long version for \textt{longtabu}
+% \cs\ialign resets \cs\everycr to an empty token. This macro sets \cs\everycr for the
+% \env*{tabu} : a \emph{bridge} around \cs\ialign is built: \cs\everycr redefines itself
+% \cs\afterassignment !
%
% \begin{macrocode}
-\long\def\tabu@long@arrayleft@measure #1\LT@bchunk #2\LT@bchunk{%
- \def\tabu@Xfinish{%
- \tabu@global@Xnested \ifnum0=`{}\fi\endgroup
- \tabu@setup@everycr \let\@preamble \tabu@savedpreamble
- \tabu@global@X #1\LT@bchunk #2\LT@bchunk}%
- \def\tabu@TRIAL{%
- \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@long@endTRIAL}%
- \toks@{}%\let\LT@output\relax
- \tabu@collect
-}% \tabu@long@arrayleft@measure
-\def\tabu@long@endTRIAL{%
- \LT@echunk
- \global\setbox\@ne \hbox{\unhbox\@ne}\kern\wd\@ne
- \LT@get@widths
- \egroup % got \tabu@box
- \iftabu@spread \tabu@spreadarith % <only once>
- \else \tabu@arith
- \fi
- \iftabu@measuring \tabu@measuringfalse
- \expandafter \tabu@TRIAL % <continue trials>
- \else
- \expandafter \tabu@Xfinish
- \the \expandafter\toks@ \tabu@endenvir % <we are then!>
- \fi
-}% \tabu@long@endTRIAL
+\def\tabu@seteverycr {\tabu@reset
+ \everycr \expandafter{\the\everycr \tabu@everycr}%
+ \let\everycr \tabu@noeverycr % <for ialign>
+}% \tabu@seteverycr
+\def\tabu@noeverycr{{\aftergroup\tabu@restoreeverycr \afterassignment}\toks@}
+\def\tabu@restoreeverycr {\let\everycr \tabu@@everycr}
+\def\tabu@everycr {\iftabu@everyrow \noalign{\tabu@everyrow}\fi}
% \end{macrocode}
% \end{macro}
%
+% \begin{macro}{\tabu@endoftrials}
+%
+% When the algorithm said the tabular was ready to be printed, \cs\tabu@endoftrials
+% closes the trials group and prints the tabular...
%
-% \begin{macro}{\tabu@collect}
+% The required values (column widths, struts etc.) are \emph{injected} into the group
+% by the mean of the buffer \cs\tabu@bufferX (locally defined).
%
-% The mechanism is the same as \hologo{AmS}-\cs{collect@body} (also defined in \xfile{environ.sty}).
-% The content of the tabular is captured inside \cs{toks@}, expanded by \cs{tabu@TRIAL}.
+% \begin{macro}{\tabu@closetrialsgroup}
+%
+% This closes the group in which all the trials are done.
%
% \begin{macrocode}
-\def\tabu@collect{\catcode`\^^@=13\def\tabu@stack{b}\tabu@collectbody}
-\long\def\tabu@collectbody#1\end#2{%
- \edef\tabu@stack{\tabu@pushbegins #1\begin\end\expandafter\@gobble\tabu@stack}%
- \ifx \tabu@stack\@empty
- \toks@\expandafter{\the\toks@#1}\def\tabu@endenvir{\end{#2}}%
- \expandafter \tabu@TRIAL
- \else
- \toks@\expandafter{\the\toks@#1\end{#2}}%
- \expandafter \tabu@collectbody
- \fi
-}% \tabu@collectbody
-\long\def\tabu@pushbegins#1\begin#2{%
- \ifx\end#2\else b\expandafter\tabu@pushbegins\fi}
+\def\tabu@endoftrials {%
+ \iftabuscantokens \expandafter\@firstoftwo
+ \else \expandafter\@secondoftwo
+ \fi
+ {\expandafter \tabu@closetrialsgroup \expandafter
+ \tabu@rescan \expandafter{%
+ \expandafter\tabuthepreamble
+ \the\tabu@thebody
+ \endarray}}
+ {\expandafter\tabu@closetrialsgroup \expandafter
+ \tabuthepreamble
+ \the\tabu@thebody}%
+ \tabu@endenvir % Finish !
+}% \tabu@endoftrials
+\def\tabu@closetrialsgroup {%
+ \toks@\expandafter{\tabu@endenvir}%
+ \edef\tabu@bufferX{\endgroup
+ \tabucolX \the\tabucolX
+ \tabu@target \the\tabu@target
+ \tabu@cnt \the\tabu@cnt
+ \def\noexpand\tabu@endenvir{\the\toks@}%
+ %Quid de \@halignto = \tabu@halignto ??
+ }% \tabu@bufferX
+ \tabu@bufferX
+ \ifcase\tabu@nested % print out (outer in mode 0)
+ \global\tabu@cnt \tabu@cnt
+ \tabu@evr{\tabu@verticaldynamicadjustment}%
+ \tabu@celllalign@def{\everypar{}}\let\tabu@cellralign \@empty
+ \let\@finalstrut \@gobble
+ \else % vertical measure of nested tabu
+ \tabu@evr{\tabu@verticalinit}%
+ \tabu@celllalign@def{\tabu@verticalmeasure}%
+ \def\tabu@cellralign{\tabu@verticalspacing}%
+ \fi
+ \tabu@clckpt \let\@halignto \tabu@halignto
+ \let\@halignto \@empty
+ \tabu@seteverycr
+ \ifdim \tabustrutrule>\z@ \ifnum\tabu@nested=\z@
+ \setbox\@arstrutbox \box\voidb@x % force \@arstrutbox to be rebuilt (visible struts)
+ \fi\fi
+}% \tabu@closetrialsgroup
% \end{macrocode}
% \end{macro}
+% \end{macro}
+%
+% \begin{macro}{\tabu@quickend}
+%
+% Quick exit after having measuring the natural width of a nested \env{tabu}.
%
+% \begin{macrocode}
+\def\tabu@quickend {\expandafter \endgroup \expandafter
+ \tabu@target \the\tabu@target \tabu@quickrule
+ \let\endarray \relax \tabu@endenvir
+}% \tabu@quickend
+% \end{macrocode}
%
-% \begin{macro}{\tabu@endTRIAL}
+% \end{macro}
%
-% At the end of the trial, we call \cs{tabu@arith} to compute the widths. \cs{tabu@arith} exits
-% leaving \cs{iftabu@measuring} equal to \cs{iftrue}: a further trial is necessary, or equal to
-% \cs{iffalse}: the target is reached, \cs{tabu@Xfinish} can print the \textt{tabu} in a last
-% expansion of \cs{halign}.
+% \begin{macro}{\tabu@endtrial}
+%
+% Depending on the strategy that was just applied, \cs\tabu@endtrial
+% chooses the algorithm and determines the number of the strategy for the next step.
%
% \begin{macrocode}
-\def\tabu@endTRIAL{%
- \tabu@adl@endTRIAL % <arydshln in nested trials>
- \endarray$\egroup
- \iftabu@spread \tabu@spreadarith % <only once>
- \else \tabu@arith
- \fi
- \iftabu@measuring \tabu@measuringfalse
- \expandafter \tabu@TRIAL % <continue trials>
- \else
- \expandafter \tabu@Xfinish
- \the \expandafter\toks@ \tabu@endenvir % <we are then!>
- \fi
-}% \tabu@endTRIAL
-\def\tabu@adl@endTRIAL{\crcr \noalign{\global\adl@ncol \tabu@nbcols}}
+\def\tabu@endtrial {\relax % stops \count@ assignment !
+ \ifcase \count@ \tabu@err % case 0 = impossible here
+ \or \tabu@err % case 1 = impossible here
+ \or \tabu@err % case 2 = impossible here
+ \or % case 3 = outer goes into mode 0
+ \def\tabu@bufferX{\endgroup}\count@ \z@
+ \else % case 4 = outer goes into mode 3
+ \iftabu@spread \tabu@spreadarith % inner into mode 1 (outer in mode 3)
+ \else \tabu@arith % or 2 (outer in mode 4)
+ \fi
+ \count@=%
+ \ifcase\tabu@nested \thr@@ % outer goes into mode 3
+ \else\iftabu@measuring \tw@ % outer is in mode 4
+ \else \@ne % outer is in mode 3
+ \fi\fi
+ \edef\tabu@bufferX{\endgroup
+ \tabucolX \the\tabucolX
+ \tabu@target \the\tabu@target}%
+ \fi
+ \expandafter \tabu@bufferX \expandafter
+ \count@ \the\count@ \tabu@strategy
+}% \tabu@endtrial
+\def\tabu@err{\errmessage{(tabu) Internal impossible error! (\count@=\the\count@)}}
% \end{macrocode}
% \end{macro}
%
%
+% \subsection{The algorithms: Measuring the \env{tabu} box}
+% \label{The algorithms: Measuring the tabubox}
+%¤<package>%% The algorithms: compute the widths / stop or go on ---------------
+%
+% At the end of each trial, we call \cs\tabu@arith (or \cs\tabu@spreadarith)
+% to computes the widths and update the values.
+%
+% At the exit, \cs\iftabu@measuring is set to \cs\iftrue: a further trial is necessary,
+% or \cs\iffalse: the target width is reached.
+%
+% \subsubsection(Algorithm for tabu to){The arithmetic of \textt X columns: the \textt{tabu to} case}
%
-% \subsection{Algorithms: Measuring the \textt{tabu}}
+% \begin{macro}{\tabu@arithnegcoef}
%
-% \subsubsection(Algorithm for tabu to){The arithmetic of \textt X columns}
+% This is a loop against the width coefficients. There is no \cs\@for or \cs\@whiles because
+% \cs\tabu@Xcoefs stores the series in the form: \cs\tabu@\M*{coef1} \cs\tabu@\M*{coef2} \cs\tabu@\M*{coef3}.
+%
+% Thus, just \cs\let\cs\tabu@ to be \cs\tabu@arith@negcoef and expand \cs\tabu@Xcoefs !
+%
+% The aim of the game is to \emph{neutralize} some \textt X columns: when their natural width
+% are less than $\text{coef}\times $\cs\tabucolX.
+%
+% \begin{macrocode}
+\def\tabu@arithnegcoef {%
+ \@tempdima \z@ \dimen@ \z@ \let\tabu@ \tabu@arith@negcoef \tabu@Xcoefs
+}% \tabu@arithnegcoef
+\def\tabu@arith@negcoef #1#2{%
+ \ifdim #2\p@>\z@ \advance\dimen@ #2\p@ % saturated by definition
+ \advance\@tempdima #2\tabucolX
+ \else
+ \ifdim -#2\tabucolX <\tabu@wd{#1}% c_i X < natural width <= \tabu@target-> saturated
+ \advance\dimen@ -#2\p@
+ \advance\@tempdima -#2\tabucolX
+ \else
+ \advance\@tempdima \tabu@wd{#1}% natural width <= c_i X => neutralised
+ \ifdim \tabu@wd{#1}<\tabu@target \else % neutralised
+ \advance\dimen@ -#2\p@ % saturated (natural width = tabu@target)
+ \fi
+ \fi
+ \fi
+}% \tabu@arith@negcoef
+% \end{macrocode}
+% \end{macro}
%
% \begin{macro}{\tabu@arith}
%
% General algorithms for \textt{tabu to} with \textt X columns.
%
% \begin{macrocode}
-\def\tabu@arith{%
- \advance\tabu@cnt \@ne \tabu@message{\tabu@message@arith}%
- \ifx \@startpbox\tabu@measure@startpbox
- \let\@startpbox \tabu@startpboxORI \fi
- \dimen@ \tabu@X@sum
- \iftabu@negcoef \tabu@arith@negcoef \fi
- \ifcase 0\ifdim \dimexpr\wd\tabu@box-\tabu@hfuzz-1sp<\tabu@target
- \else \ifdim \tabu@lasttry=\wd\tabu@box 1\else
- 2\fi\fi\relax
- \ifdim \tabu@X@sum=\dimen@ \tabu@message{\tabu@message@reached}%
- \else\ifdim\tabu@X@sum=\z@ \tabu@message{\tabu@message@reached}%
- \else\ifnum \tabu@cnt>\@ne \tabu@message{\tabu@message@reached}%
- \else \tabu@measuringtrue
- \tabucolX = \dimexpr\tabucolX*\p@/\tabu@X@sum\relax
- \fi\fi\fi
- \or \tabu@message{\tabu@header Reached minimum width. Backing up}%
- \tabu@warn{tabu width = \the\wd\tabu@box\space>
- \the\tabu@target\space+ \tabu@hfuzz}%
- \or
- \ifdim \tabu@X@sum=\z@ \tabu@measuringtrue \tabucolX=\@tempdima
- \else
- \advance\tabucolX-\dimexpr(\wd\tabu@box-\tabu@target-.5\tabu@X@sum/\p@)
- *\p@/\tabu@X@sum\relax
- \ifdim \tabucolX<\z@
- \tabu@warn{X Columns too narrow (table too wide)}%
- \tabucolX=\tabucolX@error
- \else \tabu@measuringtrue
- \ifdim \tabu@X@sum=\dimen@
- \edef\tabu@lasttry{\the\wd\tabu@box}%
+\def\tabu@givespace #1#2{% here \tabu@DELTA < \z@
+ \ifdim \@tempdima=\z@
+ \tabu@wddef{#1}{\the\dimexpr -\tabu@DELTA*\p@/\tabu@Xsum}%
+ \else
+ \tabu@wddef{#1}{\the\dimexpr \tabu@hsize{#1}{#2}
+ *(\p@ -\tabu@DELTA*\p@/\@tempdima)/\p@\relax}%
+ \fi
+}% \tabu@givespace
+\def\tabu@arith {\advance\tabu@cnt \@ne
+ \ifnum \tabu@cnt=\@ne \tabu@message{\tabu@titles}\fi
+ \tabu@arithnegcoef
+ \@tempdimb \dimexpr \wd\tabu@box -\@tempdima \relax % <incompressible material>
+ \tabu@DELTA = \dimexpr \wd\tabu@box - \tabu@target \relax
+ \tabu@message{\tabu@message@arith}%
+ \ifdim \tabu@DELTA <\tabu@hfuzz
+ \ifdim \tabu@DELTA<\z@ % wd (tabu)<\tabu@target ?
+ \let\tabu@ \tabu@givespace \tabu@Xcoefs
+ \advance\@tempdima \@tempdimb \advance\@tempdima -\tabu@DELTA % for message
+ \else % already converged: nothing to do but nearly impossible...
+ \fi
+ \tabucolX \maxdimen
+ \tabu@measuringfalse
+ \else % need for narrower X columns
+ \tabucolX =\dimexpr (\@tempdima -\tabu@DELTA) *\p@/\tabu@Xsum \relax
+ \tabu@measuringtrue
+ \@whilesw \iftabu@measuring\fi {%
+ \advance\tabu@cnt \@ne
+ \tabu@arithnegcoef
+ \tabu@DELTA =\dimexpr \@tempdima+\@tempdimb -\tabu@target \relax % always < 0 here
+ \tabu@message{\tabu@header
+ \tabu@msgalign \tabucolX { }{ }{ }{ }{ }\@@
+ \tabu@msgalign \@tempdima+\@tempdimb { }{ }{ }{ }{ }\@@
+ \tabu@msgalign \tabu@target { }{ }{ }{ }{ }\@@
+ \tabu@msgalign@PT \dimen@ { }{}{}{}{}{}{}\@@
+ \ifdim -\tabu@DELTA<\tabu@hfuzz \tabu@spaces target ok\else
+ \tabu@msgalign \dimexpr -\tabu@DELTA *\p@/\dimen@ {}{}{}{}{}\@@
+ \fi}%
+ \ifdim -\tabu@DELTA<\tabu@hfuzz
+ \advance\@tempdima \@tempdimb % for message
+ \tabu@measuringfalse
\else
- \ifnum \tabu@cnt>\@ne \edef\tabu@lasttry{\the\wd\tabu@box}\fi
- \ifdim \tabucolX<\@tempdima \tabucolX \@tempdima\fi
+ \advance\tabucolX \dimexpr -\tabu@DELTA *\p@/\dimen@ \relax
\fi
- \fi
- \fi
- \fi %(ifcase)
- \iftabu@measuring
- \else \edef\tabu@global@X{\tabu@global@X
- \tabucolX \the\tabucolX\relax
- \tabu@target \the\tabu@target\relax % < for \savetabu >
- \ifnum \tabu@nested=\z@
- \ifx \@arrayright\@empty
- \ifdim \tabu@X@sum>\z@
- \def\noexpand\@halignto{to\the\tabu@target}\fi\fi\fi}%
- \fi
- \tabu@X@sum \dimen@
+ }%
+ \fi
+ \tabu@message{\tabu@message@reached}%
+ \edef\tabu@bufferX{\endgroup \tabu@cnt \the\tabu@cnt
+ \tabucolX \the\tabucolX
+ \tabu@target \the\tabu@target}%
}% \tabu@arith
-\def\tabu@arith@negcoef{%
- \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
- \csname tabu@X\the\tabu@X@cols\endcsname
- \ifdim \tabu@wd\tabu@X@cols <\tabu@temp\tabucolX
- \advance\tabu@X@sum -\tabu@temp\p@
- \tabu@message{\tabu@message@negcoef{\the\tabu@X@cols}}%
- \ifdim \tabu@wd\tabu@X@cols >\tabu@wd\count@ \count@ \tabu@X@cols \fi
- \fi\fi
- \advance\tabu@X@cols \@ne
- }%
- \@tempdima=\dimexpr\tabu@wd\count@ * \p@/
- \dimexpr\csname tabu@X\the\count@\endcsname\p@\relax\relax
-}% \tabu@arith@negcoef
% \end{macrocode}
% \end{macro}
%
@@ -3535,128 +5914,210 @@ lppl copyright 2010-2011 by FC <florent.chervet@free.fr>
%
% \begin{macro}{\tabu@spreadarith}
%
-% Algorithm for \textt{tabu spread} with \textt X columns: only the first pass.
-%
-% \begin{macrocode}
-\def\tabu@spreadarith{%
- \tabu@naturalX \tabu@naturalX@max\relax
- \tabucolX \tabu@naturalX@min\relax
- \tabu@message{\tabu@message@spread}%
- \ifdim \dimexpr \wd\tabu@box + \tabu@spreadtarget <\tabu@target
- \advance\tabu@spreadtarget
- \dimexpr\wd\tabu@box-\tabu@naturalX+\tabucolX\relax
- \ifdim \tabu@spreadtarget <\tabu@target
- \tabu@target =\tabu@spreadtarget
- \fi
- \tabu@message{\the\tabu@target}%
- \tabu@message{\ifdim \tabu@spreadtarget>\tabu@target
- (tabu) spread reduced to fit default target.\fi}%
- \else
- \tabu@message{\expandafter\tabu@msg@align \the\tabu@target { }{}{}{}{}\@@}
- \tabu@message{(tabu)\ifdim\wd\tabu@box<\tabu@target spread too large\else
- tabu spread is useless here\fi,
- default target used.}%
- \fi
- \let\@startpbox \tabu@startpboxORI
- \xdef\tabu@halignto {to\the\tabu@target}%
- \tabucolX \tabu@target
- \tabu@spreadfalse \tabu@measuringtrue
+% Algorithm for \textt{tabu spread} with \textt X columns: the aim of the game is to compute the
+% target (relative to the natural width of the tabular) and go to \cs\tabu@arith afterwards.
+%
+% \begin{macrocode}
+\def\tabu@spreadarith {%
+ \dimen@ \z@ \@tempdima \tabu@naturalXmax \let\tabu@ \tabu@spread@arith \tabu@Xcoefs
+ \edef\tabu@naturalXmin {\the\dimexpr\tabu@naturalXmin*\dimen@/\p@}%
+ \@tempdimc =\dimexpr \wd\tabu@box -\tabu@naturalXmax+\tabu@naturalXmin \relax
+ \iftabu@measuring
+ \tabu@target =\dimexpr \@tempdimc+\tabu@spreadtarget \relax
+ \edef\tabu@bufferX{\endgroup \tabucolX \the\tabucolX \tabu@target\the\tabu@target}%
+ \else
+ \tabu@message{\tabu@message@spreadarith}%
+ \ifdim \dimexpr \@tempdimc+\tabu@spreadtarget >\tabu@target
+ \tabu@message{(tabu) spread
+ \ifdim \@tempdimc>\tabu@target useless here: default target used%
+ \else too large: reduced to fit default target\fi.}%
+ \else
+ \tabu@target =\dimexpr \@tempdimc+\tabu@spreadtarget \relax
+ \tabu@message{(tabu) spread: New target set to \the\tabu@target^^J}%
+ \fi
+ \begingroup \let\tabu@wddef \@gobbletwo
+ \@tempdimb \@tempdima
+ \tabucolX@init
+ \tabu@arithnegcoef
+ \wd\tabu@box =\dimexpr \wd\tabu@box +\@tempdima-\@tempdimb \relax
+ \expandafter\endgroup \expandafter\tabucolX \the\tabucolX
+ \tabu@arith
+ \fi
}% \tabu@spreadarith
+\def\tabu@spread@arith #1#2{%
+ \ifdim #2\p@>\z@ \advance\dimen@ #2\p@
+ \else \advance\@tempdima \tabu@wd{#1}\relax
+ \fi
+}% \tabu@spread@arith
% \end{macrocode}
% \end{macro}
%
% \subsubsection(\xext{log} report){Reporting in the \xext{log} file (\textt{debugshow option})}
+%¤<package>%% Reporting in the .log file ---------------------------------------
+%
+% \begin{macro}{\tabu@message@defaulttarget}
+% \begin{macrocode}
+\def\tabu@message@defaulttarget{%
+ \ifnum\tabu@nested=\z@^^J(tabu) Default target:
+ \ifx\tabudefaulttarget\linewidth \string\linewidth
+ \ifdim \tabu@thetarget=\linewidth \else
+ -\the\dimexpr\linewidth-\tabu@thetarget\fi =
+ \else\ifx\tabudefaulttarget\linegoal\string\linegoal=
+ \fi\fi
+ \else (tabu) Default target (nested): \fi
+ \the\tabu@target \on@line
+ \ifnum\tabu@nested=\z@ , page \the\c@page\fi}
+\def\tabu@message@target {^^J(tabu) Target specified:
+ \the\tabu@target \on@line, page \the\c@page}
+% \end{macrocode}
+% \end{macro}
%
% \begin{macro}{\tabu@message@arith}
-% \begin{macro}{\tabu@message@spread}
+% \begin{macrocode}
+\def\tabu@message@arith {\tabu@header
+ \tabu@msgalign \tabucolX { }{ }{ }{ }{ }\@@
+ \tabu@msgalign \wd\tabu@box { }{ }{ }{ }{ }\@@
+ \tabu@msgalign \tabu@target { }{ }{ }{ }{ }\@@
+ \tabu@msgalign@PT \dimen@ { }{}{}{}{}{}{}\@@
+ \ifdim \tabu@DELTA<\tabu@hfuzz giving space\else
+ \tabu@msgalign \dimexpr (\@tempdima-\tabu@DELTA) *\p@/\tabu@Xsum -\tabucolX {}{}{}{}{}\@@
+ \fi
+}% \tabu@message@arith
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\tabu@message@spreadarith}
+% \begin{macrocode}
+\def\tabu@message@spreadarith {\tabu@spreadheader
+ \tabu@msgalign \tabu@spreadtarget { }{ }{ }{ }{}\@@
+ \tabu@msgalign \wd\tabu@box { }{ }{ }{ }{}\@@
+ \tabu@msgalign -\tabu@naturalXmax { }{}{}{}{}\@@
+ \tabu@msgalign \tabu@naturalXmin { }{ }{ }{ }{}\@@
+ \tabu@msgalign \ifdim \dimexpr\@tempdimc>\tabu@target \tabu@target
+ \else \@tempdimc+\tabu@spreadtarget \fi
+ {}{}{}{}{}\@@}
+% \end{macrocode}
+% \end{macro}
+%
% \begin{macro}{\tabu@message@negcoef}
% \begin{macrocode}
-\def\tabu@message@arith{\tabu@header
- \expandafter\tabu@msg@align \the\tabucolX { }{ }{ }{ }{}\@@
- \expandafter\tabu@msg@align \the\wd\tabu@box { }{ }{ }{ }{}\@@
- \expandafter\tabu@msg@align \the\tabu@target { }{ }{ }{ }{}\@@
- \expandafter\tabu@msg@align \the\tabu@X@sum {}{}{}{}{}\@@
- \ifx\@startpbox\tabu@measure@startpbox\tabu@spaces (coefs<0)\else
- \ifdim\tabu@X@sum>\z@
- \expandafter\tabu@msg@align \the\dimexpr(\tabu@target-\wd\tabu@box)
- *\p@/\tabu@X@sum\relax {}{}{}{}{}\@@\fi\fi^^J}%
-\def\tabu@message@spread{\tabu@spreadheader
- \expandafter\tabu@msg@align \the\tabu@spreadtarget {}{}{}{}{}\@@
- \expandafter\tabu@msg@align \the\wd\tabu@box {}{}{}{}{}\@@
- \expandafter\tabu@msg@align \the\tabucolX {}{}{}{}{}\@@
- \expandafter\tabu@msg@align \expandafter-\the\tabu@naturalX {}{}{}{}{}\@@}
+\def\tabu@message@negcoef #1#2{
+ \tabu@spaces\tabu@spaces\space * #1. X[\rem@pt#2]:
+ \space width = \tabu@wd {#1}
+ \expandafter\string\csname tabu@\the\tabu@nested.W\number#1\endcsname
+ \ifdim -\tabu@pt#2\tabucolX<\tabu@target
+ < \number-\rem@pt#2 X
+ = \the\dimexpr -\tabu@pt#2\tabucolX \relax
+ \else
+ <= \the\tabu@target\space < \number-\rem@pt#2 X\fi}
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\tabu@message@reached}
+% \begin{macrocode}
\def\tabu@message@reached{\tabu@header
- \expandafter\tabu@msg@align \the\tabucolX { }{ }{ }{ }{}\@@
- \expandafter\tabu@msg@align \the\wd\tabu@box {}{}{}{}{}\@@
- <\expandafter\tabu@msg@align \the\tabu@target { }{ }{ }{ }{}\@@
- + \tabu@hfuzz\space= hfuzz *****^^J%
- (tabu)\tabu@spaces******* Reached Target:
- hfuzz = \tabu@hfuzz\on@line\space *******^^J%
- \ifnum\tabu@nested=\z@ \tabu@elapsedtime ^^J\fi}%
-\def\tabu@message@etime{(tabu)\tabu@spaces
- Time elapsed for trials:
- \the\numexpr(\pdfelapsedtime-\tabu@starttime-32767)/65536\relax sec
- \the\numexpr\numexpr(\pdfelapsedtime-\tabu@starttime)
- -\numexpr(\pdfelapsedtime-\tabu@starttime-32767)/65536\relax*65536\relax
- *1000/65536\relax ms}%
-\def\tabu@message@negcoef #1{\tabu@spaces\tabu@spaces
- * #1. X[-\csname tabu@X#1\endcsname]: natural width
- = \tabu@wd{#1}
- < \csname tabu@X#1\endcsname X
- = \the\dimexpr\csname tabu@X#1\endcsname\tabucolX
-}% \tabu@message@negcoef
+ ******* Reached Target:
+ hfuzz = \tabu@hfuzz\on@line\space *******}
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\tabu@message@etime}
+% \begin{macrocode}
+\def\tabu@message@etime{\edef\tabu@stoptime{\the\pdfelapsedtime}%
+ \tabu@message{(tabu)\tabu@spaces Time elapsed during measure:
+ \the\numexpr(\tabu@stoptime-\tabu@starttime-32767)/65536\relax sec
+ \the\numexpr\numexpr(\tabu@stoptime-\tabu@starttime)
+ -\numexpr(\tabu@stoptime-\tabu@starttime-32767)/65536\relax*65536\relax
+ *1000/65536\relax ms \tabu@spaces(\the\tabu@cnt\space
+ cycle\ifnum\tabu@cnt>\@ne s\fi)^^J^^J}}
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\tabu@message@verticalsp}
+% \begin{macrocode}
+\def\tabu@message@verticalsp {%
+ \ifdim \@tempdima>\tabu@ht
+ \ifdim \@tempdimb>\tabu@dp
+ \expandafter\expandafter\expandafter\string\tabu@ht =
+ \tabu@msgalign \@tempdima { }{ }{ }{ }{ }\@@
+ \expandafter\expandafter\expandafter\string\tabu@dp =
+ \tabu@msgalign \@tempdimb { }{ }{ }{ }{ }\@@^^J%
+ \else
+ \expandafter\expandafter\expandafter\string\tabu@ht =
+ \tabu@msgalign \@tempdima { }{ }{ }{ }{ }\@@^^J%
+ \fi
+ \else\ifdim \@tempdimb>\tabu@dp
+ \tabu@spaces\tabu@spaces\tabu@spaces
+ \expandafter\expandafter\expandafter\string\tabu@dp =
+ \tabu@msgalign \@tempdimb { }{ }{ }{ }{ }\@@^^J\fi
+ \fi
+}% \tabu@message@verticalsp
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\tabu@message@save}
+% \begin{macrocode}
\edef\tabu@spaces{\@spaces}
-\def\do#1{%
- \def\tabu@msg@align##1.##2##3##4##5##6##7##8##9\@@{%
- \ifnum##1<10 #1 #1\else
- \ifnum##1<100 #1 \else
- \ifnum##1<\@m #1\fi\fi\fi
- ##1.##2##3##4##5##6##7##8#1}%
- \def\tabu@header{(tabu) \ifnum\tabu@cnt<10 #1\fi\the\tabu@cnt) #1}%
- \def\tabu@titles{\ifnum \tabu@nested=\z@
+\def\tabu@strippt{\expandafter\tabu@pt\the}
+{\@makeother\P \@makeother\T\lowercase{\gdef\tabu@pt #1PT{#1}}}
+\def\tabu@msgalign{\expandafter\tabu@msg@align\the\dimexpr}
+\def\tabu@msgalign@PT{\expandafter\tabu@msg@align\romannumeral-`\0\tabu@strippt}
+\def\do #1{%
+ \def\tabu@msg@align##1.##2##3##4##5##6##7##8##9\@@{%
+ \ifnum##1<10 #1 #1\else
+ \ifnum##1<100 #1 \else
+ \ifnum##1<\@m #1\fi\fi\fi
+ ##1.##2##3##4##5##6##7##8#1}%
+ \def\tabu@header{(tabu) \ifnum\tabu@cnt<10 #1\fi\the\tabu@cnt) }%
+ \def\tabu@titles{\ifnum \tabu@nested=\z@
(tabu) Try#1 #1 tabu X #1 #1 #1tabu Width #1 #1 Target
- #1 #1 #1 #1 Coefs #1 #1 #1 Update^^J\fi}%
- \def\tabu@spreadheader{%
- (tabu) Try#1 #1 Spread #1 #1 tabu Width #1 #1 Nat. Min. #1 #1 #1 Nat.X
- #1 #1 #1 New Target^^J%
- (tabu)spread}%
- \def\tabu@tracing@save##1{\begingroup
- \def\col@sep ####1\relax {(tabu) column sep #1 #1 #1 = ####1^^J}%
- \def\arrayrulewidth ####1\relax{(tabu) arrayrulewidth #1 = ####1^^J}%
- \def\doublerulesep ####1\relax {(tabu) doublerulesep #1 #1= ####1^^J}%
- \def\extrarowheight ####1\relax{(tabu) extrarowheight #1 = ####1^^J}%
- \def\extrarowdepth ####1\relax {(tabu) extrarowdepth #1 #1= ####1^^J}%
- \def\extratabsurround ####1\relax{(tabu) extratabsurround = ####1^^J}%
- \def\minrowclearance ####1\relax {(tabu) minrowclearance#1 = ####1^^J}%
- \def\arraystretch ####1{(tabu) arraystretch #1 #1 = ####1^^J}%
- \iftabu@colortbl
- \def\CT@arc@####1{(tabu) arrayrulecolor #1 = ####1^^J}%
- \def\CT@drsc@####1{(tabu) doublerulesepcolor=####1^^J}%
- \let\color \relax
- \fi
- \def\NC@find ####1\@nil{(tabu) tabu preamble#1 #1 = \detokenize{####1}^^J}%
- \def\tabu@wddef####1####2{(tabu) Natural width ####1 = ####2^^J}%
- \let\edef \@gobbletwo \let\def \@empty
- \tabu@message{%
- (tabu) \string\savetabu{##1}: \on@line^^J%
- \ifx \savetabu\tabusaveX
- (tabu) X columns width #1 = \the\tabucolX^^J\fi
- (tabu) target #1 #1 #1 #1 #1 = \the\tabu@target^^J%
- \tabu@savedparam
- \tabu@savedpream \@nil
- \iftabu@negcoef \tabu@savewd\fi}%
- \endgroup}%
+ #1 #1 #1 Coefs #1 #1 #1 Update^^J\fi}%
+ \def\tabu@spreadheader{%
+ (tabu) Try#1 #1 Spread #1 #1 tabu Width #1 #1 #1 Nat. X #1 #1 #1 #1Nat. Min.
+ #1 New Target^^J%
+ (tabu) sprd}
+ \def\tabu@message@save {\begingroup
+ \def\x ####1{\tabu@msg@align ####1{ }{ }{ }{ }{}\@@}
+ \def\z ####1{\expandafter\x\expandafter{\romannumeral-`\0\tabu@strippt
+ \dimexpr####1\p@{ }{ }}}%
+ \let\color \relax \def\tabu@rulesstyle ####1####2{\detokenize{####1}}%
+ \let\CT@arc@ \relax \let\@preamble \@gobble
+ \let\tabu@savedpream \@firstofone
+ \let\tabu@savedparams \@firstofone
+ \def\tabu@target ####1\relax {(tabu) target #1 #1 #1 #1 #1 = \x{####1}^^J}%
+ \def\tabucolX ####1\relax {(tabu) X columns width#1 = \x{####1}^^J}%
+ \def\tabu@nbcols ####1\relax {(tabu) Number of columns: \z{####1}^^J}%
+ \def\tabu@aligndefault ####1{(tabu) Default alignment: #1 #1 ####1^^J}%
+ \def\col@sep ####1\relax {(tabu) column sep #1 #1 #1 = \x{####1}^^J}%
+ \def\arrayrulewidth ####1\relax{(tabu) arrayrulewidth #1 = \x{####1}}%
+ \def\doublerulesep ####1\relax { doublerulesep = \x{####1}^^J}%
+ \def\extratabsurround####1\relax{(tabu) extratabsurround = \x{####1}^^J}%
+ \def\extrarowheight ####1\relax{(tabu) extrarowheight #1 = \x{####1}}%
+ \def\extrarowdepth ####1\relax {extrarowdepth = \x{####1}^^J}%
+ \def\arraystretch ####1{(tabu) arraystretch #1 #1 = \z{####1}^^J}%
+ \def\minrowclearance####1\relax{(tabu) minrowclearance #1 = \x{####1}^^J}%
+ \def\tabu@arc@L ####1{(tabu) taburulecolor #1 #1 = ####1^^J}%
+ \def\tabu@drsc@L ####1{(tabu) tabudoublerulecolor= ####1^^J}%
+ \def\tabu@evr@L ####1{(tabu) everyrow #1 #1 #1 #1 = \detokenize{####1}^^J}%
+ \def\tabu@ls@L ####1{(tabu) line style = \detokenize{####1}^^J}%
+ \def\NC@find ####1\@nil{(tabu) tabu preamble#1 #1 = \detokenize{####1}^^J}%
+ \def\tabu@wddef####1####2{(tabu) Natural width ####1 = \x{####2}^^J}%
+ \let\edef \@gobbletwo \let\def \@empty \let\let \@gobbletwo
+ \tabu@message{%
+ (tabu) \string\savetabu{\tabu@temp}: \on@line^^J%
+ \tabu@usetabu \@nil^^J}%
+ \endgroup}
}\do{ }
% \end{macrocode}
% \end{macro}
-% \end{macro}
-% \end{macro}
%
+% \subsection(Natural width measure){Measuring the natural width of columns (\xpackage{varwidth} code from D. Arseneau)}
%
-% \subsubsection(Natural width measure){Measuring the natural width for \textt{tabu spread} and negativ width-coefficients}
+%¤<package>%% Measuring the natural width (varwidth) - store the results -------
%
-% \begin{macro}{\tabu@measure@startpbox}
-% \begin{macro}{\tabu@measure@endpbox}
+% \begin{macro}{\tabu@startpboxmeasure}
+%
+% The important job is done at the end: by \cs\tabu@endpboxmeasure.
%
% When ``\textt{tabu spread}'' is used with \textt X columns, the first trial must
% measure the natural width of the columns. When \textt X columns have negativ coefficient,
@@ -3668,488 +6129,499 @@ lppl copyright 2010-2011 by FC <florent.chervet@free.fr>
% For the furthur trials, the standard scheme for \textt X column is used: the natural width
% is measured only once.
%
-% \hologo{pdfTeX} font expansion is disabled inside the \textt{varwidth} environment
-% (we set \cs{pdfadjustspacing} to \textt 0).
+% \hologo{pdfTeX} font expansion is disabled inside the \env*{varwidth}
+% (we set \cs\pdfadjustspacing to \textt 0).
%
% \begin{macrocode}
-\def\tabu@measure@startpbox#1{\bgroup
- \let\@startpbox \tabu@startpboxORI % in case of nesting
- \in@{\tabu@dimexpr}{#1}%
- \ifin@
- \global\advance\tabu@X@cols \@ne
- \ifcsname tabu@X\the\tabu@X@cols\endcsname\else
- \global\tabu@X@cols \@ne
- \global\tabu@naturalX \z@
- \fi
- \fi
- \iftabu@spread\else
- \ifin@ {\let\tabu@dimexpr \@firstoftwo\expandafter}%
- \ifdim \tabu@wd{#1}<\p@ \in@false\fi\fi\fi
- \ifin@
- \begingroup \let\tabu@dimexpr \@secondoftwo
- \edef\x{\endgroup \def\noexpand\tabu@temp{\the\dimexpr#1}%
- }\x
- \setbox\tabu@box=\hbox\bgroup
- \let\tabu@rewrite@X \tabu@@rewrite@X
- \tabu@nocellspace
- \begin{varwidth}{\tabu@temp}\narrowragged\arraybackslash
- \tabu@noadjustspacing \parfillskip\@flushglue
- \bgroup \aftergroup\tabu@measure@endpbox
- \ifdefined \cellspacetoplimit \bgroup\color@begingroup\fi
- \else
- \expandafter\@gobble\@startpbox{#1}% \@gobble \bgroup
- \fi
-}% \tabu@measure@startpbox
-\def\tabu@nocellspace{\def\bcolumn##1\@nil{}\let\ecolumn\@empty}
-\ifdefined\pdfadjustspacing
- \def\tabu@noadjustspacing{\pdfadjustspacing\z@}%
-\else
- \let\tabu@noadjustspacing\relax
-\fi
-\def\tabu@measure@endpbox{%
- \@finalstrut\@arstrutbox\end{varwidth}\egroup % <got my \tabu@box>
- \global\advance\tabu@naturalX \wd\tabu@box
- \ifdim \tabu@naturalX@max<\tabu@naturalX
- \xdef\tabu@naturalX@max{\the\tabu@naturalX}\fi
- \@tempdima=\dimexpr \wd\tabu@box * \tabu@X@sum /
- \dimexpr\csname tabu@X\the\tabu@X@cols\endcsname\p@\relax\relax
- \ifdim \tabu@naturalX@min<\@tempdima
- \xdef\tabu@naturalX@min{\the\@tempdima}\fi
- \ifdim \tabu@wd\tabu@X@cols>\z@
- \ifdim \tabu@wd\tabu@X@cols<\wd\tabu@box
- \tabu@wddef\tabu@X@cols {\the\wd\tabu@box}%
- \tabu@debug{\tabu@spaces\tabu@spaces
- * \the\tabu@X@cols. X[-\csname tabu@X\the\tabu@X@cols\endcsname]:
- target=\the\dimexpr\tabu@temp\relax\space
- \expandafter\expandafter\expandafter\string\tabu@wd\tabu@X@cols
- =\tabu@wd\tabu@X@cols}%
- \fi\fi
- \box\tabu@box \egroup % end of \vtop (measure)
-}% \tabu@measure@endpbox
-\def\tabu@wd#1{\csname tabu@W\the\tabu@nested @\number#1\endcsname}
-\def\tabu@wddef#1{\expandafter\xdef
- \csname tabu@W\the\tabu@nested @\number#1\endcsname}
-\def\tabu@wdlet#1{\global\expandafter\let
- \csname tabu@W\the\tabu@nested @\number#1\endcsname}
-\def\tabu@naturalX@min{\z@}
-\def\tabu@naturalX@max{\z@}
-% \end{macrocode}
-% \end{macro}
-% \end{macro}
-%
-%
-% \subsection{\cs{everycr} setup and \cs{tabuphantomline}}
-%
-% \begin{macro}{\tabu@setup@everycr}
-%
-% \cs{ialign} resets \cs{everycr} to an empty token. This macro sets \cs{everycr} for the
-% \textt{tabu} environment.
-%
-% \begin{macrocode}
-\def\tabu@setup@everycr{%
- \tabu@firstclinetrue \tabu@everyrowtrue
- \let\tabu@first@cline \z@
- \def\tabu@restoreeverycr {\let\everycr \tabu@everycr}%
- \def\everycr{\afterassignment\tabu@restoreeverycr \@temptokena}% <for ialign>
- \tabu@everycr\expandafter{\the\tabu@everycr \tabu@everyrow}%
-}% \tabu@setup@everycr
-\def\tabu@everyrow{%
- \noalign{%
- \ifcase\tabu@first@cline
- \global\let\tabu@first@cline \tw@
- \or\global\let\tabu@first@cline \tw@
- \or\global\tabu@firstclinefalse
- \global\let\tabu@first@cline \m@ne
- \fi}%
- \tabu@rowfontreset
- \iftabu@everyrow
- \noalign{\tabu@everyrowfalse}\expandafter\tabu@everyrow@hook
- \fi
-}% \tabu@everyrow
-\let\tabu@everyrow@hook \@empty
+\def\tabu@startpboxmeasure #1{\bgroup % entering \vtop
+ \edef\tabu@temp{\expandafter\@secondoftwo \ifx\tabu@hsize #1\else\relax\fi}%
+ \ifodd 1\ifx \tabu@temp\@empty 0 \else % starts with \tabu@hsize ?
+ \iftabu@spread \else % if spread -> measure
+ \ifdim \tabu@temp\p@>\z@ 0 \fi\fi\fi% if coef>0 -> do not measure
+ \let\@startpbox \tabu@startpboxORI % restore immediately (nesting)
+ \tabu@measuringtrue % for the quick option...
+ \tabu@Xcol =\expandafter\@firstoftwo\ifx\tabu@hsize #1\fi
+ \ifdim \tabu@temp\p@>\z@ \ifdim \tabu@temp\tabucolX<\tabu@target
+ \tabu@target=\tabu@temp\tabucolX \fi\fi
+ \setbox\tabu@box \hbox \bgroup
+ \begin{varwidth}\tabu@target
+ \let\FV@ListProcessLine \tabu@FV@ListProcessLine % \hbox to natural width...
+ \narrowragged \arraybackslash \parfillskip \@flushglue
+ \ifdefined\pdfadjustspacing \pdfadjustspacing\z@ \fi
+ \bgroup \aftergroup\tabu@endpboxmeasure
+ \ifdefined \cellspacetoplimit \tabu@cellspacepatch \fi
+ \else \expandafter\@gobble
+ \tabu@startpboxquick{#1}% \@gobble \bgroup
+ \fi
+}% \tabu@startpboxmeasure
+\def\tabu@cellspacepatch{\def\bcolumn##1\@nil{}\let\ecolumn\@empty
+ \bgroup\color@begingroup}
% \end{macrocode}
% \end{macro}
%
-% \begin{macro}{\tabuphantomline}
+% \begin{macro}{\tabu@endpboxmeasure}
%
-% This macro inserts a phantom line in front of a \textt{tabu}.
-% This is necessary when you use \cs{usetabu} with \textt{tabu X} column,
-% with a single line containing \cs{multicolumn}...
+% The cell has been built inside a box: we have to get its dimensions,
+% and update \cs\tabu@naturalX, \cs\tabu@naturalXmin and \cs\tabu@naturalXmax
+% accordingly (for \textt{tabu spread}), and even store (globally) each column width:
+% the column width is the maximum width of the cells it contains.
%
% \begin{macrocode}
-\def\tabuphantomline{\crcr\noalign{%
- \global\let\@arstrutbox \voidb@x
- \iftabu@colortbl
- \xdef\tabu@minrowclearance{\the\minrowclearance}%
- \global\minrowclearance \z@
- \fi
- \global\let\vcenter \vbox
- \ifnum \tabu@nested>\z@ \vspace*{\dimexpr\extrarowheight-\ht\@arstrutbox}\fi
- \toks@{}\count@\@ne
- \@whilenum\count@<\tabu@nbcols\do{\advance\count@\@ne
- \toks@\expandafter{\the\toks@&}}%
- \toks@\expandafter{\the\toks@
- \cr\noalign{%
- \global\let\@arstrutbox \tabu@arstrutbox
- \global\let\vcenter \tabu@vcenter
- \iftabu@colortbl
- \global\minrowclearance \tabu@minrowclearance\relax\fi
- \global\let\tabu@first@cline \@ne}}%
- \expandafter}\the\toks@
-}% \tabuphantomline
+\def\tabu@endpboxmeasure {%
+ \@finalstrut \@arstrutbox
+ \end{varwidth}\egroup % <got my \tabu@box>
+ \ifdim \tabu@temp\p@ <\z@ % neg coef
+ \ifdim \tabu@wd\tabu@Xcol <\wd\tabu@box
+ \tabu@wddef\tabu@Xcol {\the\wd\tabu@box}%
+ \tabu@debug{\tabu@message@endpboxmeasure}%
+ \fi
+ \else % spread coef>0
+ \global\advance \tabu@naturalX \wd\tabu@box
+ \@tempdima =\dimexpr \wd\tabu@box *\p@/\dimexpr \tabu@temp\p@\relax \relax
+ \ifdim \tabu@naturalXmax <\tabu@naturalX
+ \xdef\tabu@naturalXmax {\the\tabu@naturalX}\fi
+ \ifdim \tabu@naturalXmin <\@tempdima
+ \xdef\tabu@naturalXmin {\the\@tempdima}\fi
+ \fi
+ \box\tabu@box \egroup % end of \vtop (measure) restore \tabu@target
+}% \tabu@endpboxmeasure
+\def\tabu@wddef #1{\expandafter\xdef
+ \csname tabu@\the\tabu@nested.W\number#1\endcsname}
+\def\tabu@wd #1{\csname tabu@\the\tabu@nested.W\number#1\endcsname}
+\def\tabu@message@endpboxmeasure{\tabu@spaces\tabu@spaces<-> % <-> save natural wd
+ \the\tabu@Xcol. X[\tabu@temp]:
+ target = \the\tabucolX \space
+ \expandafter\expandafter\expandafter\string\tabu@wd\tabu@Xcol
+ =\tabu@wd\tabu@Xcol
+}% \tabu@message@endpboxmeasure
% \end{macrocode}
% \end{macro}
%
+% \begin{macro}{\tabu@startpboxquick}
%
+% With the \textt{quick} option, content of paragraph columns are not
+% built during trials in strategy number 2.
%
-% \subsection(Lines inside tabu){Lines inside \textt{tabu}}
+% \begin{macrocode}
+\def\tabu@startpboxquick {\bgroup
+ \let\@startpbox \tabu@startpboxORI % restore immediately
+ \let\tabu \tabu@quick % \begin is expanded before...
+ \expandafter\@gobble \@startpbox % gobbles \bgroup
+}% \tabu@startpboxquick
+\def\tabu@quick {\begingroup \iffalse{\fi \ifnum0=`}\fi
+ \toks@{}\def\tabu@stack{b}\tabu@collectbody
+ \endgroup
+}% \tabu@quick
+% \end{macrocode}
+% \end{macro}
%
-% \subsubsection{Vertical lines}
+% \subsection(Vertical measure){Measuring the height and depths of rows}
+%¤<package>%% Measuring the heights and depths - store the results -------------
%
+% \begin{macro}{\tabu@verticalmeasure}
%
-% \begin{macro}{\tabuvline@rewrite}
+% Starting point for vertical measure of every cell. Only the maxima/minima are stored,
+% for \TabU must know the height/depth of every row.
%
-% \textt\textbar\ is defined as a new column type but only inside the group
-% where \cs{@mkpream} does its job. This way, the modification is very local
-% to \textt{tabu}.
+% \begin{macrocode}
+\def\tabu@verticalmeasure{\everypar{}%
+ \ifnum \currentgrouptype>12 % 14=semi-simple, 15=math shift group
+ \setbox\tabu@box =\hbox\bgroup
+ \let\tabu@verticalspacing \tabu@verticalsp@lcr
+ \d@llarbegin % after \hbox ...
+ \else
+ \edef\tabu@temp{\ifnum\currentgrouptype=5\vtop
+ \else\ifnum\currentgrouptype=12\vcenter
+ \else\vbox\fi\fi}%
+ \setbox\tabu@box \hbox\bgroup$\tabu@temp \bgroup
+ \let\tabu@verticalspacing \tabu@verticalsp@pmb
+ \fi
+}% \tabu@verticalmeasure
+% \end{macrocode}
+% \end{macro}
%
-% \begin{macro}{\tabu@lines}
+% \begin{macro}{\tabu@verticalsp@lcr}
%
-% This feature is disabled with the \textt{light} option.
+% Vertical spacing adjustment for standard \textt l,\, \textt c,\, \textt r\, columns.
%
% \begin{macrocode}
-\def\tabu@lines{{\endlinechar\m@ne \scantokens{\def\x{|}}%
- \expandafter}\expandafter\tabu@lines@ \x
-}% \tabu@lines
-\def\tabu@lines@#1{%
- \tabu@newcolumntype #1{\tabuvline@rewrite}%
- \NC@list\expandafter{\the\NC@list \NC@do #1}%
-}% \tabu@lines@
-\newcommand*\tabuvline@rewrite[1][]{\tabuvline@arg{#1}%
- \expandafter \NC@find \tabu@temp}
-\def\tabu@vline#1{\vrule width#1}
+\def\tabu@verticalsp@lcr{%
+ \d@llarend \egroup % <got my \tabu@box>
+ \@tempdima \dimexpr \ht\tabu@box+\abovetabulinesep
+ \@tempdimb \dimexpr \dp\tabu@box+\belowtabulinesep \relax
+ \ifdim\tabustrutrule>\z@ \tabu@debug{\tabu@message@verticalsp}\fi
+ \ifdim \tabu@ht<\@tempdima \tabu@htdef{\the\@tempdima}\fi
+ \ifdim \tabu@dp<\@tempdimb \tabu@dpdef{\the\@tempdimb}\fi
+ \noindent\vrule height\@tempdima depth\@tempdimb
+}% \tabu@verticalsp@lcr
% \end{macrocode}
% \end{macro}
-% \end{macro}
%
+% \begin{macro}{\tabu@verticalsp@pmb}
%
-% \begin{macro}{\tabuvline@arg}
+% Vertical spacing adjustment with struts for \textt p,\, \textt m,\, or \textt b\, columns.
%
-% A tedious (and fastidious) macro to parse the optional argument of \textt\textbar\ vertical lines...
-
% \begin{macrocode}
-\def\tabuvline@arg#1{%
- \ifx\\#1\\% <shortcut when no option>
- \edef\tabu@temp{!{%
- \iftabu@colortbl\begingroup\noexpand\CT@arc@\fi
- \noexpand\tabu@vline\arrayrulewidth
- \iftabu@colortbl\endgroup\fi}}%
- \else
- \ifcsname tabu@line@style@\detokenize {#1}\endcsname
- \def\tabu@temp##1\relax##2\relax{##1}%
- \expandafter\tabu@temp\romannumeral-`\q
- \csname tabu@line@style@\detokenize {#1}\endcsname
- \tabuvline@argiii
- \else \futurelet \tabu@temp \tabuvline@argi #1\p@\p@\@nnil \tabuvline@argiii
- \fi
- \fi
-}% \tabuvline@arg
-\def\tabuvline@argi{%
- \let\tabu@color \@empty
- \ifcat A\noexpand\tabu@temp
- \@tempdima\arrayrulewidth
- \expandafter\tabu@getlinecolor
- \else \expandafter\tabuvline@argii
- \fi
-}% \tabuvline@argi
-\def\tabuvline@argii#1\@nnil{%
- \tabu@maybecolor \@tempdima #1 \@nnil
-}% \tabuvline@argii
-\def\tabuvline@argiii{%
- \edef\tabu@temp{!{\begingroup
- \ifx\tabu@color\@empty
- \iftabu@colortbl \noexpand\CT@arc@ \fi
- \else \tabu@color\fi
- \noexpand\tabu@vline{\the\@tempdima}\endgroup}}%
-}% \tabuvline@argiii
+\def\tabu@verticalsp@pmb{% inserts struts as needed
+ \par \expandafter\egroup
+ \expandafter$\expandafter
+ \egroup \expandafter
+ \@tempdimc \the\prevdepth
+ \@tempdima \dimexpr \ht\tabu@box+\abovetabulinesep
+ \@tempdimb \dimexpr \dp\tabu@box+\belowtabulinesep \relax
+ \ifdim\tabustrutrule>\z@ \tabu@debug{\tabu@message@verticalsp}\fi
+ \ifdim \tabu@ht<\@tempdima \tabu@htdef{\the\@tempdima}\fi
+ \ifdim \tabu@dp<\@tempdimb \tabu@dpdef{\the\@tempdimb}\fi
+ \let\@finalstrut \@gobble
+ \hrule height\@tempdima depth\@tempdimb width\hsize
+%% \box\tabu@box
+}% \tabu@verticalsp@pmb
% \end{macrocode}
% \end{macro}
%
+% \begin{macro}{\tabu@verticalinit}
%
-% \subsubsection{Horizontal lines: \cs{tabucline}}
+% Initialisation of \cs\tabu@ht and \cs\tabu@dp. Done at \cs\everyrow.
+
+% \begin{macrocode}
+\def\tabu@verticalinit{%
+ \ifnum \c@taburow=\z@ \tabu@rearstrut \fi % after \tabu@reset !
+ \advance\c@taburow \@ne
+ \tabu@htdef{\the\ht\@arstrutbox}\tabu@dpdef{\the\dp\@arstrutbox}%
+ \advance\c@taburow \m@ne
+}% \tabu@verticalinit
+\def\tabu@htdef {\expandafter\xdef \csname tabu@\the\tabu@nested.H\the\c@taburow\endcsname}
+\def\tabu@ht {\csname tabu@\the\tabu@nested.H\the\c@taburow\endcsname}
+\def\tabu@dpdef {\expandafter\xdef \csname tabu@\the\tabu@nested.D\the\c@taburow\endcsname}
+\def\tabu@dp {\csname tabu@\the\tabu@nested.D\the\c@taburow\endcsname}
+% \end{macrocode}
+% \end{macro}
%
-% \begin{macro}{\tabucline}
+% \begin{macro}{\tabu@verticaldynamicadjustment}
%
-% \cs{tabucline}\M[style or spec.]\M*{start-end}
-%
-% \cs{tabucline} appears only at the end of a line: this is the place where we can insert a \cs{noalign} group.
-% We built a new line to be inserted inside the \textt{tabu}: this new line which contains the rule or leaders,
-% is stored into \cs{toks@} (inside the \cs{noalign} group). When leaving the group \cs{toks@} is expanded.
-%
-% \begin{macrocode}
-\def\tabu@linedash{4pt}% <default value>
-\def\tabu@dashgap{4pt}% <default value>
-\def\tabucline{\crcr\noalign{\ifnum0=`}\fi \@ifstar
- {\@tempswatrue \tabu@cline}
- {\@tempswafalse \tabu@cline}}%
-\newcommand*\tabu@cline[2][]{\toks@{}%
- \tabu@startstop{#2}\tabu@getlinespec{#1}\@multicnt\@ne
- \ifnum\tabu@start>\tabu@stop
- \else\ifx\tabu@xleaders\relax
- \else
- \toks@{\noalign{\global\let\@arstrutbox \voidb@x}}%
-%% \iftabu@firstcline\if\tabu@align t\vskip-\ht\@arstrutbox\fi\fi
- \@whilenum\@multicnt<\tabu@start\do{\advance\@multicnt\@ne
- \toks@\expandafter{\the\toks@ &}}%
- \loop
- \toks@\expandafter{\the\toks@ \omit }%
- \ifnum \@multicnt=\@ne
- \expandafter \tabu@add \csname tabu@tok@\the\@multicnt L\endcsname \@nil
- \fi
- \ifcase 0\if@tempswa\else\ifnum \@multicnt<\tabu@stop 1\fi\fi\relax
- \toks@\expandafter{\the\toks@ \begingroup}%
- \toks@\expandafter{\the\expandafter\toks@
- \tabu@xleaders \endgroup}%
- \fi
- \ifcase 0\if@tempswa\else\ifnum \@multicnt<\tabu@stop 1\fi\fi\relax
- \expandafter \tabu@add \csname tabu@tok@\the\@multicnt R\endcsname \@nil
- \fi
- \ifnum\@multicnt<\tabu@stop
- \advance\@multicnt\@ne
- \if@tempswa \toks@\expandafter{\the\toks@ &}%
- \else \toks@\expandafter{\the\toks@ \span}\fi
- \repeat
- \@whilenum\@multicnt<\tabu@nbcols\do{\advance\@multicnt\@ne
- \toks@\expandafter{\the\toks@ &}}%
- \toks@\expandafter{\the\toks@ \cr
- \noalign{\global\let\@arstrutbox \tabu@arstrutbox}}%
-%% \tabu@debug{LIGNE AJOUTEE:\the\toks@}%
- \fi\fi
- \ifnum0=`{\fi\expandafter}\the\toks@
-}% \tabu@cline
-\def\tabu@add #1\@nil{\toks@\expandafter{\the\toks@
- \begingroup #1\endgroup\ifmmode$\fi}}
+% This updates the \cs\@arstrutbox at \cs\everyrow (\ie \cs\everycr) in order to
+% adjust the vertical spacing of cells.
+%
+% \begin{macrocode}
+\def\tabu@verticaldynamicadjustment {%
+ \advance\c@taburow \@ne
+ \extrarowheight \dimexpr\tabu@ht - \ht\strutbox
+ \extrarowdepth \dimexpr\tabu@dp - \dp\strutbox
+ \let\arraystretch \@empty
+ \advance\c@taburow \m@ne
+}% \tabu@verticaldynamicadjustment
% \end{macrocode}
% \end{macro}
%
+% \subsection{\cs{tabuphantomline}}
%
-% \begin{macro}{\tabu@startstop}
+% \begin{macro}{\tabuphantomline}
%
-% This macro parses the mandatory argument of \cs{tabucline}: start-column and end-column of the \textt{cline}.
+% This macro inserts a phantom line in front of a \textt{tabu}.
+% This is necessary when you use \cs{usetabu} with \textt{tabu X} column,
+% with a single line containing \cs{multicolumn}...
%
% \begin{macrocode}
-\def\tabu@startstop#1{\tabu@start@stop #1\relax 1-\tabu@nbcols\@nnil}
-\def\tabu@start@stop #1-#2\@nnil{%
- \@defaultunits \tabu@start \number0#1\relax\@nnil
- \@defaultunits \tabu@stop \number0#2\relax\@nnil
- \ifnum\tabu@start>\tabu@nbcols\tabu@start \tabu@nbcols\else
- \ifnum\tabu@start<\@ne \tabu@start \@ne \fi\fi
- \ifnum\tabu@stop>\tabu@nbcols \tabu@stop \tabu@nbcols \else
- \ifnum\tabu@stop<\@ne \tabu@stop \tabu@nbcols\fi\fi
-}% \tabu@start@stop
+\def\tabuphantomline{\crcr \noalign{%
+ {\globaldefs \@ne
+ \setbox\@arstrutbox \box\voidb@x
+ \let\tabu@@celllalign \tabu@celllalign
+ \let\tabu@@cellralign \tabu@cellralign
+ \let\tabu@@cellleft \tabu@cellleft
+ \let\tabu@@cellright \tabu@cellright
+ \let\tabu@@thevline \tabu@thevline
+ \let\tabu@celllalign \@empty
+ \let\tabu@cellralign \@empty
+ \let\tabu@cellright \@empty
+ \let\tabu@cellleft \@empty
+ \let\tabu@thevline \relax}%
+ \edef\tabu@temp{\tabu@multispan \tabu@nbcols{\noindent &}}%
+ \toks@\expandafter{\tabu@temp \noindent\tabu@everyrowfalse \cr
+ \noalign{\tabu@rearstrut
+ {\globaldefs\@ne
+ \let\tabu@celllalign \tabu@@celllalign
+ \let\tabu@cellralign \tabu@@cellralign
+ \let\tabu@cellleft \tabu@@cellleft
+ \let\tabu@cellright \tabu@@cellright
+ \let\tabu@thevline \tabu@@thevline}}}%
+ \expandafter}\the\toks@
+}% \tabuphantomline
% \end{macrocode}
% \end{macro}
%
%
-% \begin{macro}{\tabu@getlinespec}
+% \subsection(Horizontal lines inside tabu){Horizontal lines inside \textt{tabu}: \cs{tabucline}, \cs{firsthline} and \cs{lasthline}}
+%
+%¤<package>%% \firsthline and \lasthline corrections ---------------------------
+%
+% \subsubsection{Horizontal lines: multiple \cs{firsthline} / \cs{lasthline}}
+%
+% \begin{macro}{\tabu@firstline}
+% \begin{macro}{\tabu@lastline}%
+% \begin{macro}{\tabu@firsthline}
+% \begin{macro}{\tabu@lasthline}
+%
+% \cs\firsthline and \cs\lasthline are \cs\let to \cs\tabu@firsthline and \cs\tabu@lasthline
+% inside the \env*{tabu}.
+%
+% This allows to duplicate horizontal lines, while keeping the alignement:
+%
+% \cs\firsthline\cs\firsthline\cs\firsthline is allowed inside \env{tabu} and is the same as:
%
-% This macro parses the optional argument of \cs{tabucline} and check if it's a line specification
-% (then \cs{tabu@getline} is expanded) or a \cs{leaders} specification (then \cs{tabu@leaders} is expanded).
+% \cs\firsthline\cs\hline\cs\hline.
%
% \begin{macrocode}
-\def\tabu@getlinespec#1{\let\tabu@xleaders \relax \let\tabu@color \@empty
- \@defaultunits \let\@tempa=#1 \relax\@nnil
- \ifx\@tempa\relax \let\tabu@xleaders \tabu@defaultleaders\else
- \ifx\@tempa\hbox \tabu@defleaders{#1}\else
- \ifx\@tempa\box \tabu@defleaders{#1}\else
- \ifx\@tempa\copy \tabu@defleaders{#1}\else
- \ifcsname tabu@line@style@\detokenize{#1}\endcsname
- \csname tabu@line@style@\detokenize{#1}\endcsname
- \else \tabu@getline{#1\p@ on0pt off0pt}\fi\fi\fi\fi\fi
-}% \tabu@getlinespec
-\def\tabu@defleaders#1{%
- \def\tabu@xleaders{\iftabu@colortbl\CT@arc@\fi
- \xleaders\hbox{\lower.5\extrarowheight#1}\tabu@leaderfill}}
-\def\tabucline@warn#1{\PackageWarning{tabu}
- {Undefined line syle: #1
- \MessageBreak Using default line style instead}%
- \let\tabu@xleaders \tabu@defaultleaders
-}% \tabucline@warn
+\def\tabu@firstline {\tabu@hlineAZ \tabu@firsthlinecorrection {}}
+\def\tabu@firsthline{\tabu@hlineAZ \tabu@firsthlinecorrection \hline}
+\def\tabu@lastline {\tabu@hlineAZ \tabu@lasthlinecorrection {}}
+\def\tabu@lasthline {\tabu@hlineAZ \tabu@lasthlinecorrection \hline}
+\def\tabu@hline {% replaces \hline if no colortbl (see \AtBeginDocument)
+ \noalign{\ifnum0=`}\fi
+ {\CT@arc@\hrule height\arrayrulewidth}%
+ \futurelet \tabu@temp \tabu@xhline
+}% \tabu@hline
+\def\tabu@xhline{%
+ \ifx \tabu@temp \hline
+ {\ifx \CT@drsc@\relax \vskip
+ \else\ifx \CT@drsc@\@empty \vskip
+ \else \CT@drsc@\hrule height
+ \fi\fi
+ \doublerulesep}%
+ \fi
+ \ifnum0=`{\fi}%
+}% \tabu@xhline
% \end{macrocode}
% \end{macro}
+% \end{macro}
+% \end{macro}
+% \end{macro}
%
-% \begin{macro}{\tabu@getline}
+% \begin{macro}{\tabu@hlineAZ}
+% \begin{macro}{\tabu@nexthlineAZ}
+% \begin{macro}{\tabu@xhlineAZ}
%
-% This macro parses the optional argument of \cs{tabucline} (or the one of \cs{tabulinestyle})
-% and extract the thickness, the dash an gap specified. Default values assignments are done either.
+% Here we go, inside a \cs\noalign group, we collect the next tokens:
+% \begin{enumerate}[label=\arabic*.]
+% \item first the option,
+% \item and then the next tokens if they are \cs\hline or \cs\firsthline.
+% \end{enumerate}
%
-% \begin{macro}{\tabu@maybecolor}
+% The code to be executed at the end of the \cs\noalign group is built into \cs\toks@.
+%
+% \begin{macrocode}
+\def\tabu@hlineAZ #1#2{\noalign{\ifnum0=`}\fi \dimen@ \z@ \count@ \z@
+ \toks@{}\def\tabu@hlinecorrection{#1}\def\tabu@temp{#2}%
+ \tabu@hlineAZsurround
+}% \tabu@hlineAZ
+\newcommand*\tabu@hlineAZsurround[1][\extratabsurround]{%
+ \extratabsurround #1\let\tabucline \tabucline@scan
+ \let\hline \tabu@hlinescan \let\firsthline \hline
+ \let\cline \tabu@clinescan \let\lasthline \hline
+ \expandafter \futurelet \expandafter \tabu@temp
+ \expandafter \tabu@nexthlineAZ \tabu@temp
+}% \tabu@hlineAZsurround
+\def\tabu@hlinescan {\tabu@thick \arrayrulewidth \tabu@xhlineAZ \hline}
+\def\tabu@clinescan #1{\tabu@thick \arrayrulewidth \tabu@xhlineAZ {\cline{#1}}}
+\def\tabucline@scan{\@testopt \tabucline@sc@n {}}
+\def\tabucline@sc@n #1[#2]{\tabu@xhlineAZ {\tabucline[{#1}]{#2}}}
+\def\tabu@nexthlineAZ{%
+ \ifx \tabu@temp\hline \else
+ \ifx \tabu@temp\cline \else
+ \ifx \tabu@temp\tabucline \else
+ \tabu@hlinecorrection
+ \fi\fi\fi
+}% \tabu@nexthlineAZ
+\def\tabu@xhlineAZ #1{%
+ \toks@\expandafter{\the\toks@ #1}%
+ \@tempdimc \tabu@thick % The last line width
+ \ifcase\count@ \@tempdimb \tabu@thick % The first line width
+ \else \advance\dimen@ \dimexpr \tabu@thick+\doublerulesep \relax
+ \fi
+ \advance\count@ \@ne \futurelet \tabu@temp \tabu@nexthlineAZ
+}% \tabu@xhlineAZ
+% \end{macrocode}
+% \end{macro}
+% \end{macro}
+% \end{macro}
%
+% \begin{macro}{\tabu@firsthlinecorrection}
%
+% This is the ``correction macro'' for \cs\firsthline, \ie a strut and a skip are inserted
+% \textbf{before} the first \cs\hline.
%
% \begin{macrocode}
-\def\tabu@getline#1{\tabu@lineon #1 \@nil on\tabu@linedash \p@ \@nil\@nnil{#1}}
-\def\tabu@maybecolor{\ifx\tabu@color\@empty \afterassignment\tabu@colortest
- \else \@defaultunits\fi}
-\def\tabu@lineon #1on#2\@nil#3\@nnil#4{%
- \@defaultunits \let\@tempa=#1 \relax\@nnil
- \ifcase 0\ifx o\@tempa 1\else\ifcat A\noexpand\@tempa 2\fi\fi\relax
- \tabu@maybecolor \@tempdima #1\arrayrulewidth \p@\@nnil
- \tabu@maybecolor \@tempdimb #2\p@ \@nnil
- \tabu@lineoff #1 on#2 off\tabu@dashgap \p@ \@nnil
- \or\@tempdima \arrayrulewidth
- \tabu@maybecolor \@tempdimb #2\p@ \@nnil
- \tabu@lineoff #1 on#2 off\tabu@dashgap \p@ \@nnil
- \else
- \tabu@maybecolor \@tempdima \arrayrulewidth #1\p@\@nnil
- \ifx\tabu@color\@empty \tabucline@warn\@tempa\else
- \@tempdimb \z@
- \tabu@lineoff off0pt \p@\@nnil \fi
- \fi
-}% \tabu@lineon
-\def\tabu@lineoff #1off#2\@nnil{%
- \tabu@maybecolor \@tempdimc #2\p@ \@nnil
- \iftabu@colortbl \ifx \tabu@color\@empty
- \def\tabu@color{\noexpand\CT@arc@}%
- \fi\fi
- \ifdim \@tempdimb=\z@
- \ifdim \@tempdimc>\z@ \@tempdimb \tabu@dashgap\relax\fi\fi
- \ifdim \@tempdimc=\z@
- \ifdim \@tempdimb>\z@ \@tempdimc \tabu@linedash\relax\fi\fi
- \ifdim \@tempdima<\z@ \else
- \ifdim \@tempdimb<\z@ \else
- \ifdim \@tempdimc<\z@ \else
- \edef \tabu@xleaders{\tabu@color\xleaders
- \ifdim\@tempdimc>\z@
- \hbox\bgroup \kern\the\dimexpr\@tempdimc/2\relax\fi
- \noexpand\iftabu@firstcline
- \vrule depth\dimexpr\the\@tempdima
- \ifdim\@tempdimb>\z@ width\the\@tempdimb\fi
- \noexpand\else
- \vrule height\dimexpr-\extrarowheight+\the\@tempdima
- depth\dimexpr\extrarowheight
- \ifdim\@tempdimb>\z@ width\the\@tempdimb\fi
- \noexpand\fi
- \ifdim\@tempdimc>\z@
- \kern\the\dimexpr\@tempdimc/2\egroup\fi
- \tabu@leaderfill}%
- \fi\fi\fi
-}% \tabu@lineoff
-% \end{macrocode}
-% \end{macro}
-% \end{macro}
-%
-% \begin{macro}{\tabu@colortest}
-%
-%
-%
-% \begin{macrocode}
-\def\tabu@colortest{\futurelet\tabu@temp\tabu@linecolor}
-\def\tabu@linecolor{%
- \ifcase 0\if ,\noexpand\tabu@temp\else
- \ifx\relax\tabu@temp\else
- \ifx \@sptoken\tabu@temp1\else
- \ifcat A\noexpand\tabu@temp2\else
- 3\fi\fi\fi\fi\relax
- \def\tabu@next##1{\futurelet\tabu@temp\tabu@linecolor}%
- \or\def\tabu@next{\tabu@gobblespace{\futurelet\tabu@temp\tabu@linecolor}}%
- \or\let\tabu@next \tabu@getlinecolor
- \else\expandafter\remove@to@nnil
- \fi \tabu@next
-}% \tabu@linecolor
-\def\tabu@getlinecolor#1\p@{%
- \edef\@tempa{\zap@space #1 \@empty}%
- \ifcsname\string\color@\@tempa\endcsname
- \edef\tabu@color{\noexpand\noexpand\noexpand\color{\@tempa}}% \set@color
- \fi\remove@to@nnil
-}% \tabu@getlinecolor
+\def\tabu@firsthlinecorrection{% \count@ = number of \hline -1
+ \@tempdima \dimexpr \ht\@arstrutbox+\dimen@
+ \edef\firsthline{% <local in \noalign>
+ \omit \hbox to\z@{\hss{\noexpand\tabu@DBG{yellow}\vrule
+ height \the\dimexpr\@tempdima+\extratabsurround
+ depth \dp\@arstrutbox
+ width \tabustrutrule}\hss}\cr
+ \noalign{\vskip -\the\dimexpr \@tempdima+\@tempdimb
+ +\dp\@arstrutbox \relax}%
+ \the\toks@
+ }\ifnum0=`{\fi
+ \expandafter}\firsthline % we are then !
+}% \tabu@firsthlinecorrection
% \end{macrocode}
% \end{macro}
%
-% \begin{macro}{\tabulinestyle}
%
-% \cs{tabulinestyle}\M*{style=spec.}
+% \begin{macro}{\tabu@lasthlinecorrection}
+%
+% This is the ``correction macro'' for \cs\lasthline, \ie a strut and a skip are inserted
+% \textbf{after} the last \cs\hline.
%
% \begin{macrocode}
-\def\tabulinestyle#1{\@for\@tempa:=#1\do
- {\expandafter\tabu@linestyle\@tempa==\@nil}}
-\def\tabu@linestyle#1=#2=#3\@nil{%
- \begingroup \tabu@getlinespec {#2}%
- \toks@\expandafter{\tabu@xleaders}%
- \@temptokena\expandafter{\tabu@color}%
- \expandafter\xdef\csname tabu@line@style@\detokenize{#1}\endcsname
- {\@tempdima\the\@tempdima
- \def\noexpand\tabu@color{\the\@temptokena}\relax
- \def\noexpand\tabu@xleaders{\the\toks@}\relax}%
- \endgroup
-}% \tabu@linestyle
-\expandafter\def \csname tabu@line@style@\endcsname {%
- \let\tabu@xleaders \tabu@defaultleaders}%
-\def\tabu@defaultleaders{\iftabu@colortbl\CT@arc@\fi
- \leaders
- \iftabu@firstcline
- \vrule depth \arrayrulewidth
- \else
- \vrule height\dimexpr-\extrarowheight+\arrayrulewidth
- depth \extrarowheight
- \fi
- \tabu@leaderfill}
-\let\tabu@leaderfill \hfil
+\def\tabu@lasthlinecorrection{%
+ \@tempdima \dimexpr \dp\@arstrutbox+\dimen@+\@tempdimb+\@tempdimc
+ \edef\lasthline{% <local in \noalign>
+ \the\toks@
+ \noalign{\vskip -\the\dimexpr\dimen@+\@tempdimb+\dp\@arstrutbox}%
+ \omit \hbox to\z@{\hss{\noexpand\tabu@DBG{yellow}\vrule
+ depth \the\dimexpr \dp\@arstrutbox+\@tempdimb+\dimen@
+ +\extratabsurround-\@tempdimc
+ height \z@
+ width \tabustrutrule}\hss}\cr
+ }\ifnum0=`{\fi
+ \expandafter}\lasthline % we are then !
+}% \tabu@lasthlinecorrection
% \end{macrocode}
% \end{macro}
%
+% \subsubsection{Horizontal lines: \cs{tabucline}}
%
-% \subsection(Verbatim with X columns){Verbatim inside \textt{tabu} with \textt X columns}
+%¤<package>%% Horizontal lines : \tabucline ------------------------------------
%
-% \begin{macro}{\tabu@sanitizetext}
+% \begin{macro}{\tabucline}
%
+% \cs\tabucline \M[style or spec.]\M*{start-end}
%
+% \cs\tabucline appears only at the end of a line: this is the place where we can insert a \cs\noalign group.
+% The line to be inserted inside the \env{tabu} is build inside this \cs\noalign group.
+%
+% \cs\tabu@start and \cs\tabu@stop store the limits for the line: they are, for clarity,
+% the local name of \cs\@tempcnta and \cs\@tempcntb.
%
% \begin{macrocode}
-{\catcode32=13\relax\catcode`\^^@=13\relax
-\gdef\tabu@verb{\@sanitize\catcode`\^=7\edef\^{\string^}\tabu@makeatletter
-\catcode32=13\let =\ \catcode`\^^@=13\def^^@{\hskip\parfillskip\null\linebreak}%
-\endlinechar\m@ne}}
-{\catcode64=13\edef @{\string @}\expandafter\xdef
- \csname tabu@makeatletter\endcsname{\catcode64=13\def\noexpand @{\unskip @}}}
-\newcommand\tabu@sanitizetext[1][\ttfamily]{\begingroup
- \tabu@verb #1\tabu@s@nitizetext}
-\long\def\tabu@s@nitizetext#1{\@makeother\{\@makeother\}%
- \everyeof{\noexpand}\scantokens{#1}\endgroup}
+\let\tabu@start \@tempcnta
+\let\tabu@stop \@tempcntb
+\newcommand*\tabucline{\noalign{\ifnum0=`}\fi \tabu@cline}
+\newcommand*\tabu@cline[2][]{\tabu@startstop{#2}%
+ \ifnum \tabu@stop<\z@ \toks@{}%
+ \else \tabu@clinearg{#1}\tabu@thestyle
+ \edef\tabucline{\toks@{%
+ \ifnum \tabu@start>\z@ \omit
+ \tabu@multispan\tabu@start {\span\omit}&\fi
+ \omit \tabu@multispan\tabu@stop {\span\omit}%
+ \tabu@thehline\cr
+ }}\tabucline
+ \tabu@tracinglines{(tabu:tabucline) Style: #1^^J\the\toks@^^J^^J}%
+ \fi
+ \futurelet \tabu@temp \tabu@xcline
+}% \tabu@cline
+\def\tabu@clinearg #1{%
+ \ifx\\#1\\\let\tabu@thestyle \tabu@ls@
+ \else \@defaultunits \expandafter\let\expandafter\@tempa
+ \romannumeral-`\0#1\relax \@nnil
+ \ifx \hbox\@tempa \tabu@clinebox{#1}%
+ \else\ifx \box\@tempa \tabu@clinebox{#1}%
+ \else\ifx \vbox\@tempa \tabu@clinebox{#1}%
+ \else\ifx \vtop\@tempa \tabu@clinebox{#1}%
+ \else\ifx \copy\@tempa \tabu@clinebox{#1}%
+ \else\ifx \leaders\@tempa \tabu@clineleads{#1}%
+ \else\ifx \cleaders\@tempa \tabu@clineleads{#1}%
+ \else\ifx \xleaders\@tempa \tabu@clineleads{#1}%
+ \else\tabu@getline {#1}%
+ \fi\fi\fi\fi\fi\fi\fi\fi
+ \fi
+}% \tabu@clinearg
+\def\tabu@clinebox #1{\tabu@clineleads{\xleaders#1\hss}}
+\def\tabu@clineleads #1{%
+ \let\tabu@thestyle \relax \let\tabu@leaders \@undefined
+ \gdef\tabu@thehrule{#1}}
+\def\tabu@thehline{\begingroup
+ \ifdefined\tabu@leaders
+ \noexpand\tabu@thehleaders
+ \else \noexpand\tabu@thehrule
+ \fi \endgroup
+}% \tabu@thehline
+\def\tabu@xcline{%
+ \ifx \tabu@temp\tabucline
+ \toks@\expandafter{\the\toks@ \noalign
+ {\ifx\CT@drsc@\relax \vskip
+ \else \CT@drsc@\hrule height
+ \fi
+ \doublerulesep}}%
+ \fi
+ \tabu@docline
+}% \tabu@xcline
+\def\tabu@docline {\ifnum0=`{\fi \expandafter}\the\toks@}
+\def\tabu@docline@evr {\xdef\tabu@doclineafter{\the\toks@}%
+ \ifnum0=`{\fi}\aftergroup\tabu@doclineafter}
+\def\tabu@multispan #1#2{%
+ \ifnum\numexpr#1>\@ne #2\expandafter\tabu@multispan
+ \else \expandafter\@gobbletwo
+ \fi {#1-1}{#2}%
+}% \tabu@multispan
+% \end{macrocode}
+% \end{macro}
+%
+%
+% \begin{macro}{\tabu@startstop}
+%
+% This macro parses the mandatory argument of \cs{tabucline}: start-column and end-column of the \textt{cline}.
+%
+% \begin{macrocode}
+\def\tabu@startstop #1{\tabu@start@stop #1\relax 1-\tabu@nbcols \@nnil}
+\def\tabu@start@stop #1-#2\@nnil{%
+ \@defaultunits \tabu@start\number 0#1\relax \@nnil
+ \@defaultunits \tabu@stop \number 0#2\relax \@nnil
+ \tabu@stop \ifnum \tabu@start>\tabu@nbcols \m@ne
+ \else\ifnum \tabu@stop=\z@ \tabu@nbcols
+ \else\ifnum \tabu@stop>\tabu@nbcols \tabu@nbcols
+ \else \tabu@stop
+ \fi\fi\fi
+ \advance\tabu@start \m@ne
+ \ifnum \tabu@start>\z@ \advance\tabu@stop -\tabu@start \fi
+}% \tabu@start@stop
% \end{macrocode}
% \end{macro}
%
+%
% \subsection{Numbers in \textt{tabu}}
%
+%¤<package>%% Numbers: siunitx S columns (and \tabudecimal) -------------------
+%
% \subsubsection{\cs{tabudecimal}}
%
% \begin{macro}{\tabudecimal}
%
-% \cs{tabu@tabudecimal} is \cs{tabudecimal} inside \textt{tabu}.
+% \cs\tabu@tabudecimal is \cs\tabudecimal inside the \env*{tabu}.
%
% \begin{macrocode}
-\def\tabu@tabudecimal#1{%
- \def\tabu@decimal{#1}\@temptokena{}%
- \let\tabu@getdecimal@ \tabu@getdecimal@ignorespaces
- \tabu@scandecimal
+\def\tabu@tabudecimal #1{%
+ \def\tabu@decimal{#1}\@temptokena{}%
+ \let\tabu@getdecimal@ \tabu@getdecimal@ignorespaces
+ \tabu@scandecimal
}% \tabu@tabudecimal
\def\tabu@scandecimal{\futurelet \tabu@temp \tabu@getdecimal@}
\def\tabu@skipdecimal#1{#1\tabu@scandecimal}
\def\tabu@getdecimal@ignorespaces{%
- \ifcase 0\ifx\tabu@temp\ignorespaces\else
- \ifx\tabu@temp\@sptoken1\else
- 2\fi\fi\relax
- \let\tabu@getdecimal@ \tabu@getdecimal
- \expandafter\tabu@skipdecimal
- \or \expandafter\tabu@gobblespace\expandafter\tabu@scandecimal
- \else \expandafter\tabu@skipdecimal
- \fi
+ \ifcase 0\ifx\tabu@temp\ignorespaces\else
+ \ifx\tabu@temp\@sptoken1\else
+ 2\fi\fi\relax
+ \let\tabu@getdecimal@ \tabu@getdecimal
+ \expandafter\tabu@skipdecimal
+ \or \expandafter\tabu@gobblespace\expandafter\tabu@scandecimal
+ \else \expandafter\tabu@skipdecimal
+ \fi
}% \tabu@getdecimal@ignorespaces
\def\tabu@get@decimal#1{\@temptokena\expandafter{\the\@temptokena #1}%
\tabu@scandecimal}
\def\do#1{%
- \def\tabu@get@decimalspace#1{%
- \@temptokena\expandafter{\the\@temptokena #1}\tabu@scandecimal}%
+ \def\tabu@get@decimalspace#1{%
+ \@temptokena\expandafter{\the\@temptokena #1}\tabu@scandecimal}%
}\do{ }
\let\tabu@@tabudecimal \tabu@tabudecimal
% \end{macrocode}
@@ -4188,157 +6660,130 @@ lppl copyright 2010-2011 by FC <florent.chervet@free.fr>
\fi
}% \tabu@getdecimal
\def\tabu@printdecimal{%
- \edef\tabu@temp{\the\@temptokena}%
- \ifx\tabu@temp\@empty\else
- \ifx\tabu@temp\space\else
- \expandafter\tabu@decimal\expandafter{\the\@temptokena}%
- \fi\fi
+ \edef\tabu@temp{\the\@temptokena}%
+ \ifx\tabu@temp\@empty\else
+ \ifx\tabu@temp\space\else
+ \expandafter\tabu@decimal\expandafter{\the\@temptokena}%
+ \fi\fi
}% \tabu@printdecimal
% \end{macrocode}
% \end{macro}
%
-% \sectionformat\subsection{bookmark={color*=DarkRed}}
-% \subsection{\cs{extrarowsep} and \cs{tabulinesep}}
%
-% \begin{macro}{\extrarowsep}
+% \subsection(Verbatim with X columns){Verbatim inside \textt{tabu} with \textt X columns}
+%
+%¤<package>%% Verbatim inside X columns ----------------------------------------
%
-% \cs{extrarowsep} makes the assignment for both \cs{extrarowheight} and \cs{extrarowdepth}.
+% \begin{macro}{\tabu@verbatim}
%
-% The macro may be prefixed by \cs{global}.
+% Setup to be done before \cs\scantokens to allow verbatim inside the \env*{tabu}.
%
% \begin{macrocode}
-\def\extrarowsep{\edef\tabu@C@rowsep{\the\numexpr\tabu@C@rowsep+1}%
- \aftergroup\tabu@Growsep
- \afterassignment\tabu@setrowsep \extrarowheight
-}% \extrarowsep
-\def\tabu@setrowsep{%
- \extrarowdepth\extrarowheight
- \tabu@Gsave \tabu@G@rowsep \tabu@C@rowsep \extrarowheight \extrarowdepth
-}% \tabu@setrowsep
-\def\tabu@Growsep{\ifx \tabu@G@rowsep\@empty \else \tabu@Rrowsep\fi}
-\def\tabu@Rrowsep{\tabu@Grestore \tabu@G@rowsep \tabu@C@rowsep}
-\let\tabu@C@rowsep \z@
-\let\tabu@G@rowsep \@empty
+\def\tabu@verbatim{%
+ \let\verb \tabu@verb
+ \let\FV@DefineCheckEnd \tabu@FV@DefineCheckEnd
+}% \tabu@verbatim
% \end{macrocode}
% \end{macro}
%
-% \begin{macro}{\tabulinesep}
+% \subsubsection{Compatibility with \LaTeX's kernel \cs{verb} command}
%
-% \cs{tabulinesep} makes the assignment for both \cs{abovetabulinesep} and \cs{belowtabulinesep},
-% similar to \xpackage{cellspace} \cs{cellspacetoplimit} and \cs{cellspacebottomlimit}.
+% \begin{macro}{\tabu@verb}
%
-% The macro may be prefixed by \cs{global}.
+% The \cs{verb} macro from the latex kernel expands \cs{@ifstar} in
+% a context where the space token: \textvisiblespace\, has a category code of 12.
%
-% \begin{macrocode}
-\def\tabulinesep{\edef\tabu@C@linesep{\the\numexpr\tabu@C@linesep+1}%
- \aftergroup\tabu@Glinesep
- \afterassignment\tabu@setlinesep \abovetabulinesep
-}% \tabulinesep
-\def\tabu@setlinesep{%
- \belowtabulinesep\abovetabulinesep
- \tabu@Gsave \tabu@G@linesep \tabu@C@linesep \abovetabulinesep \belowtabulinesep
-}% \tabu@setlinesep
-\def\tabu@Glinesep{\ifx \tabu@G@linesep\@empty \else \tabu@Rlinesep\fi}
-\def\tabu@Rlinesep{\tabu@Grestore \tabu@G@linesep \tabu@C@linesep}
-\let\tabu@C@linesep \z@
-\let\tabu@G@linesep \@empty
-% \end{macrocode}
-% \end{macro}
+% This is not compatible with \cs{scantokens} since \cs{scantokens} adds a space
+% after each control sequence, including \cs{verb}:
%
-% \begin{macro}{\tabu@Gsave}
-% \begin{macro}{\tabu@Grestore}
+% \cs{verb}+some verbatim text+ \qquad becomes:
%
-% Utility macro to implement the possibility to prefix a macro by \cs{global}.
+% \cs{verb}\textvisiblespace+some verbatim text+
+%
+% and thus, the space token \textvisiblespace\, is set as the \cs{verb} delimiter.
+%
+% We therefore use (a silly) \cs{@ifstar} in order to gobble the possible space token.
%
% \begin{macrocode}
-\def\tabu@Gsave #1#2#3#4{\xdef#1{#1%
- \toks#2{\toks\the\currentgrouplevel{\global#3\the#3\global#4\the#4}}}%
-}% \tabu@Gsave
-\def\tabu@Grestore#1#2{\begingroup
- \toks#2{}#1\toks\currentgrouplevel\expandafter{\expandafter}\the\toks#2\relax
- \ifcat$\the\toks\currentgrouplevel$\else
- \global\let#1\@empty \global\let#2\z@
- \fi
- \expandafter\endgroup
- \the\toks\currentgrouplevel
-}% \tabu@Grestore
+\let\tabu@ltx@verb \verb
+\def\tabu@verb{\@ifstar {\tabu@ltx@verb*} \tabu@ltx@verb}
% \end{macrocode}
% \end{macro}
-% \end{macro}
%
+% \subsubsection{Compatibility with the \xpackage{fancyvrb} package}
%
-% \begin{macro}{\tabu@verticalmeasure}
+% \begin{macro}{\tabu@FV@DefineCheckEnd}
%
+% This is quite the same issue as for \LaTeX{} \cs{verb} command: a space is inserted
+% after each control sequence scanned by \cs{scantoken}.
%
+% This leads to a break in the macro that checks the end of a \textt{Verbatim} environment,
+% since this macro basically checks for a line that conforms to the pattern:
%
-% \begin{macrocode}
-\def\tabu@verticalmeasure{%
- \ifnum \currentgrouptype>12
- \begingroup\lrbox\tabu@box \d@llarbegin
- \let\tabu@verticalspacing \tabu@verticalsp@lcr
- \else
- \setbox\tabu@box
- \ifnum \currentgrouptype=5\vtop\else\vbox\fi \bgroup
- \everypar{}\let\@finalstrut \@gobble
- \let\tabu@verticalspacing \tabu@verticalsp@pmb
- \fi
-}% \tabu@verticalmeasure
-% \end{macrocode}
-% \end{macro}
+% \#1\cs{end}\M*{\#2}\#3
%
-% \begin{macro}{\tabu@verticalsp@lcr}
+% while with \cs{scantokens}, such a line becomes:
%
-% Vertical spacing adjustment for standard \textt l,\, \textt c,\, \textt r\, columns.
+% \#1\cs{end}\textvisiblespace\M*{\#2}\#3
+%
+% in a context where the space token is not of category 10 (space).
+%
+% Thus we replace the end-check for the \textt{Verbatim} environment by a check
+% on the detokenized-line (with \eTeX{} \cs{detokenize}):
%
% \begin{macrocode}
-\def\tabu@verticalsp@lcr{% adjust \ht \tabu@box and \dp \tabu@box
- \d@llarend\endlrbox\endgroup
- \@tempdima \dimexpr \ht\@arstrutbox -\ht\tabu@box \relax
- \@tempdimb \dimexpr \dp\@arstrutbox -\dp\tabu@box \relax
- \ifdim \@tempdima<\abovetabulinesep
- \ht\tabu@box=\dimexpr \ht\tabu@box+\abovetabulinesep\relax \fi
- \ifdim \@tempdimb<\belowtabulinesep
- \dp\tabu@box=\dimexpr \dp\tabu@box+\belowtabulinesep \relax \fi
- \leavevmode \box\tabu@box
-}% \tabu@verticalsp@lcr
+\def\tabu@fancyvrb {%
+ \def\tabu@FV@DefineCheckEnd ##1{%
+ \def\tabu@FV@DefineCheckEnd{%
+ ##1% <original definition (if fancyvrb is loaded)>
+ \let\FV@CheckEnd \tabu@FV@CheckEnd
+ \let\FV@@CheckEnd \tabu@FV@@CheckEnd
+ \let\FV@@@CheckEnd \tabu@FV@@@CheckEnd
+ \edef\FV@EndScanning{%
+ \def\noexpand\next{\noexpand\end{\FV@EnvironName}}%
+ \global\let\noexpand\FV@EnvironName\relax
+ \noexpand\next}%
+ \xdef\FV@EnvironName{\detokenize\expandafter{\FV@EnvironName}}}%
+ }\expandafter\tabu@FV@DefineCheckEnd\expandafter{\FV@DefineCheckEnd}
+}% \tabu@fancyvrb
+\def\tabu@FV@CheckEnd #1{\expandafter\FV@@CheckEnd \detokenize{#1\end{}}\@nil}
+\edef\tabu@FV@@@CheckEnd {\detokenize{\end{}}}
+\begingroup
+\catcode`\[1 \catcode`\]2
+\@makeother\{ \@makeother\}
+ \edef\x[\endgroup
+ \def\noexpand\tabu@FV@@CheckEnd ##1\detokenize[\end{]##2\detokenize[}]##3%
+ ]\x \@nil{\def\@tempa{#2}\def\@tempb{#3}}
% \end{macrocode}
% \end{macro}
%
-% \begin{macro}{\tabu@verticalsp@pmb}
+% \begin{macro}{\tabu@FV@ListProcessLine}
%
-% Vertical spacing adjustment with struts for \textt p,\, \textt m,\, or \textt b\, columns.
+% This macro replaces \cs\FV@ListProcessLine when measuring the
+% natural width of a \textt{Verbatim} environment (see \cs\tabu@startpboxmeasure)
%
% \begin{macrocode}
-\def\tabu@verticalsp@pmb{% inserts struts as needed
- \par \expandafter\egroup
- \expandafter\@tempdimc \the\prevdepth
- \@tempdima \dimexpr \ht\@arstrutbox -\ht\tabu@box \relax
- \@tempdimb \dimexpr \dp\@arstrutbox -\@tempdimc \relax
- \ifdim \@tempdima<\abovetabulinesep
- \llap {\vrule
- \@height \dimexpr\ht\tabu@box+\abovetabulinesep\relax
- \@depth -\ht\tabu@box
- \@width \tabustrutrule
- }\nointerlineskip \vskip-\ht\tabu@box
- \fi
- \unvbox\tabu@box
- \ifdim \@tempdimb<\belowtabulinesep
- \llap{\vrule
- \@depth \dimexpr \belowtabulinesep \relax
- \@height \z@
- \@width \tabustrutrule
- }\nointerlineskip%\vskip-\@tempdimc
- \let\@finalstrut \@gobble
- \fi
-}% \tabu@verticalsp@pmb
+\def\tabu@FV@ListProcessLine #1{%
+ \hbox {%to \hsize{%
+ \kern\leftmargin
+ \hbox {%to \linewidth{%
+ \FV@LeftListNumber
+ \FV@LeftListFrame
+ \FancyVerbFormatLine{#1}\hss
+%% DG/SR modification begin - Jan. 28, 1998 (for numbers=right add-on)
+%% \FV@RightListFrame}%
+ \FV@RightListFrame
+ \FV@RightListNumber}%
+%% DG/SR modification end
+ \hss}}
% \end{macrocode}
% \end{macro}
%
-%
-%
% \sectionformat\subsection{bookmark={color*=DarkRed}}
% \subsection{\cs{savetabu}}
%
+%¤<package>%% \savetabu --------------------------------------------------------
+%
% \begin{macro}{\savetabu}
%
% When this command is called by the user, the \textt{tabu} preamble and target are globally
@@ -4346,70 +6791,71 @@ lppl copyright 2010-2011 by FC <florent.chervet@free.fr>
%
% \begin{macrocode}
\newcommand*\savetabu[1]{\noalign{%
- \ifx\\#1\\\tabu@savewarn{}{The tabu will not be saved}\else
- \@ifundefined{tabu@saved@\string#1}{}{\tabu@savewarn{#1}{Overwritting}}%
- {%
- \toks0\expandafter{\tabu@savedpreamble}%
- \toks1\expandafter{\tabu@savedparam}%
- \toks2\expandafter{\tabu@savedpream}%
- \toks3{}%
- \iftabu@negcoef
- \edef\tabu@savewd{\tabu@savewd{\number\numexpr1}}%
- \toks3\expandafter{\tabu@savewd}\fi
- \expandafter\xdef\csname tabu@saved@\string#1\endcsname##1{%
- \noexpand\ifcase##1\relax
- \noexpand\ifdim\tabu@target>\z@
- \noexpand\tabu@warn@usetabu
- \noexpand\fi
- \tabu@target \the\tabu@target\relax
- \tabucolX \the\tabucolX\relax
- \the\toks1%
- \gdef\noexpand\tabu@usetabu{%
- \the\toks1%
- \def\noexpand\@halignto{\tabu@halignto}%
- \tabucolX \the\tabucolX\relax
- \def\noexpand\@preamble{\the\toks0}%
- \noexpand\tabu@make@arstrutbox
- \the\toks3
- \noexpand\ifx \noexpand\tabu@align\noexpand\tabu@aligndefault@text
- \def\noexpand\tabu@align{\tabu@align}%
- \noexpand\fi}%
- \aftergroup\noexpand\tabu@usetabu
- \noexpand\else
- \noexpand\ifdim\tabu@target=\z@
- \tabu@target \the\tabu@target\relax
- \noexpand\fi
- \gdef\noexpand\tabu@preamble{%
- \noexpand\ifx \noexpand\tabu@align\noexpand\tabu@aligndefault@text
- \def\noexpand\tabu@align{\tabu@align}%
- \noexpand\fi}%
- \aftergroup\noexpand\tabu@preamble
- \noexpand\fi
- \the\toks2}%
- \tabu@message@save{#1}}%
- \fi}%
+ \tabu@sanitizearg{#1}\tabu@temp
+ \ifx \tabu@temp\@empty \tabu@savewarn{}{The tabu will not be saved}\else
+ \@ifundefined{tabu@saved@\tabu@temp}{}{\tabu@savewarn{#1}{Overwritting}}%
+ \ifdefined\tabu@restored \expandafter\let
+ \csname tabu@saved@\tabu@temp \endcsname \tabu@restored
+ \else {\tabu@save}%
+ \fi
+ \fi}%
}% \savetabu
-\def\tabu@aligndefault@text{\tabu@aligndefault}%
-\def\tabu@warn@usetabu{\PackageWarning{tabu}
- {Specifying a target with \string\usetabu\space is useless
- \MessageBreak The target cannot be changed!}}
-\def\tabu@savewd#1{%
- \ifnum#1>\tabu@nbcols \expandafter \@gobble
- \else \ifdim\tabu@wd{#1}>\z@
- \noexpand\tabu@wddef{#1}{\tabu@wd{#1}}\fi
- \expandafter\tabu@savewd % loop
- \fi{#1+1}%
-}% \tabu@savewd
-\def\tabu@make@arstrutbox{%
- \@tempdima \ht \strutbox
- \@tempdimb \dp \strutbox
- \advance \@tempdima by\extrarowheight
- \advance \@tempdimb by\extrarowdepth
- \setbox \@arstrutbox \hbox{\vrule
- \@height \arraystretch \@tempdima
- \@depth \arraystretch \@tempdimb
- \@width \z@}%
-}% \tabu@make@arstrutbox
+\def\tabu@save {%
+ \toks0\expandafter{\tabu@saved@}%
+ \iftabu@negcoef
+ \let\tabu@wddef \relax \let\tabu@ \tabu@savewd \edef\tabu@savewd{\tabu@Xcoefs}%
+ \toks0\expandafter{\the\toks\expandafter0\tabu@savewd}\fi
+ \toks1\expandafter{\tabu@savedpream}%
+ \toks2\expandafter{\tabu@savedpreamble}%
+ \let\@preamble \relax
+ \let\tabu@savedpream \relax \let\tabu@savedparams \relax
+ \edef\tabu@preamble{%
+ \def\noexpand\tabu@aligndefault{\tabu@align}%
+ \def\tabu@savedparams {\noexpand\the\toks0}%
+ \def\tabu@savedpream {\noexpand\the\toks1}}%
+ \edef\tabu@usetabu{%
+ \def\@preamble {\noexpand\the\toks2}%
+ \tabu@target \the\tabu@target \relax
+ \tabucolX \the\tabucolX \relax
+ \tabu@nbcols \the\tabu@nbcols \relax
+ \def\noexpand\tabu@aligndefault{\tabu@align}%
+ \def\tabu@savedparams {\noexpand\the\toks0}%
+ \def\tabu@savedpream {\noexpand\the\toks1}}%
+ \let\tabu@aligndefault \relax \let\@sharp \relax
+ \edef\@tempa{\noexpand\tabu@s@ved
+ {\tabu@usetabu}
+ {\tabu@preamble}
+ {\the\toks1}}\@tempa
+ \tabu@message@save
+}% \tabu@save
+\long\def\tabu@s@ved #1#2#3{%
+ \def\tabu@usetabu{#1}% <for \tabu@message@save>
+ \expandafter\gdef\csname tabu@saved@\tabu@temp\endcsname ##1{%
+ \ifodd ##1% \usetabu
+ \tabu@measuringfalse \tabu@spreadfalse % Just in case...
+ \gdef\tabu@usetabu {%
+ \ifdim \tabu@target>\z@ \tabu@warn@usetabu \fi
+ \global\let\tabu@usetabu \@undefined
+ \def\@halignto {to\tabu@target}%
+ #1%
+ \ifx \tabu@align\tabu@aligndefault@text
+ \ifnum \tabu@nested=\z@
+ \let\tabu@align \tabu@aligndefault \fi\fi}%
+ \else % \preamble
+ \gdef\tabu@preamble {%
+ \global\let\tabu@preamble \@undefined
+ #2%
+ \ifx \tabu@align\tabu@aligndefault@text
+ \ifnum \tabu@nested=\z@
+ \let\tabu@align \tabu@aligndefault \fi\fi}%
+ \fi
+ #3}%
+}% \tabu@s@ved
+\def\tabu@aligndefault@text {\tabu@aligndefault}%
+\def\tabu@warn@usetabu {\PackageWarning{tabu}
+ {Specifying a target with \string\usetabu\space is useless
+ \MessageBreak The target cannot be changed!}}
+\def\tabu@savewd #1#2{\ifdim #2\p@<\z@ \tabu@wddef{#1}{\tabu@wd{#1}}\fi}
% \end{macrocode}
% \end{macro}
%
@@ -4422,11 +6868,11 @@ lppl copyright 2010-2011 by FC <florent.chervet@free.fr>
%
% \begin{macrocode}
\def\tabu@savewarn#1#2{\PackageInfo{tabu}
- {User-name `#1' already used for \string\savetabu
- \MessageBreak #2}}%
+ {User-name `#1' already used for \string\savetabu
+ \MessageBreak #2}}%
\def\tabu@saveerr#1{\PackageError{tabu}
- {User-name `#1' is unknown for \string\usetabu
- \MessageBreak I cannot restore an unknown preamble!}\@ehd}
+ {User-name `#1' is unknown for \string\usetabu
+ \MessageBreak I cannot restore an unknown preamble!}\@ehd}
% \end{macrocode}
% \end{macro}
% \end{macro}
@@ -4436,94 +6882,82 @@ lppl copyright 2010-2011 by FC <florent.chervet@free.fr>
%
% \subsubsection(Font and alignment){Setting font and alignment specification}
%
+%¤<package>%% \rowfont ---------------------------------------------------------
+%
% \begin{macro}{\rowfont}
%
-% \cs{rowfont} uses the control sequences \cs{tabu@celllalign}, \cs{tabu@cellleft}, \cs{tabu@cellright}\linebreak
-% and \cs{tabu@cellralign} which have been placed on purpose into the user-defined tokens inserted
+% \cs\rowfont uses the control sequences \cs\tabu@celllalign, \cs\tabu@cellleft, \cs\tabu@cellright\linebreak
+% and \cs\tabu@cellralign which have been placed on purpose into the user-defined tokens inserted
% in any preamble by the \xpackage{array} package.
%
-% \cs{tabu@celllalign} and \cs{tabu@cellralign} are used to modify the alignment. If the optional
-% \M[alignment] parameter of \cs{rowfont} is not specified, then those control sequence expand
-% to \cs{@empty}.
+% \cs\tabu@celllalign and \cs\tabu@cellralign are used to modify the alignment. If the optional
+% \M[alignment] parameter of \cs\rowfont is not specified, then those control sequence expand
+% to \cs\@empty.
%
-% \cs{tabu@cellleft} contains the font-modification information.
+% \cs\tabu@cellleft contains the font-modification information.
%
% Placement of those control sequences into the user-tokens that are inserted in the preamble
-% by the \xpackage{array} package is explained below under the macro \cs{tabu@prepnext@tok}.
+% by the \xpackage{array} package is explained below under the macro \cs\tabu@prepnext@tok.
%
% \begin{macrocode}
-\def\tabu@rowfont{\noalign{\ifnum0=`}\fi\tabu@row@font}
+\newskip \tabu@cellskip
+\def\tabu@rowfont{\ifdim \baselineskip=\z@\noalign\fi
+ {\ifnum0=`}\fi \tabu@row@font}
\newcommand*\tabu@row@font[2][]{%
- \global\let\tabu@rowfontreset \tabu@rowfont@reset
- \global\let\tabu@@cellleft \tabu@cellleft
- \global\let\tabu@@cellright \tabu@cellright
- \global\let\tabu@@celllalign \tabu@celllalign
- \global\let\tabu@@cellralign \tabu@cellralign
- \gdef\tabu@cellfont{#2}%
- \ifcsname tabu@cell@#1\endcsname % row alignment
- \csname tabu@cell@#1\endcsname \fi
- \toks@\expandafter {\tabu@cellleft\tabu@cellfont}% inside \noalign group ok
- \xdef\tabu@cellleft {\the\toks@}%
- \ifnum0=`{\fi}% end of noalign group
+ \ifnum7=\currentgrouptype
+ \global\let\tabu@@cellleft \tabu@cellleft
+ \global\let\tabu@@cellright \tabu@cellright
+ \global\let\tabu@@celllalign \tabu@celllalign
+ \global\let\tabu@@cellralign \tabu@cellralign
+ \global\let\tabu@@rowfontreset\tabu@rowfontreset
+ \fi
+ \global\let\tabu@rowfontreset \tabu@rowfont@reset
+ \expandafter\gdef\expandafter\tabu@cellleft\expandafter{\tabu@cellleft #2}%
+ \ifcsname tabu@cell@#1\endcsname % row alignment
+ \csname tabu@cell@#1\endcsname \fi
+ \ifnum0=`{\fi}% end of group / noalign group
}% \rowfont
-\def\tabu@ifcolorleavevmode#1{\let\color \tabu@leavevmodecolor #1\let\color\tabu@color}%
-\AtBeginDocument{%
- \ifdefined\color
- \let\tabu@color \color
- {\toks@\expandafter\expandafter\expandafter{\csname color \endcsname}
- \xdef\tabu@leavevmodecolor{\leavevmode\the\toks@}}
- \else \let\tabu@ifcolorleavevmode \@firstofone
- \fi
-}%
+\def\tabu@ifcolorleavevmode #1{\let\color \tabu@leavevmodecolor #1\let\color\tabu@color}%
% \end{macrocode}
% \end{macro}
%
-%
% \begin{macro}{\tabu@rowfont@reset}
%
-% This macro resets \cs{tabu@celllalign},\, \cs{tabu@cellleft},\, \cs{tabu@cellright},\, \cs{tabu@cellralign}\, and\,
-% \cs{everycr} to the value they had before the expansion of \cs{rowfont}.
+% This macro restores \cs\tabu@celllalign,\, \cs\tabu@cellleft,\, \cs\tabu@cellright,\, and\, \cs\tabu@cellralign
+% to the value they had before the expansion of \cs\rowfont.
%
% It expands when a new row is inserted into the tabular or array.
%
% \begin{macrocode}
\def\tabu@rowfont@reset{%
- \noalign{%
- \global\let\tabu@rowfontreset \@empty
- \global\let\tabu@cellleft \tabu@@cellleft
- \global\let\tabu@cellright \tabu@@cellright
- \global\let\tabu@cellfont \@empty
- \global\let\tabu@celllalign \tabu@@celllalign
- \global\let\tabu@cellralign \tabu@@cellralign
- }%
-}% \tabu@rowfont@reset
-\let\tabu@rowfontreset \@empty
-% \end{macrocode}
-% \end{macro}
-%
-%
-% \begin{macro}{\everyrow}
-%
-% \begin{macrocode}
-\def\everyrow #1{%
- \ifdim\baselineskip=\z@\noalign\fi
- {\gdef\tabu@everyrow@hook{#1}}%
-}% \everyrow
+ \global\let\tabu@rowfontreset \tabu@@rowfontreset
+ \global\let\tabu@cellleft \tabu@@cellleft
+ \global\let\tabu@cellright \tabu@@cellright
+ \global\let\tabu@cellfont \@empty
+ \global\let\tabu@celllalign \tabu@@celllalign
+ \global\let\tabu@cellralign \tabu@@cellralign
+}% \tabu@@rowfontreset
+\let\tabu@rowfontreset \@empty % overwritten \AtBeginDocument if colortbl
% \end{macrocode}
% \end{macro}
%
% \subsubsection(Tokens preparation){Preparing stuff to be able to use \cs{rowfont}}
%
+%¤<package>%% \tabu@prepnext@tok -----------------------------------------------
+%
% \begin{macro}{\tabu@prepnext@tok}
%
-% \cs{tabu@prepnext@tok} will replace \cs{prepnext@tok} (in \xfile{array.sty}): its purpose is to add
-% the control sequences \cs{tabu@celllalign},\, \cs{tabu@cellleft},\, \cs{tabu@cellright}\, and\, \cs{tabu@cellralign}\,
-% at the right position in the ``preamble'' for \cs{halign}. Those control sequences are not inserted directly
-% into the preamble, but by the means of the user-tokens placed there by the \xpackage{array} package.
+% \cs\tabu@prepnext@tok will replace \cs\prepnext@tok defined in \xfile{array.sty} (only inside a \env*{tabu}).
+% its purpose is to count the number of columns, and to insert the control sequences
+% \cs\tabu@celllalign,\, \cs\tabu@cellleft,\, \cs\tabu@cellright\, and\, \cs\tabu@cellralign\,
+% at the edge of each cell of the tabular. This is done by putting them inside the user-tokens
+% placed around each column by the \xpackage{array} package.
+%
+% \cs\prepnext@tok in \xfile{array.sty} initialises each user-token to an empty one, each time there is
+% a need for a new one ! The macro has a very simple definition, but it expansion is the occasion to
+% look carefully at the counters \cs\count@ and \cs\@tempcnta which gives us all information required
+% to decide is the token in preparation will be finally placed on the left or on the right of a column.
%
-% The package \xpackage{array} defines a macro \cs{prenext@tok} to initialize each user-token
-% inserted at both side of each ``normal'' column. For ``special`' \textttbf @ and \texttbf ! columns,
-% there is only one token.
% \begin{center}
% \begin{tikzpicture}
% \node (L) at (1,1) {$\underbrace{\hbox{>\M*{\cs{bfseries}\cs{color}\M*{red}}}}$}
@@ -4565,110 +6999,81 @@ lppl copyright 2010-2011 by FC <florent.chervet@free.fr>
% to prepare (\cs{toks}\cs{count@}$\,=$\cs{toks}$<i+1>$) to an empty one.
%
% \begin{macrocode}
-\newif\iftabu@cellright
-\AtBeginDocument{\let\tabu@prepnext@tokORI \prepnext@tok }% original definition
+\newif \iftabu@cellright
\def\tabu@prepnext@tok{%
- \ifnum \count@<\z@ % <first initialisation>
- \@tempcnta \@M % <not initialized by array.sty>
- \tabu@nbcols\z@
- \let\tabu@fornoopORI \@fornoop
- \expandafter\gdef\expandafter\tabu@global@temp\expandafter{%
- \tabu@global@temp\gdef\tabu@global@temp{}\tabu@nbcols\z@}%
- \expandafter\let\csname tabu@tok@1L\endcsname \relax
- \tabu@cellrightfalse
- \else
- \ifcase \numexpr \count@-\@tempcnta \relax % (case 0): prev. token is left
- \advance \tabu@nbcols\@ne
- \expandafter\let\csname tabu@tok@\the\tabu@nbcols R\endcsname \relax
- \expandafter\gdef\expandafter\tabu@global@temp\expandafter{%
- \tabu@global@temp \advance\tabu@nbcols\@ne}%
- \iftabu@cellright % before-previous token is right and is finished
- \tabu@cellrightfalse % <only once>
- \tabu@savetok R\tabu@preptokenright
- \fi
- \ifnum \tabu@nbcols=\@ne \tabu@savetok L\fi
- \tabu@preptokenleft
- \or % (case 1) previous token is right
- \tabu@savetok R\tabu@cellrighttrue
- \let\@fornoop \tabu@lastnoop
- \else % special column: do not change the token
- \ifnum \tabu@nbcols>\z@ %special column: always on the right of normal one
- \tabu@savetok R%
- \else % unless this is the very first column (\tabu@nbcols=0)
- \advance\tabu@nbcols\@ne \tabu@savetok L\advance\tabu@nbcols\m@ne
- \fi
- \iftabu@cellright % before-previous token is right
+ \ifnum \count@<\z@ % <first initialisation>
+ \@tempcnta \@M % <not initialized by array.sty>
+ \tabu@nbcols\z@
+ \let\tabu@fornoopORI \@fornoop
\tabu@cellrightfalse
- \tabu@preptokenright
- \fi
- \fi % \ifcase
- \fi
- \tabu@prepnext@tokORI
+ \else
+ \ifcase \numexpr \count@-\@tempcnta \relax % (case 0): prev. token is left
+ \advance \tabu@nbcols \@ne
+ \iftabu@cellright % before-previous token is right and is finished
+ \tabu@cellrightfalse % <only once>
+ \tabu@righttok
+ \fi
+ \tabu@lefttok
+ \or % (case 1) previous token is right
+ \tabu@cellrighttrue \let\@fornoop \tabu@lastnoop
+ \else % special column: do not change the token
+ \iftabu@cellright % before-previous token is right
+ \tabu@cellrightfalse
+ \tabu@righttok
+ \fi
+ \fi % \ifcase
+ \fi
+ \tabu@prepnext@tokORI
}% \tabu@prepnext@tok
-\long\def\tabu@lastnoop#1\@@#2#3{\in@\@nextchar{#2}%
- \ifin@
- \let\@fornoop \tabu@fornoopORI
- \toks0\expandafter{\expandafter\tabu@everyrowtrue \the\toks0}%
- \expandafter\prepnext@tok
- \fi
+\long\def\tabu@lastnoop#1\@@#2#3{\tabu@lastn@@p #2\@nextchar \in@\in@@}
+\def\tabu@lastn@@p #1\@nextchar #2#3\in@@{%
+ \ifx \in@#2\else
+ \let\@fornoop \tabu@fornoopORI
+ \xdef\tabu@mkpreambuffer{\tabu@nbcols\the\tabu@nbcols \tabu@mkpreambuffer}%
+ \toks0\expandafter{\expandafter\tabu@everyrowtrue \the\toks0}%
+ \expandafter\prepnext@tok
+ \fi
}% \tabu@lastnoop
-\def\tabu@preptokenright{%
- \advance \count@ \m@ne
- \toks\count@\expandafter {\the\toks\count@ \tabu@cellright \tabu@cellralign}%
- \advance \count@ \@ne
-}% \tabu@preptokenright
-\def\tabu@preptokenleft{\toks\count@\expandafter{\expandafter\tabu@celllalign
- \the\toks\count@ \tabu@cellleft}% after because of $
-}% \tabu@preptokenleft
-\def\tabu@savetok#1{\begingroup
- \expandafter\tabu@savet@k\csname tabu@tok@\the\tabu@nbcols #1\endcsname
-}% \tabu@savetok
-\def\tabu@savet@k#1{%
- \ifnum \@chclass=\@ne \toks@\toks\count@
- \else\ifnum\@chclass=5 \toks@\toks\count@
- \else \toks@{}\fi\fi
- \unless\ifx#1\relax
- \toks@\expandafter\expandafter\expandafter{%
- \expandafter#1\the\toks@}\fi
- \toks@\expandafter{\expandafter\def\expandafter#1\expandafter{%
- \the\toks@}}%
- \@temptokena\expandafter{\tabu@global@temp}%
- \xdef\tabu@global@temp {\the\@temptokena \the\toks@}%
- \expandafter\endgroup \the\toks@
-}% \tabu@savetok
+\def\tabu@righttok{%
+ \advance \count@ \m@ne
+ \toks\count@\expandafter {\the\toks\count@ \tabu@cellright \tabu@cellralign}%
+ \advance \count@ \@ne
+}% \tabu@righttok
+\def\tabu@lefttok{\toks\count@\expandafter{\expandafter\tabu@celllalign
+ \the\toks\count@ \tabu@cellleft}% after because of $
+}% \tabu@lefttok
% \end{macrocode}
% \end{macro}
%
% \subsubsection(Glue neutralisation){Neutralisation of glues and alignment modification}
%
+%¤<package>%% Neutralisation of glues ------------------------------------------
+%
% \begin{macro}{\tabu@cellleft}
% \begin{macro}{\tabu@celllalign}
% \begin{macro}{\tabu@cellright}
% \begin{macro}{\tabu@cellralign}
-% \begin{macro}{\tabu@cellfont}
% First initialisation to \cs{@empty}.
% \begin{macrocode}
\let\tabu@cellleft \@empty
\let\tabu@cellright \@empty
-\def\tabu@celllalign {\tabu@cellleft}% row font spec. applies to pre-column material
+\tabu@celllalign@def{\tabu@cellleft}%
\let\tabu@cellralign \@empty
-\let\tabu@cellfont \@empty
% \end{macrocode}
% \end{macro}
% \end{macro}
% \end{macro}
% \end{macro}
-% \end{macro}
%
% \begin{macro}{\tabu@cell@align}
% \begin{macrocode}
\def\tabu@cell@align #1#2#3{%
- \toks@\expandafter{\tabu@celllalign #1}%
- \xdef\tabu@celllalign{\the\toks@}%
- \toks@\expandafter{\tabu@cellralign #2}%
- \xdef\tabu@cellralign{\the\toks@}%
- \toks@\expandafter{\tabu@cellleft #3}%
- \xdef\tabu@cellleft{\the\toks@}%
+ \let\tabu@maybesiunitx \toks@ \tabu@celllalign
+ \global \expandafter \tabu@celllalign@def \expandafter {\the\toks@ #1}%
+ \toks@\expandafter{\tabu@cellralign #2}%
+ \xdef\tabu@cellralign{\the\toks@}%
+ \toks@\expandafter{\tabu@cellleft #3}%
+ \xdef\tabu@cellleft{\the\toks@}%
}% \tabu@cell@align
% \end{macrocode}
% \end{macro}
@@ -4714,52 +7119,39 @@ lppl copyright 2010-2011 by FC <florent.chervet@free.fr>
%% ragged2e settings
\def\tabu@cell@L{% force alignment to left (ragged2e)
\tabu@cell@align
- {\tabu@removehfil \RaggedRight \arraybackslash
- \tabu@cellleft}
- {\tabu@flush1\tabu@ignorehfil}
- {\RaggedRight \arraybackslash}%
+ {\tabu@removehfil \RaggedRight \tabu@cellleft}
+ {\tabu@flush 1\tabu@ignorehfil}
+ \RaggedRight
}% \tabu@cell@L
\def\tabu@cell@C{% force alignment to center (ragged2e)
\tabu@cell@align
- {\tabu@removehfil \Centering \arraybackslash
- \tabu@flush{.5}\tabu@cellleft}
+ {\tabu@removehfil \Centering \tabu@flush{.5}\tabu@cellleft}
{\tabu@flush{.5}\tabu@ignorehfil}
- {\Centering \arraybackslash}%
+ \Centering
}% \tabu@cell@C
\def\tabu@cell@R{% force alignment to right (ragged2e)
\tabu@cell@align
- {\tabu@removehfil \RaggedLeft \arraybackslash
- \tabu@flush1\tabu@cellleft}
- {\tabu@ignorehfil}
- {\RaggedLeft \arraybackslash}%
+ {\tabu@removehfil \RaggedLeft \tabu@flush 1\tabu@cellleft}
+ \tabu@ignorehfil
+ \RaggedLeft
}% \tabu@cell@R
\def\tabu@cell@J{% force justification (ragged2e)
\tabu@cell@align
- {\justifying \arraybackslash \tabu@cellleft}
+ {\justifying \tabu@cellleft}
{}
- {\justifying \arraybackslash}%
+ \justifying
}% \tabu@cell@J
\def\tabu@flush#1{%
- \iftabu@colortbl % colortbl uses \hfill rather than \hfil
- \hskip \ifnum\currentgrouptype>13 \stretch{#1}%
- \else\ifdim#1pt<1pt \tabu@cellskip
- \else \stretch{#1}
- \fi\fi \relax
- \else % array.sty
- \ifnum \currentgrouptype>13\relax
- \hfil \hskip1sp
- \fi
- \fi
+ \iftabu@colortbl % colortbl uses \hfill rather than \hfil
+ \hskip \ifnum13<\currentgrouptype \stretch{#1}%
+ \else \ifdim#1pt<\p@ \tabu@cellskip
+ \else \stretch{#1}
+ \fi\fi \relax
+ \else % array.sty
+ \ifnum 13<\currentgrouptype
+ \hfil \hskip1sp \relax \fi
+ \fi
}% \tabu@flush
-\AtBeginDocument{%
- \@ifpackageloaded{ragged2e}
- {}
- {\let\tabu@cell@L \tabu@cell@l
- \let\tabu@cell@R \tabu@cell@r
- \let\tabu@cell@C \tabu@cell@c
- \let\tabu@cell@J \tabu@cell@j
- }%
-}% AtBeginDocument
% \end{macrocode}
% \end{macro}
% \end{macro}
@@ -4772,22 +7164,21 @@ lppl copyright 2010-2011 by FC <florent.chervet@free.fr>
% \emph{before} the cell (in the preamble of \cs{halign}) to make the column alignment.
%
% \begin{macrocode}
-\newskip\tabu@cellskip
-\let\tabu@hfil\hfil
-\let\tabu@hfill\hfill
-\let\tabu@hskip\hskip
+\let\tabu@hfil \hfil
+\let\tabu@hfill \hfill
+\let\tabu@hskip \hskip
\def\tabu@removehfil{%
- \iftabu@colortbl
- \unkern \tabu@cellskip = \lastskip
- \ifnum\gluestretchorder\tabu@cellskip = \tw@ \hskip-\tabu@cellskip
- \else \tabu@cellskip = \z@skip
- \fi
- \else
- \ifdim\lastskip=1sp\unskip\fi
- \ifnum\gluestretchorder\lastskip = \@ne
- \hfilneg % \hfilneg for array.sty but not for colortbl...
- \fi
- \fi
+ \iftabu@colortbl
+ \unkern \tabu@cellskip =\lastskip
+ \ifnum\gluestretchorder\tabu@cellskip =\tw@ \hskip-\tabu@cellskip
+ \else \tabu@cellskip \z@skip
+ \fi
+ \else
+ \ifdim\lastskip=1sp\unskip\fi
+ \ifnum\gluestretchorder\lastskip =\@ne
+ \hfilneg % \hfilneg for array.sty but not for colortbl...
+ \fi
+ \fi
}% \tabu@removehfil
% \end{macrocode}
% \end{macro}
@@ -4798,91 +7189,147 @@ lppl copyright 2010-2011 by FC <florent.chervet@free.fr>
% \emph{after} the cell (in the preamble of \cs{halign}) to make the column alignment.
%
% \begin{macrocode}
-\def\tabu@ignorehfil{%
- \aftergroup\tabu@nohfil
-}% \tabu@ignorehfil
+\def\tabu@ignorehfil{\aftergroup \tabu@nohfil}
\def\tabu@nohfil{% \hfil -> do nothing + restore original \hfil
- \def\hfil{\let\hfil\tabu@hfil}% local to (alignment template) group
+ \def\hfil{\let\hfil \tabu@hfil}% local to (alignment template) group
}% \tabu@nohfil
-\AtBeginDocument{%
- \@ifpackageloaded{colortbl}
- {%
- \def\tabu@nohfil{%
- \def\hfil{\let\hfil\tabu@hfil}% local to (alignment template) group
- \def\hfill{\let\hfill\tabu@hfill}% (colortbl uses \hfill) pfff...
- \def\hskip##1\relax{\let\hskip\tabu@hskip}}% local
- }% @ifpackageloaded colortbl
- {}%
-}% AtBeginDocument
+\def\tabu@colortblalignments {% if colortbl
+ \def\tabu@nohfil{%
+ \def\hfil {\let\hfil \tabu@hfil}% local to (alignment template) group
+ \def\hfill {\let\hfill \tabu@hfill}% (colortbl uses \hfill) pfff...
+ \def\hskip ####1\relax{\let\hskip \tabu@hskip}}% local
+}% \tabu@colortblalignments
% \end{macrocode}
% \end{macro}
%
%
-% \subsection{Utilities}
+% \subsection{Taking care of footnotes and \cs{arraybackslash}}
+% \label{Taking care of footnotes and arraybackslash}
+%
+% \subsubsection{Footnotes and hyperfootnotes}
+%¤<package>%% Taking care of footnotes and hyperfootnotes ----------------------
%
-% \subsubsection{\textt{tabu} \cs{fbox}}
+% \begin{macro}{\tabu@footenotetext}
%
-% \cs{tabu@fbox} works exactly like \LaTeX{} \cs{fbox} but allows the syntax: \cs{fbox}\cs{bgroup}...\cs{egroup}
-% suitable for use inside tabular columns. \cs{fbox} is \cs{let} to \cs{tabu@fbox} at the entry inside a \textt{tabu}
-% environment.
+% The macros in case \xpackage{hyperref} is not used, or used with the option \textt{hyperfootnotes=false}:
%
% \begin{macrocode}
-\def\tabu@fbox{%
- \leavevmode
- \let\color@bgroup\bgroup
- \def\color@egroup{\endgraf\egroup}%
- \afterassignment\tabu@begin@fbox
- \setbox\@tempboxa \hbox
-}% \tabu@fbox
-\def\tabu@begin@fbox{\color@bgroup\kern\fboxsep\aftergroup\tabu@end@fbox}
-\def\tabu@end@fbox{\kern\fboxsep \color@egroup \@frameb@x\relax}
+\long\def\tabu@footnotetext #1{%
+ \edef\@tempa{\the\tabu@footnotes
+ \noexpand\footnotetext [\the\csname c@\@mpfn\endcsname]}%
+ \global\tabu@footnotes\expandafter{\@tempa {#1}}}%
+\long\def\tabu@xfootnotetext [#1]#2{%
+ \global\tabu@footnotes\expandafter{\the\tabu@footnotes
+ \footnotetext [{#1}]{#2}}}
+\let\tabu@xfootnote \@xfootnote
% \end{macrocode}
+% \end{macro}
%
-% \subsubsection{\textt{tabu} \cs{fcolorbox}}
-%
-% \cs{tabu@fcolorbox} works exactly like \xpackage{xcolor} \cs{fcolorbox} but allows the syntax:
-%
-% \cs{fcolorbox}\M*{frame color}\M*{background color}\cs{bgroup}...\cs{egroup}
+% \begin{macro}{\tabu@Hy@ftntext}
+% \begin{macro}{\tabu@Hy@xfootnote}
%
-% suitable for use insed tabular columns. \cs{fcolorbox} is \cs{let} to \cs{tabu@fcolorbox} at the entry inside a \textt{tabu}
-% environment.
+% The macros in case \xpackage{hyperref} is loaded with the option \textt{hyperfootnotes=true}:
%
% \begin{macrocode}
-\def\tabu@color@b@x#1#2{\leavevmode
- \def\tabu@do@color@b@x{#1{#2\color@block{\wd\z@}{\ht\z@}{\dp\z@}\box\z@}}%
- \afterassignment\tabu@begin@color@b@x
- \setbox\z@ \hbox
-}% \tabu@color@b@x
-\def\tabu@begin@color@b@x{%
- \bgroup \kern\fboxsep \set@color
- \aftergroup\tabu@end@color@b@x
-}% \tabu@begin@color@b@x
-\def\tabu@end@color@b@x{\kern\fboxsep \egroup
- \dimen@\ht\z@\advance\dimen@\fboxsep\ht\z@\dimen@
- \dimen@\dp\z@\advance\dimen@\fboxsep\dp\z@\dimen@
- \tabu@do@color@b@x
-}% \tabu@end@color@b@x
+\long\def\tabu@Hy@ftntext{\tabu@Hy@ftntxt {\the \c@footnote }}
+\long\def\tabu@Hy@xfootnote [#1]{%
+ \begingroup
+ \value\@mpfn #1\relax
+ \protected@xdef \@thefnmark {\thempfn}%
+ \endgroup
+ \@footnotemark \tabu@Hy@ftntxt {#1}%
+}% \tabu@Hy@xfootnote
+\long\def\tabu@Hy@ftntxt #1#2{%
+ \edef\@tempa{%
+ \the\tabu@footnotes
+ \begingroup
+ \value\@mpfn #1\relax
+ \noexpand\protected@xdef\noexpand\@thefnmark {\noexpand\thempfn}%
+ \expandafter \noexpand \expandafter
+ \tabu@Hy@footnotetext \expandafter{\Hy@footnote@currentHref}%
+ }%
+ \global\tabu@footnotes\expandafter{\@tempa {#2}%
+ \endgroup}%
+}% \tabu@Hy@ftntxt
+\long\def\tabu@Hy@footnotetext #1#2{%
+ \H@@footnotetext{%
+ \ifHy@nesting
+ \hyper@@anchor {#1}{#2}%
+ \else
+ \Hy@raisedlink{%
+ \hyper@@anchor {#1}{\relax}%
+ }%
+ \def\@currentHref {#1}%
+ \let\@currentlabelname \@empty
+ #2%
+ \fi
+ }%
+}% \tabu@Hy@footnotetext
% \end{macrocode}
+% \end{macro}
+% \end{macro}
%
+% \subsubsection{\cs{centering}, \cs{raggedright}, \cs{raggedleft} and \cs{@normalcr}}
+%¤<package>%% No need for \arraybackslash ! ------------------------------------
%
-% \subsubsection{\cs{centering}, \cs{raggedright}, \cs{raggedleft}}
-%
-% Inside \textt{tabu} environment, no need to add \cs{arraybackslash} after these commands.
+% Inside \env*{tabu}, no need to add \cs\arraybackslash after such commands.
%
% \begin{macrocode}
-\def\tabu@temp#1#2#3{{\toks@\expandafter{#2#3}\xdef#1{\the\toks@}}}
+\def\tabu@latextwoe {%
+\def\tabu@temp##1##2##3{{\toks@\expandafter{##2##3}\xdef##1{\the\toks@}}}
\tabu@temp \tabu@centering \centering \arraybackslash
\tabu@temp \tabu@raggedleft \raggedleft \arraybackslash
\tabu@temp \tabu@raggedright \raggedright \arraybackslash
+}% \tabu@latextwoe
+\def\tabu@raggedtwoe {%
+\def\tabu@temp ##1##2##3{{\toks@\expandafter{##2##3}\xdef##1{\the\toks@}}}
+\tabu@temp \tabu@Centering \Centering \arraybackslash
+\tabu@temp \tabu@RaggedLeft \RaggedLeft \arraybackslash
+\tabu@temp \tabu@RaggedRight \RaggedRight \arraybackslash
+\tabu@temp \tabu@justifying \justifying \arraybackslash
+}% \tabu@raggedtwoe
\def\tabu@normalcrbackslash{\let\\\@normalcr}
\def\tabu@trivlist{\expandafter\def\expandafter\@trivlist\expandafter{%
- \expandafter\tabu@normalcrbackslash \@trivlist}}%
+ \expandafter\tabu@normalcrbackslash \@trivlist}}
+% \end{macrocode}
+%
+% \subsubsection{Utilities: \textt{tabu} \cs{fbox}}
+%¤<package>%% Utilities: \fbox \fcolorbox and \tabudecimal -------------------
+%
+% \cs\tabu@fbox works exactly like \LaTeX{} \cs\fbox but allows the syntax: \cs\fbox\cs\bgroup...\cs\egroup
+% suitable for use inside tabular columns. \cs\fbox is \cs\let to \cs\tabu@fbox at the entry inside a \env*{tabu}.
+%
+% \begin{macrocode}
+\def\tabu@fbox {\leavevmode\afterassignment\tabu@beginfbox \setbox\@tempboxa\hbox}
+\def\tabu@beginfbox {\bgroup \kern\fboxsep
+ \bgroup\aftergroup\tabu@endfbox}
+\def\tabu@endfbox {\kern\fboxsep\egroup\egroup
+ \@frameb@x\relax}
% \end{macrocode}
%
+% \cs\tabu@fcolorbox works exactly like \xpackage{xcolor} \cs\fcolorbox but allows the syntax:
+%
+% \cs\fcolorbox\M*{frame color}\M*{background color}\cs\bgroup...\cs\egroup
%
+% suitable for use insed tabular columns. \cs\fcolorbox is \cs\let to \cs\tabu@fcolorbox at the entry inside a \env*{tabu}.
%
+% \begin{macrocode}
+\def\tabu@color@b@x #1#2{\leavevmode \bgroup
+ \def\tabu@docolor@b@x{#1{#2\color@block{\wd\z@}{\ht\z@}{\dp\z@}\box\z@}}%
+ \afterassignment\tabu@begincolor@b@x \setbox\z@ \hbox
+}% \tabu@color@b@x
+\def\tabu@begincolor@b@x {\kern\fboxsep \bgroup
+ \aftergroup\tabu@endcolor@b@x \set@color}
+\def\tabu@endcolor@b@x {\kern\fboxsep \egroup
+ \dimen@\ht\z@ \advance\dimen@ \fboxsep \ht\z@ \dimen@
+ \dimen@\dp\z@ \advance\dimen@ \fboxsep \dp\z@ \dimen@
+ \tabu@docolor@b@x \egroup
+}% \tabu@endcolor@b@x
+% \end{macrocode}
%
% \subsection{Corrections}
+% \label{Corrections}
+%¤<package>%% Corrections (arydshln, delarray, colortbl) -----------------------
%
% \subsubsection(delarray compatibility fix){delarray comptability fix for \xpackage{colortbl} and \xpackage{arydshln}}
%
@@ -4890,47 +7337,42 @@ lppl copyright 2010-2011 by FC <florent.chervet@free.fr>
% which must be expanded by \cs{endarray}. Originally defined for \xpackage{delarray}, this control
% sequence is used by \textt{tabu} environments when \textt{tabu X} columns are present in the preamble.
%
-% Here is the fix. We test if \cs{endarray} contains \cs{@arrayright} before modifying the control sequence,
-% in case \xpackage{colortbl} and/or \xpackage{arydshln} modify their implementation.
-%
-% \begin{macrocode}
-\def\tabu@fix@arrayright{%
- \@ifpackageloaded{arydshln}
- {%
- \@ifpackageloaded{colortbl}
- {%% colortbl + arydshln
- \def\tabu@endarray{%
- \adl@endarray \egroup \adl@arrayrestore \CT@end \egroup %<original>
- \@arrayright % <FC>
- \gdef\@preamble{}% <FC>
- }}% \endarray
- {%% arydshln / no colortbl
- \def\tabu@endarray{%
- \adl@endarray \egroup \adl@arrayrestore \egroup %<original>
- \@arrayright % <FC>
- \gdef\@preamble{}% <FC>
- }}% \endarray
- }%
- {%
- \@ifpackageloaded{colortbl}
- {%% colortbl / no arydshln
- \def\tabu@endarray{%
- \crcr \egroup \egroup
- \@arrayright % <FC>
- \gdef\@preamble{}\CT@end
- }}%
- {\PackageWarning{tabu}
- {\string\@arrayright\space is missing from the
- \MessageBreak definition of \string\endarray.
- \MessageBreak Comptability with delarray.sty is broken.}}%
- }%
+% Here is the fix. We test if \cs\endarray contains \cs\@arrayright before modifying the control sequence,
+% in case \xpackage{colortbl} and/or \xpackage{arydshln} modify their definition.
+%
+% \begin{macrocode}
+\def\tabu@fix@arrayright {%% \@arrayright is missing from \endarray
+ \iftabu@colortbl
+ \ifdefined\adl@array % <colortbl + arydshln>
+ \def\tabu@endarray{%
+ \adl@endarray \egroup \adl@arrayrestore \CT@end \egroup %<original>
+ \@arrayright % <FC>
+ \gdef\@preamble{}}% <FC>
+ \else % <colortbl / no arydshln>
+ \def\tabu@endarray{%
+ \crcr \egroup \egroup %<original>
+ \@arrayright % <FC>
+ \gdef\@preamble{}\CT@end}%
+ \fi
+ \else
+ \ifdefined\adl@array % <arydshln / no colortbl>
+ \def\tabu@endarray{%
+ \adl@endarray \egroup \adl@arrayrestore \egroup %<original>
+ \@arrayright % <FC>
+ \gdef\@preamble{}}% <FC>
+ \else % <no arydshln / no colotbl + \@arrayright missing>
+ \PackageWarning{tabu}
+ {\string\@arrayright\space is missing from the
+ \MessageBreak definition of \string\endarray.
+ \MessageBreak Comptability with delarray.sty is broken.}%
+ \fi\fi
}% \tabu@fix@arrayright
% \end{macrocode}
%
% \subsubsection{arydshln @ columns}
%
% \begin{macrocode}
-\def\tabu@adl@xarraydashrule#1#2#3{%
+\def\tabu@adl@xarraydashrule #1#2#3{%
\ifnum\@lastchclass=\adl@class@start\else
\ifnum\@lastchclass=\@ne\else
\ifnum\@lastchclass=5 \else % <FC> @-arg (class 5) and !-arg (class 1)
@@ -4960,51 +7402,237 @@ lppl copyright 2010-2011 by FC <florent.chervet@free.fr>
% \egroup \adl@colhtdp \box\adl@box \hfil
% \end{Verb*}
%
-% The \cs{vrule} inserted is exactly what package \xpackage{array} calls: \cs{@finalstrut}\cs{@arstrutbox}.
+% The \cs\vrule inserted is exactly what package \xpackage{array} calls: \cs\@finalstrut\cs\@arstrutbox.
%
% However, just like in \xfile{array.sty}, this array-\textt{strut} should be inserted inconditionnally,
-% and \cs{ifhmode} applies only to \cs{nobreak} (misplaced \cs{fi} in \xpackage{arydshln} definition).
+% and \cs{ifhmode} applies only to \cs\nobreak (misplaced \cs{fi} in \xpackage{arydshln} definition).
%
% Finally, \xpackage{arydshln} is not compatible with colors in columns, such that: \textt{>\M*{\cs{color}\M*{red}}p{3in}},
% Unless \xpackage{colortbl} is also loaded, the color group is missing.
%
-% Fixed inside \textt{tabu}.
+% Fixed inside \env*{tabu}.
%
% \begin{macrocode}
-\def\tabu@adl@act@endpbox{%
- \unskip \ifhmode \nobreak \fi \@finalstrut \@arstrutbox
- \egroup \egroup
- \adl@colhtdp \box\adl@box \hfil
+\def\tabu@adl@act@endpbox {%
+ \unskip \ifhmode \nobreak \fi \@finalstrut \@arstrutbox
+ \egroup \egroup
+ \adl@colhtdp \box\adl@box \hfil
}% \tabu@adl@act@endpbox
-\def\tabu@adl@fix{%
- \let\adl@xarraydashrule \tabu@adl@xarraydashrule % <fix> arydshln
- \let\adl@act@endpbox \tabu@adl@act@endpbox % <fix> arydshln
- \let\adl@act@@endpbox \tabu@adl@act@endpbox % <fix> arydshln
- \let\@preamerror \@preamerr % <fix> arydshln
+\def\tabu@adl@fix {%
+ \let\adl@xarraydashrule \tabu@adl@xarraydashrule % <fix> arydshln
+ \let\adl@act@endpbox \tabu@adl@act@endpbox % <fix> arydshln
+ \let\adl@act@@endpbox \tabu@adl@act@endpbox % <fix> arydshln
+ \let\@preamerror \@preamerr % <fix> arydshln
}% \tabu@adl@fix
% \end{macrocode}
%
+%
% \subsubsection{\xpackage{longtable} \cs{@startpbox}: \cs{everypar} needed}
%
+%¤<package>%% Correction for longtable' \@startbox definition ------------------
+%¤<package>%% => \everypar is ``missing'' : TeX should be in vertical mode
+%
% \begin{macro}{\tabu@LT@startpbox}
%
-% The leading strut should be inserted at \cs{everypar} in order for \cs{tabulinesep} to work
-% (otherwise, \TeX{} is in horizontal mode and \cs{nointerlineskip} breaks).
+% The leading strut should be inserted at \cs\everypar in order for \cs\tabulinesep to work
+% (otherwise, \TeX{} is in horizontal mode and \cs\nointerlineskip breaks).
%
% \begin{macrocode}
\def\tabu@LT@startpbox #1{%
- \bgroup
- \let\@footnotetext\LT@p@ftntext
- \setlength\hsize{#1}%
- \@arrayparboxrestore
- \everypar{%
- \vrule \@height \ht\@arstrutbox \@width \z@
- \everypar{}}%
+ \bgroup
+ \let\@footnotetext\LT@p@ftntext
+ \setlength\hsize{#1}%
+ \@arrayparboxrestore
+ \everypar{%
+ \vrule \@height \ht\@arstrutbox \@width \z@
+ \everypar{}}%
}% \tabu@LT@startpbox
% \end{macrocode}
% \end{macro}
%
%
+% \subsection{Package options and Initialisation}
+% \label{Package options and Initialisation}
+%
+% \subsubsection{\cs{tracingtabu} and the package options}
+%¤<package>%% \tracingtabu and the package options ------------------
+%
+% \begin{macro}{delarray (package option)}
+%
+% The \textt{delarray} package option is only there for convenience: it simply loads
+% the \Xpackage{delarray} package.
+%
+% \begin{macrocode}
+\DeclareOption{delarray}{\AtEndOfPackage{\RequirePackage{delarray}}}
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{linegoal (package option)}
+%
+% The \textt{linegoal} package option only sets \cs\tabudefaulttarget to be equal to
+% \cs\linegoal. The required package \Xpackage{linegoal} is loaded.
+%
+% \begin{macrocode}
+\DeclareOption{linegoal}{%
+ \AtEndOfPackage{%
+ \RequirePackage{linegoal}[2010/12/07]%
+ \let\tabudefaulttarget \linegoal% \linegoal is \linewidth if not pdfTeX
+}}
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\scantokens (package option)}
+%
+% The \textt{scantokens} package option makes \env{tabu} equal to \env{tabu\stform*}.
+%
+% \begin{macrocode}
+\DeclareOption{scantokens}{\tabuscantokenstrue}
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\tracingtabu}
+% \begin{macro}{debugshow (package option)}
+%
+% \cs\tracingtabu is the same as the package option \hyperref[debugshow]{\textt{debugshow}}.
+%
+% \begin{macrocode}
+\DeclareOption{debugshow}{\AtEndOfPackage{\tracingtabu=\tw@}}
+\def\tracingtabu {\begingroup\@ifnextchar=%
+ {\afterassignment\tabu@tracing\count@}
+ {\afterassignment\tabu@tracing\count@1\relax}}
+\def\tabu@tracing{\expandafter\endgroup
+ \expandafter\tabu@tr@cing \the\count@ \relax
+}% \tabu@tracing
+\def\tabu@tr@cing #1\relax {%
+ \ifnum#1>\thr@@ \let\tabu@tracinglines\message
+ \else \let\tabu@tracinglines\@gobble
+ \fi
+ \ifnum#1>\tw@ \let\tabu@DBG \tabu@@DBG
+ \def\tabu@mkarstrut {\tabu@DBG@arstrut}%
+ \tabustrutrule 1.5\p@
+ \else \let\tabu@DBG \@gobble
+ \def\tabu@mkarstrut {\tabu@arstrut}%
+ \tabustrutrule \z@
+ \fi
+ \ifnum#1>\@ne \let\tabu@debug \message
+ \else \let\tabu@debug \@gobble
+ \fi
+ \ifnum#1>\z@
+ \let\tabu@message \message
+ \let\tabu@tracing@save \tabu@message@save
+ \let\tabu@starttimer \tabu@pdftimer
+ \else
+ \let\tabu@message \@gobble
+ \let\tabu@tracing@save \@gobble
+ \let\tabu@starttimer \relax
+ \fi
+}% \tabu@tr@cing
+% \end{macrocode}
+% \end{macro}
+% \end{macro}
+%
+% \subsubsection{Initialisation and setup \cs{AtBeginDocument}}
+%¤<package>%% Setup \AtBeginDocument
+%
+% At the end of the \xpackage{tabu} package:
+% \begin{itemize}
+% \item \cs\tracingtabu is set to $0$: this initialises the message commands. Eventually,, t
+% he value will be overwritten by the \textt{debugshow} package option later.
+% \item \cs\everyrow is set to empty: this initialises the process at \cs\everycr to the default process,
+% \item a new \emph{empty} line style is defined, to be equivalent to \cs\hline: this creates the \emph{default leaders},
+% which will be used if a line style specification cannot be parsed successfully.\\
+% Then this default line style is set to be the current one.
+% \end{itemize}
+%
+% At Begin Document,a fix for \Xpackage{arydshln} and \Xpackage{colortbl} comptability with \Xpackage{delarray}
+% shortcuts available inside \textt{tabu}: requirement for this fix is checked by \cs\tabu@fix@arrayright.
+%
+% Then the switch \cs{iftabu@colortbl} is set.
+%
+% Finally, the \env*{longtabu} is defined only if the \Xpackage{longtable} package is detected.
+%
+% \begin{macrocode}
+\AtBeginDocument{\tabu@AtBeginDocument}
+\def\tabu@AtBeginDocument{\let\tabu@AtBeginDocument \@undefined
+ \ifdefined\arrayrulecolor \tabu@colortbltrue % <colortbl>
+ \tabu@colortblalignments % different glues are used
+ \else \tabu@colortblfalse \fi
+ \ifdefined\CT@arc@ \else \let\CT@arc@ \relax \fi
+ \ifdefined\CT@drsc@\else \let\CT@drsc@ \relax \fi
+ \let\tabu@arc@L \CT@arc@ \let\tabu@drsc@L \CT@drsc@
+ \ifodd 1\ifcsname siunitx_table_collect_begin:Nn\endcsname % <siunitx: ok>
+ \expandafter\ifx
+ \csname siunitx_table_collect_begin:Nn\endcsname\relax 0\fi\fi\relax
+ \tabu@siunitxtrue
+ \else \let\tabu@maybesiunitx \@firstofone % <not siunitx: setup>
+ \let\tabu@siunitx \tabu@nosiunitx
+ \tabu@siunitxfalse
+ \fi
+ \ifdefined\adl@array % <arydshln>
+ \else \let\tabu@adl@fix \relax
+ \let\tabu@adl@endtrial \@empty \fi
+ \ifdefined\longtable % <longtable>
+ \else \let\longtabu \tabu@nolongtabu \fi
+ \ifdefined\cellspacetoplimit \tabu@warn@cellspace\fi
+ \csname\ifcsname ifHy@hyperfootnotes\endcsname % <hyperfootnotes>
+ ifHy@hyperfootnotes\else iffalse\fi\endcsname
+ \let\tabu@footnotetext \tabu@Hy@ftntext
+ \let\tabu@xfootnote \tabu@Hy@xfootnote \fi
+ \ifdefined\FV@DefineCheckEnd% <fancyvrb>
+ \tabu@fancyvrb \fi
+ \ifdefined\color % <color / xcolor>
+ \let\tabu@color \color
+ \def\tabu@leavevmodecolor ##1{%
+ \def\tabu@leavevmodecolor {\leavevmode ##1}%
+ }\expandafter\tabu@leavevmodecolor\expandafter{\color}%
+ \else
+ \let\tabu@color \tabu@nocolor
+ \let\tabu@leavevmodecolor \@firstofone \fi
+ \tabu@latextwoe
+ \ifdefined\@raggedtwoe@everyselectfont % <ragged2e>
+ \tabu@raggedtwoe
+ \else
+ \let\tabu@cell@L \tabu@cell@l
+ \let\tabu@cell@R \tabu@cell@r
+ \let\tabu@cell@C \tabu@cell@c
+ \let\tabu@cell@J \tabu@cell@j \fi
+ \expandafter\in@ \expandafter\@arrayright \expandafter{\endarray}%
+ \ifin@ \let\tabu@endarray \endarray
+ \else \tabu@fix@arrayright \fi% <fix for colortbl & arydshln (delarray)>
+ \everyrow{}%
+}% \tabu@AtBeginDocument
+\def\tabu@warn@cellspace{%
+ \PackageWarning{tabu}{%
+ Package cellspace has some limitations
+ \MessageBreak And redefines some macros of array.sty.
+ \MessageBreak Please use \string\tabulinesep\space to control
+ \MessageBreak vertical spacing of lines inside tabu environnement}%
+}% \tabu@warn@cellspace
+% \end{macrocode}
+%
+%¤<package>%% tabu Package initialisation
+%
+% \cs\ProcessOption\stform* is much quicker than without the star...
+%
+% \begin{macrocode}
+\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@}%
+\def\tabu@naturalXmin {\z@}
+\def\tabu@naturalXmax {\z@}
+\let\tabu@rowfontreset \@empty
+\def\tabulineon {4pt}\let\tabulineoff \tabulineon
+\tabu@everyrowtrue
+\tracingtabu=\z@
+\newtabulinestyle {=\maxdimen}% creates the 'factory' settings \tabu@linestyle@
+\tabulinestyle{}
+\taburowcolors{}
+\let\tabudefaulttarget \linewidth
+\ProcessOptions* % \ProcessOptions* is quicker !
+% \end{macrocode}
+%
% \begin{macrocode}
%</package>
% \end{macrocode}
@@ -5012,9 +7640,9 @@ lppl copyright 2010-2011 by FC <florent.chervet@free.fr>
% \restoregeometry
% \bookmarksetup{bold*}
% \pagesetup*{
-% left/offset-=1cm,right/offset+=1cm,
+% left/offset+=5mm,right/offset+=12mm,
% head/color=LightSteelBlue,
-% head/left=\moveleft1cm\vbox to0pt{\vss\setbox0=\null\ht0=0pt\wd0=\paperwidth\dp0=\headheight\rlap{\colorbox{GhostWhite}{\box0}}}\vskip-\headheight t\,a\,b\,u\,\ \ i\,n\,d\,e\,x,
+% head/left=\moveleft1cm\vbox to0pt{\vss\setbox0=\null\ht0=0pt\wd0=\paperwidth\dp0=\headheight\rlap{\colorbox{GhostWhite}{\box0}}}\vskip-\headheight \TabU\ \ i\,n\,d\,e\,x,
% }
%
% \begin{thebibliography}{9}
@@ -5038,17 +7666,47 @@ lppl copyright 2010-2011 by FC <florent.chervet@free.fr>
% \end{thebibliography}
%
%
-%
% \begin{History}
%
% \def\Version#1{\HistVersion{#1}\setitemize{name=#1,leftmargin=2em}\itemize}
+% \addtocontents{toc}{\tocsetup{subsection/font+=\string\smaller}}
+%
+% \sectionformat\subsection[hang]{font=\large\bfseries\macrocodecolor} \robustify\textbf \robustify\xfile ^^A\HistLabel does \edef on \@currentlabel (\protected@edef required !!)
+%
+% \begin{Version}{2011/02/13 v2.3}\HistLabel{2.3}
+% \item Fixed two bugs for nested \env*{tabu}: when using \cs\rowfont and when \env{tabu} is nested inside \env{longtabu}
+% \end{Version}
+%
+% \begin{Version}{2011/02/12 v2.2 -- \texorpdf\textbf{New implementation - Absolutely no modification of \texorpdf\xfile{array.sty}}}\HistLabel{2.2}
+% \item \thispackage has been totally reimplemented, including the algorithms. \\
+% In particular, outside of the \textt{tabu} environment, absolutely none of the macros of \xfile{array.sty},
+% (and obviously none of \LaTeX{}) is modified. \\[\medskipamount]
+% The process has been completely reinvented: \env{tabu} follows a path along different modes (or strategies)
+% measuring natural width of cells, fixing \textt X column widths, measuring vertical length of rows and then printing the
+% final tabular. The process is optimized, especially in the case of nested \env{tabu} environments: a tabular is not built twice
+% for measuring purpose... \\
+% As a result, many new features are now possible... vertical leaders (dashed lines), dynamic vertical spacing adjustment,
+% and hopefully still more in a next release. \\[\medskipamount]
+% \env{tabu} now systematically collects the environment body. But with \cs\scantokens, it is possible to insert verbatim
+% material inside the columns: use \env{tabu*} instead of \env{tabu}, for the outer most tabular.
+%
+% \item New: \csref\firsthline and \csref\lasthline can draw multiple lines, and there is an option to
+% set \cs\extratabsurround instantly, and locally.
+% \item New: \cs\taburulecolor with a good behaviour with groupings (like \cs\everyrow)
+% \item Modification: \cs\tabulinestyle sets the line style for the tabu, \cs\newtabulinestyle defines
+% a new line style.
+% \end{Version}
%
-% \sectionformat\subsection[hang]{font=\large\bfseries\macrocodecolor}
+% {\tabulinestyle{2pt on 3pt Crimson off 3pt GreenYellow} \tabulinesep=2mm\bfseries
+% \begin{tabu}to\linewidth{|*5{X[c]|[.4pt on2pt off3pt GreenYellow]}X[c]|} \tabucline-
+% This & is & the & new & \TabU & package \\ \tabucline-
+% \end{tabu}\par
+% }
%
% \begin{Version}{2011/01/19 v2.1}\HistLabel{2.1}
% \item \hyperref[vertical spacing.sec]{Vertical spacing} had a bug with \textt{longtabu} and paragraph columns.\\
% Fixed.
-% \item New: \csref{everyrow}.
+% \item New: \csref\everyrow.
% \item Fix a bug of \csref{rowfont} when using \Xpackage{siunitx} \textt S columns.
% \item Some code optimisation.
% \item To do (if possible): a syntax \textt{X[6mc]{S[...]}} to ``embed'' \Xpackage{siunitx} \textt S column
@@ -5069,21 +7727,21 @@ lppl copyright 2010-2011 by FC <florent.chervet@free.fr>
% The \textt S column modifier becomes \textt C when the package \Xpackage{siunitx} is loaded
% (see \xpackage{siunitx} documentation). \\
% Moreover, \xpackage{cellspace} does not work with \xpackage{color} or \xpackage{xcolor} and paragraph column types !! \\
-% Finally, \xpackage{cellspace} redefines \cs{@startpbox} and \cs{@endpbox} and is therefore not fully compatible
-% with \xfile{array.sty} and therefore with \thispackage. \\
+% Finally, \xpackage{cellspace} redefines \textbf{globally} \cs\@startpbox and \cs\@endpbox and is
+% therefore not fully compatible with \xfile{array.sty} and therefore with \thispackage. \\
% For all those reasons, \thispackage displays a warning to discourage the use of \xpackage{cellspace} with the
% \textt{tabu} environment.
% \end{Version}
%
% \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}).
+% \item Bug in \csref\savetabu when used inside \textt{longtabu}...
+% \item Bug when \env{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) \\
+% reporting of the time elapsed during trials (if \cs\pdfelapsedtime and thus \hologo{pdfTeX} is available) \\
% Slight modifications for better reporting on the \xext{log} file.
% \item Fix a bug when \csref{savetabu} is used after \cs{multicolumn} (\cs{multicolumn} globally redefines \cs{@preamble}).
% \item Fix a bug with \csref{tabucline} and \cs{CT@arc@} (\xpackage{colortbl}).
@@ -5104,11 +7762,11 @@ lppl copyright 2010-2011 by FC <florent.chervet@free.fr>
% \item \textt{longtabu} is now provided, based on the \xpackage{longtable} package by David Carlisle. \\
% \textt{longtabu} can be used just like \textt{tabu}.
% \item Vertical lines can be used whatever the catcode of \textbf\textbar\ is.
-% \item \csref{savetabu} reports saved informations in the \xext{log} (\hyperref[debugshow]{\textt{debugshow}} option).
-% \item \cs{savetabu} ... \cs{usetabu} now restores the \cs{halign} preamble rather than the \textt{tabu} preamble! \\
-% \csref{preamble} can be use in the \textt{tabu} preamble to restore a \texttt{tabu} preamble.
-% \item \csref{tabucline} is more robust with ``special'' preambles containing\, \texttbf>\, or\, \texttbf<\, tokens. \\
-% \cs{tabucline} now takes care of \cs{arrayrulecolor} (package \xpackage{colortbl}).
+% \item \csref\savetabu reports saved informations in the \xext{log} (\hyperref[debugshow]{\textt{debugshow}} option).
+% \item \cs\savetabu ... \cs{usetabu} now restores the \cs{halign} preamble rather than the \textt{tabu} preamble! \\
+% \csref\preamble can be use in the \textt{tabu} preamble to restore a \texttt{tabu} preamble.
+% \item \csref\tabucline is more robust with ``special'' preambles containing\, \texttbf>\, or\, \texttbf<\, tokens. \\
+% \cs\tabucline now takes care of \cs\arrayrulecolor (package \xpackage{colortbl}).
% \item \Xpackage{enumitem-zref} package has been added to the documentation (see the link \refitem{2010/12/07 v1.5,1}[point 1])
% \item Optimisation of some parts of the code.
% \end{Version}
diff --git a/Master/texmf-dist/source/latex/tabu/tabu.ins b/Master/texmf-dist/source/latex/tabu/tabu.ins
index 76ccd90c8d8..ca448812881 100644
--- a/Master/texmf-dist/source/latex/tabu/tabu.ins
+++ b/Master/texmf-dist/source/latex/tabu/tabu.ins
@@ -7,23 +7,47 @@
%% tabu.dtx (with options: `install')
%%
%% This is a generated file.
+%% Copyright (FC) 2010-2011 - lppl
%%
-%% tabu : 2011/01/19 v2.1 - tabu : Flexible LaTeX tabulars
+%% tabu : 2011/02/13 v2.3 - tabu : Flexible LaTeX tabulars
%%
-%% *******************************************************
-%% \begin{tabu} to <dimen>{ preamble }
-%% \begin{tabu} spread <dimen>{ preamble }
+%% **********************************************************************************************
+%% \begin{tabu} { preamble } => default target: \linewidth or \linegoal
+%% \begin{tabu} to <dimen>{ preamble } => target specified
+%% \begin{tabu} spread <dimen>{ preamble } => target relative to the ``natural width''
%%
-%% Default target: \linewidth or \linegoal:
+%% tabu works in text and in math modes.
%%
-%% \tabulinesep=2pt
+%% X columns: automatic width ajustment + horizontal and vertical alignment
+%% \begin{tabu} { X[4c] X[1c] X[-2ml] }
%%
-%% \begin{tabu} { |[3pt red] X[4c] X[1c] X[-2ml] |[3pt blue] }
-%% \tabucline[3pt on 2pt, cyan]-
-%% one & two & three
-%% \\ \tabucline[3pt yellow]-
-%% \end{tabu}
-%% *******************************************************
+%% Horizontal lines and / or leaders:
+%% \hline\hline => double horizontal line
+%% \firsthline\hline => for nested tabulars
+%% \lasthline\hline => for nested tabulars
+%% \tabucline[line spec]{column-column} => ``funny'' lines (dash/leader)
+%% Automatic lines / leaders :
+%% \everyrow{\hline\hline}
+%%
+%% Vertical lines and / or leaders:
+%% \begin{tabu} { |[3pt red] X[4c] X[1c] X[-2ml] |[3pt blue] }
+%% \begin{tabu} { |[3pt red] X[4c] X[1c] X[-2ml] |[3pt on 2pt off 4pt blue] }
+%%
+%% Fixed vertical spacing adjustment:
+%% \extrarowheight=<dimen> \extrarowdepth=<dimen>
+%% or: \extrarowsep=<dimen> => may be prefixed by \global
+%%
+%% Dynamic vertical spacing adjustment:
+%% \abovetabulinesep=<dimen> \belowtabulinesep=<dimen>
+%% or: \tabulinesep=<dimen> => may be prefixed by \global
+%%
+%% delarray.sty shortcuts: in math and text modes
+%% \begin{tabu} .... \({ preamble }\)
+%%
+%% Algorithms reports:
+%% \tracingtabu=1 \tracingtabu=2
+%%
+%% **********************************************************************************************
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either
@@ -41,7 +65,7 @@
\input docstrip.tex
\Msg{************************************************************************}
\Msg{* Installation}
-\Msg{* Package: 2011/01/26 v2.1 - tabu: Flexible LaTeX tabulars}
+\Msg{* Package: 2011/02/13 v2.3 - tabu: Flexible LaTeX tabulars}
\Msg{************************************************************************}
\keepsilent
@@ -51,23 +75,47 @@
\preamble
This is a generated file.
+Copyright (FC) 2010-2011 - lppl
+
+tabu : 2011/02/13 v2.3 - tabu : Flexible LaTeX tabulars
-tabu : 2011/01/19 v2.1 - tabu : Flexible LaTeX tabulars
+**********************************************************************************************
+\string\begin{tabu} { preamble } => default target: \string\linewidth or \string\linegoal
+\string\begin{tabu} to <dimen>{ preamble } => target specified
+\string\begin{tabu} spread <dimen>{ preamble } => target relative to the ``natural width''
-*******************************************************
-\string\begin{tabu} to <dimen>{ preamble }
-\string\begin{tabu} spread <dimen>{ preamble }
+ tabu works in text and in math modes.
-Default target: \string\linewidth or \string\linegoal:
+ X columns: automatic width ajustment + horizontal and vertical alignment
+ \string\begin{tabu} { X[4c] X[1c] X[-2ml] }
-\string\tabulinesep=2pt
+ Horizontal lines and / or leaders:
+ \string\hline\string\hline => double horizontal line
+ \string\firsthline\string\hline => for nested tabulars
+ \string\lasthline\string\hline => for nested tabulars
+ \string\tabucline[line spec]{column-column} => ``funny'' lines (dash/leader)
+ Automatic lines / leaders :
+ \string\everyrow{\string\hline\string\hline}
-\string\begin{tabu} { |[3pt red] X[4c] X[1c] X[-2ml] |[3pt blue] }
- \string\tabucline[3pt on 2pt, cyan]-
- one & two & three
- \string\\ \string\tabucline[3pt yellow]-
-\string\end{tabu}
-*******************************************************
+ Vertical lines and / or leaders:
+ \string\begin{tabu} { |[3pt red] X[4c] X[1c] X[-2ml] |[3pt blue] }
+ \string\begin{tabu} { |[3pt red] X[4c] X[1c] X[-2ml] |[3pt on 2pt off 4pt blue] }
+
+ Fixed vertical spacing adjustment:
+ \string\extrarowheight=<dimen> \string\extrarowdepth=<dimen>
+ or: \string\extrarowsep=<dimen> => may be prefixed by \string\global
+
+ Dynamic vertical spacing adjustment:
+ \string\abovetabulinesep=<dimen> \string\belowtabulinesep=<dimen>
+ or: \string\tabulinesep=<dimen> => may be prefixed by \string\global
+
+ delarray.sty shortcuts: in math and text modes
+ \string\begin{tabu} .... \string\({ preamble }\string\)
+
+ Algorithms reports:
+ \string\tracingtabu=1 \string\tracingtabu=2
+
+**********************************************************************************************
This work may be distributed and/or modified under the
conditions of the LaTeX Project Public License, either
@@ -85,10 +133,13 @@ lppl copyright 2010-2011 by FC <florent.chervet@free.fr>
\endpreamble
\let\MetaPrefix \DoubleperCent
+{
+\catcode164=9
\generate{%
\file{tabu.ins}{\from{tabu.dtx}{install}}%
\file{tabu.sty}{\from{tabu.dtx}{package}}%
}
+}
\askforoverwritefalse
\generate{%
diff --git a/Master/texmf-dist/tex/latex/tabu/tabu.sty b/Master/texmf-dist/tex/latex/tabu/tabu.sty
index 1c278d8312f..bd642627081 100644
--- a/Master/texmf-dist/tex/latex/tabu/tabu.sty
+++ b/Master/texmf-dist/tex/latex/tabu/tabu.sty
@@ -7,23 +7,47 @@
%% tabu.dtx (with options: `package')
%%
%% This is a generated file.
+%% Copyright (FC) 2010-2011 - lppl
%%
-%% tabu : 2011/01/19 v2.1 - tabu : Flexible LaTeX tabulars
+%% tabu : 2011/02/13 v2.3 - tabu : Flexible LaTeX tabulars
%%
-%% *******************************************************
-%% \begin{tabu} to <dimen>{ preamble }
-%% \begin{tabu} spread <dimen>{ preamble }
+%% **********************************************************************************************
+%% \begin{tabu} { preamble } => default target: \linewidth or \linegoal
+%% \begin{tabu} to <dimen>{ preamble } => target specified
+%% \begin{tabu} spread <dimen>{ preamble } => target relative to the ``natural width''
%%
-%% Default target: \linewidth or \linegoal:
+%% tabu works in text and in math modes.
%%
-%% \tabulinesep=2pt
+%% X columns: automatic width ajustment + horizontal and vertical alignment
+%% \begin{tabu} { X[4c] X[1c] X[-2ml] }
%%
-%% \begin{tabu} { |[3pt red] X[4c] X[1c] X[-2ml] |[3pt blue] }
-%% \tabucline[3pt on 2pt, cyan]-
-%% one & two & three
-%% \\ \tabucline[3pt yellow]-
-%% \end{tabu}
-%% *******************************************************
+%% Horizontal lines and / or leaders:
+%% \hline\hline => double horizontal line
+%% \firsthline\hline => for nested tabulars
+%% \lasthline\hline => for nested tabulars
+%% \tabucline[line spec]{column-column} => ``funny'' lines (dash/leader)
+%% Automatic lines / leaders :
+%% \everyrow{\hline\hline}
+%%
+%% Vertical lines and / or leaders:
+%% \begin{tabu} { |[3pt red] X[4c] X[1c] X[-2ml] |[3pt blue] }
+%% \begin{tabu} { |[3pt red] X[4c] X[1c] X[-2ml] |[3pt on 2pt off 4pt blue] }
+%%
+%% Fixed vertical spacing adjustment:
+%% \extrarowheight=<dimen> \extrarowdepth=<dimen>
+%% or: \extrarowsep=<dimen> => may be prefixed by \global
+%%
+%% Dynamic vertical spacing adjustment:
+%% \abovetabulinesep=<dimen> \belowtabulinesep=<dimen>
+%% or: \tabulinesep=<dimen> => may be prefixed by \global
+%%
+%% delarray.sty shortcuts: in math and text modes
+%% \begin{tabu} .... \({ preamble }\)
+%%
+%% Algorithms reports:
+%% \tracingtabu=1 \tracingtabu=2
+%%
+%% **********************************************************************************************
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either
@@ -39,500 +63,914 @@
%% lppl copyright 2010-2011 by FC <florent.chervet@free.fr>
%%
\NeedsTeXFormat{LaTeX2e}[2005/12/01]
-\ProvidesPackage{tabu}[2011/01/19 v2.1 - flexible LaTeX tabulars (FC)]
+\ProvidesPackage{tabu}[2011/02/13 v2.3 - flexible LaTeX tabulars (FC)]
\RequirePackage{array}[2008/09/09]
\RequirePackage{varwidth}[2009/03/30]
-\AtEndOfPackage{\tabu@AtEnd\let\tabu@AtEnd\@undefined}
+\AtEndOfPackage{\tabu@AtEnd \let\tabu@AtEnd \@undefined}
\let\tabu@AtEnd\@empty
-\def\TMP@EnsureCode#1#2{%
- \edef\tabu@AtEnd{%
- \tabu@AtEnd
- \catcode#1 \the\catcode#1\relax
- }%
- \catcode#1 #2\relax
+\def\TMP@EnsureCode#1={%
+ \edef\tabu@AtEnd{\tabu@AtEnd
+ \catcode#1 \the\catcode#1}%
+ \catcode#1=%
}% \TMP@EnsureCode
-\TMP@EnsureCode{33}{12} % !
-\TMP@EnsureCode{124}{12}% |
-\TMP@EnsureCode{0}{12}% ^^@
-\TMP@EnsureCode{36}{3}% $ = math shift
-\def\tracingtabu{\begingroup\@ifnextchar=%
- {\afterassignment\tabu@tracing\count@}
- {\afterassignment\tabu@tracing\count@1\relax}}
-\def\tabu@tracing{\expandafter\endgroup
- \expandafter\tabu@tr@cing\number\count@\@nil
-}% \tabu@tracing
-\def\tabu@tr@cing #1\@nil{%
- \ifnum#1>\z@
- \let\tabu@message \message \let\tabu@message@save \tabu@tracing@save
- \ifdefined \pdfelapsedtime
- \def\tabu@timerstart {\edef\tabu@starttime{\the\pdfelapsedtime}}%
- \let\tabu@elapsedtime \tabu@message@etime \fi
- \ifnum#1>\@ne \let\tabu@debug \message
- \else \let\tabu@debug \@gobble \fi
- \else
- \let\tabu@message \@gobble
- \let\tabu@message@save \@gobble
- \let\tabu@debug \@gobble
- \let\tabu@timerstart \relax
- \fi
-}% \tabu@tr@cing
-\tracingtabu=\z@
-\DeclareOption{debugshow}{\AtEndOfPackage{\tracingtabu=2\relax}}
-\let\tabudefaulttarget \linewidth
-\DeclareOption{linegoal}{%
- \AtEndOfPackage{%
- \RequirePackage{linegoal}[2010/12/07]%
- \let\tabudefaulttarget \linegoal% \linegoal is \linewidth if not pdfTeX
-}}
-\DeclareOption{delarray}{%
- \AtEndOfPackage{\RequirePackage{delarray}}%
-}
-\DeclareOption{light}{%
- \AtEndOfPackage{%
- \let\tabu@prepnext@tok \prepnext@tok \let\tabu@save@decl \save@decl
- \let\tabu@rowfont \tabu@norowfont \let\tabucline \tabu@nocline
- \let\tabu@firstcline \relax \let\tabu@lines \relax
- \let\tabu@setup@everycr\relax \let\tabu@multicolumn \multicolumn
- }
-}
-\def\tabu@norowfont{\PackageError{tabu}
- {\string\rowfont\space is not available with option `light'}\@ehd}
-\def\tabu@nocline{\PackageError{tabu}
- {\string\tabucline\space is not available with option `light'}\@ehd}
-\ProcessOptions
-\AtBeginDocument{%
- \expandafter\in@ \expandafter\@arrayright\expandafter{\endarray}%
- \ifin@ \let\tabu@endarray \endarray
- \else \tabu@fix@arrayright \fi % <fix for colortbl & arydshln (delarray)>
- \@ifpackageloaded{colortbl} \tabu@colortbltrue \tabu@colortblfalse
- \@ifpackageloaded{arydshln}{}
- {\let\tabu@adl@fix \relax \let\tabu@adl@endTRIAL \@empty}%
- \@ifpackageloaded{longtable}{}{\let\longtabu \tabu@nolongtabu}%
- \@ifpackageloaded{cellspace} \tabu@warn@cellspace \relax
-}
-\def\tabu@warn@cellspace{%
- \PackageWarning{tabu}{%
- Package cellspace has some limitations \MessageBreak
- And redefines some macros of array.sty.\MessageBreak
- Please use \string\tabulinesep\space to control\MessageBreak
- vertical spacing of lines inside tabu environnement}%
-}% \tabu@warn@cellspace
-\newcount \tabu@cnt
+\TMP@EnsureCode 33 = 12 % !
+\TMP@EnsureCode 58 = 12 % : (for siunitx)
+\TMP@EnsureCode124 = 12 % |
+\TMP@EnsureCode 36 = 3 % $ = math shift
+\TMP@EnsureCode 38 = 4 % & = tab alignmment character
+\TMP@EnsureCode 32 = 10 % space
+\TMP@EnsureCode 94 = 7 % ^
+\TMP@EnsureCode 95 = 8 % _
+%% Constants --------------------------------------------------------
+\newcount \c@taburow \def\thetaburow {\number\c@taburow}
\newcount \tabu@nbcols
-\newcount \tabu@X@cols
+\newcount \tabu@cnt
+\newcount \tabu@Xcol
+\let\tabu@start \@tempcnta
+\let\tabu@stop \@tempcntb
+\newcount \tabu@alloc \tabu@alloc=\m@ne
\newcount \tabu@nested
-\newcount \tabu@start
-\newcount \tabu@stop
+\def\tabu@alloc@{\global\advance\tabu@alloc \@ne \tabu@nested\tabu@alloc}
\newdimen \tabu@target
\newdimen \tabu@spreadtarget
\newdimen \tabu@naturalX
\newdimen \tabucolX
-\newdimen \tabu@X@sum
-\newdimen \tabucolX@error \tabucolX@error=1em
+\let\tabu@DELTA \@tempdimc
+\let\tabu@thick \@tempdima
+\let\tabu@on \@tempdimb
+\let\tabu@off \@tempdimc
+\newdimen \tabu@Xsum
+\newdimen \extrarowdepth
\newdimen \abovetabulinesep
\newdimen \belowtabulinesep
-\newdimen \extrarowdepth
\newdimen \tabustrutrule \tabustrutrule \z@
+\newtoks \tabu@thebody
+\newtoks \tabu@footnotes
+\newsavebox \tabu@box
+\newsavebox \tabu@arstrutbox
+\newsavebox \tabu@hleads
+\newsavebox \tabu@vleads
+\newif \iftabu@colortbl
+\newif \iftabu@siunitx
\newif \iftabu@measuring
\newif \iftabu@spread
\newif \iftabu@negcoef
-\newif \iftabu@firstcline
\newif \iftabu@everyrow
-\def\tabu@everyrowtrue{\global\let\iftabu@everyrow \iftrue}
+\def\tabu@everyrowtrue {\global\let\iftabu@everyrow \iftrue}
\def\tabu@everyrowfalse{\global\let\iftabu@everyrow \iffalse}
-\newsavebox \tabu@box
-\chardef \tabu@arstrutbox=\@arstrutbox
-\let\tabu@vcenter \vcenter
-\def\tabu@gobblespace#1 {#1}
-\def\tabu@gobbleopt#1{\@ifnextchar [{\tabu@gobble@pt{#1}}{#1}}%]
-\def\tabu@gobble@pt#1[#2]{#1}
-\def\tabu@ifenvir {%
- \csname @\expandafter\ifx\csname\@currenvir\endcsname\tabu
- first\else\expandafter\ifx\csname\@currenvir\endcsname\longtabu
- first\else second\fi\fi oftwo\endcsname
+\newif \iftabu@long
+\newif \iftabuscantokens
+\def\tabu@rescan {\tabu@verbatim \scantokens }
+%% Utilities (for internal usage) -----------------------------------
+\def\tabu@gobblespace #1 {#1}
+\def\tabu@gobbletoken #1#2{#1}
+\def\tabu@gobbleX{\futurelet\@let@token \tabu@gobblex}
+\def\tabu@gobblex{\if ^^J\noexpand\@let@token \expandafter\@gobble
+ \else\ifx \@sptoken\@let@token
+ \expandafter\tabu@gobblespace\expandafter\tabu@gobbleX
+ \fi\fi
+}% \tabu@gobblex
+\def\tabu@X{^^J}
+{\obeyspaces
+\global\let\tabu@spxiii= % saves an active space (for \ifx)
+\gdef\tabu@@spxiii{ }}
+\def\tabu@ifenvir {% only for \multicolumn
+ \expandafter\tabu@if@nvir\csname\@currenvir\endcsname
}% \tabu@ifenvir
-\def\tabu@save@decl{%
- \toks\count@ =\expandafter{\the\toks\expandafter\count@ \@nextchar}%
-}% \tabu@save@decl
-\def\tabu@newcolumntype #1{%
- \expandafter\tabu@new@columntype
- \csname NC@find@\string#1\expandafter\endcsname
- \csname NC@rewrite@\string#1\endcsname
- {#1}%
-}% \tabu@newcolumntype
-\def\tabu@new@columntype #1#2#3{%
- \def#1##1#3{\NC@{##1}}%
- \let#2\relax \newcommand*#2%
-}% \tabu@new@columntype
-\def\tabu@privatecolumntype #1{%
- \expandafter\tabu@private@columntype
- \csname NC@find@\string#1\expandafter\endcsname
- \csname NC@rewrite@\string#1\expandafter\endcsname
- \csname tabu@NC@find@\string#1\expandafter\endcsname
- \csname tabu@NC@rewrite@\string#1\endcsname
- {#1}%
-}% \tabu@privatecolumntype
-\def\tabu@private@columntype#1#2#3#4{%
- \g@addto@macro\tabu@privatecolumns{\let#1#3\let#2#4}%
- \tabu@new@columntype#3#4%
-}% \tabu@private@columntype
-\let\tabu@privatecolumns \@empty
-\tabu@privatecolumntype X[1][]{\tabu@rewrite@X{#1}%
- \let\@halignto \relax
- \expandafter \NC@find \tabucolX@rw}
-\tabu@privatecolumntype \usetabu [1]{%
- \ifx\\#1\\\tabu@saveerr{}\else
- \@ifundefined{tabu@saved@\string#1}
- {\tabu@saveerr{#1}}
- {\let\tabu@rewrite@X \tabu@rewrite@Xrestore
- \csname tabu@saved@\string#1\expandafter\endcsname\expandafter\z@}%
- \fi
-}% \NC@rewrite@\usetabu
-\tabu@privatecolumntype \preamble [1]{%
- \ifx\\#1\\\tabu@saveerr{}\else
- \@ifundefined{tabu@saved@\string#1}
- {\tabu@saveerr{#1}}
- {\csname tabu@saved@\string#1\expandafter\endcsname\expandafter\@ne}%
- \fi
-}% \NC@rewrite@\preamble
-\tabu@newcolumntype \tabu@rewritefirst{%
- \tabu@X@cols \z@
- \let\tabu@dimexpr \relax
- \let\tabu@savepreamble \relax
- \let\NC@rewrite@X \tabu@NC@rewrite@X
- \gdef\tabu@global@temp {\tabu@savepreamble}%
- \aftergroup \tabu@global@temp
- \let\tabu@islast \relax
- \tabu@privatecolumns
- \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\expandafter\NC@list \expandafter\NC@do \expandafter X%
- \tabu@NC@list \NC@do X\NC@do\tabu@rewritemiddle}%
- \ifcat$\d@llarend\else
- \let\save@decl \tabu@save@decl \fi % no inversion of tokens in text mode
- \NC@find \tabu@rewritemiddle
-}% NC@rewrite@\tabu@rewritefirst
-\def\tabu@savepreamble{%
- \NC@list\expandafter{\tabu@NC@list}%
- \let\tabu@savedpreamble \@preamble
- \ifdim \tabustrutrule>\z@
- \setbox\@arstrutbox\hbox{\vrule
- \@height \ht\@arstrutbox
- \@width \tabustrutrule
- \@depth \dp\@arstrutbox}%
- \fi
- \ifdim \extrarowdepth>\z@
- \setbox\@arstrutbox\hbox{\vrule
- \@height \ht\@arstrutbox
- \@width \tabustrutrule
- \@depth \dimexpr\dp\@arstrutbox+\arraystretch\extrarowdepth}%
- \fi
-}% \tabu@savepreamble
-\tabu@newcolumntype \tabu@rewritemiddle{%
- \NC@list\expandafter{\tabu@NC@list \NC@do\tabu@endrewrite \NC@do\tabu@rewritelast}%
- \tabu@checklast
-}% \NC@rewrite@\tabu@rewritemiddle
-\def\tabu@checklast#1\relax{%
- \def\tabu@temp{#1}%
- \ifx \tabu@temp\tabu@islast
- \expandafter\tabu@lastrewrite
- \else \let\tabu@islast \tabu@temp
- \expandafter\NC@find \expandafter\tabu@rewritelast
- \fi
- #1\relax
-}% \tabu@checklast
-\tabu@newcolumntype \tabu@rewritelast{\NC@find \tabu@endrewrite}
-\tabu@newcolumntype \tabu@endrewrite{\tabu@checklast}
-\def\tabu@lastrewrite{%
- \let\tabu@next \NC@find
- \ifx \@halignto\relax % found a X column
- \edef\tabu@global@X{\tabu@global@X \tabu@X@cols\the\tabu@X@cols\relax}%
- \ifx \tabu@halignto\relax % X column measure
- \tabu@global@Xnested
- \iftabu@negcoef \aftergroup\tabu@negcoeftrue \fi
- \aftergroup \tabu@prep@TRIAL
- \else \aftergroup \tabu@setup@everycr
- \fi
- \else
- \aftergroup \tabu@setup@everycr
- \ifdim \tabu@target=\z@ \else
- \let\tabu@next \tabu@extracolsep \fi % <need \extracolsep ?>
- \fi
- \let\@halignto \tabu@halignto
- \tabu@next
-}% \tabu@lastrewrite
-\def\tabu@extracolsep{\futurelet\tabu@temp \tabu@extracol@sep}
-\def\tabu@extracol@sep{%
- \ifx \tabu@temp\@sptoken
- \expandafter\tabu@gobblespace \expandafter\tabu@extracol@sep
- \else
- {\endlinechar\m@ne\scantokens{\let\x |}%
- \expandafter}\ifx \x\tabu@temp
- \def\tabu@next {\NC@find @{\extracolsep\@flushglue}}\else
- {\endlinechar\m@ne\scantokens{\let\x !}%
- \expandafter}\ifx \x\tabu@temp
- \def\tabu@next {\NC@find @{\extracolsep\@flushglue}}\else
- \def\tabu@next {\NC@find !{\extracolsep\@flushglue}}\fi\fi
- \expandafter\tabu@next
- \fi
-}% \tabu@extracol@sep
-\def\tabu@global@Xnested{\expandafter\tabu@global@X@nested
- \csname tabu@global@X\the\tabu@nested\endcsname}
-\def\tabu@global@X@nested#1{%
- \global\let#1\tabu@global@X
- \aftergroup\let \aftergroup\tabu@global@X \aftergroup#1%
-}% \tabu@global@Xnested
-\tabu@newcolumntype \tabu@rewrite@multicolumn{%
- \aftergroup\endgroup % after \@mkpream group (restores \multispan)
- \tabu@lines \NC@list\expandafter{\the\expandafter\NC@list \tabu@NC@list}%
- \ifcat$\d@llarend\else
- \let\save@decl \tabu@save@decl \fi % no inversion of tokens in text mode
- \NC@find
-}% \tabu@rewrite@multicolumn
-\def\tabu@multicolumn{\tabu@ifenvir \tabu@multic@lumn \tabu@multicolumnORI}
-\def\tabu@multic@lumn#1#2{\multispan{#1}\begingroup
- \NC@list{\NC@do \tabu@rewrite@multicolumn}%
- \expandafter\@gobbletwo % gobbles \multispan{#1}
- \tabu@multicolumnORI{#1}{\tabu@rewrite@multicolumn #2}%
-}% \tabu@multic@lumn
-\newif\iftabu@colortbl
-\def\tabu@nowrite#1#{{\afterassignment}\toks@}
+\def\tabu@if@nvir #1{\csname @\ifx\tabu#1first\else
+ \ifx\longtabu#1first\else
+ second\fi\fi oftwo\endcsname
+}% \tabu@ifenvir
+\def\tabu@modulo #1#2{\numexpr\ifnum\numexpr#1=\z@ 0\else #1-(#1-(#2-1)/2)/(#2)*(#2)\fi}
+{\catcode`\&=3
+\gdef\tabu@strtrim #1{% #1 = control sequence to trim
+ \ifodd 1\ifx #1\@empty \else \ifx #1\space \else 0\fi \fi
+ \let\tabu@c@l@r \@empty \let#1\@empty
+ \else \expandafter \tabu@trimspaces #1&#1\@nnil
+ \fi
+}% \tabu@strtrim
+\gdef\tabu@trimspaces #1&#2\@nnil{\let\tabu@c@l@r=#2\tabu@firstspace .#1& &#2}%
+\gdef\tabu@firstspace #1#2#3 &{\tabu@lastspace #2#3&}
+\gdef\tabu@lastspace #1&#2&#3{\def #3{#1}%
+ \ifx #3\tabu@c@l@r \def\tabu@c@l@r{\protect\color{#1}}\expandafter\remove@to@nnil \fi
+ \tabu@trimspaces #1&#3\@nnil}
+}% \catcode
+\def\tabu@sanitizearg #1#2{{%
+ \csname \ifcsname if@safe@actives\endcsname % <babel>
+ @safe@activestrue\else
+ relax\fi \endcsname
+ \edef#2{#1}\tabu@strtrim#2\@onelevel@sanitize#2%
+ \expandafter}\expandafter\def\expandafter#2\expandafter{#2}%
+}% \tabu@sanitizearg
+\def\tabu@textbar #1{\begingroup \endlinechar\m@ne \scantokens{\def\:{|}}%
+ \expandafter\endgroup \expandafter#1\:% !!! semi simple group !!!
+}% \tabu@textbar
+\def\tabu@everyrow@bgroup{\iftabu@everyrow \begingroup \else \noalign{\ifnum0=`}\fi \fi}
+\def\tabu@everyrow@egroup{%
+ \iftabu@everyrow \expandafter \endgroup \the\toks@
+ \else \ifnum0=`{\fi}%
+ \fi
+}% \tabu@everyrow@egroup
+\def\tabu@arstrut {\global\setbox\@arstrutbox \hbox{\vrule
+ height \arraystretch \dimexpr\ht\strutbox+\extrarowheight
+ depth \arraystretch \dimexpr\dp\strutbox+\extrarowdepth
+ width \z@}%
+}% \tabu@arstrut
+\def\tabu@rearstrut {%
+ \@tempdima \arraystretch\dimexpr\ht\strutbox+\extrarowheight \relax
+ \@tempdimb \arraystretch\dimexpr\dp\strutbox+\extrarowdepth \relax
+ \ifodd 1\ifdim \ht\@arstrutbox=\@tempdima
+ \ifdim \dp\@arstrutbox=\@tempdimb 0 \fi\fi
+ \tabu@mkarstrut
+ \fi
+}% \tabu@rearstrut
+\def\tabu@@DBG #1{\ifdim\tabustrutrule>\z@ \color{#1}\fi}
+\def\tabu@DBG@arstrut {\global\setbox\@arstrutbox
+ \hbox to\z@{\hbox to\z@{\hss
+ {\tabu@DBG{cyan}\vrule
+ height \arraystretch \dimexpr\ht\strutbox+\extrarowheight
+ depth \z@
+ width \tabustrutrule}\kern-\tabustrutrule
+ {\tabu@DBG{pink}\vrule
+ height \z@
+ depth \arraystretch \dimexpr\dp\strutbox+\extrarowdepth
+ width \tabustrutrule}}}%
+}% \tabu@DBG@arstrut
+\def\tabu@save@decl{\toks\count@ \expandafter{\the\toks\expandafter\count@
+ \@nextchar}}%
+\def\tabu@savedecl{\ifcat$\d@llarend\else
+ \let\save@decl \tabu@save@decl \fi % no inversion of tokens in text mode
+}% \tabu@savedecl
+\newcommand*\tabuDisableCommands {\g@addto@macro\tabu@trialh@@k }
+\let\tabu@trialh@@k \@empty
+\def\tabu@nowrite #1#{{\afterassignment}\toks@}
\let\tabu@write\write
\let\tabu@immediate\immediate
-\protected\def\tabu@GenericError{\begingroup
- \def\immediate\write{\aftergroup\endgroup
- \tabu@immediate\tabu@write}\tabu@GenericErrorORI}%
-\let\tabu@GenericErrorORI \GenericError
-\protected\def\tabu@warn{\begingroup
+\def\tabu@WRITE{\begingroup
\def\immediate\write{\aftergroup\endgroup
- \tabu@immediate\tabu@write}\PackageWarning{tabu}}
-\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{%
+ \tabu@immediate\tabu@write}%
+}% \tabu@WRITE
+\expandafter\def\expandafter\tabu@GenericError\expandafter{%
+ \expandafter\tabu@WRITE\GenericError}
+\def\tabu@warn{\tabu@WRITE\PackageWarning{tabu}}
+\def\tabu@noxfootnote [#1]{\@gobble}
+\def\tabu@nocolor #1#{\@gobble}
+\newcommand*\tabu@norowcolor[2][]{}
+\def\tabu@maybesiunitx #1{\def\tabu@temp{#1}%
+ \futurelet\@let@token \tabu@m@ybesiunitx}
+\def\tabu@m@ybesiunitx #1{\def\tabu@m@ybesiunitx {%
+ \ifx #1\@let@token \let\tabu@cellleft \@empty \let\tabu@cellright \@empty \fi
+ \tabu@temp}% \tabu@m@ybesiunitx
+}\expandafter\tabu@m@ybesiunitx \csname siunitx_table_collect_begin:Nn\endcsname
+\def\tabu@celllalign@def #1{\def\tabu@celllalign{\tabu@maybesiunitx{#1}}}%
+%% Fixed vertical spacing adjustment: \extrarowsep ------------------
+\newcommand*\extrarowsep{\edef\tabu@C@extra{\the\numexpr\tabu@C@extra+1}%
+ \iftabu@everyrow \aftergroup\tabu@Gextra
+ \else \aftergroup\tabu@n@Gextra
+ \fi
+ \@ifnextchar={\tabu@gobbletoken\tabu@extra} \tabu@extra
+}% \extrarowsep
+\def\tabu@extra {\@ifnextchar_%
+ {\tabu@gobbletoken{\tabu@setextra\extrarowheight \extrarowdepth}}
+ {\ifx ^\@let@token \def\tabu@temp{%
+ \tabu@gobbletoken{\tabu@setextra\extrarowdepth \extrarowheight}}%
+ \else \let\tabu@temp \@empty
+ \afterassignment \tabu@setextrasep \extrarowdepth
+ \fi \tabu@temp}%
+}% \tabu@extra
+\def\tabu@setextra #1#2{\def\tabu@temp{\tabu@extr@#1#2}\afterassignment\tabu@temp#2}
+\def\tabu@extr@ #1#2{\@ifnextchar^%
+ {\tabu@gobbletoken{\tabu@setextra\extrarowdepth \extrarowheight}}
+ {\ifx _\@let@token \def\tabu@temp{%
+ \tabu@gobbletoken{\tabu@setextra\extrarowheight \extrarowdepth}}%
+ \else \let\tabu@temp \@empty
+ \tabu@Gsave \tabu@G@extra \tabu@C@extra \extrarowheight \extrarowdepth
+ \fi \tabu@temp}%
+}% \tabu@extr@
+\def\tabu@setextrasep {\extrarowheight=\extrarowdepth
+ \tabu@Gsave \tabu@G@extra \tabu@C@extra \extrarowheight \extrarowdepth
+}% \tabu@setextrasep
+\def\tabu@Gextra{\ifx \tabu@G@extra\@empty \else {\tabu@Rextra}\fi}
+\def\tabu@n@Gextra{\ifx \tabu@G@extra\@empty \else \noalign{\tabu@Rextra}\fi}
+\def\tabu@Rextra{\tabu@Grestore \tabu@G@extra \tabu@C@extra}
+\let\tabu@C@extra \z@
+\let\tabu@G@extra \@empty
+%% Dynamic vertical spacing adjustment: \tabulinesep ----------------
+\newcommand*\tabulinesep{\edef\tabu@C@linesep{\the\numexpr\tabu@C@linesep+1}%
+ \iftabu@everyrow \aftergroup\tabu@Glinesep
+ \else \aftergroup\tabu@n@Glinesep
+ \fi
+ \@ifnextchar={\tabu@gobbletoken\tabu@linesep} \tabu@linesep
+}% \tabulinesep
+\def\tabu@linesep {\@ifnextchar_%
+ {\tabu@gobbletoken{\tabu@setsep\abovetabulinesep \belowtabulinesep}}
+ {\ifx ^\@let@token \def\tabu@temp{%
+ \tabu@gobbletoken{\tabu@setsep\belowtabulinesep \abovetabulinesep}}%
+ \else \let\tabu@temp \@empty
+ \afterassignment \tabu@setlinesep \abovetabulinesep
+ \fi \tabu@temp}%
+}% \tabu@linesep
+\def\tabu@setsep #1#2{\def\tabu@temp{\tabu@sets@p#1#2}\afterassignment\tabu@temp#2}
+\def\tabu@sets@p #1#2{\@ifnextchar^%
+ {\tabu@gobbletoken{\tabu@setsep\belowtabulinesep \abovetabulinesep}}
+ {\ifx _\@let@token \def\tabu@temp{%
+ \tabu@gobbletoken{\tabu@setsep\abovetabulinesep \belowtabulinesep}}%
+ \else \let\tabu@temp \@empty
+ \tabu@Gsave \tabu@G@linesep \tabu@C@linesep \abovetabulinesep \belowtabulinesep
+ \fi \tabu@temp}%
+}% \tabu@sets@p
+\def\tabu@setlinesep {\belowtabulinesep=\abovetabulinesep
+ \tabu@Gsave \tabu@G@linesep \tabu@C@linesep \abovetabulinesep \belowtabulinesep
+}% \tabu@setlinesep
+\def\tabu@Glinesep{\ifx \tabu@G@linesep\@empty \else {\tabu@Rlinesep}\fi}
+\def\tabu@n@Glinesep{\ifx \tabu@G@linesep\@empty \else \noalign{\tabu@Rlinesep}\fi}
+\def\tabu@Rlinesep{\tabu@Grestore \tabu@G@linesep \tabu@C@linesep}
+\let\tabu@C@linesep \z@
+\let\tabu@G@linesep \@empty
+%% \global\extrarowsep and \global\tabulinesep -------------------
+\def\tabu@Gsave #1#2#3#4{\xdef#1{#1%
+ \toks#2{\toks\the\currentgrouplevel{\global#3\the#3\global#4\the#4}}}%
+}% \tabu@Gsave
+\def\tabu@Grestore#1#2{%\ifdim \baselineskip=\z@\noalign\fi
+ \toks#2{}#1\toks\currentgrouplevel\expandafter{\expandafter}\the\toks#2\relax
+ \ifcat$\the\toks\currentgrouplevel$\else
+ \global\let#1\@empty \global\let#2\z@
+ \the\toks\currentgrouplevel
+ \fi
+}% \tabu@Grestore
+%% Setting code for every row ---------------------------------------
+\newcommand*\everyrow{\tabu@everyrow@bgroup
+ \tabu@start \z@ \tabu@stop \z@ \tabu@evrstartstop
+}% \everyrow
+\def\tabu@evrstartstop {\@ifnextchar^%
+ {\afterassignment \tabu@evrstartstop \tabu@stop=}%
+ {\ifx ^\@let@token
+ \afterassignment\tabu@evrstartstop \tabu@start=%
+ \else \afterassignment\tabu@everyr@w \toks@
+ \fi}%
+}% \tabu@evrstartstop
+\def\tabu@everyr@w {%
+ \xdef\tabu@everyrow{%
+ \noexpand\tabu@everyrowfalse
+ \let\noalign \relax
+ \noexpand\tabu@rowfontreset
+ \iftabu@colortbl \noexpand\tabu@rc@ \fi % \taburowcolors
+ \let\noexpand\tabu@docline \noexpand\tabu@docline@evr
+ \the\toks@
+ \noexpand\tabu@evrh@@k
+ \noexpand\tabu@rearstrut
+ \global\advance\c@taburow \@ne}%
+ \iftabu@everyrow \toks@\expandafter
+ {\expandafter\def\expandafter\tabu@evr@L\expandafter{\the\toks@}}%
+ \else \xdef\tabu@evr@G{\the\toks@}%
+ \fi
+ \tabu@everyrow@egroup
+}% \tabu@everyr@w
+\def\tabu@evr {\def\tabu@evrh@@k} % for internal use only
+\tabu@evr{}
+%% line style and leaders -------------------------------------------
+\newcommand*\newtabulinestyle [1]{%
+ {\@for \@tempa :=#1\do{\expandafter\tabu@newlinestyle \@tempa==\@nil}}%
+}% \newtabulinestyle
+\def\tabu@newlinestyle #1=#2=#3\@nil{\tabu@getline {#2}%
+ \tabu@sanitizearg {#1}\@tempa
+ \ifodd 1\ifx \@tempa\@empty \ifdefined\tabu@linestyle@ 0 \fi\fi
+ \global\expandafter\let
+ \csname tabu@linestyle@\@tempa \endcsname =\tabu@thestyle \fi
+}% \tabu@newlinestyle
+\newcommand*\tabulinestyle [1]{\tabu@everyrow@bgroup \tabu@getline{#1}%
+ \iftabu@everyrow
+ \toks@\expandafter{\expandafter \def \expandafter
+ \tabu@ls@L\expandafter{\tabu@thestyle}}%
+ \gdef\tabu@ls@{\tabu@ls@L}%
+ \else
+ \global\let\tabu@ls@G \tabu@thestyle
+ \gdef\tabu@ls@{\tabu@ls@G}%
+ \fi
+ \tabu@everyrow@egroup
+}% \tabulinestyle
+\newcommand*\taburulecolor{\tabu@everyrow@bgroup \tabu@textbar \tabu@rulecolor}
+\def\tabu@rulecolor #1{\toks@{}%
+ \def\tabu@temp #1##1#1{\tabu@ruledrsc{##1}}\@ifnextchar #1%
+ \tabu@temp
+ \tabu@rulearc
+}% \tabu@rulecolor
+\def\tabu@ruledrsc #1{\edef\tabu@temp{#1}\tabu@strtrim\tabu@temp
+ \ifx \tabu@temp\@empty \def\tabu@temp{\tabu@rule@drsc@ {}{}}%
+ \else \edef\tabu@temp{\noexpand\tabu@rule@drsc@ {}{\tabu@temp}}%
+ \fi
+ \tabu@temp
+}% \tabu@ruledrsc@
+\def\tabu@ruledrsc@ #1#{\tabu@rule@drsc@ {#1}}
+\def\tabu@rule@drsc@ #1#2{%
+ \iftabu@everyrow
+ \ifx \\#1#2\\\toks@{\let\CT@drsc@ \relax}%
+ \else \toks@{\def\CT@drsc@{\color #1{#2}}}%
+ \fi
+ \else
+ \ifx \\#1#2\\\global\let\CT@drsc@ \relax
+ \else \gdef\CT@drsc@{\color #1{#2}}%
+ \fi
+ \fi
+ \tabu@rulearc
+}% \tabu@rule@drsc@
+\def\tabu@rulearc #1#{\tabu@rule@arc@ {#1}}
+\def\tabu@rule@arc@ #1#2{%
+ \iftabu@everyrow
+ \ifx \\#1#2\\\toks@\expandafter{\the\toks@ \def\CT@arc@{}}%
+ \else \toks@\expandafter{\the\toks@ \def\CT@arc@{\color #1{#2}}}%
+ \fi
+ \toks@\expandafter{\the\toks@
+ \let\tabu@arc@L \CT@arc@
+ \let\tabu@drsc@L \CT@drsc@}%
+ \else
+ \ifx \\#1#2\\\gdef\CT@arc@{}%
+ \else \gdef\CT@arc@{\color #1{#2}}%
+ \fi
+ \global\let\tabu@arc@G \CT@arc@
+ \global\let\tabu@drsc@G \CT@drsc@
+ \fi
+ \tabu@everyrow@egroup
+}% \tabu@rule@arc@
+\def\taburowcolors {\tabu@everyrow@bgroup \@testopt \tabu@rowcolors 1}
+\def\tabu@rowcolors [#1]#2#{\tabu@rowc@lors{#1}{#2}}
+\def\tabu@rowc@lors #1#2#3{%
+ \toks@{}\@defaultunits \count@ =\number0#2\relax \@nnil
+ \@defaultunits \tabu@start =\number0#1\relax \@nnil
+ \ifnum \count@<\tw@ \count@=\tw@ \fi
+ \advance\tabu@start \m@ne
+ \ifnum \tabu@start<\z@ \tabu@start \z@ \fi
+ \tabu@rowcolorseries #3\in@..\in@ \@nnil
+}% \tabu@rowcolors
+\def\tabu@rowcolorseries #1..#2\in@ #3\@nnil {%
+ \ifx \in@#1\relax
+ \iftabu@everyrow \toks@{\def\tabu@rc@{}\let\tabu@rc@L \tabu@rc@}%
+ \else \gdef\tabu@rc@{}\global\let\tabu@rc@G \tabu@rc@
+ \fi
+ \else
+ \ifx \\#2\\\tabu@rowcolorserieserror \fi
+ \tabu@sanitizearg{#1}\tabu@temp
+ \tabu@sanitizearg{#2}\@tempa
+ \advance\count@ \m@ne
+ \iftabu@everyrow
+ \def\tabu@rc@ ##1##2##3##4{\def\tabu@rc@{%
+ \ifnum ##2=\c@taburow
+ \definecolorseries{tabu@rcseries@\the\tabu@nested}{rgb}{last}{##3}{##4}\fi
+ \ifnum \c@taburow<##2 \else
+ \ifnum \tabu@modulo {\c@taburow-##2}{##1+1}=\z@
+ \resetcolorseries[{##1}]{tabu@rcseries@\the\tabu@nested}\fi
+ \xglobal\colorlet{tabu@rc@\the\tabu@nested}{tabu@rcseries@\the\tabu@nested!!+}%
+ \rowcolor{tabu@rc@\the\tabu@nested}\fi}%
+ }\edef\x{\noexpand\tabu@rc@ {\the\count@}
+ {\the\tabu@start}
+ {\tabu@temp}
+ {\@tempa}%
+ }\x
+ \toks@\expandafter{\expandafter\def\expandafter\tabu@rc@\expandafter{\tabu@rc@}}%
+ \toks@\expandafter{\the\toks@ \let\tabu@rc@L \tabu@rc@}%
+ \else % inside \noalign
+ \definecolorseries{tabu@rcseries@\the\tabu@nested}{rgb}{last}{\tabu@temp}{\@tempa}%
+ \expandafter\resetcolorseries\expandafter[\the\count@]{tabu@rcseries@\the\tabu@nested}%
+ \xglobal\colorlet{tabu@rc@\the\tabu@nested}{tabu@rcseries@\the\tabu@nested!!+}%
+ \let\noalign \relax \rowcolor{tabu@rc@\the\tabu@nested}%
+ \def\tabu@rc@ ##1##2{\gdef\tabu@rc@{%
+ \ifnum \tabu@modulo {\c@taburow-##2}{##1+1}=\@ne
+ \resetcolorseries[{##1}]{tabu@rcseries@\the\tabu@nested}\fi
+ \xglobal\colorlet{tabu@rc@\the\tabu@nested}{tabu@rcseries@\the\tabu@nested!!+}%
+ \rowcolor{tabu@rc@\the\tabu@nested}}%
+ }\edef\x{\noexpand\tabu@rc@{\the\count@}{\the\c@taburow}}\x
+ \global\let\tabu@rc@G \tabu@rc@
+ \fi
+ \fi
+ \tabu@everyrow@egroup
+}% \tabu@rowcolorseries
+\tabuDisableCommands {\let\tabu@rc@ \@empty }
+\def\tabu@rowcolorserieserror {\PackageError{tabu}
+ {Invalid syntax for \string\taburowcolors
+ \MessageBreak Please look at the documentation!}\@ehd
+}% \tabu@rowcolorserieserror
+\newcommand*\tabureset {%
+ \tabulinesep=\z@ \extrarowsep=\z@ \extratabsurround=\z@
+ \tabulinestyle{}\everyrow{}\taburulecolor||{}\taburowcolors{}%
+}% \tabureset
+%% Parsing the line styles ------------------------------------------
+\def\tabu@getline #1{\begingroup
+ \csname \ifcsname if@safe@actives\endcsname % <babel>
+ @safe@activestrue\else
+ relax\fi \endcsname
+ \edef\tabu@temp{#1}\tabu@sanitizearg{#1}\@tempa
+ \let\tabu@thestyle \relax
+ \ifcsname tabu@linestyle@\@tempa \endcsname
+ \edef\tabu@thestyle{\endgroup
+ \def\tabu@thestyle{\expandafter\noexpand
+ \csname tabu@linestyle@\@tempa\endcsname}%
+ }\tabu@thestyle
+ \else \expandafter\tabu@definestyle \tabu@temp \@nil
+ \fi
+}% \tabu@getline
+\def\tabu@definestyle #1#2\@nil {\endlinechar \m@ne \makeatletter
+ \tabu@thick \maxdimen \tabu@on \maxdimen \tabu@off \maxdimen
+ \let\tabu@c@lon \@undefined \let\tabu@c@loff \@undefined
+ \ifodd 1\ifcat .#1\else\ifcat\relax #1\else 0\fi\fi % catcode 12 or non expandable cs
+ \def\tabu@temp{\tabu@getparam{thick}}%
+ \else \def\tabu@temp{\tabu@getparam{thick}\maxdimen}%
+ \fi
+ {%
+ \let\tabu@ \relax
+ \def\:{\obeyspaces \tabu@oXIII \tabu@commaXIII \edef\:}% (space active \: happy ;-))
+ \scantokens{\:{\tabu@temp #1#2 \tabu@\tabu@}}%
+ \expandafter}\expandafter
+ \def\expandafter\:\expandafter{\:}% line spec rewritten now ;-)
+ \def\;{\def\:}%
+ \scantokens\expandafter{\expandafter\;\expandafter{\:}}% space is now inactive (catcode 10)
+ \let\tabu@ \tabu@getcolor \:% all arguments are ready now ;-)
+ \ifdefined\tabu@c@lon \else \let\tabu@c@lon\@empty \fi
+ \ifx \tabu@c@lon\@empty \def\tabu@c@lon{\CT@arc@}\fi
+ \ifdefined\tabu@c@loff \else \let\tabu@c@loff \@empty \fi
+ \ifdim \tabu@on=\maxdimen \ifdim \tabu@off<\maxdimen
+ \tabu@on \tabulineon \fi\fi
+ \ifdim \tabu@off=\maxdimen \ifdim \tabu@on<\maxdimen
+ \tabu@off \tabulineoff \fi\fi
+ \ifodd 1\ifdim \tabu@off=\maxdimen \ifdim \tabu@on=\maxdimen 0 \fi\fi
+ \in@true % <leaders>
+ \else \in@false % <rule>
+ \fi
+ \ifdim\tabu@thick=\maxdimen \def\tabu@thick{\arrayrulewidth}%
+ \else \edef\tabu@thick{\the\tabu@thick}%
+ \fi
+ \edef \tabu@thestyle ##1##2{\endgroup
+ \def\tabu@thestyle{%
+ \ifin@ \noexpand\tabu@leadersstyle {\tabu@thick}
+ {\the\tabu@on}{##1}
+ {\the\tabu@off}{##2}%
+ \else \noexpand\tabu@rulesstyle
+ {##1\vrule width \tabu@thick}%
+ {##1\leaders \hrule height \tabu@thick \hfil}%
+ \fi}%
+ }\expandafter \expandafter
+ \expandafter \tabu@thestyle \expandafter
+ \expandafter \expandafter
+ {\expandafter\tabu@c@lon\expandafter}\expandafter{\tabu@c@loff}%
+}% \tabu@definestyle
+{\catcode`\O=\active \lccode`\O=`\o \catcode`\,=\active
+ \lowercase{\gdef\tabu@oXIII {\catcode`\o=\active \let O=\tabu@oxiii}}
+ \gdef\tabu@commaXIII {\catcode`\,=\active \let ,=\space}
+}% \catcode
+\def\tabu@oxiii #1{%
+ \ifcase \ifx n#1\z@ \else
+ \ifx f#1\@ne\else
+ \tw@ \fi\fi
+ \expandafter\tabu@onxiii
+ \or \expandafter\tabu@ofxiii
+ \else o%
+ \fi#1}%
+\def\tabu@onxiii #1#2{%
+ \ifcase \ifx !#2\tw@ \else
+ \ifcat.\noexpand#2\z@ \else
+ \ifx \tabu@spxiii#2\@ne\else
+ \tw@ \fi\fi\fi
+ \tabu@getparam{on}#2\expandafter\@gobble
+ \or \expandafter\tabu@onxiii % (space is active)
+ \else o\expandafter\@firstofone
+ \fi{#1#2}}%
+\def\tabu@ofxiii #1#2{%
+ \ifx #2f\expandafter\tabu@offxiii
+ \else o\expandafter\@firstofone
+ \fi{#1#2}}
+\def\tabu@offxiii #1#2{%
+ \ifcase \ifx !#2\tw@ \else
+ \ifcat.\noexpand#2\z@ \else
+ \ifx\tabu@spxiii#2\@ne \else
+ \tw@ \fi\fi\fi
+ \tabu@getparam{off}#2\expandafter\@gobble
+ \or \expandafter\tabu@offxiii % (space is active)
+ \else o\expandafter\@firstofone
+ \fi{#1#2}}
+\def\tabu@getparam #1{\tabu@ \csname tabu@#1\endcsname=}
+\def\tabu@getcolor #1{% \tabu@ <- \tabu@getcolor after \edef
+ \ifx \tabu@#1\else % no more spec
+ \let\tabu@theparam=#1\afterassignment \tabu@getc@l@r #1\fi
+}% \tabu@getcolor
+\def\tabu@getc@l@r #1\tabu@ {%
+ \def\tabu@temp{#1}\tabu@strtrim \tabu@temp
+ \ifx \tabu@temp\@empty
+ \else%\ifcsname \string\color@\tabu@temp \endcsname % if the color exists
+ \ifx \tabu@theparam \tabu@off \let\tabu@c@loff \tabu@c@l@r
+ \else \let\tabu@c@lon \tabu@c@l@r
+ \fi
+ %\else \tabu@warncolour{\tabu@temp}%
+ \fi%\fi
+ \tabu@ % next spec
+}% \tabu@getc@l@r
+\def\tabu@warncolour #1{\PackageWarning{tabu}
+ {Color #1 is not defined. Default color used}%
+}% \tabu@warncolour
+\def\tabu@leadersstyle #1#2#3#4#5{\def\tabu@leaders{{#1}{#2}{#3}{#4}{#5}}%
+ \ifx \tabu@leaders\tabu@leaders@G \else
+ \tabu@LEADERS{#1}{#2}{#3}{#4}{#5}\fi
+}% \tabu@leadersstyle
+\def\tabu@rulesstyle #1#2{\let\tabu@leaders \@undefined
+ \gdef\tabu@thevrule{#1}\gdef\tabu@thehrule{#2}%
+}% \tabu@rulesstyle
+%% The leaders boxes ------------------------------------------------
+\def\tabu@LEADERS #1#2#3#4#5{%% width, dash, dash color, gap, gap color
+ {\let\color \tabu@color % => during trials -> \color = \tabu@nocolor
+ {% % but the leaders boxes should have colors !
+ \def\@therule{\vrule}\def\@thick{height}\def\@length{width}%
+ \def\@box{\hbox}\def\@unbox{\unhbox}\def\@elt{\wd}%
+ \def\@skip{\hskip}\def\@ss{\hss}\def\tabu@leads{\tabu@hleads}%
+ \tabu@l@@d@rs {#1}{#2}{#3}{#4}{#5}%
+ \global\let\tabu@thehleaders \tabu@theleaders
+ }%
+ {%
+ \def\@therule{\hrule}\def\@thick{width}\def\@length{height}%
+ \def\@box{\vbox}\def\@unbox{\unvbox}\def\@elt{\ht}%
+ \def\@skip{\vskip}\def\@ss{\vss}\def\tabu@leads{\tabu@vleads}%
+ \tabu@l@@d@rs {#1}{#2}{#3}{#4}{#5}%
+ \global\let\tabu@thevleaders \tabu@theleaders
+ }%
+ \gdef\tabu@leaders@G{{#1}{#2}{#3}{#4}{#5}}%
+ }%
+}% \tabu@LEADERS
+\def\tabu@therule #1#2{\@therule \@thick#1\@length\dimexpr#2/2 \@depth\z@}
+\def\tabu@l@@d@rs #1#2#3#4#5{%% width, dash, dash color, gap, gap color
+ \global\setbox \tabu@leads=\@box{%
+ {#3\tabu@therule{#1}{#2}}%
+ \ifx\\#5\\\@skip#4\else{#5\tabu@therule{#1}{#4*2}}\fi
+ {#3\tabu@therule{#1}{#2}}}%
+ \global\setbox\tabu@leads=\@box to\@elt\tabu@leads{\@ss
+ {#3\tabu@therule{#1}{#2}}\@unbox\tabu@leads}%
+ \edef\tabu@theleaders ##1{\def\noexpand\tabu@theleaders {%
+ {##1\tabu@therule{#1}{#2}}%
+ \xleaders \copy\tabu@leads \@ss
+ \tabu@therule{0pt}{-#2}{##1\tabu@therule{#1}{#2}}}%
+ }\tabu@theleaders{#3}%
+}% \tabu@l@@d@rs
+%% \tabu \endtabu \tabu* \longtabu \endlongtabu \longtabu* ----------
+\newcommand*\tabu {\tabu@longfalse
+ \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
+ \tabu@spreadfalse \tabu@negcoeffalse \tabu@settarget
+}% {tabu}
+\let\tabu@tabular \tabular % <For LyX: some users redefine \tabular...>
+\expandafter\def\csname tabu*\endcsname{\tabuscantokenstrue \tabu}
+\newcommand*\longtabu {\tabu@longtrue
\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\LT@startpbox \tabu@LT@startpbox % \everypar{ array strut } instead of { array strut }
- \tabu@setup \tabu@settarget
-}% \longtabu
+ \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
+}% {longtabu}
+\expandafter\def\csname longtabu*\endcsname{\tabuscantokenstrue \longtabu}
\def\tabu@nolongtabu{\PackageError{tabu}
{longtabu requires the longtable package}\@ehd}
-\def\tabu@setup{%
- \tabu@adl@fix \let\endarray \tabu@endarray % <fix> colortbl & arydshln (delarray)
- \let\tabu@global@X \@empty
- \ifx \verbatim\tabu@sanitizetext % <nested tabu>
- \advance\tabu@nested \@ne
- \def\tabu@aligndefault{t}\let\tabudefaulttarget \linewidth
- \else
- \tabu@timerstart \global\tabu@footnotes{}\tabu@nested \z@
- \let\tabu@multicolumnORI \multicolumn \let\multicolumn \tabu@multicolumn
- \def\tabu@aligndefault{c}\edef\tabu@hfuzz {\the\hfuzz}%
- \ifdim\parindent>\z@ \ifx\linewidth\tabudefaulttarget
- \everypar\expandafter{% % correction for indentation
- \the\everypar\everypar\expandafter{\the\everypar}%
- \setbox\z@=\lastbox
- \ifdim\wd\z@>\z@ \advance\linewidth -\wd\z@\fi
- \box\z@
- }%
- \fi\fi
- \fi
- \ifcase 0\ifdim\abovetabulinesep>\z@ 1\else\ifdim\belowtabulinesep>\z@ 1\fi\fi
- \let\tabu@celllalign \@empty \let\tabu@cellralign \@empty
- \else \def\tabu@celllalign{\tabu@verticalmeasure}%
- \def\tabu@cellralign{\tabu@verticalspacing}%
- \fi
- \tabu@setup@saveglobal
- \let\@footnotetext \tabu@footnotetext \let\@xfootnotetext \tabu@xfootnotetext
- \let\@xfootnote \tabu@xfootnote \let\centering \tabu@centering
- \let\raggedright \tabu@raggedright \let\raggedleft \tabu@raggedleft
- \tabu@trivlist %<restore \\=\@normalcr inside lists>
- \def\tabudecimal {\tabu@tabudecimal}\let\verbatim \tabu@sanitizetext
- \let\fbox \tabu@fbox \let\color@b@x \tabu@color@b@x
- \let\rowfont \tabu@rowfont
- \let\prepnext@tok \tabu@prepnext@tok %<for \rowfont and \tabucline>
- \everycr{}\let\tabu@everycr \everycr
- \tabu@spreadfalse \tabu@measuringfalse \tabu@negcoeffalse
- \edef\tabu@NC@list{\the\NC@list}\NC@list{\NC@do \tabu@rewritefirst}%
-}% \tabu@setup
-\def\tabu@setup@saveglobal{{%
- \toks@\expandafter{\tabu@everyrow@hook}%
- \expandafter\xdef\csname tabu@global@\the\tabu@nested\endcsname{%
- \gdef\noexpand\tabu@everyrow@hook {\the\toks@}%
- \noexpand\tabu@everyrowtrue
- \ifcase \tabu@nested
- \noexpand\the \tabu@footnotes
- \else
- \global\tabu@X@cols \the\tabu@X@cols\relax
- \global\tabu@naturalX \the\tabu@naturalX\relax
- \gdef\noexpand\tabu@naturalX@min {\tabu@naturalX@min}%
- \gdef\noexpand\tabu@naturalX@max {\tabu@naturalX@max}%
- \fi}}%
- \expandafter\aftergroup\csname tabu@global@\the\tabu@nested\endcsname
-}% \tabu@setup@saveglobal
-\def\tabu@settarget{\futurelet\@let@token \tabu@sett@rget}
-\def\tabu@sett@rget{\tabu@target\z@
- \ifcase \ifx \bgroup\@let@token 0\else
- \ifx [\@let@token 0\else
- \ifx \@sptoken\@let@token 1\else
- \if t\@let@token 2\else
- \if s\@let@token 3\else
- \m@ne\fi\fi\fi\fi\fi\relax
+%% Read the target and then : \tabular or \@array ------------------
+\def\tabu@settarget {\futurelet\@let@token \tabu@sett@rget }
+\def\tabu@sett@rget {\tabu@target \z@
+ \ifcase \ifx \bgroup\@let@token \z@ \else
+ \ifx \@sptoken\@let@token \@ne \else
+ \if t\@let@token \tw@ \else
+ \if s\@let@token \thr@@\else
+ \z@\fi\fi\fi\fi
\expandafter\tabu@begin
\or \expandafter\tabu@gobblespace\expandafter\tabu@settarget
\or \expandafter\tabu@to
\or \expandafter\tabu@spread
- \else \expandafter\tabu@begin
\fi
}% \tabu@sett@rget
\def\tabu@to to{\def\tabu@halignto{to}\tabu@gettarget}
\def\tabu@spread spread{\tabu@spreadtrue\def\tabu@halignto{spread}\tabu@gettarget}
-\def\tabu@gettarget {\afterassignment\tabu@linegoaltarget \tabu@target}
-\def\tabu@linegoaltarget {\futurelet\tabu@temp \tabu@linegoal@target}
-\def\tabu@linegoal@target {%
+\def\tabu@gettarget {\afterassignment\tabu@linegoaltarget \tabu@target }
+\def\tabu@linegoaltarget {\futurelet\tabu@temp \tabu@linegoalt@rget }
+\def\tabu@linegoalt@rget {%
\ifx \tabu@temp\LNGL@setlinegoal
\LNGL@setlinegoal \expandafter \@firstoftwo \fi % @gobbles \LNGL@setlinegoal
\tabu@begin
-}% \tabu@linegoal@target
+}% \tabu@linegoalt@rget
\def\tabu@begin #1#{%
- \edef\tabu@halignto{\ifdim\tabu@target>\z@ \tabu@halignto\the\tabu@target\fi}%
- \@testopt \tabu@@begin \tabu@aligndefault #1\@nil
+ \iftabu@measuring \expandafter\tabu@nestedmeasure \fi
+ \ifdim \tabu@target=\z@ \let\tabu@halignto \@empty
+ \else \edef\tabu@halignto{\tabu@halignto\the\tabu@target}%
+ \fi
+ \@testopt \tabu@tabu@ \tabu@aligndefault #1\@nil
}% \tabu@begin
-\def\tabu@@begin [#1]#2\@nil#3{%
- \tabu@preparesave{#3}% <for \savetabu>
- \def\tabu@align {#1}%
- \tabu@ [\tabu@align]#2{\tabu@rewritefirst #3}%
-}% \tabu@@begin
-\def\tabu@preparesave #1{%
- \iftabu@colortbl \@temptokena{}%
- \tabu@prepare@save \CT@arc@
- \tabu@prepare@save \CT@drsc@
- \fi
- \edef\tabu@savedparam{%
- \ifmmode \col@sep \the\arraycolsep
- \else \col@sep \the\tabcolsep \fi\relax
- \arrayrulewidth \the\arrayrulewidth\relax
- \doublerulesep \the\doublerulesep\relax
- \extrarowheight \the\extrarowheight\relax
- \extrarowdepth \the\extrarowdepth\relax
- \extratabsurround \the\extratabsurround\relax
- \def\noexpand\arraystretch {\arraystretch}%
- \iftabu@colortbl \minrowclearance\the\minrowclearance\relax
- \the\@temptokena
- \fi}%
- \def\tabu@savedpream {\edef\tabu@halignto{to\the\tabu@target}\NC@find #1}%
-}% \tabu@preparesave
-\def\tabu@prepare@save #1{%
- \ifx\relax#1\else
- \@temptokena\expandafter{\the\expandafter\@temptokena
- \expandafter\def\expandafter#1\expandafter{#1}}\fi
-}% \tabu@prepare@save
-\newtoks\tabu@footnotes
-\long\def\tabu@footnotetext #1{%
- \edef\@tempa{\the\tabu@footnotes
- \noexpand\footnotetext [\the\csname c@\@mpfn\endcsname]}%
- \global\tabu@footnotes\expandafter{\@tempa {#1}}}%
-\long\def\tabu@xfootnotetext [#1]#2{%
- \global\tabu@footnotes\expandafter{\the\tabu@footnotes
- \footnotetext [{#1}]{#2}}}
-\let\tabu@xfootnote \@xfootnote
-\long\def\tabu@Hy@ftntext{\tabu@Hy@ftntxt {\the \c@footnote }}
-\long\def\tabu@Hy@xfootnote [#1]{%
- \begingroup
- \value\@mpfn #1\relax
- \protected@xdef \@thefnmark {\thempfn}%
- \endgroup
- \@footnotemark \tabu@Hy@ftntxt {#1}%
-}% \tabu@Hy@xfootnote
-\long\def\tabu@Hy@ftntxt #1#2{%
- \edef\@tempa{%
- \the\tabu@footnotes
- \begingroup
- \value\@mpfn #1\relax
- \noexpand\protected@xdef
- \noexpand\@thefnmark{\noexpand\thempfn}%
- \expandafter\noexpand\expandafter\tabu@Hy@footnotetext
- \expandafter{%
- \Hy@footnote@currentHref
- }%
- }%
- \global\tabu@footnotes\expandafter{%
- \@tempa {#2}%
- \endgroup
- }%
-}% \tabu@Hy@ftntxt
-\long\def\tabu@Hy@footnotetext #1#2{%
- \H@@footnotetext{%
- \ifHy@nesting
- \hyper@@anchor {#1}{#2}%
- \else
- \Hy@raisedlink{%
- \hyper@@anchor {#1}{\relax}%
- }%
- \def\@currentHref {#1}%
- \let\@currentlabelname \@empty
- #2%
- \fi
- }%
-}% \tabu@Hy@footnotetext
-\AtBeginDocument{%
- \csname\ifcsname ifHy@hyperfootnotes\endcsname
- ifHy@hyperfootnotes\else iffalse\fi\endcsname
- \let\tabu@footnotetext \tabu@Hy@ftntext
- \let\tabu@xfootnote \tabu@Hy@xfootnote
- \fi
-}
-\def\tabu@rewrite@X #1{\tabu@Xarg {#1}%
- \expandafter\let\csname tabu@X\the\tabu@X@cols\endcsname \relax
- \iftabu@measuring % not the first X column found in preamble
- \edef\tabu@global@X {\tabu@global@X
- \def\csname tabu@X\the\tabu@X@cols\endcsname {\strip@pt\tabu@X@sum}%
- \advance\tabu@X@sum \the\tabu@X@sum\relax}%
- \else % first X column found in preamble
- \tabu@measuringtrue
- \iftabu@spread \tabu@spreadtarget\tabu@target \tabu@target\z@
- \else \tabu@spreadtarget \z@ \fi
- \ifdim\tabu@target=\z@
- \setlength\tabu@target \tabudefaulttarget
- \tabu@message{(tabu) Default target:
- \ifx\tabudefaulttarget\linewidth\string\linewidth
- \else\ifx\tabudefaulttarget\linegoal\string\linegoal
- \fi\fi=\the\tabu@target \on@line, page \the\c@page}\fi
- \tabu@message{\tabu@titles}%
- \edef\tabu@global@X {\tabu@global@X
- \def\csname tabu@X1\endcsname{\strip@pt\tabu@X@sum}%
- \tabu@X@sum \the\tabu@X@sum\relax
- \tabu@target \the\tabu@target\relax
- \tabu@spreadtarget \the\tabu@spreadtarget\relax}%
- \let\tabu@halignto \relax
- \fi
-}% \tabu@rewrite@X
-\let\tabu@@rewrite@X \tabu@rewrite@X
-\def\tabu@rewrite@Xnested #1{\in@ ${#1}\ifin@
- \def\tabucolX@rw {>{$}p{\tabucolX}<{$}}\else
- \def\tabucolX@rw {p{\tabucolX}}\fi}
-\def\tabu@rewrite@Xrestore #1{\tabu@gobbleopt{\def\tabucolX@rw{l}}}
-\def\tabu@Xarg#1{%
- \advance\tabu@X@cols \@ne
- \tabu@wdlet\tabu@X@cols \z@
- \ifx\\#1\\% <shortcut when no option>
- \tabu@X@sum \p@
- \edef\tabucolX@rw {p{\tabu@dimexpr{\the\tabu@X@cols}{\tabucolX}}}%
- \edef\tabu@temp {p{\the\tabucolX}}% <required for \usetabu>
- \else
- \tabu@X@sum \z@
- \let\tabucolX@align \@empty \let\tabucolX@rw \@empty
- \let\tabu@Xmath \@empty \let\tabu@temp \@empty
- \tabu@Xparse {}#1,\@nnil
- \fi
+\long\def\tabu@tabu@ [#1]#2\@nil #3{\tabu@setup
+ \def\tabu@align {#1}\def\tabu@savedpream{\NC@find #3}%
+ \tabu@ [\tabu@align ]#2{#3\tabu@rewritefirst }%
+}% \tabu@tabu@
+\def\tabu@nestedmeasure {%
+ \ifodd 1\iftabu@spread \else \ifdim\tabu@target=\z@ \else 0 \fi\fi\relax
+ \tabu@spreadtrue
+ \else \begingroup \iffalse{\fi \ifnum0=`}\fi
+ \toks@{}\def\tabu@stack{b}%
+ \expandafter\tabu@collectbody\expandafter\tabu@quickrule
+ \expandafter\endgroup
+ \fi
+}% \tabu@nestedmeasure
+\def\tabu@quickrule {\indent\vrule height\z@ depth\z@ width\tabu@target}
+%% \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
+ \def\tabu@aligndefault{c}\tabu@init \tabu@indent
+ \else % <nested tabu>
+ \def\tabu@aligndefault{t}\let\tabudefaulttarget \linewidth
+ \fi
+ \let\tabu@thetarget \tabudefaulttarget \let\tabu@restored \@undefined
+ \edef\tabu@NC@list{\the\NC@list}\NC@list{\NC@do \tabu@rewritefirst}%
+ \everycr{}\let\@startpbox \tabu@startpbox % for nested tabu inside longtabu...
+ \let\@endpbox \tabu@endpbox % idem " " " " " "
+ \let\@tabarray \tabu@tabarray % idem " " " " " "
+ \tabu@setcleanup \tabu@setreset
+}% \tabu@setup
+\def\tabu@init{\tabu@starttimer \tabu@measuringfalse
+ \edef\tabu@hfuzz {\the\dimexpr\hfuzz+1sp}\global\tabu@footnotes{}%
+ \let\firsthline \tabu@firsthline \let\lasthline \tabu@lasthline
+ \let\firstline \tabu@firstline \let\lastline \tabu@lastline
+ \let\hline \tabu@hline \let\@xhline \tabu@xhline
+ \let\color \tabu@color \let\@arstrutbox \tabu@arstrutbox
+ \tabu@trivlist %<restore \\=\@normalcr inside lists>
+ \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\tabudecimal \tabu@tabudecimal \let\Centering \tabu@Centering
+ \let\RaggedRight \tabu@RaggedRight \let\RaggedLeft \tabu@RaggedLeft
+ \let\justifying \tabu@justifying \let\rowfont \tabu@rowfont
+ \let\fbox \tabu@fbox \let\color@b@x \tabu@color@b@x
+ \let\tabu@@everycr \everycr \let\tabu@@everypar \everypar
+ \let\tabu@prepnext@tokORI \prepnext@tok\let\prepnext@tok \tabu@prepnext@tok
+ \let\tabu@multicolumnORI\multicolumn \let\multicolumn \tabu@multicolumn
+ \let\tabu@startpbox \@startpbox % for nested tabu inside longtabu pfff !!!
+ \let\tabu@endpbox \@endpbox % idem " " " " " " "
+ \let\tabu@tabarray \@tabarray % idem " " " " " " "
+ \tabu@adl@fix \let\endarray \tabu@endarray % <fix> colortbl & arydshln (delarray)
+ \iftabu@colortbl\CT@everycr\expandafter{\expandafter\iftabu@everyrow \the\CT@everycr \fi}\fi
+}% \tabu@init
+\def\tabu@indent{% correction for indentation
+ \ifdim \parindent>\z@\ifx \linewidth\tabudefaulttarget
+ \everypar\expandafter{%
+ \the\everypar\everypar\expandafter{\the\everypar}%
+ \setbox\z@=\lastbox
+ \ifdim\wd\z@>\z@ \edef\tabu@thetarget
+ {\the\dimexpr -\wd\z@+\tabudefaulttarget}\fi
+ \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{%
+ \def\tabu@aftergroupcleanup{\aftergroup\tabu@cleanup}}%
+ \else
+ \def\tabu@aftergroupcleanup{%
+ \aftergroup\aftergroup\aftergroup\tabu@cleanup
+ \let\tabu@aftergroupcleanup \relax}%
+ \fi
+ \let\tabu@arc@Gsave \tabu@arc@G
+ \let\tabu@arc@G \tabu@arc@L % <init>
+ \let\tabu@drsc@Gsave \tabu@drsc@G
+ \let\tabu@drsc@G \tabu@drsc@L % <init>
+ \let\tabu@ls@Gsave \tabu@ls@G
+ \let\tabu@ls@G \tabu@ls@L % <init>
+ \let\tabu@rc@Gsave \tabu@rc@G
+ \let\tabu@rc@G \tabu@rc@L % <init>
+ \let\tabu@evr@Gsave \tabu@evr@G
+ \let\tabu@evr@G \tabu@evr@L % <init>
+ \let\tabu@celllalign@save \tabu@celllalign
+ \let\tabu@cellralign@save \tabu@cellralign
+ \let\tabu@cellleft@save \tabu@cellleft
+ \let\tabu@cellright@save \tabu@cellright
+ \let\tabu@@celllalign@save \tabu@@celllalign
+ \let\tabu@@cellralign@save \tabu@@cellralign
+ \let\tabu@@cellleft@save \tabu@@cellleft
+ \let\tabu@@cellright@save \tabu@@cellright
+ \let\tabu@rowfontreset@save \tabu@rowfontreset
+ \let\tabu@@rowfontreset@save\tabu@@rowfontreset
+ \let\tabu@rowfontreset \@empty
+ \edef\tabu@alloc@save {\the\tabu@alloc}% restore at \tabu@reset
+ \edef\c@taburow@save {\the\c@taburow}%
+ \edef\tabu@naturalX@save {\the\tabu@naturalX}%
+ \let\tabu@naturalXmin@save \tabu@naturalXmin
+ \let\tabu@naturalXmax@save \tabu@naturalXmax
+ \let\tabu@mkarstrut@save \tabu@mkarstrut
+ \edef\tabu@clarstrut{%
+ \extrarowheight \the\dimexpr \ht\@arstrutbox-\ht\strutbox \relax
+ \extrarowdepth \the\dimexpr \dp\@arstrutbox-\dp\strutbox \relax
+ \let\noexpand\@arraystretch \@ne \noexpand\tabu@rearstrut}%
+}% \tabu@setcleanup
+\def\tabu@cleanup {\begingroup
+ \globaldefs\@ne \tabu@everyrowtrue
+ \let\tabu@arc@G \tabu@arc@Gsave
+ \let\CT@arc@ \tabu@arc@G
+ \let\tabu@drsc@G \tabu@drsc@Gsave
+ \let\CT@drsc@ \tabu@drsc@G
+ \let\tabu@ls@G \tabu@ls@Gsave
+ \let\tabu@ls@ \tabu@ls@G
+ \let\tabu@rc@G \tabu@rc@Gsave
+ \let\tabu@rc@ \tabu@rc@G
+ \let\CT@do@color \relax
+ \let\tabu@evr@G \tabu@evr@Gsave
+ \let\tabu@celllalign \tabu@celllalign@save
+ \let\tabu@cellralign \tabu@cellralign@save
+ \let\tabu@cellleft \tabu@cellleft@save
+ \let\tabu@cellright \tabu@cellright@save
+ \let\tabu@@celllalign \tabu@@celllalign@save
+ \let\tabu@@cellralign \tabu@@cellralign@save
+ \let\tabu@@cellleft \tabu@@cellleft@save
+ \let\tabu@@cellright \tabu@@cellright@save
+ \let\tabu@rowfontreset \tabu@rowfontreset@save
+ \let\tabu@@rowfontreset \tabu@@rowfontreset@save
+ \tabu@naturalX =\tabu@naturalX@save
+ \let\tabu@naturalXmax \tabu@naturalXmax@save
+ \let\tabu@naturalXmin \tabu@naturalXmin@save
+ \let\tabu@mkarstrut \tabu@mkarstrut@save
+ \c@taburow =\c@taburow@save
+ \ifcase \tabu@nested \tabu@alloc \m@ne\fi
+ \endgroup % <end of \globaldefs>
+ \ifcase \tabu@nested
+ \the\tabu@footnotes \global\tabu@footnotes{}%
+ \tabu@afterendpar \tabu@elapsedtime
+ \fi
+ \tabu@clarstrut
+ \everyrow\expandafter {\tabu@evr@G}%
+}% \tabu@cleanup
+\let\tabu@afterendpar \relax
+\def\tabu@setreset {%
+ \edef\tabu@savedparams {% \relax for \tabu@message@save
+ \ifmmode \col@sep \the\arraycolsep
+ \else \col@sep \the\tabcolsep \fi \relax
+ \arrayrulewidth \the\arrayrulewidth \relax
+ \doublerulesep \the\doublerulesep \relax
+ \extratabsurround \the\extratabsurround \relax
+ \extrarowheight \the\extrarowheight \relax
+ \extrarowdepth \the\extrarowdepth \relax
+ \def\noexpand\arraystretch{\arraystretch}%
+ \ifdefined\minrowclearance \minrowclearance\the\minrowclearance\relax\fi}%
+ \begingroup
+ \@temptokena\expandafter{\tabu@savedparams}% => only for \savetabu / \usetabu
+ \ifx \tabu@arc@L\relax \else \tabu@setsave \tabu@arc@L \fi
+ \ifx \tabu@drsc@L\relax \else \tabu@setsave \tabu@drsc@L \fi
+ \tabu@setsave \tabu@ls@L \tabu@setsave \tabu@evr@L
+ \expandafter \endgroup \expandafter
+ \def\expandafter\tabu@saved@ \expandafter{\the\@temptokena
+ \let\tabu@arc@G \tabu@arc@L
+ \let\tabu@drsc@G \tabu@drsc@L
+ \let\tabu@ls@G \tabu@ls@L
+ \let\tabu@rc@G \tabu@rc@L
+ \let\tabu@evr@G \tabu@evr@L}%
+ \def\tabu@reset{\tabu@savedparams
+ \tabu@everyrowtrue \c@taburow \z@
+ \let\CT@arc@ \tabu@arc@L
+ \let\CT@drsc@ \tabu@drsc@L
+ \let\tabu@ls@ \tabu@ls@L
+ \let\tabu@rc@ \tabu@rc@L
+ \global\tabu@alloc \tabu@alloc@save
+ \everyrow\expandafter{\tabu@evr@L}}%
+}% \tabu@reset
+\def\tabu@setsave #1{\expandafter\tabu@sets@ve #1\@nil{#1}}
+\long\def\tabu@sets@ve #1\@nil #2{\@temptokena\expandafter{\the\@temptokena \def#2{#1}}}
+%% The Rewritting Process -------------------------------------------
+\def\tabu@newcolumntype #1{%
+ \expandafter\tabu@new@columntype
+ \csname NC@find@\string#1\expandafter\endcsname
+ \csname NC@rewrite@\string#1\endcsname
+ {#1}%
+}% \tabu@newcolumntype
+\def\tabu@new@columntype #1#2#3{%
+ \def#1##1#3{\NC@{##1}}%
+ \let#2\relax \newcommand*#2%
+}% \tabu@new@columntype
+\def\tabu@privatecolumntype #1{%
+ \expandafter\tabu@private@columntype
+ \csname NC@find@\string#1\expandafter\endcsname
+ \csname NC@rewrite@\string#1\expandafter\endcsname
+ \csname tabu@NC@find@\string#1\expandafter\endcsname
+ \csname tabu@NC@rewrite@\string#1\endcsname
+ {#1}%
+}% \tabu@privatecolumntype
+\def\tabu@private@columntype#1#2#3#4{%
+ \g@addto@macro\tabu@privatecolumns{\let#1#3\let#2#4}%
+ \tabu@new@columntype#3#4%
+}% \tabu@private@columntype
+\let\tabu@privatecolumns \@empty
+\newcommand*\tabucolumn [1]{\expandafter \def \expandafter
+ \tabu@highprioritycolumns\expandafter{\tabu@highprioritycolumns
+ \NC@do #1}}%
+\let\tabu@highprioritycolumns \@empty
+%% The | ``column'' : rewritting process --------------------------
+\tabu@privatecolumntype |{\tabu@rewritevline}
+\newcommand*\tabu@rewritevline[1][]{\tabu@vlinearg{#1}%
+ \expandafter \NC@find \tabu@rewritten}
+\def\tabu@lines #1{%
+ \ifx|#1\else \tabu@privatecolumntype #1{\tabu@rewritevline}\fi
+ \NC@list\expandafter{\the\NC@list \NC@do #1}%
+}% \tabu@lines@
+\def\tabu@vlinearg #1{%
+ \ifx\\#1\\\def\tabu@thestyle {\tabu@ls@}%
+ \else\tabu@getline {#1}%
+ \fi
+ \def\tabu@rewritten ##1{\def\tabu@rewritten{!{##1\tabu@thevline}}%
+ }\expandafter\tabu@rewritten\expandafter{\tabu@thestyle}%
+ \expandafter \tabu@keepls \tabu@thestyle \@nil
+}% \tabu@vlinearg
+\def\tabu@keepls #1\@nil{%
+ \ifcat $\@cdr #1\@nil $%
+ \ifx \relax#1\else
+ \ifx \tabu@ls@#1\else
+ \let#1\relax
+ \xdef\tabu@mkpreambuffer{\tabu@mkpreambuffer
+ \tabu@savels\noexpand#1}\fi\fi\fi
+}% \tabu@keepls
+\def\tabu@thevline {\begingroup
+ \ifdefined\tabu@leaders
+ \setbox\@tempboxa=\vtop to\dimexpr
+ \ht\@arstrutbox+\dp\@arstrutbox{{\tabu@thevleaders}}%
+ \ht\@tempboxa=\ht\@arstrutbox \dp\@tempboxa=\dp\@arstrutbox
+ \box\@tempboxa
+ \else
+ \tabu@thevrule
+ \fi \endgroup
+}% \tabu@thevline
+\def\tabu@savels #1{%
+ \expandafter\let\csname\string#1\endcsname #1%
+ \expandafter\def\expandafter\tabu@reset\expandafter{\tabu@reset
+ \tabu@resetls#1}}%
+\def\tabu@resetls #1{\expandafter\let\expandafter#1\csname\string#1\endcsname}%
+%% \multicolumn inside tabu environment -----------------------------
+\tabu@newcolumntype \tabu@rewritemulticolumn{%
+ \aftergroup \tabu@endrewritemulticolumn % after \@mkpream group
+ \NC@list{\NC@do *}\tabu@textbar \tabu@lines
+ \tabu@savedecl
+ \tabu@privatecolumns
+ \NC@list\expandafter{\the\expandafter\NC@list \tabu@NC@list}%
+ \let\tabu@savels \relax
+ \NC@find
+}% \tabu@rewritemulticolumn
+\def\tabu@endrewritemulticolumn{\gdef\tabu@mkpreambuffer{}\endgroup}
+\def\tabu@multicolumn{\tabu@ifenvir \tabu@multic@lumn \tabu@multicolumnORI}
+\long\def\tabu@multic@lumn #1#2#3{\multispan{#1}\begingroup
+ \tabu@everyrowtrue
+ \NC@list{\NC@do \tabu@rewritemulticolumn}%
+ \expandafter\@gobbletwo % gobbles \multispan{#1}
+ \tabu@multicolumnORI{#1}{\tabu@rewritemulticolumn #2}%
+ {\iftabuscantokens \tabu@rescan \else \expandafter\@firstofone \fi
+ {#3}}%
+}% \tabu@multic@lumn
+%% The X column(s): rewritting 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
+ {\tabu@rewriteX@Ss{#1}}
+ {\tabu@nosiunitx{#1}}}
+\def\tabu@rewriteX@Ss #1#2{\@temptokena{}%
+ \@defaultunits \let\tabu@temp =#2\relax\@nnil
+ \ifodd 1\ifx S\tabu@temp \else \ifx s\tabu@temp \else 0 \fi\fi
+ \def\NC@find{\def\NC@find >####1####2<####3\relax{#1 {####1}{####3}%
+ }\expandafter\NC@find \the\@temptokena \relax
+ }\expandafter\NC@rewrite@S \@gobble #2\relax
+ \else \tabu@siunitxerror
+ \fi
+ \expandafter \NC@find \tabu@rewritten
+}% \tabu@rewriteX@Ss
+\def\tabu@siunitxerror {\PackageError{tabu}{Not a S nor s column !
+ \MessageBreak X column can only embed siunitx S or s columns}\@ehd
+}% \tabu@siunitxerror
+\def\tabu@rewriteX #1#2#3{\tabu@Xarg {#1}{#2}{#3}%
+ \iftabu@measuring
+ \else \tabu@measuringtrue % first X column found in the preamble
+ \let\@halignto \relax \let\tabu@halignto \relax
+ \iftabu@spread \tabu@spreadtarget \tabu@target \tabu@target \z@
+ \else \tabu@spreadtarget \z@ \fi
+ \ifdim \tabu@target=\z@
+ \setlength\tabu@target \tabu@thetarget
+ \tabu@message{\tabu@message@defaulttarget}%
+ \else \tabu@message{\tabu@message@target}\fi
+ \fi
+}% \tabu@rewriteX
+\def\tabu@rewriteXrestore #1#2#3{\let\@halignto \relax
+ \def\tabu@rewritten{l}}
+\def\tabu@Xarg #1#2#3{%
+ \advance\tabu@Xcol \@ne \let\tabu@Xlcr \@empty
+ \let\tabu@Xdisp \@empty \let\tabu@Xmath \@empty
+ \ifx\\#1\\% <shortcut when no option>
+ \def\tabu@rewritten{p}\tabucolX \p@ % <default coef = 1>
+ \else
+ \let\tabu@rewritten \@empty \let\tabu@temp \@empty \tabucolX \z@
+ \tabu@Xparse {}#1\relax
+ \fi
+ \tabu@Xrewritten{#2}{#3}%
}% \tabu@Xarg
\def\tabu@Xparse #1{\futurelet\@let@token \tabu@Xtest}
\expandafter\def\expandafter\tabu@Xparsespace\space{\tabu@Xparse{}}
\def\tabu@Xtest{%
- \ifcase \ifx \@nnil\@let@token \z@ \else
+ \ifcase \ifx \relax\@let@token \z@ \else
\if ,\@let@token \m@ne\else
\if p\@let@token 1\else
\if m\@let@token 2\else
@@ -550,7 +988,6 @@
\if -\@let@token 13\else
\ifcat $\@let@token 14\else
15\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\relax
- \tabucolX@do \expandafter \remove@to@nnil
\or \tabu@Xtype {p}%
\or \tabu@Xtype {m}%
\or \tabu@Xtype {b}%
@@ -564,662 +1001,920 @@
\or \tabu@Xalign \justifying\tabu@justify
\or \expandafter \tabu@Xparsespace
\or \expandafter \tabu@Xcoef
- \or \let\tabu@Xmath=$\expandafter \tabu@Xparse
+ \or \expandafter \tabu@Xm@th
\or \tabu@Xcoef{}%
\else\expandafter \tabu@Xparse
\fi
}% \tabu@Xtest
-\def\tabu@Xalign#1#2{%
- \ifx \tabucolX@align\@empty \else \PackageWarning{tabu}
- {Duplicate horizontal alignment specification}\fi
- \ifdefined#1\def\tabucolX@align{#1}\else
- \def\tabucolX@align{#2}\fi
- \expandafter\tabu@Xparse
+\def\tabu@Xalign #1#2{%
+ \ifx \tabu@Xlcr\@empty \else \PackageWarning{tabu}
+ {Duplicate horizontal alignment specification}\fi
+ \ifdefined#1\def\tabu@Xlcr{#1}\let#1\relax
+ \else \def\tabu@Xlcr{#2}\let#2\relax\fi
+ \expandafter\tabu@Xparse
}% \tabu@Xalign
-\def\tabu@Xtype#1{%
- \ifx \tabucolX@rw\@empty \else \PackageWarning{tabu}
- {Duplicate vertical alignment specification}\fi
- \def\tabucolX@rw{#1}\expandafter\tabu@Xparse
+\def\tabu@Xtype #1{%
+ \ifx \tabu@rewritten\@empty \else \PackageWarning{tabu}
+ {Duplicate vertical alignment specification}\fi
+ \def\tabu@rewritten{#1}\expandafter\tabu@Xparse
}% \tabu@Xtype
\def\tabu@Xcoef#1{\edef\tabu@temp{\tabu@temp#1}%
- \afterassignment\tabu@Xc@ef \tabu@cnt\number\if-#10\fi
+ \afterassignment\tabu@Xc@ef \tabu@cnt\number\if-#10\fi
}% \tabu@Xcoef
-\def\tabu@Xc@ef{%
- \advance\tabu@X@sum \tabu@temp\the\tabu@cnt\p@
- \tabu@Xparse{}%
+\def\tabu@Xc@ef{\advance\tabucolX \tabu@temp\the\tabu@cnt\p@
+ \tabu@Xparse{}%
}% \tabu@Xc@ef
-\def\tabucolX@do{%
- \ifx\tabucolX@rw\@empty \def\tabucolX@rw{p}\fi
- \ifdim\tabu@X@sum<\z@ \tabu@negcoeftrue
- \tabu@X@sum \m@ne\tabu@X@sum
- \tabu@wdlet \tabu@X@cols \p@
- \else \ifdim \tabu@X@sum=\z@ \tabu@X@sum \p@ \fi
+\def\tabu@Xm@th #1{\futurelet \@let@token \tabu@Xd@sp}
+\def\tabu@Xd@sp{\let\tabu@Xmath=$%
+ \ifx $\@let@token \def\tabu@Xdisp{\displaystyle}%
+ \expandafter\tabu@Xparse
+ \else \expandafter\tabu@Xparse\expandafter{\expandafter}%
+ \fi
+}% \tabu@Xd@sp
+\def\tabu@Xrewritten {%
+ \ifx \tabu@rewritten\@empty \def\tabu@rewritten{p}\fi
+ \ifdim \tabucolX<\z@ \tabu@negcoeftrue
+ \else\ifdim \tabucolX=\z@ \tabucolX \p@
+ \fi\fi
+ \edef\tabu@temp{{\the\tabu@Xcol}{\tabu@strippt\tabucolX}}%
+ \edef\tabu@Xcoefs{\tabu@Xcoefs \tabu@ \tabu@temp}%
+ \edef\tabu@rewritten ##1##2{\def\noexpand\tabu@rewritten{%
+ >{\tabu@Xlcr \ifx$\tabu@Xmath$\tabu@Xdisp\fi ##1}%
+ \tabu@rewritten {\tabu@hsize \tabu@temp}%
+ <{##2\ifx$\tabu@Xmath$\fi}}%
+ }\tabu@rewritten
+}% \tabu@Xrewritten
+\def\tabu@hsize #1#2{%
+ \ifdim #2\p@<\z@
+ \ifdim \tabucolX=\maxdimen \tabu@wd{#1}\else
+ \ifdim \tabu@wd{#1}<-#2\tabucolX \tabu@wd{#1}\else -#2\tabucolX\fi
+ \fi
+ \else #2\tabucolX
\fi
- \begingroup
- \toks@\expandafter {\tabucolX@align}%
- \edef\tabu@temp {\strip@pt\tabu@X@sum \tabucolX}%
- \edef\tabucolX@rw##1{%
- \ifx$\tabu@Xmath>{\noexpand\the\toks@ $}\else
- \ifx \tabucolX@align\@empty \else
- >{\noexpand\the\toks@}\fi\fi
- \tabucolX@rw{##1}%
- \ifx$\tabu@Xmath<{$}\fi}%
- \edef\x{\endgroup
- \def\noexpand\tabu@temp {\tabucolX@rw{\the\dimexpr\tabu@temp}}%
- \def\noexpand\tabucolX@rw{%
- \tabucolX@rw{\tabu@dimexpr{\the\tabu@X@cols}{\tabu@temp}}}%
- }\x
-}% \tabucolX@do
-\def\tabu@dimexpr#1#2{%
- \ifdim \tabu@wd{#1}>\p@
- \ifdim \tabu@wd{#1}<#2 \tabu@wd{#1}\else#2\fi\else #2\fi
-}% \tabu@dimexpr
-\def\tabu@prep@TRIAL{%
- \begingroup \iffalse{\fi \ifnum0=`}\fi
- \tabu@setup@TRIAL
- \tabucolX \tabu@target
- \ifcase 0\iftabu@negcoef \else\iftabu@spread \else 1\fi\fi
- \advance\tabu@X@cols \@ne
- \expandafter\let\csname tabu@X\the\tabu@X@cols\endcsname \@undefined
- \tabu@X@cols \z@
- \def\tabu@naturalX@max {\z@}%
- \def\tabu@naturalX@min {\z@}%
- \let\tabu@startpboxORI \@startpbox
- \let\@startpbox \tabu@measure@startpbox
- \fi
- \def\tabu@lasttry{\m@ne\p@}\tabu@cnt \z@ % number of trials
- \tabu@arrayleft@measure
-}% \tabu@prep@TRIAL
-\def\tabu@setup@TRIAL{\tabu@global@X \let\tabu@global@X \@empty
- \let\@halignto \@empty \tabu@naturalX \z@
- \tabu@savecounters \let\tabu@savecounters \relax
- \hbadness \@M \let\hbadness \@tempcnta
- \hfuzz \maxdimen \let\hfuzz \@tempdima
- \let\tabu@rewrite@X \tabu@rewrite@Xnested
- \let\savetabu \@gobble \let\everyrow \@gobble
- \let\tabudefaulttarget \linewidth
- \let\write \tabu@nowrite \let\GenericError \tabu@GenericError
- \long\def\@xfootnote[##1]##2{}\let\@footnotetext \@gobble
- \ifx\@arrayright\relax \let\@arrayright \@empty\fi
- \let\tabu@verticalmeasure \@empty
- \let\tabu@verticalspacing \@empty
- \tabu@TRIAL@hook
-}% \tabu@setup@TRIAL
+}% \tabu@hsize
+%% \usetabu and \preamble: rewritting process ---------------------
+\tabu@privatecolumntype \usetabu [1]{%
+ \ifx\\#1\\\tabu@saveerr{}\else
+ \@ifundefined{tabu@saved@\string#1}
+ {\tabu@saveerr{#1}}
+ {\let\tabu@rewriteX \tabu@rewriteXrestore
+ \csname tabu@saved@\string#1\expandafter\endcsname\expandafter\@ne}%
+ \fi
+}% \NC@rewrite@\usetabu
+\tabu@privatecolumntype \preamble [1]{%
+ \ifx\\#1\\\tabu@saveerr{}\else
+ \@ifundefined{tabu@saved@\string#1}
+ {\tabu@saveerr{#1}}
+ {\csname tabu@saved@\string#1\expandafter\endcsname\expandafter\z@}%
+ \fi
+}% \NC@rewrite@\preamble
+%% Controlling the rewritting process -------------------------------
+\tabu@newcolumntype \tabu@rewritefirst{%
+ \iftabu@long \aftergroup \tabu@longpream % <the whole implementation is here !>
+ \else \aftergroup \tabu@pream
+ \fi
+ \let\tabu@ \relax \let\tabu@hsize \relax
+ \let\tabu@Xcoefs \@empty \let\tabu@savels \relax
+ \tabu@Xcol \z@ \tabu@cnt \tw@
+ \gdef\tabu@mkpreambuffer{\tabu@{}}\tabu@measuringfalse
+ \global\setbox\@arstrutbox \box\@arstrutbox
+ \NC@list{\NC@do *}\tabu@textbar \tabu@lines
+ \NC@list\expandafter{\the\NC@list \NC@do X}%
+ \iftabu@siunitx % <siunitx S and s columns>
+ \NC@list\expandafter{\the\NC@list \NC@do S\NC@do s}\fi
+ \NC@list\expandafter{\the\expandafter\NC@list \tabu@highprioritycolumns}%
+ \expandafter\def\expandafter\tabu@NC@list\expandafter{%
+ \the\expandafter\NC@list \tabu@NC@list}% % * | X S <original>
+ \NC@list\expandafter{\expandafter \NC@do \expandafter\usetabu
+ \expandafter \NC@do \expandafter\preamble
+ \the\NC@list \NC@do \tabu@rewritemiddle
+ \NC@do \tabu@rewritelast}%
+ \tabu@savedecl
+ \tabu@privatecolumns
+ \edef\tabu@prev{\the\@temptokena}\NC@find \tabu@rewritemiddle
+}% NC@rewrite@\tabu@rewritefirst
+\tabu@newcolumntype \tabu@rewritemiddle{%
+ \edef\tabu@temp{\the\@temptokena}\NC@find \tabu@rewritelast
+}% \NC@rewrite@\tabu@rewritemiddle
+\tabu@newcolumntype \tabu@rewritelast{%
+ \ifx \tabu@temp\tabu@prev \advance\tabu@cnt \m@ne
+ \NC@list\expandafter{\tabu@NC@list \NC@do \tabu@rewritemiddle
+ \NC@do \tabu@rewritelast}%
+ \else \let\tabu@prev\tabu@temp
+ \fi
+ \ifcase \tabu@cnt \expandafter\tabu@endrewrite
+ \else \expandafter\NC@find \expandafter\tabu@rewritemiddle
+ \fi
+}% \NC@ewrite@\tabu@rewritelast
+%% Choosing the strategy --------------------------------------------
+\def\tabu@endrewrite {%
+ \let\tabu@temp \NC@find
+ \ifx \@arrayright\relax \let\@arrayright \@empty \fi
+ \count@=%
+ \ifx \@finalstrut\@gobble \z@ % outer in mode 0 print
+ \iftabu@measuring
+ \xdef\tabu@mkpreambuffer{\tabu@mkpreambuffer
+ \tabu@target \csname tabu@\the\tabu@nested.T\endcsname
+ \tabucolX \csname tabu@\the\tabu@nested.X\endcsname
+ \edef\@halignto {\ifx\@arrayright\@empty to\tabu@target\fi}}%
+ \fi
+ \else\iftabu@measuring 4 % X columns
+ \xdef\tabu@mkpreambuffer{\tabu@{\tabu@mkpreambuffer
+ \tabu@target \the\tabu@target
+ \tabu@spreadtarget \the\tabu@spreadtarget}%
+ \def\noexpand\tabu@Xcoefs{\tabu@Xcoefs}%
+ \edef\tabu@halignto{\ifx \@arrayright\@empty to\tabu@target\fi}}%
+ \let\tabu@Xcoefs \relax
+ \else\ifcase\tabu@nested \thr@@ % outer, no X
+ \global\let\tabu@afterendpar \relax
+ \else \@ne % inner, no X, outer in mode 1 or 2
+ \fi
+ \ifdefined\tabu@usetabu
+ \else \ifdim\tabu@target=\z@
+ \else \let\tabu@temp \tabu@extracolsep
+ \fi\fi
+ \fi
+ \fi
+ \xdef\tabu@mkpreambuffer{\count@ \the\count@ \tabu@mkpreambuffer}%
+ \tabu@temp
+}% \tabu@endrewrite
+\def\tabu@extracolsep{\@defaultunits \expandafter\let
+ \expandafter\tabu@temp \expandafter=\the\@temptokena \relax\@nnil
+ \ifx \tabu@temp\@sptoken
+ \expandafter\tabu@gobblespace \expandafter\tabu@extracolsep
+ \else
+ \edef\tabu@temp{\noexpand\NC@find
+ \if |\noexpand\tabu@temp @%
+ \else\if !\noexpand\tabu@temp @%
+ \else !%
+ \fi\fi
+ {\noexpand\extracolsep\noexpand\@flushglue}}%
+ \fi
+ \tabu@temp
+}% \tabu@extrac@lsep
+%% Implementing the strategy ----------------------------------------
+\long\def\tabu@pream #1\@preamble {%
+ \let\tabu@ \tabu@@ \tabu@mkpreambuffer \tabu@aftergroupcleanup
+ \NC@list\expandafter {\tabu@NC@list}% in case of nesting...
+ \ifdefined\tabu@usetabu \tabu@usetabu \tabu@target \z@ \fi
+ \let\tabu@savedpreamble \@preamble
+ \global\let\tabu@elapsedtime \relax
+ \tabu@thebody ={#1\tabu@aftergroupcleanup}%
+ \tabu@thebody =\expandafter{\the\expandafter\tabu@thebody
+ \@preamble}%
+ \edef\tabuthepreamble {\the\tabu@thebody}% ( no @ allowed for \scantokens )
+ \tabu@select
+}% \tabu@pream
+\long\def\tabu@longpream #1\LT@bchunk #2\LT@bchunk{%
+ \let\tabu@ \tabu@@ \tabu@mkpreambuffer \tabu@aftergroupcleanup
+ \NC@list\expandafter {\tabu@NC@list}% in case of nesting...
+ \let\tabu@savedpreamble \@preamble
+ \global\let\tabu@elapsedtime \relax
+ \tabu@thebody ={#1\LT@bchunk #2\tabu@aftergroupcleanup \LT@bchunk}%
+ \edef\tabuthepreamble {\the\tabu@thebody}% ( no @ allowed for \scantokens )
+ \tabu@select
+}% \tabu@longpream
+\def\tabu@select {%
+ \ifnum\tabu@nested>\z@ \tabuscantokensfalse \fi
+ \ifnum \count@=\@ne \iftabu@measuring \count@=\tw@ \fi\fi
+ \ifcase \count@
+ \global\let\tabu@elapsedtime \relax
+ \tabu@seteverycr
+ \expandafter \tabuthepreamble % vertical adjustment (inheritated from outer)
+ \or % exit in vertical measure + struts per cell because no X and outer in mode 3
+ \tabu@evr{\tabu@verticalinit}\tabu@celllalign@def{\tabu@verticalmeasure}%
+ \def\tabu@cellralign{\tabu@verticalspacing}%
+ \tabu@seteverycr
+ \expandafter \tabuthepreamble
+ \or % exit without measure because no X and outer in mode 4
+ \tabu@evr{}\tabu@celllalign@def{}\let\tabu@cellralign \@empty
+ \tabu@seteverycr
+ \expandafter \tabuthepreamble
+ \else % needs trials
+ \tabu@evr{}\tabu@celllalign@def{}\let\tabu@cellralign \@empty
+ \tabu@savecounters
+ \expandafter \tabu@setstrategy
+ \fi
+}% \tabu@select
+\def\tabu@@ {\gdef\tabu@mkpreambuffer}
+%% Protections to set up before trials ------------------------------
+\def\tabu@setstrategy {\begingroup % <trials group>
+ \tabu@trialh@@k \tabu@cnt \z@ % number of trials
+ \hbadness \@M \let\hbadness \@tempcnta
+ \hfuzz \maxdimen \let\hfuzz \@tempdima
+ \let\write \tabu@nowrite\let\GenericError \tabu@GenericError
+ \let\savetabu \@gobble \let\tabudefaulttarget \linewidth
+ \let\@footnotetext \@gobble \let\@xfootnote \tabu@xfootnote
+ \let\color \tabu@nocolor\let\rowcolor \tabu@norowcolor
+ \let\tabu@aftergroupcleanup \relax % only after the last trial
+ \tabu@mkpreambuffer
+ \ifnum \count@>\thr@@ \let\@halignto \@empty \tabucolX@init
+ \def\tabu@lasttry{\m@ne\p@}\fi
+ \begingroup \iffalse{\fi \ifnum0=`}\fi
+ \toks@{}\def\tabu@stack{b}\iftabuscantokens \endlinechar=10 \obeyspaces \fi %
+ \tabu@collectbody \tabu@strategy %
+}% \tabu@setstrategy
\def\tabu@savecounters{%
- \def\@elt##1{\global\value{##1}\the\value{##1}\relax}%
- \edef\tabu@global@X {\cl@@ckpt}\let\@elt \relax
+ \def\@elt ##1{\csname c@##1\endcsname\the\csname c@##1\endcsname}%
+ \edef\tabu@clckpt {\begingroup \globaldefs=\@ne \cl@@ckpt \endgroup}\let\@elt \relax
}% \tabu@savecounters
-\let\tabu@TRIAL@hook \@empty
-\newcommand\tabuDisableCommands[1]{\g@addto@macro\tabu@TRIAL@hook {#1}}
-\def\tabu@arrayleftmeasure#1\bgroup{%
- \def\tabu@Xfinish{%
- \tabu@global@Xnested \ifnum0=`{}\fi\endgroup
- \ifdim \abovetabulinesep>\z@ \setbox\@arstrutbox\box\voidb@x
- \else\ifdim\belowtabulinesep>\z@ \setbox\@arstrutbox\box\voidb@x
- \fi\fi
- \tabu@global@X #1\bgroup}%
- \def\tabu@TRIAL {\setbox\tabu@box \hbox\bgroup $#1\bgroup
- \the\toks@ \tabu@endTRIAL}%
- \toks@{\tabu@setup@everycr
- \let\@preamble \tabu@savedpreamble}% <required for multicolumn>
- \tabu@collect
-}% \tabu@arrayleftmeasure
-\long\def\tabu@long@arrayleft@measure #1\LT@bchunk #2\LT@bchunk{%
- \def\tabu@Xfinish{%
- \tabu@global@Xnested \ifnum0=`{}\fi\endgroup
- \tabu@setup@everycr \let\@preamble \tabu@savedpreamble
- \tabu@global@X #1\LT@bchunk #2\LT@bchunk}%
- \def\tabu@TRIAL{%
- \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@long@endTRIAL}%
- \toks@{}%\let\LT@output\relax
- \tabu@collect
-}% \tabu@long@arrayleft@measure
-\def\tabu@long@endTRIAL{%
- \LT@echunk
- \global\setbox\@ne \hbox{\unhbox\@ne}\kern\wd\@ne
- \LT@get@widths
- \egroup % got \tabu@box
- \iftabu@spread \tabu@spreadarith % <only once>
- \else \tabu@arith
- \fi
- \iftabu@measuring \tabu@measuringfalse
- \expandafter \tabu@TRIAL % <continue trials>
- \else
- \expandafter \tabu@Xfinish
- \the \expandafter\toks@ \tabu@endenvir % <we are then!>
- \fi
-}% \tabu@long@endTRIAL
-\def\tabu@collect{\catcode`\^^@=13\def\tabu@stack{b}\tabu@collectbody}
-\long\def\tabu@collectbody#1\end#2{%
- \edef\tabu@stack{\tabu@pushbegins #1\begin\end\expandafter\@gobble\tabu@stack}%
- \ifx \tabu@stack\@empty
- \toks@\expandafter{\the\toks@#1}\def\tabu@endenvir{\end{#2}}%
- \expandafter \tabu@TRIAL
- \else
- \toks@\expandafter{\the\toks@#1\end{#2}}%
- \expandafter \tabu@collectbody
- \fi
+\def\tabucolX@init {% \tabucolX <= \tabu@target / (sum coefs > 0)
+ \dimen@ \z@ \tabu@Xsum \z@ \tabucolX \z@ \let\tabu@ \tabu@Xinit \tabu@Xcoefs
+ \ifdim \dimen@>\z@
+ \@tempdima \dimexpr \tabu@target *\p@/\dimen@ + \tabu@hfuzz\relax
+ \ifdim \tabucolX<\@tempdima \tabucolX \@tempdima \fi
+ \fi
+}% \tabucolX@init
+\def\tabu@Xinit #1#2{\tabu@Xcol #1 \advance \tabu@Xsum
+ \ifdim #2\p@>\z@ #2\p@ \advance\dimen@ #2\p@
+ \else -#2\p@ \tabu@negcoeftrue
+ \@tempdima \dimexpr \tabu@target*\p@/\dimexpr-#2\p@\relax \relax
+ \ifdim \tabucolX<\@tempdima \tabucolX \@tempdima \fi
+ \tabu@wddef{#1}{0pt}%
+ \fi
+}% \tabu@Xinit
+%% Collecting the environment body ----------------------------------
+\long\def\tabu@collectbody #1#2\end #3{%
+ \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}%
+ \iftabuscantokens \def\tabu@endenvir{\let\endarray \@empty
+ \end{#3}\tabu@gobbleX}%
+ \else \def\tabu@endenvir{\end{#3}}\fi}%
+ \let\tabu@collectbody \tabu@endofcollect
+ \else\def\tabu@temp{#3}%
+ \ifx \tabu@temp\@empty \toks@\expandafter{\the\toks@ #2\end }%
+ \else \ifx\tabu@temp\tabu@@spxiii \toks@\expandafter{\the\toks@ #2\end #3}%
+ \else \ifx\tabu@temp\tabu@X \toks@\expandafter{\the\toks@ #2\end #3}%
+ \else \toks@\expandafter{\the\toks@ #2\end{#3}}%
+ \fi\fi\fi
+ \fi
+ \tabu@collectbody{#1}%
}% \tabu@collectbody
-\long\def\tabu@pushbegins#1\begin#2{%
- \ifx\end#2\else b\expandafter\tabu@pushbegins\fi}
-\def\tabu@endTRIAL{%
- \tabu@adl@endTRIAL % <arydshln in nested trials>
- \endarray$\egroup
- \iftabu@spread \tabu@spreadarith % <only once>
- \else \tabu@arith
- \fi
- \iftabu@measuring \tabu@measuringfalse
- \expandafter \tabu@TRIAL % <continue trials>
- \else
- \expandafter \tabu@Xfinish
- \the \expandafter\toks@ \tabu@endenvir % <we are then!>
- \fi
-}% \tabu@endTRIAL
-\def\tabu@adl@endTRIAL{\crcr \noalign{\global\adl@ncol \tabu@nbcols}}
-\def\tabu@arith{%
- \advance\tabu@cnt \@ne \tabu@message{\tabu@message@arith}%
- \ifx \@startpbox\tabu@measure@startpbox
- \let\@startpbox \tabu@startpboxORI \fi
- \dimen@ \tabu@X@sum
- \iftabu@negcoef \tabu@arith@negcoef \fi
- \ifcase 0\ifdim \dimexpr\wd\tabu@box-\tabu@hfuzz-1sp<\tabu@target
- \else \ifdim \tabu@lasttry=\wd\tabu@box 1\else
- 2\fi\fi\relax
- \ifdim \tabu@X@sum=\dimen@ \tabu@message{\tabu@message@reached}%
- \else\ifdim\tabu@X@sum=\z@ \tabu@message{\tabu@message@reached}%
- \else\ifnum \tabu@cnt>\@ne \tabu@message{\tabu@message@reached}%
- \else \tabu@measuringtrue
- \tabucolX = \dimexpr\tabucolX*\p@/\tabu@X@sum\relax
- \fi\fi\fi
- \or \tabu@message{\tabu@header Reached minimum width. Backing up}%
- \tabu@warn{tabu width = \the\wd\tabu@box\space>
- \the\tabu@target\space+ \tabu@hfuzz}%
- \or
- \ifdim \tabu@X@sum=\z@ \tabu@measuringtrue \tabucolX=\@tempdima
- \else
- \advance\tabucolX-\dimexpr(\wd\tabu@box-\tabu@target-.5\tabu@X@sum/\p@)
- *\p@/\tabu@X@sum\relax
- \ifdim \tabucolX<\z@
- \tabu@warn{X Columns too narrow (table too wide)}%
- \tabucolX=\tabucolX@error
- \else \tabu@measuringtrue
- \ifdim \tabu@X@sum=\dimen@
- \edef\tabu@lasttry{\the\wd\tabu@box}%
+\long\def\tabu@pushbegins#1\begin#2{\ifx\end#2\else b\expandafter\tabu@pushbegins\fi}%
+\def\tabu@endofcollect #1{\ifnum0=`{}\fi
+ \expandafter\endgroup \the\toks@ #1%
+}% \tabu@endofcollect
+%% The trials: switching between strategies -------------------------
+\def\tabu@strategy {\relax % stops \count@ assignment !
+ \ifcase\count@ % case 0 = print with vertical adjustment (outer is finished)
+ \expandafter \tabu@endoftrials
+ \or % case 1 = exit in vertical measure (outer in mode 3)
+ \expandafter\xdef\csname tabu@\the\tabu@nested.T\endcsname{\the\tabu@target}%
+ \expandafter\xdef\csname tabu@\the\tabu@nested.X\endcsname{\the\tabucolX}%
+ \expandafter \tabu@endoftrials
+ \or % case 2 = exit with a rule replacing the table (outer in mode 4)
+ \expandafter \tabu@quickend
+ \or % case 3 = outer is in mode 3 because of no X
+ \begingroup
+ \tabu@evr{\tabu@verticalinit}\tabu@celllalign@def{\tabu@verticalmeasure}%
+ \def\tabu@cellralign{\tabu@verticalspacing}%
+ \expandafter \tabu@measuring
+ \else % case 4 = horizontal measure
+ \begingroup
+ \global\let\tabu@elapsedtime \tabu@message@etime
+ \long\def\multicolumn##1##2##3{\multispan{##1}}%
+ \let\tabu@startpboxORI \@startpbox
+ \iftabu@spread
+ \def\tabu@naturalXmax {\z@}%
+ \let\tabu@naturalXmin \tabu@naturalXmax
+ \tabu@evr{\global\tabu@naturalX \z@}%
+ \let\@startpbox \tabu@startpboxmeasure
+ \else\iftabu@negcoef
+ \let\@startpbox \tabu@startpboxmeasure
+ \else \let\@startpbox \tabu@startpboxquick
+ \fi\fi
+ \expandafter \tabu@measuring
+ \fi
+}% \tabu@strategy
+\def\tabu@measuring{\expandafter \tabu@trial \expandafter
+ \count@ \the\count@ \tabu@endtrial
+}% \tabu@measuring
+\def\tabu@trial{\iftabu@long \tabu@longtrial \else \tabu@shorttrial \fi}
+\def\tabu@shorttrial {\setbox\tabu@box \hbox\bgroup \tabu@seteverycr
+ \ifx \tabu@savecounters\relax \else
+ \let\tabu@savecounters \relax \tabu@clckpt \fi
+ $\iftabuscantokens \tabu@rescan \else \expandafter\@secondoftwo \fi
+ \expandafter{\expandafter \tabuthepreamble
+ \the\tabu@thebody
+ \csname tabu@adl@endtrial\endcsname
+ \endarray}$\egroup % got \tabu@box
+}% \tabu@shorttrial
+\def\tabu@longtrial {\setbox\tabu@box \hbox\bgroup \tabu@seteverycr
+ \ifx \tabu@savecounters\relax \else
+ \let\tabu@savecounters \relax \tabu@clckpt \fi
+ \iftabuscantokens \tabu@rescan \else \expandafter\@secondoftwo \fi
+ \expandafter{\expandafter \tabuthepreamble
+ \the\tabu@thebody
+ \LT@echunk
+ \global\setbox\@ne \hbox{\unhbox\@ne}\kern\wd\@ne
+ \LT@get@widths}\egroup % got \tabu@box
+}% \tabu@longtrial
+\def\tabu@adl@endtrial{% <arydshln in nested trials - problem for global column counters!>
+ \crcr \noalign{\global\adl@ncol \tabu@nbcols}}% anything global is crap, junky and fails !
+\def\tabu@seteverycr {\tabu@reset
+ \everycr \expandafter{\the\everycr \tabu@everycr}%
+ \let\everycr \tabu@noeverycr % <for ialign>
+}% \tabu@seteverycr
+\def\tabu@noeverycr{{\aftergroup\tabu@restoreeverycr \afterassignment}\toks@}
+\def\tabu@restoreeverycr {\let\everycr \tabu@@everycr}
+\def\tabu@everycr {\iftabu@everyrow \noalign{\tabu@everyrow}\fi}
+\def\tabu@endoftrials {%
+ \iftabuscantokens \expandafter\@firstoftwo
+ \else \expandafter\@secondoftwo
+ \fi
+ {\expandafter \tabu@closetrialsgroup \expandafter
+ \tabu@rescan \expandafter{%
+ \expandafter\tabuthepreamble
+ \the\tabu@thebody
+ \endarray}}
+ {\expandafter\tabu@closetrialsgroup \expandafter
+ \tabuthepreamble
+ \the\tabu@thebody}%
+ \tabu@endenvir % Finish !
+}% \tabu@endoftrials
+\def\tabu@closetrialsgroup {%
+ \toks@\expandafter{\tabu@endenvir}%
+ \edef\tabu@bufferX{\endgroup
+ \tabucolX \the\tabucolX
+ \tabu@target \the\tabu@target
+ \tabu@cnt \the\tabu@cnt
+ \def\noexpand\tabu@endenvir{\the\toks@}%
+ %Quid de \@halignto = \tabu@halignto ??
+ }% \tabu@bufferX
+ \tabu@bufferX
+ \ifcase\tabu@nested % print out (outer in mode 0)
+ \global\tabu@cnt \tabu@cnt
+ \tabu@evr{\tabu@verticaldynamicadjustment}%
+ \tabu@celllalign@def{\everypar{}}\let\tabu@cellralign \@empty
+ \let\@finalstrut \@gobble
+ \else % vertical measure of nested tabu
+ \tabu@evr{\tabu@verticalinit}%
+ \tabu@celllalign@def{\tabu@verticalmeasure}%
+ \def\tabu@cellralign{\tabu@verticalspacing}%
+ \fi
+ \tabu@clckpt \let\@halignto \tabu@halignto
+ \let\@halignto \@empty
+ \tabu@seteverycr
+ \ifdim \tabustrutrule>\z@ \ifnum\tabu@nested=\z@
+ \setbox\@arstrutbox \box\voidb@x % force \@arstrutbox to be rebuilt (visible struts)
+ \fi\fi
+}% \tabu@closetrialsgroup
+\def\tabu@quickend {\expandafter \endgroup \expandafter
+ \tabu@target \the\tabu@target \tabu@quickrule
+ \let\endarray \relax \tabu@endenvir
+}% \tabu@quickend
+\def\tabu@endtrial {\relax % stops \count@ assignment !
+ \ifcase \count@ \tabu@err % case 0 = impossible here
+ \or \tabu@err % case 1 = impossible here
+ \or \tabu@err % case 2 = impossible here
+ \or % case 3 = outer goes into mode 0
+ \def\tabu@bufferX{\endgroup}\count@ \z@
+ \else % case 4 = outer goes into mode 3
+ \iftabu@spread \tabu@spreadarith % inner into mode 1 (outer in mode 3)
+ \else \tabu@arith % or 2 (outer in mode 4)
+ \fi
+ \count@=%
+ \ifcase\tabu@nested \thr@@ % outer goes into mode 3
+ \else\iftabu@measuring \tw@ % outer is in mode 4
+ \else \@ne % outer is in mode 3
+ \fi\fi
+ \edef\tabu@bufferX{\endgroup
+ \tabucolX \the\tabucolX
+ \tabu@target \the\tabu@target}%
+ \fi
+ \expandafter \tabu@bufferX \expandafter
+ \count@ \the\count@ \tabu@strategy
+}% \tabu@endtrial
+\def\tabu@err{\errmessage{(tabu) Internal impossible error! (\count@=\the\count@)}}
+%% The algorithms: compute the widths / stop or go on ---------------
+\def\tabu@arithnegcoef {%
+ \@tempdima \z@ \dimen@ \z@ \let\tabu@ \tabu@arith@negcoef \tabu@Xcoefs
+}% \tabu@arithnegcoef
+\def\tabu@arith@negcoef #1#2{%
+ \ifdim #2\p@>\z@ \advance\dimen@ #2\p@ % saturated by definition
+ \advance\@tempdima #2\tabucolX
+ \else
+ \ifdim -#2\tabucolX <\tabu@wd{#1}% c_i X < natural width <= \tabu@target-> saturated
+ \advance\dimen@ -#2\p@
+ \advance\@tempdima -#2\tabucolX
+ \else
+ \advance\@tempdima \tabu@wd{#1}% natural width <= c_i X => neutralised
+ \ifdim \tabu@wd{#1}<\tabu@target \else % neutralised
+ \advance\dimen@ -#2\p@ % saturated (natural width = tabu@target)
+ \fi
+ \fi
+ \fi
+}% \tabu@arith@negcoef
+\def\tabu@givespace #1#2{% here \tabu@DELTA < \z@
+ \ifdim \@tempdima=\z@
+ \tabu@wddef{#1}{\the\dimexpr -\tabu@DELTA*\p@/\tabu@Xsum}%
+ \else
+ \tabu@wddef{#1}{\the\dimexpr \tabu@hsize{#1}{#2}
+ *(\p@ -\tabu@DELTA*\p@/\@tempdima)/\p@\relax}%
+ \fi
+}% \tabu@givespace
+\def\tabu@arith {\advance\tabu@cnt \@ne
+ \ifnum \tabu@cnt=\@ne \tabu@message{\tabu@titles}\fi
+ \tabu@arithnegcoef
+ \@tempdimb \dimexpr \wd\tabu@box -\@tempdima \relax % <incompressible material>
+ \tabu@DELTA = \dimexpr \wd\tabu@box - \tabu@target \relax
+ \tabu@message{\tabu@message@arith}%
+ \ifdim \tabu@DELTA <\tabu@hfuzz
+ \ifdim \tabu@DELTA<\z@ % wd (tabu)<\tabu@target ?
+ \let\tabu@ \tabu@givespace \tabu@Xcoefs
+ \advance\@tempdima \@tempdimb \advance\@tempdima -\tabu@DELTA % for message
+ \else % already converged: nothing to do but nearly impossible...
+ \fi
+ \tabucolX \maxdimen
+ \tabu@measuringfalse
+ \else % need for narrower X columns
+ \tabucolX =\dimexpr (\@tempdima -\tabu@DELTA) *\p@/\tabu@Xsum \relax
+ \tabu@measuringtrue
+ \@whilesw \iftabu@measuring\fi {%
+ \advance\tabu@cnt \@ne
+ \tabu@arithnegcoef
+ \tabu@DELTA =\dimexpr \@tempdima+\@tempdimb -\tabu@target \relax % always < 0 here
+ \tabu@message{\tabu@header
+ \tabu@msgalign \tabucolX { }{ }{ }{ }{ }\@@
+ \tabu@msgalign \@tempdima+\@tempdimb { }{ }{ }{ }{ }\@@
+ \tabu@msgalign \tabu@target { }{ }{ }{ }{ }\@@
+ \tabu@msgalign@PT \dimen@ { }{}{}{}{}{}{}\@@
+ \ifdim -\tabu@DELTA<\tabu@hfuzz \tabu@spaces target ok\else
+ \tabu@msgalign \dimexpr -\tabu@DELTA *\p@/\dimen@ {}{}{}{}{}\@@
+ \fi}%
+ \ifdim -\tabu@DELTA<\tabu@hfuzz
+ \advance\@tempdima \@tempdimb % for message
+ \tabu@measuringfalse
\else
- \ifnum \tabu@cnt>\@ne \edef\tabu@lasttry{\the\wd\tabu@box}\fi
- \ifdim \tabucolX<\@tempdima \tabucolX \@tempdima\fi
+ \advance\tabucolX \dimexpr -\tabu@DELTA *\p@/\dimen@ \relax
\fi
- \fi
- \fi
- \fi %(ifcase)
- \iftabu@measuring
- \else \edef\tabu@global@X{\tabu@global@X
- \tabucolX \the\tabucolX\relax
- \tabu@target \the\tabu@target\relax % < for \savetabu >
- \ifnum \tabu@nested=\z@
- \ifx \@arrayright\@empty
- \ifdim \tabu@X@sum>\z@
- \def\noexpand\@halignto{to\the\tabu@target}\fi\fi\fi}%
- \fi
- \tabu@X@sum \dimen@
+ }%
+ \fi
+ \tabu@message{\tabu@message@reached}%
+ \edef\tabu@bufferX{\endgroup \tabu@cnt \the\tabu@cnt
+ \tabucolX \the\tabucolX
+ \tabu@target \the\tabu@target}%
}% \tabu@arith
-\def\tabu@arith@negcoef{%
- \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
- \csname tabu@X\the\tabu@X@cols\endcsname
- \ifdim \tabu@wd\tabu@X@cols <\tabu@temp\tabucolX
- \advance\tabu@X@sum -\tabu@temp\p@
- \tabu@message{\tabu@message@negcoef{\the\tabu@X@cols}}%
- \ifdim \tabu@wd\tabu@X@cols >\tabu@wd\count@ \count@ \tabu@X@cols \fi
- \fi\fi
- \advance\tabu@X@cols \@ne
- }%
- \@tempdima=\dimexpr\tabu@wd\count@ * \p@/
- \dimexpr\csname tabu@X\the\count@\endcsname\p@\relax\relax
-}% \tabu@arith@negcoef
-\def\tabu@spreadarith{%
- \tabu@naturalX \tabu@naturalX@max\relax
- \tabucolX \tabu@naturalX@min\relax
- \tabu@message{\tabu@message@spread}%
- \ifdim \dimexpr \wd\tabu@box + \tabu@spreadtarget <\tabu@target
- \advance\tabu@spreadtarget
- \dimexpr\wd\tabu@box-\tabu@naturalX+\tabucolX\relax
- \ifdim \tabu@spreadtarget <\tabu@target
- \tabu@target =\tabu@spreadtarget
- \fi
- \tabu@message{\the\tabu@target}%
- \tabu@message{\ifdim \tabu@spreadtarget>\tabu@target
- (tabu) spread reduced to fit default target.\fi}%
- \else
- \tabu@message{\expandafter\tabu@msg@align \the\tabu@target { }{}{}{}{}\@@}
- \tabu@message{(tabu)\ifdim\wd\tabu@box<\tabu@target spread too large\else
- tabu spread is useless here\fi,
- default target used.}%
- \fi
- \let\@startpbox \tabu@startpboxORI
- \xdef\tabu@halignto {to\the\tabu@target}%
- \tabucolX \tabu@target
- \tabu@spreadfalse \tabu@measuringtrue
+\def\tabu@spreadarith {%
+ \dimen@ \z@ \@tempdima \tabu@naturalXmax \let\tabu@ \tabu@spread@arith \tabu@Xcoefs
+ \edef\tabu@naturalXmin {\the\dimexpr\tabu@naturalXmin*\dimen@/\p@}%
+ \@tempdimc =\dimexpr \wd\tabu@box -\tabu@naturalXmax+\tabu@naturalXmin \relax
+ \iftabu@measuring
+ \tabu@target =\dimexpr \@tempdimc+\tabu@spreadtarget \relax
+ \edef\tabu@bufferX{\endgroup \tabucolX \the\tabucolX \tabu@target\the\tabu@target}%
+ \else
+ \tabu@message{\tabu@message@spreadarith}%
+ \ifdim \dimexpr \@tempdimc+\tabu@spreadtarget >\tabu@target
+ \tabu@message{(tabu) spread
+ \ifdim \@tempdimc>\tabu@target useless here: default target used%
+ \else too large: reduced to fit default target\fi.}%
+ \else
+ \tabu@target =\dimexpr \@tempdimc+\tabu@spreadtarget \relax
+ \tabu@message{(tabu) spread: New target set to \the\tabu@target^^J}%
+ \fi
+ \begingroup \let\tabu@wddef \@gobbletwo
+ \@tempdimb \@tempdima
+ \tabucolX@init
+ \tabu@arithnegcoef
+ \wd\tabu@box =\dimexpr \wd\tabu@box +\@tempdima-\@tempdimb \relax
+ \expandafter\endgroup \expandafter\tabucolX \the\tabucolX
+ \tabu@arith
+ \fi
}% \tabu@spreadarith
-\def\tabu@message@arith{\tabu@header
- \expandafter\tabu@msg@align \the\tabucolX { }{ }{ }{ }{}\@@
- \expandafter\tabu@msg@align \the\wd\tabu@box { }{ }{ }{ }{}\@@
- \expandafter\tabu@msg@align \the\tabu@target { }{ }{ }{ }{}\@@
- \expandafter\tabu@msg@align \the\tabu@X@sum {}{}{}{}{}\@@
- \ifx\@startpbox\tabu@measure@startpbox\tabu@spaces (coefs<0)\else
- \ifdim\tabu@X@sum>\z@
- \expandafter\tabu@msg@align \the\dimexpr(\tabu@target-\wd\tabu@box)
- *\p@/\tabu@X@sum\relax {}{}{}{}{}\@@\fi\fi^^J}%
-\def\tabu@message@spread{\tabu@spreadheader
- \expandafter\tabu@msg@align \the\tabu@spreadtarget {}{}{}{}{}\@@
- \expandafter\tabu@msg@align \the\wd\tabu@box {}{}{}{}{}\@@
- \expandafter\tabu@msg@align \the\tabucolX {}{}{}{}{}\@@
- \expandafter\tabu@msg@align \expandafter-\the\tabu@naturalX {}{}{}{}{}\@@}
+\def\tabu@spread@arith #1#2{%
+ \ifdim #2\p@>\z@ \advance\dimen@ #2\p@
+ \else \advance\@tempdima \tabu@wd{#1}\relax
+ \fi
+}% \tabu@spread@arith
+%% Reporting in the .log file ---------------------------------------
+\def\tabu@message@defaulttarget{%
+ \ifnum\tabu@nested=\z@^^J(tabu) Default target:
+ \ifx\tabudefaulttarget\linewidth \string\linewidth
+ \ifdim \tabu@thetarget=\linewidth \else
+ -\the\dimexpr\linewidth-\tabu@thetarget\fi =
+ \else\ifx\tabudefaulttarget\linegoal\string\linegoal=
+ \fi\fi
+ \else (tabu) Default target (nested): \fi
+ \the\tabu@target \on@line
+ \ifnum\tabu@nested=\z@ , page \the\c@page\fi}
+\def\tabu@message@target {^^J(tabu) Target specified:
+ \the\tabu@target \on@line, page \the\c@page}
+\def\tabu@message@arith {\tabu@header
+ \tabu@msgalign \tabucolX { }{ }{ }{ }{ }\@@
+ \tabu@msgalign \wd\tabu@box { }{ }{ }{ }{ }\@@
+ \tabu@msgalign \tabu@target { }{ }{ }{ }{ }\@@
+ \tabu@msgalign@PT \dimen@ { }{}{}{}{}{}{}\@@
+ \ifdim \tabu@DELTA<\tabu@hfuzz giving space\else
+ \tabu@msgalign \dimexpr (\@tempdima-\tabu@DELTA) *\p@/\tabu@Xsum -\tabucolX {}{}{}{}{}\@@
+ \fi
+}% \tabu@message@arith
+\def\tabu@message@spreadarith {\tabu@spreadheader
+ \tabu@msgalign \tabu@spreadtarget { }{ }{ }{ }{}\@@
+ \tabu@msgalign \wd\tabu@box { }{ }{ }{ }{}\@@
+ \tabu@msgalign -\tabu@naturalXmax { }{}{}{}{}\@@
+ \tabu@msgalign \tabu@naturalXmin { }{ }{ }{ }{}\@@
+ \tabu@msgalign \ifdim \dimexpr\@tempdimc>\tabu@target \tabu@target
+ \else \@tempdimc+\tabu@spreadtarget \fi
+ {}{}{}{}{}\@@}
+\def\tabu@message@negcoef #1#2{
+ \tabu@spaces\tabu@spaces\space * #1. X[\rem@pt#2]:
+ \space width = \tabu@wd {#1}
+ \expandafter\string\csname tabu@\the\tabu@nested.W\number#1\endcsname
+ \ifdim -\tabu@pt#2\tabucolX<\tabu@target
+ < \number-\rem@pt#2 X
+ = \the\dimexpr -\tabu@pt#2\tabucolX \relax
+ \else
+ <= \the\tabu@target\space < \number-\rem@pt#2 X\fi}
\def\tabu@message@reached{\tabu@header
- \expandafter\tabu@msg@align \the\tabucolX { }{ }{ }{ }{}\@@
- \expandafter\tabu@msg@align \the\wd\tabu@box {}{}{}{}{}\@@
- <\expandafter\tabu@msg@align \the\tabu@target { }{ }{ }{ }{}\@@
- + \tabu@hfuzz\space= hfuzz *****^^J%
- (tabu)\tabu@spaces******* Reached Target:
- hfuzz = \tabu@hfuzz\on@line\space *******^^J%
- \ifnum\tabu@nested=\z@ \tabu@elapsedtime ^^J\fi}%
-\def\tabu@message@etime{(tabu)\tabu@spaces
- Time elapsed for trials:
- \the\numexpr(\pdfelapsedtime-\tabu@starttime-32767)/65536\relax sec
- \the\numexpr\numexpr(\pdfelapsedtime-\tabu@starttime)
- -\numexpr(\pdfelapsedtime-\tabu@starttime-32767)/65536\relax*65536\relax
- *1000/65536\relax ms}%
-\def\tabu@message@negcoef #1{\tabu@spaces\tabu@spaces
- * #1. X[-\csname tabu@X#1\endcsname]: natural width
- = \tabu@wd{#1}
- < \csname tabu@X#1\endcsname X
- = \the\dimexpr\csname tabu@X#1\endcsname\tabucolX
-}% \tabu@message@negcoef
+ ******* Reached Target:
+ hfuzz = \tabu@hfuzz\on@line\space *******}
+\def\tabu@message@etime{\edef\tabu@stoptime{\the\pdfelapsedtime}%
+ \tabu@message{(tabu)\tabu@spaces Time elapsed during measure:
+ \the\numexpr(\tabu@stoptime-\tabu@starttime-32767)/65536\relax sec
+ \the\numexpr\numexpr(\tabu@stoptime-\tabu@starttime)
+ -\numexpr(\tabu@stoptime-\tabu@starttime-32767)/65536\relax*65536\relax
+ *1000/65536\relax ms \tabu@spaces(\the\tabu@cnt\space
+ cycle\ifnum\tabu@cnt>\@ne s\fi)^^J^^J}}
+\def\tabu@message@verticalsp {%
+ \ifdim \@tempdima>\tabu@ht
+ \ifdim \@tempdimb>\tabu@dp
+ \expandafter\expandafter\expandafter\string\tabu@ht =
+ \tabu@msgalign \@tempdima { }{ }{ }{ }{ }\@@
+ \expandafter\expandafter\expandafter\string\tabu@dp =
+ \tabu@msgalign \@tempdimb { }{ }{ }{ }{ }\@@^^J%
+ \else
+ \expandafter\expandafter\expandafter\string\tabu@ht =
+ \tabu@msgalign \@tempdima { }{ }{ }{ }{ }\@@^^J%
+ \fi
+ \else\ifdim \@tempdimb>\tabu@dp
+ \tabu@spaces\tabu@spaces\tabu@spaces
+ \expandafter\expandafter\expandafter\string\tabu@dp =
+ \tabu@msgalign \@tempdimb { }{ }{ }{ }{ }\@@^^J\fi
+ \fi
+}% \tabu@message@verticalsp
\edef\tabu@spaces{\@spaces}
-\def\do#1{%
- \def\tabu@msg@align##1.##2##3##4##5##6##7##8##9\@@{%
- \ifnum##1<10 #1 #1\else
- \ifnum##1<100 #1 \else
- \ifnum##1<\@m #1\fi\fi\fi
- ##1.##2##3##4##5##6##7##8#1}%
- \def\tabu@header{(tabu) \ifnum\tabu@cnt<10 #1\fi\the\tabu@cnt) #1}%
- \def\tabu@titles{\ifnum \tabu@nested=\z@
+\def\tabu@strippt{\expandafter\tabu@pt\the}
+{\@makeother\P \@makeother\T\lowercase{\gdef\tabu@pt #1PT{#1}}}
+\def\tabu@msgalign{\expandafter\tabu@msg@align\the\dimexpr}
+\def\tabu@msgalign@PT{\expandafter\tabu@msg@align\romannumeral-`\0\tabu@strippt}
+\def\do #1{%
+ \def\tabu@msg@align##1.##2##3##4##5##6##7##8##9\@@{%
+ \ifnum##1<10 #1 #1\else
+ \ifnum##1<100 #1 \else
+ \ifnum##1<\@m #1\fi\fi\fi
+ ##1.##2##3##4##5##6##7##8#1}%
+ \def\tabu@header{(tabu) \ifnum\tabu@cnt<10 #1\fi\the\tabu@cnt) }%
+ \def\tabu@titles{\ifnum \tabu@nested=\z@
(tabu) Try#1 #1 tabu X #1 #1 #1tabu Width #1 #1 Target
- #1 #1 #1 #1 Coefs #1 #1 #1 Update^^J\fi}%
- \def\tabu@spreadheader{%
- (tabu) Try#1 #1 Spread #1 #1 tabu Width #1 #1 Nat. Min. #1 #1 #1 Nat.X
- #1 #1 #1 New Target^^J%
- (tabu)spread}%
- \def\tabu@tracing@save##1{\begingroup
- \def\col@sep ####1\relax {(tabu) column sep #1 #1 #1 = ####1^^J}%
- \def\arrayrulewidth ####1\relax{(tabu) arrayrulewidth #1 = ####1^^J}%
- \def\doublerulesep ####1\relax {(tabu) doublerulesep #1 #1= ####1^^J}%
- \def\extrarowheight ####1\relax{(tabu) extrarowheight #1 = ####1^^J}%
- \def\extrarowdepth ####1\relax {(tabu) extrarowdepth #1 #1= ####1^^J}%
- \def\extratabsurround ####1\relax{(tabu) extratabsurround = ####1^^J}%
- \def\minrowclearance ####1\relax {(tabu) minrowclearance#1 = ####1^^J}%
- \def\arraystretch ####1{(tabu) arraystretch #1 #1 = ####1^^J}%
- \iftabu@colortbl
- \def\CT@arc@####1{(tabu) arrayrulecolor #1 = ####1^^J}%
- \def\CT@drsc@####1{(tabu) doublerulesepcolor=####1^^J}%
- \let\color \relax
- \fi
- \def\NC@find ####1\@nil{(tabu) tabu preamble#1 #1 = \detokenize{####1}^^J}%
- \def\tabu@wddef####1####2{(tabu) Natural width ####1 = ####2^^J}%
- \let\edef \@gobbletwo \let\def \@empty
- \tabu@message{%
- (tabu) \string\savetabu{##1}: \on@line^^J%
- \ifx \savetabu\tabusaveX
- (tabu) X columns width #1 = \the\tabucolX^^J\fi
- (tabu) target #1 #1 #1 #1 #1 = \the\tabu@target^^J%
- \tabu@savedparam
- \tabu@savedpream \@nil
- \iftabu@negcoef \tabu@savewd\fi}%
- \endgroup}%
+ #1 #1 #1 Coefs #1 #1 #1 Update^^J\fi}%
+ \def\tabu@spreadheader{%
+ (tabu) Try#1 #1 Spread #1 #1 tabu Width #1 #1 #1 Nat. X #1 #1 #1 #1Nat. Min.
+ #1 New Target^^J%
+ (tabu) sprd}
+ \def\tabu@message@save {\begingroup
+ \def\x ####1{\tabu@msg@align ####1{ }{ }{ }{ }{}\@@}
+ \def\z ####1{\expandafter\x\expandafter{\romannumeral-`\0\tabu@strippt
+ \dimexpr####1\p@{ }{ }}}%
+ \let\color \relax \def\tabu@rulesstyle ####1####2{\detokenize{####1}}%
+ \let\CT@arc@ \relax \let\@preamble \@gobble
+ \let\tabu@savedpream \@firstofone
+ \let\tabu@savedparams \@firstofone
+ \def\tabu@target ####1\relax {(tabu) target #1 #1 #1 #1 #1 = \x{####1}^^J}%
+ \def\tabucolX ####1\relax {(tabu) X columns width#1 = \x{####1}^^J}%
+ \def\tabu@nbcols ####1\relax {(tabu) Number of columns: \z{####1}^^J}%
+ \def\tabu@aligndefault ####1{(tabu) Default alignment: #1 #1 ####1^^J}%
+ \def\col@sep ####1\relax {(tabu) column sep #1 #1 #1 = \x{####1}^^J}%
+ \def\arrayrulewidth ####1\relax{(tabu) arrayrulewidth #1 = \x{####1}}%
+ \def\doublerulesep ####1\relax { doublerulesep = \x{####1}^^J}%
+ \def\extratabsurround####1\relax{(tabu) extratabsurround = \x{####1}^^J}%
+ \def\extrarowheight ####1\relax{(tabu) extrarowheight #1 = \x{####1}}%
+ \def\extrarowdepth ####1\relax {extrarowdepth = \x{####1}^^J}%
+ \def\arraystretch ####1{(tabu) arraystretch #1 #1 = \z{####1}^^J}%
+ \def\minrowclearance####1\relax{(tabu) minrowclearance #1 = \x{####1}^^J}%
+ \def\tabu@arc@L ####1{(tabu) taburulecolor #1 #1 = ####1^^J}%
+ \def\tabu@drsc@L ####1{(tabu) tabudoublerulecolor= ####1^^J}%
+ \def\tabu@evr@L ####1{(tabu) everyrow #1 #1 #1 #1 = \detokenize{####1}^^J}%
+ \def\tabu@ls@L ####1{(tabu) line style = \detokenize{####1}^^J}%
+ \def\NC@find ####1\@nil{(tabu) tabu preamble#1 #1 = \detokenize{####1}^^J}%
+ \def\tabu@wddef####1####2{(tabu) Natural width ####1 = \x{####2}^^J}%
+ \let\edef \@gobbletwo \let\def \@empty \let\let \@gobbletwo
+ \tabu@message{%
+ (tabu) \string\savetabu{\tabu@temp}: \on@line^^J%
+ \tabu@usetabu \@nil^^J}%
+ \endgroup}
}\do{ }
-\def\tabu@measure@startpbox#1{\bgroup
- \let\@startpbox \tabu@startpboxORI % in case of nesting
- \in@{\tabu@dimexpr}{#1}%
- \ifin@
- \global\advance\tabu@X@cols \@ne
- \ifcsname tabu@X\the\tabu@X@cols\endcsname\else
- \global\tabu@X@cols \@ne
- \global\tabu@naturalX \z@
- \fi
- \fi
- \iftabu@spread\else
- \ifin@ {\let\tabu@dimexpr \@firstoftwo\expandafter}%
- \ifdim \tabu@wd{#1}<\p@ \in@false\fi\fi\fi
- \ifin@
- \begingroup \let\tabu@dimexpr \@secondoftwo
- \edef\x{\endgroup \def\noexpand\tabu@temp{\the\dimexpr#1}%
- }\x
- \setbox\tabu@box=\hbox\bgroup
- \let\tabu@rewrite@X \tabu@@rewrite@X
- \tabu@nocellspace
- \begin{varwidth}{\tabu@temp}\narrowragged\arraybackslash
- \tabu@noadjustspacing \parfillskip\@flushglue
- \bgroup \aftergroup\tabu@measure@endpbox
- \ifdefined \cellspacetoplimit \bgroup\color@begingroup\fi
- \else
- \expandafter\@gobble\@startpbox{#1}% \@gobble \bgroup
- \fi
-}% \tabu@measure@startpbox
-\def\tabu@nocellspace{\def\bcolumn##1\@nil{}\let\ecolumn\@empty}
-\ifdefined\pdfadjustspacing
- \def\tabu@noadjustspacing{\pdfadjustspacing\z@}%
-\else
- \let\tabu@noadjustspacing\relax
-\fi
-\def\tabu@measure@endpbox{%
- \@finalstrut\@arstrutbox\end{varwidth}\egroup % <got my \tabu@box>
- \global\advance\tabu@naturalX \wd\tabu@box
- \ifdim \tabu@naturalX@max<\tabu@naturalX
- \xdef\tabu@naturalX@max{\the\tabu@naturalX}\fi
- \@tempdima=\dimexpr \wd\tabu@box * \tabu@X@sum /
- \dimexpr\csname tabu@X\the\tabu@X@cols\endcsname\p@\relax\relax
- \ifdim \tabu@naturalX@min<\@tempdima
- \xdef\tabu@naturalX@min{\the\@tempdima}\fi
- \ifdim \tabu@wd\tabu@X@cols>\z@
- \ifdim \tabu@wd\tabu@X@cols<\wd\tabu@box
- \tabu@wddef\tabu@X@cols {\the\wd\tabu@box}%
- \tabu@debug{\tabu@spaces\tabu@spaces
- * \the\tabu@X@cols. X[-\csname tabu@X\the\tabu@X@cols\endcsname]:
- target=\the\dimexpr\tabu@temp\relax\space
- \expandafter\expandafter\expandafter\string\tabu@wd\tabu@X@cols
- =\tabu@wd\tabu@X@cols}%
- \fi\fi
- \box\tabu@box \egroup % end of \vtop (measure)
-}% \tabu@measure@endpbox
-\def\tabu@wd#1{\csname tabu@W\the\tabu@nested @\number#1\endcsname}
-\def\tabu@wddef#1{\expandafter\xdef
- \csname tabu@W\the\tabu@nested @\number#1\endcsname}
-\def\tabu@wdlet#1{\global\expandafter\let
- \csname tabu@W\the\tabu@nested @\number#1\endcsname}
-\def\tabu@naturalX@min{\z@}
-\def\tabu@naturalX@max{\z@}
-\def\tabu@setup@everycr{%
- \tabu@firstclinetrue \tabu@everyrowtrue
- \let\tabu@first@cline \z@
- \def\tabu@restoreeverycr {\let\everycr \tabu@everycr}%
- \def\everycr{\afterassignment\tabu@restoreeverycr \@temptokena}% <for ialign>
- \tabu@everycr\expandafter{\the\tabu@everycr \tabu@everyrow}%
-}% \tabu@setup@everycr
-\def\tabu@everyrow{%
- \noalign{%
- \ifcase\tabu@first@cline
- \global\let\tabu@first@cline \tw@
- \or\global\let\tabu@first@cline \tw@
- \or\global\tabu@firstclinefalse
- \global\let\tabu@first@cline \m@ne
- \fi}%
- \tabu@rowfontreset
- \iftabu@everyrow
- \noalign{\tabu@everyrowfalse}\expandafter\tabu@everyrow@hook
- \fi
-}% \tabu@everyrow
-\let\tabu@everyrow@hook \@empty
-\def\tabuphantomline{\crcr\noalign{%
- \global\let\@arstrutbox \voidb@x
- \iftabu@colortbl
- \xdef\tabu@minrowclearance{\the\minrowclearance}%
- \global\minrowclearance \z@
- \fi
- \global\let\vcenter \vbox
- \ifnum \tabu@nested>\z@ \vspace*{\dimexpr\extrarowheight-\ht\@arstrutbox}\fi
- \toks@{}\count@\@ne
- \@whilenum\count@<\tabu@nbcols\do{\advance\count@\@ne
- \toks@\expandafter{\the\toks@&}}%
- \toks@\expandafter{\the\toks@
- \cr\noalign{%
- \global\let\@arstrutbox \tabu@arstrutbox
- \global\let\vcenter \tabu@vcenter
- \iftabu@colortbl
- \global\minrowclearance \tabu@minrowclearance\relax\fi
- \global\let\tabu@first@cline \@ne}}%
- \expandafter}\the\toks@
-}% \tabuphantomline
-\def\tabu@lines{{\endlinechar\m@ne \scantokens{\def\x{|}}%
- \expandafter}\expandafter\tabu@lines@ \x
-}% \tabu@lines
-\def\tabu@lines@#1{%
- \tabu@newcolumntype #1{\tabuvline@rewrite}%
- \NC@list\expandafter{\the\NC@list \NC@do #1}%
-}% \tabu@lines@
-\newcommand*\tabuvline@rewrite[1][]{\tabuvline@arg{#1}%
- \expandafter \NC@find \tabu@temp}
-\def\tabu@vline#1{\vrule width#1}
+%% Measuring the natural width (varwidth) - store the results -------
+\def\tabu@startpboxmeasure #1{\bgroup % entering \vtop
+ \edef\tabu@temp{\expandafter\@secondoftwo \ifx\tabu@hsize #1\else\relax\fi}%
+ \ifodd 1\ifx \tabu@temp\@empty 0 \else % starts with \tabu@hsize ?
+ \iftabu@spread \else % if spread -> measure
+ \ifdim \tabu@temp\p@>\z@ 0 \fi\fi\fi% if coef>0 -> do not measure
+ \let\@startpbox \tabu@startpboxORI % restore immediately (nesting)
+ \tabu@measuringtrue % for the quick option...
+ \tabu@Xcol =\expandafter\@firstoftwo\ifx\tabu@hsize #1\fi
+ \ifdim \tabu@temp\p@>\z@ \ifdim \tabu@temp\tabucolX<\tabu@target
+ \tabu@target=\tabu@temp\tabucolX \fi\fi
+ \setbox\tabu@box \hbox \bgroup
+ \begin{varwidth}\tabu@target
+ \let\FV@ListProcessLine \tabu@FV@ListProcessLine % \hbox to natural width...
+ \narrowragged \arraybackslash \parfillskip \@flushglue
+ \ifdefined\pdfadjustspacing \pdfadjustspacing\z@ \fi
+ \bgroup \aftergroup\tabu@endpboxmeasure
+ \ifdefined \cellspacetoplimit \tabu@cellspacepatch \fi
+ \else \expandafter\@gobble
+ \tabu@startpboxquick{#1}% \@gobble \bgroup
+ \fi
+}% \tabu@startpboxmeasure
+\def\tabu@cellspacepatch{\def\bcolumn##1\@nil{}\let\ecolumn\@empty
+ \bgroup\color@begingroup}
+\def\tabu@endpboxmeasure {%
+ \@finalstrut \@arstrutbox
+ \end{varwidth}\egroup % <got my \tabu@box>
+ \ifdim \tabu@temp\p@ <\z@ % neg coef
+ \ifdim \tabu@wd\tabu@Xcol <\wd\tabu@box
+ \tabu@wddef\tabu@Xcol {\the\wd\tabu@box}%
+ \tabu@debug{\tabu@message@endpboxmeasure}%
+ \fi
+ \else % spread coef>0
+ \global\advance \tabu@naturalX \wd\tabu@box
+ \@tempdima =\dimexpr \wd\tabu@box *\p@/\dimexpr \tabu@temp\p@\relax \relax
+ \ifdim \tabu@naturalXmax <\tabu@naturalX
+ \xdef\tabu@naturalXmax {\the\tabu@naturalX}\fi
+ \ifdim \tabu@naturalXmin <\@tempdima
+ \xdef\tabu@naturalXmin {\the\@tempdima}\fi
+ \fi
+ \box\tabu@box \egroup % end of \vtop (measure) restore \tabu@target
+}% \tabu@endpboxmeasure
+\def\tabu@wddef #1{\expandafter\xdef
+ \csname tabu@\the\tabu@nested.W\number#1\endcsname}
+\def\tabu@wd #1{\csname tabu@\the\tabu@nested.W\number#1\endcsname}
+\def\tabu@message@endpboxmeasure{\tabu@spaces\tabu@spaces<-> % <-> save natural wd
+ \the\tabu@Xcol. X[\tabu@temp]:
+ target = \the\tabucolX \space
+ \expandafter\expandafter\expandafter\string\tabu@wd\tabu@Xcol
+ =\tabu@wd\tabu@Xcol
+}% \tabu@message@endpboxmeasure
+\def\tabu@startpboxquick {\bgroup
+ \let\@startpbox \tabu@startpboxORI % restore immediately
+ \let\tabu \tabu@quick % \begin is expanded before...
+ \expandafter\@gobble \@startpbox % gobbles \bgroup
+}% \tabu@startpboxquick
+\def\tabu@quick {\begingroup \iffalse{\fi \ifnum0=`}\fi
+ \toks@{}\def\tabu@stack{b}\tabu@collectbody
+ \endgroup
+}% \tabu@quick
+%% Measuring the heights and depths - store the results -------------
+\def\tabu@verticalmeasure{\everypar{}%
+ \ifnum \currentgrouptype>12 % 14=semi-simple, 15=math shift group
+ \setbox\tabu@box =\hbox\bgroup
+ \let\tabu@verticalspacing \tabu@verticalsp@lcr
+ \d@llarbegin % after \hbox ...
+ \else
+ \edef\tabu@temp{\ifnum\currentgrouptype=5\vtop
+ \else\ifnum\currentgrouptype=12\vcenter
+ \else\vbox\fi\fi}%
+ \setbox\tabu@box \hbox\bgroup$\tabu@temp \bgroup
+ \let\tabu@verticalspacing \tabu@verticalsp@pmb
+ \fi
+}% \tabu@verticalmeasure
+\def\tabu@verticalsp@lcr{%
+ \d@llarend \egroup % <got my \tabu@box>
+ \@tempdima \dimexpr \ht\tabu@box+\abovetabulinesep
+ \@tempdimb \dimexpr \dp\tabu@box+\belowtabulinesep \relax
+ \ifdim\tabustrutrule>\z@ \tabu@debug{\tabu@message@verticalsp}\fi
+ \ifdim \tabu@ht<\@tempdima \tabu@htdef{\the\@tempdima}\fi
+ \ifdim \tabu@dp<\@tempdimb \tabu@dpdef{\the\@tempdimb}\fi
+ \noindent\vrule height\@tempdima depth\@tempdimb
+}% \tabu@verticalsp@lcr
+\def\tabu@verticalsp@pmb{% inserts struts as needed
+ \par \expandafter\egroup
+ \expandafter$\expandafter
+ \egroup \expandafter
+ \@tempdimc \the\prevdepth
+ \@tempdima \dimexpr \ht\tabu@box+\abovetabulinesep
+ \@tempdimb \dimexpr \dp\tabu@box+\belowtabulinesep \relax
+ \ifdim\tabustrutrule>\z@ \tabu@debug{\tabu@message@verticalsp}\fi
+ \ifdim \tabu@ht<\@tempdima \tabu@htdef{\the\@tempdima}\fi
+ \ifdim \tabu@dp<\@tempdimb \tabu@dpdef{\the\@tempdimb}\fi
+ \let\@finalstrut \@gobble
+ \hrule height\@tempdima depth\@tempdimb width\hsize
+%% \box\tabu@box
+}% \tabu@verticalsp@pmb
-\def\tabuvline@arg#1{%
- \ifx\\#1\\% <shortcut when no option>
- \edef\tabu@temp{!{%
- \iftabu@colortbl\begingroup\noexpand\CT@arc@\fi
- \noexpand\tabu@vline\arrayrulewidth
- \iftabu@colortbl\endgroup\fi}}%
- \else
- \ifcsname tabu@line@style@\detokenize {#1}\endcsname
- \def\tabu@temp##1\relax##2\relax{##1}%
- \expandafter\tabu@temp\romannumeral-`\q
- \csname tabu@line@style@\detokenize {#1}\endcsname
- \tabuvline@argiii
- \else \futurelet \tabu@temp \tabuvline@argi #1\p@\p@\@nnil \tabuvline@argiii
- \fi
- \fi
-}% \tabuvline@arg
-\def\tabuvline@argi{%
- \let\tabu@color \@empty
- \ifcat A\noexpand\tabu@temp
- \@tempdima\arrayrulewidth
- \expandafter\tabu@getlinecolor
- \else \expandafter\tabuvline@argii
- \fi
-}% \tabuvline@argi
-\def\tabuvline@argii#1\@nnil{%
- \tabu@maybecolor \@tempdima #1 \@nnil
-}% \tabuvline@argii
-\def\tabuvline@argiii{%
- \edef\tabu@temp{!{\begingroup
- \ifx\tabu@color\@empty
- \iftabu@colortbl \noexpand\CT@arc@ \fi
- \else \tabu@color\fi
- \noexpand\tabu@vline{\the\@tempdima}\endgroup}}%
-}% \tabuvline@argiii
-\def\tabu@linedash{4pt}% <default value>
-\def\tabu@dashgap{4pt}% <default value>
-\def\tabucline{\crcr\noalign{\ifnum0=`}\fi \@ifstar
- {\@tempswatrue \tabu@cline}
- {\@tempswafalse \tabu@cline}}%
-\newcommand*\tabu@cline[2][]{\toks@{}%
- \tabu@startstop{#2}\tabu@getlinespec{#1}\@multicnt\@ne
- \ifnum\tabu@start>\tabu@stop
- \else\ifx\tabu@xleaders\relax
- \else
- \toks@{\noalign{\global\let\@arstrutbox \voidb@x}}%
-%% \iftabu@firstcline\if\tabu@align t\vskip-\ht\@arstrutbox\fi\fi
- \@whilenum\@multicnt<\tabu@start\do{\advance\@multicnt\@ne
- \toks@\expandafter{\the\toks@ &}}%
- \loop
- \toks@\expandafter{\the\toks@ \omit }%
- \ifnum \@multicnt=\@ne
- \expandafter \tabu@add \csname tabu@tok@\the\@multicnt L\endcsname \@nil
- \fi
- \ifcase 0\if@tempswa\else\ifnum \@multicnt<\tabu@stop 1\fi\fi\relax
- \toks@\expandafter{\the\toks@ \begingroup}%
- \toks@\expandafter{\the\expandafter\toks@
- \tabu@xleaders \endgroup}%
- \fi
- \ifcase 0\if@tempswa\else\ifnum \@multicnt<\tabu@stop 1\fi\fi\relax
- \expandafter \tabu@add \csname tabu@tok@\the\@multicnt R\endcsname \@nil
- \fi
- \ifnum\@multicnt<\tabu@stop
- \advance\@multicnt\@ne
- \if@tempswa \toks@\expandafter{\the\toks@ &}%
- \else \toks@\expandafter{\the\toks@ \span}\fi
- \repeat
- \@whilenum\@multicnt<\tabu@nbcols\do{\advance\@multicnt\@ne
- \toks@\expandafter{\the\toks@ &}}%
- \toks@\expandafter{\the\toks@ \cr
- \noalign{\global\let\@arstrutbox \tabu@arstrutbox}}%
-%% \tabu@debug{LIGNE AJOUTEE:\the\toks@}%
- \fi\fi
- \ifnum0=`{\fi\expandafter}\the\toks@
+\def\tabu@verticalinit{%
+ \ifnum \c@taburow=\z@ \tabu@rearstrut \fi % after \tabu@reset !
+ \advance\c@taburow \@ne
+ \tabu@htdef{\the\ht\@arstrutbox}\tabu@dpdef{\the\dp\@arstrutbox}%
+ \advance\c@taburow \m@ne
+}% \tabu@verticalinit
+\def\tabu@htdef {\expandafter\xdef \csname tabu@\the\tabu@nested.H\the\c@taburow\endcsname}
+\def\tabu@ht {\csname tabu@\the\tabu@nested.H\the\c@taburow\endcsname}
+\def\tabu@dpdef {\expandafter\xdef \csname tabu@\the\tabu@nested.D\the\c@taburow\endcsname}
+\def\tabu@dp {\csname tabu@\the\tabu@nested.D\the\c@taburow\endcsname}
+\def\tabu@verticaldynamicadjustment {%
+ \advance\c@taburow \@ne
+ \extrarowheight \dimexpr\tabu@ht - \ht\strutbox
+ \extrarowdepth \dimexpr\tabu@dp - \dp\strutbox
+ \let\arraystretch \@empty
+ \advance\c@taburow \m@ne
+}% \tabu@verticaldynamicadjustment
+\def\tabuphantomline{\crcr \noalign{%
+ {\globaldefs \@ne
+ \setbox\@arstrutbox \box\voidb@x
+ \let\tabu@@celllalign \tabu@celllalign
+ \let\tabu@@cellralign \tabu@cellralign
+ \let\tabu@@cellleft \tabu@cellleft
+ \let\tabu@@cellright \tabu@cellright
+ \let\tabu@@thevline \tabu@thevline
+ \let\tabu@celllalign \@empty
+ \let\tabu@cellralign \@empty
+ \let\tabu@cellright \@empty
+ \let\tabu@cellleft \@empty
+ \let\tabu@thevline \relax}%
+ \edef\tabu@temp{\tabu@multispan \tabu@nbcols{\noindent &}}%
+ \toks@\expandafter{\tabu@temp \noindent\tabu@everyrowfalse \cr
+ \noalign{\tabu@rearstrut
+ {\globaldefs\@ne
+ \let\tabu@celllalign \tabu@@celllalign
+ \let\tabu@cellralign \tabu@@cellralign
+ \let\tabu@cellleft \tabu@@cellleft
+ \let\tabu@cellright \tabu@@cellright
+ \let\tabu@thevline \tabu@@thevline}}}%
+ \expandafter}\the\toks@
+}% \tabuphantomline
+%% \firsthline and \lasthline corrections ---------------------------
+\def\tabu@firstline {\tabu@hlineAZ \tabu@firsthlinecorrection {}}
+\def\tabu@firsthline{\tabu@hlineAZ \tabu@firsthlinecorrection \hline}
+\def\tabu@lastline {\tabu@hlineAZ \tabu@lasthlinecorrection {}}
+\def\tabu@lasthline {\tabu@hlineAZ \tabu@lasthlinecorrection \hline}
+\def\tabu@hline {% replaces \hline if no colortbl (see \AtBeginDocument)
+ \noalign{\ifnum0=`}\fi
+ {\CT@arc@\hrule height\arrayrulewidth}%
+ \futurelet \tabu@temp \tabu@xhline
+}% \tabu@hline
+\def\tabu@xhline{%
+ \ifx \tabu@temp \hline
+ {\ifx \CT@drsc@\relax \vskip
+ \else\ifx \CT@drsc@\@empty \vskip
+ \else \CT@drsc@\hrule height
+ \fi\fi
+ \doublerulesep}%
+ \fi
+ \ifnum0=`{\fi}%
+}% \tabu@xhline
+\def\tabu@hlineAZ #1#2{\noalign{\ifnum0=`}\fi \dimen@ \z@ \count@ \z@
+ \toks@{}\def\tabu@hlinecorrection{#1}\def\tabu@temp{#2}%
+ \tabu@hlineAZsurround
+}% \tabu@hlineAZ
+\newcommand*\tabu@hlineAZsurround[1][\extratabsurround]{%
+ \extratabsurround #1\let\tabucline \tabucline@scan
+ \let\hline \tabu@hlinescan \let\firsthline \hline
+ \let\cline \tabu@clinescan \let\lasthline \hline
+ \expandafter \futurelet \expandafter \tabu@temp
+ \expandafter \tabu@nexthlineAZ \tabu@temp
+}% \tabu@hlineAZsurround
+\def\tabu@hlinescan {\tabu@thick \arrayrulewidth \tabu@xhlineAZ \hline}
+\def\tabu@clinescan #1{\tabu@thick \arrayrulewidth \tabu@xhlineAZ {\cline{#1}}}
+\def\tabucline@scan{\@testopt \tabucline@sc@n {}}
+\def\tabucline@sc@n #1[#2]{\tabu@xhlineAZ {\tabucline[{#1}]{#2}}}
+\def\tabu@nexthlineAZ{%
+ \ifx \tabu@temp\hline \else
+ \ifx \tabu@temp\cline \else
+ \ifx \tabu@temp\tabucline \else
+ \tabu@hlinecorrection
+ \fi\fi\fi
+}% \tabu@nexthlineAZ
+\def\tabu@xhlineAZ #1{%
+ \toks@\expandafter{\the\toks@ #1}%
+ \@tempdimc \tabu@thick % The last line width
+ \ifcase\count@ \@tempdimb \tabu@thick % The first line width
+ \else \advance\dimen@ \dimexpr \tabu@thick+\doublerulesep \relax
+ \fi
+ \advance\count@ \@ne \futurelet \tabu@temp \tabu@nexthlineAZ
+}% \tabu@xhlineAZ
+\def\tabu@firsthlinecorrection{% \count@ = number of \hline -1
+ \@tempdima \dimexpr \ht\@arstrutbox+\dimen@
+ \edef\firsthline{% <local in \noalign>
+ \omit \hbox to\z@{\hss{\noexpand\tabu@DBG{yellow}\vrule
+ height \the\dimexpr\@tempdima+\extratabsurround
+ depth \dp\@arstrutbox
+ width \tabustrutrule}\hss}\cr
+ \noalign{\vskip -\the\dimexpr \@tempdima+\@tempdimb
+ +\dp\@arstrutbox \relax}%
+ \the\toks@
+ }\ifnum0=`{\fi
+ \expandafter}\firsthline % we are then !
+}% \tabu@firsthlinecorrection
+\def\tabu@lasthlinecorrection{%
+ \@tempdima \dimexpr \dp\@arstrutbox+\dimen@+\@tempdimb+\@tempdimc
+ \edef\lasthline{% <local in \noalign>
+ \the\toks@
+ \noalign{\vskip -\the\dimexpr\dimen@+\@tempdimb+\dp\@arstrutbox}%
+ \omit \hbox to\z@{\hss{\noexpand\tabu@DBG{yellow}\vrule
+ depth \the\dimexpr \dp\@arstrutbox+\@tempdimb+\dimen@
+ +\extratabsurround-\@tempdimc
+ height \z@
+ width \tabustrutrule}\hss}\cr
+ }\ifnum0=`{\fi
+ \expandafter}\lasthline % we are then !
+}% \tabu@lasthlinecorrection
+%% Horizontal lines : \tabucline ------------------------------------
+\let\tabu@start \@tempcnta
+\let\tabu@stop \@tempcntb
+\newcommand*\tabucline{\noalign{\ifnum0=`}\fi \tabu@cline}
+\newcommand*\tabu@cline[2][]{\tabu@startstop{#2}%
+ \ifnum \tabu@stop<\z@ \toks@{}%
+ \else \tabu@clinearg{#1}\tabu@thestyle
+ \edef\tabucline{\toks@{%
+ \ifnum \tabu@start>\z@ \omit
+ \tabu@multispan\tabu@start {\span\omit}&\fi
+ \omit \tabu@multispan\tabu@stop {\span\omit}%
+ \tabu@thehline\cr
+ }}\tabucline
+ \tabu@tracinglines{(tabu:tabucline) Style: #1^^J\the\toks@^^J^^J}%
+ \fi
+ \futurelet \tabu@temp \tabu@xcline
}% \tabu@cline
-\def\tabu@add #1\@nil{\toks@\expandafter{\the\toks@
- \begingroup #1\endgroup\ifmmode$\fi}}
-\def\tabu@startstop#1{\tabu@start@stop #1\relax 1-\tabu@nbcols\@nnil}
+\def\tabu@clinearg #1{%
+ \ifx\\#1\\\let\tabu@thestyle \tabu@ls@
+ \else \@defaultunits \expandafter\let\expandafter\@tempa
+ \romannumeral-`\0#1\relax \@nnil
+ \ifx \hbox\@tempa \tabu@clinebox{#1}%
+ \else\ifx \box\@tempa \tabu@clinebox{#1}%
+ \else\ifx \vbox\@tempa \tabu@clinebox{#1}%
+ \else\ifx \vtop\@tempa \tabu@clinebox{#1}%
+ \else\ifx \copy\@tempa \tabu@clinebox{#1}%
+ \else\ifx \leaders\@tempa \tabu@clineleads{#1}%
+ \else\ifx \cleaders\@tempa \tabu@clineleads{#1}%
+ \else\ifx \xleaders\@tempa \tabu@clineleads{#1}%
+ \else\tabu@getline {#1}%
+ \fi\fi\fi\fi\fi\fi\fi\fi
+ \fi
+}% \tabu@clinearg
+\def\tabu@clinebox #1{\tabu@clineleads{\xleaders#1\hss}}
+\def\tabu@clineleads #1{%
+ \let\tabu@thestyle \relax \let\tabu@leaders \@undefined
+ \gdef\tabu@thehrule{#1}}
+\def\tabu@thehline{\begingroup
+ \ifdefined\tabu@leaders
+ \noexpand\tabu@thehleaders
+ \else \noexpand\tabu@thehrule
+ \fi \endgroup
+}% \tabu@thehline
+\def\tabu@xcline{%
+ \ifx \tabu@temp\tabucline
+ \toks@\expandafter{\the\toks@ \noalign
+ {\ifx\CT@drsc@\relax \vskip
+ \else \CT@drsc@\hrule height
+ \fi
+ \doublerulesep}}%
+ \fi
+ \tabu@docline
+}% \tabu@xcline
+\def\tabu@docline {\ifnum0=`{\fi \expandafter}\the\toks@}
+\def\tabu@docline@evr {\xdef\tabu@doclineafter{\the\toks@}%
+ \ifnum0=`{\fi}\aftergroup\tabu@doclineafter}
+\def\tabu@multispan #1#2{%
+ \ifnum\numexpr#1>\@ne #2\expandafter\tabu@multispan
+ \else \expandafter\@gobbletwo
+ \fi {#1-1}{#2}%
+}% \tabu@multispan
+\def\tabu@startstop #1{\tabu@start@stop #1\relax 1-\tabu@nbcols \@nnil}
\def\tabu@start@stop #1-#2\@nnil{%
- \@defaultunits \tabu@start \number0#1\relax\@nnil
- \@defaultunits \tabu@stop \number0#2\relax\@nnil
- \ifnum\tabu@start>\tabu@nbcols\tabu@start \tabu@nbcols\else
- \ifnum\tabu@start<\@ne \tabu@start \@ne \fi\fi
- \ifnum\tabu@stop>\tabu@nbcols \tabu@stop \tabu@nbcols \else
- \ifnum\tabu@stop<\@ne \tabu@stop \tabu@nbcols\fi\fi
+ \@defaultunits \tabu@start\number 0#1\relax \@nnil
+ \@defaultunits \tabu@stop \number 0#2\relax \@nnil
+ \tabu@stop \ifnum \tabu@start>\tabu@nbcols \m@ne
+ \else\ifnum \tabu@stop=\z@ \tabu@nbcols
+ \else\ifnum \tabu@stop>\tabu@nbcols \tabu@nbcols
+ \else \tabu@stop
+ \fi\fi\fi
+ \advance\tabu@start \m@ne
+ \ifnum \tabu@start>\z@ \advance\tabu@stop -\tabu@start \fi
}% \tabu@start@stop
-\def\tabu@getlinespec#1{\let\tabu@xleaders \relax \let\tabu@color \@empty
- \@defaultunits \let\@tempa=#1 \relax\@nnil
- \ifx\@tempa\relax \let\tabu@xleaders \tabu@defaultleaders\else
- \ifx\@tempa\hbox \tabu@defleaders{#1}\else
- \ifx\@tempa\box \tabu@defleaders{#1}\else
- \ifx\@tempa\copy \tabu@defleaders{#1}\else
- \ifcsname tabu@line@style@\detokenize{#1}\endcsname
- \csname tabu@line@style@\detokenize{#1}\endcsname
- \else \tabu@getline{#1\p@ on0pt off0pt}\fi\fi\fi\fi\fi
-}% \tabu@getlinespec
-\def\tabu@defleaders#1{%
- \def\tabu@xleaders{\iftabu@colortbl\CT@arc@\fi
- \xleaders\hbox{\lower.5\extrarowheight#1}\tabu@leaderfill}}
-\def\tabucline@warn#1{\PackageWarning{tabu}
- {Undefined line syle: #1
- \MessageBreak Using default line style instead}%
- \let\tabu@xleaders \tabu@defaultleaders
-}% \tabucline@warn
-\def\tabu@getline#1{\tabu@lineon #1 \@nil on\tabu@linedash \p@ \@nil\@nnil{#1}}
-\def\tabu@maybecolor{\ifx\tabu@color\@empty \afterassignment\tabu@colortest
- \else \@defaultunits\fi}
-\def\tabu@lineon #1on#2\@nil#3\@nnil#4{%
- \@defaultunits \let\@tempa=#1 \relax\@nnil
- \ifcase 0\ifx o\@tempa 1\else\ifcat A\noexpand\@tempa 2\fi\fi\relax
- \tabu@maybecolor \@tempdima #1\arrayrulewidth \p@\@nnil
- \tabu@maybecolor \@tempdimb #2\p@ \@nnil
- \tabu@lineoff #1 on#2 off\tabu@dashgap \p@ \@nnil
- \or\@tempdima \arrayrulewidth
- \tabu@maybecolor \@tempdimb #2\p@ \@nnil
- \tabu@lineoff #1 on#2 off\tabu@dashgap \p@ \@nnil
- \else
- \tabu@maybecolor \@tempdima \arrayrulewidth #1\p@\@nnil
- \ifx\tabu@color\@empty \tabucline@warn\@tempa\else
- \@tempdimb \z@
- \tabu@lineoff off0pt \p@\@nnil \fi
- \fi
-}% \tabu@lineon
-\def\tabu@lineoff #1off#2\@nnil{%
- \tabu@maybecolor \@tempdimc #2\p@ \@nnil
- \iftabu@colortbl \ifx \tabu@color\@empty
- \def\tabu@color{\noexpand\CT@arc@}%
- \fi\fi
- \ifdim \@tempdimb=\z@
- \ifdim \@tempdimc>\z@ \@tempdimb \tabu@dashgap\relax\fi\fi
- \ifdim \@tempdimc=\z@
- \ifdim \@tempdimb>\z@ \@tempdimc \tabu@linedash\relax\fi\fi
- \ifdim \@tempdima<\z@ \else
- \ifdim \@tempdimb<\z@ \else
- \ifdim \@tempdimc<\z@ \else
- \edef \tabu@xleaders{\tabu@color\xleaders
- \ifdim\@tempdimc>\z@
- \hbox\bgroup \kern\the\dimexpr\@tempdimc/2\relax\fi
- \noexpand\iftabu@firstcline
- \vrule depth\dimexpr\the\@tempdima
- \ifdim\@tempdimb>\z@ width\the\@tempdimb\fi
- \noexpand\else
- \vrule height\dimexpr-\extrarowheight+\the\@tempdima
- depth\dimexpr\extrarowheight
- \ifdim\@tempdimb>\z@ width\the\@tempdimb\fi
- \noexpand\fi
- \ifdim\@tempdimc>\z@
- \kern\the\dimexpr\@tempdimc/2\egroup\fi
- \tabu@leaderfill}%
- \fi\fi\fi
-}% \tabu@lineoff
-\def\tabu@colortest{\futurelet\tabu@temp\tabu@linecolor}
-\def\tabu@linecolor{%
- \ifcase 0\if ,\noexpand\tabu@temp\else
- \ifx\relax\tabu@temp\else
- \ifx \@sptoken\tabu@temp1\else
- \ifcat A\noexpand\tabu@temp2\else
- 3\fi\fi\fi\fi\relax
- \def\tabu@next##1{\futurelet\tabu@temp\tabu@linecolor}%
- \or\def\tabu@next{\tabu@gobblespace{\futurelet\tabu@temp\tabu@linecolor}}%
- \or\let\tabu@next \tabu@getlinecolor
- \else\expandafter\remove@to@nnil
- \fi \tabu@next
-}% \tabu@linecolor
-\def\tabu@getlinecolor#1\p@{%
- \edef\@tempa{\zap@space #1 \@empty}%
- \ifcsname\string\color@\@tempa\endcsname
- \edef\tabu@color{\noexpand\noexpand\noexpand\color{\@tempa}}% \set@color
- \fi\remove@to@nnil
-}% \tabu@getlinecolor
-\def\tabulinestyle#1{\@for\@tempa:=#1\do
- {\expandafter\tabu@linestyle\@tempa==\@nil}}
-\def\tabu@linestyle#1=#2=#3\@nil{%
- \begingroup \tabu@getlinespec {#2}%
- \toks@\expandafter{\tabu@xleaders}%
- \@temptokena\expandafter{\tabu@color}%
- \expandafter\xdef\csname tabu@line@style@\detokenize{#1}\endcsname
- {\@tempdima\the\@tempdima
- \def\noexpand\tabu@color{\the\@temptokena}\relax
- \def\noexpand\tabu@xleaders{\the\toks@}\relax}%
- \endgroup
-}% \tabu@linestyle
-\expandafter\def \csname tabu@line@style@\endcsname {%
- \let\tabu@xleaders \tabu@defaultleaders}%
-\def\tabu@defaultleaders{\iftabu@colortbl\CT@arc@\fi
- \leaders
- \iftabu@firstcline
- \vrule depth \arrayrulewidth
- \else
- \vrule height\dimexpr-\extrarowheight+\arrayrulewidth
- depth \extrarowheight
- \fi
- \tabu@leaderfill}
-\let\tabu@leaderfill \hfil
-{\catcode32=13\relax\catcode`\^^@=13\relax
-\gdef\tabu@verb{\@sanitize\catcode`\^=7\edef\^{\string^}\tabu@makeatletter
-\catcode32=13\let =\ \catcode`\^^@=13\def^^@{\hskip\parfillskip\null\linebreak}%
-\endlinechar\m@ne}}
-{\catcode64=13\edef @{\string @}\expandafter\xdef
- \csname tabu@makeatletter\endcsname{\catcode64=13\def\noexpand @{\unskip @}}}
-\newcommand\tabu@sanitizetext[1][\ttfamily]{\begingroup
- \tabu@verb #1\tabu@s@nitizetext}
-\long\def\tabu@s@nitizetext#1{\@makeother\{\@makeother\}%
- \everyeof{\noexpand}\scantokens{#1}\endgroup}
-\def\tabu@tabudecimal#1{%
- \def\tabu@decimal{#1}\@temptokena{}%
- \let\tabu@getdecimal@ \tabu@getdecimal@ignorespaces
- \tabu@scandecimal
+%% Numbers: siunitx S columns (and \tabudecimal) -------------------
+\def\tabu@tabudecimal #1{%
+ \def\tabu@decimal{#1}\@temptokena{}%
+ \let\tabu@getdecimal@ \tabu@getdecimal@ignorespaces
+ \tabu@scandecimal
}% \tabu@tabudecimal
\def\tabu@scandecimal{\futurelet \tabu@temp \tabu@getdecimal@}
\def\tabu@skipdecimal#1{#1\tabu@scandecimal}
\def\tabu@getdecimal@ignorespaces{%
- \ifcase 0\ifx\tabu@temp\ignorespaces\else
- \ifx\tabu@temp\@sptoken1\else
- 2\fi\fi\relax
- \let\tabu@getdecimal@ \tabu@getdecimal
- \expandafter\tabu@skipdecimal
- \or \expandafter\tabu@gobblespace\expandafter\tabu@scandecimal
- \else \expandafter\tabu@skipdecimal
- \fi
+ \ifcase 0\ifx\tabu@temp\ignorespaces\else
+ \ifx\tabu@temp\@sptoken1\else
+ 2\fi\fi\relax
+ \let\tabu@getdecimal@ \tabu@getdecimal
+ \expandafter\tabu@skipdecimal
+ \or \expandafter\tabu@gobblespace\expandafter\tabu@scandecimal
+ \else \expandafter\tabu@skipdecimal
+ \fi
}% \tabu@getdecimal@ignorespaces
\def\tabu@get@decimal#1{\@temptokena\expandafter{\the\@temptokena #1}%
\tabu@scandecimal}
\def\do#1{%
- \def\tabu@get@decimalspace#1{%
- \@temptokena\expandafter{\the\@temptokena #1}\tabu@scandecimal}%
+ \def\tabu@get@decimalspace#1{%
+ \@temptokena\expandafter{\the\@temptokena #1}\tabu@scandecimal}%
}\do{ }
\let\tabu@@tabudecimal \tabu@tabudecimal
\def\tabu@getdecimal{%
@@ -1250,282 +1945,211 @@
\fi
}% \tabu@getdecimal
\def\tabu@printdecimal{%
- \edef\tabu@temp{\the\@temptokena}%
- \ifx\tabu@temp\@empty\else
- \ifx\tabu@temp\space\else
- \expandafter\tabu@decimal\expandafter{\the\@temptokena}%
- \fi\fi
+ \edef\tabu@temp{\the\@temptokena}%
+ \ifx\tabu@temp\@empty\else
+ \ifx\tabu@temp\space\else
+ \expandafter\tabu@decimal\expandafter{\the\@temptokena}%
+ \fi\fi
}% \tabu@printdecimal
-\def\extrarowsep{\edef\tabu@C@rowsep{\the\numexpr\tabu@C@rowsep+1}%
- \aftergroup\tabu@Growsep
- \afterassignment\tabu@setrowsep \extrarowheight
-}% \extrarowsep
-\def\tabu@setrowsep{%
- \extrarowdepth\extrarowheight
- \tabu@Gsave \tabu@G@rowsep \tabu@C@rowsep \extrarowheight \extrarowdepth
-}% \tabu@setrowsep
-\def\tabu@Growsep{\ifx \tabu@G@rowsep\@empty \else \tabu@Rrowsep\fi}
-\def\tabu@Rrowsep{\tabu@Grestore \tabu@G@rowsep \tabu@C@rowsep}
-\let\tabu@C@rowsep \z@
-\let\tabu@G@rowsep \@empty
-\def\tabulinesep{\edef\tabu@C@linesep{\the\numexpr\tabu@C@linesep+1}%
- \aftergroup\tabu@Glinesep
- \afterassignment\tabu@setlinesep \abovetabulinesep
-}% \tabulinesep
-\def\tabu@setlinesep{%
- \belowtabulinesep\abovetabulinesep
- \tabu@Gsave \tabu@G@linesep \tabu@C@linesep \abovetabulinesep \belowtabulinesep
-}% \tabu@setlinesep
-\def\tabu@Glinesep{\ifx \tabu@G@linesep\@empty \else \tabu@Rlinesep\fi}
-\def\tabu@Rlinesep{\tabu@Grestore \tabu@G@linesep \tabu@C@linesep}
-\let\tabu@C@linesep \z@
-\let\tabu@G@linesep \@empty
-\def\tabu@Gsave #1#2#3#4{\xdef#1{#1%
- \toks#2{\toks\the\currentgrouplevel{\global#3\the#3\global#4\the#4}}}%
-}% \tabu@Gsave
-\def\tabu@Grestore#1#2{\begingroup
- \toks#2{}#1\toks\currentgrouplevel\expandafter{\expandafter}\the\toks#2\relax
- \ifcat$\the\toks\currentgrouplevel$\else
- \global\let#1\@empty \global\let#2\z@
- \fi
- \expandafter\endgroup
- \the\toks\currentgrouplevel
-}% \tabu@Grestore
-\def\tabu@verticalmeasure{%
- \ifnum \currentgrouptype>12
- \begingroup\lrbox\tabu@box \d@llarbegin
- \let\tabu@verticalspacing \tabu@verticalsp@lcr
- \else
- \setbox\tabu@box
- \ifnum \currentgrouptype=5\vtop\else\vbox\fi \bgroup
- \everypar{}\let\@finalstrut \@gobble
- \let\tabu@verticalspacing \tabu@verticalsp@pmb
- \fi
-}% \tabu@verticalmeasure
-\def\tabu@verticalsp@lcr{% adjust \ht \tabu@box and \dp \tabu@box
- \d@llarend\endlrbox\endgroup
- \@tempdima \dimexpr \ht\@arstrutbox -\ht\tabu@box \relax
- \@tempdimb \dimexpr \dp\@arstrutbox -\dp\tabu@box \relax
- \ifdim \@tempdima<\abovetabulinesep
- \ht\tabu@box=\dimexpr \ht\tabu@box+\abovetabulinesep\relax \fi
- \ifdim \@tempdimb<\belowtabulinesep
- \dp\tabu@box=\dimexpr \dp\tabu@box+\belowtabulinesep \relax \fi
- \leavevmode \box\tabu@box
-}% \tabu@verticalsp@lcr
-\def\tabu@verticalsp@pmb{% inserts struts as needed
- \par \expandafter\egroup
- \expandafter\@tempdimc \the\prevdepth
- \@tempdima \dimexpr \ht\@arstrutbox -\ht\tabu@box \relax
- \@tempdimb \dimexpr \dp\@arstrutbox -\@tempdimc \relax
- \ifdim \@tempdima<\abovetabulinesep
- \llap {\vrule
- \@height \dimexpr\ht\tabu@box+\abovetabulinesep\relax
- \@depth -\ht\tabu@box
- \@width \tabustrutrule
- }\nointerlineskip \vskip-\ht\tabu@box
- \fi
- \unvbox\tabu@box
- \ifdim \@tempdimb<\belowtabulinesep
- \llap{\vrule
- \@depth \dimexpr \belowtabulinesep \relax
- \@height \z@
- \@width \tabustrutrule
- }\nointerlineskip%\vskip-\@tempdimc
- \let\@finalstrut \@gobble
- \fi
-}% \tabu@verticalsp@pmb
+%% Verbatim inside X columns ----------------------------------------
+\def\tabu@verbatim{%
+ \let\verb \tabu@verb
+ \let\FV@DefineCheckEnd \tabu@FV@DefineCheckEnd
+}% \tabu@verbatim
+\let\tabu@ltx@verb \verb
+\def\tabu@verb{\@ifstar {\tabu@ltx@verb*} \tabu@ltx@verb}
+\def\tabu@fancyvrb {%
+ \def\tabu@FV@DefineCheckEnd ##1{%
+ \def\tabu@FV@DefineCheckEnd{%
+ ##1% <original definition (if fancyvrb is loaded)>
+ \let\FV@CheckEnd \tabu@FV@CheckEnd
+ \let\FV@@CheckEnd \tabu@FV@@CheckEnd
+ \let\FV@@@CheckEnd \tabu@FV@@@CheckEnd
+ \edef\FV@EndScanning{%
+ \def\noexpand\next{\noexpand\end{\FV@EnvironName}}%
+ \global\let\noexpand\FV@EnvironName\relax
+ \noexpand\next}%
+ \xdef\FV@EnvironName{\detokenize\expandafter{\FV@EnvironName}}}%
+ }\expandafter\tabu@FV@DefineCheckEnd\expandafter{\FV@DefineCheckEnd}
+}% \tabu@fancyvrb
+\def\tabu@FV@CheckEnd #1{\expandafter\FV@@CheckEnd \detokenize{#1\end{}}\@nil}
+\edef\tabu@FV@@@CheckEnd {\detokenize{\end{}}}
+\begingroup
+\catcode`\[1 \catcode`\]2
+\@makeother\{ \@makeother\}
+ \edef\x[\endgroup
+ \def\noexpand\tabu@FV@@CheckEnd ##1\detokenize[\end{]##2\detokenize[}]##3%
+ ]\x \@nil{\def\@tempa{#2}\def\@tempb{#3}}
+\def\tabu@FV@ListProcessLine #1{%
+ \hbox {%to \hsize{%
+ \kern\leftmargin
+ \hbox {%to \linewidth{%
+ \FV@LeftListNumber
+ \FV@LeftListFrame
+ \FancyVerbFormatLine{#1}\hss
+%% DG/SR modification begin - Jan. 28, 1998 (for numbers=right add-on)
+%% \FV@RightListFrame}%
+ \FV@RightListFrame
+ \FV@RightListNumber}%
+%% DG/SR modification end
+ \hss}}
+%% \savetabu --------------------------------------------------------
\newcommand*\savetabu[1]{\noalign{%
- \ifx\\#1\\\tabu@savewarn{}{The tabu will not be saved}\else
- \@ifundefined{tabu@saved@\string#1}{}{\tabu@savewarn{#1}{Overwritting}}%
- {%
- \toks0\expandafter{\tabu@savedpreamble}%
- \toks1\expandafter{\tabu@savedparam}%
- \toks2\expandafter{\tabu@savedpream}%
- \toks3{}%
- \iftabu@negcoef
- \edef\tabu@savewd{\tabu@savewd{\number\numexpr1}}%
- \toks3\expandafter{\tabu@savewd}\fi
- \expandafter\xdef\csname tabu@saved@\string#1\endcsname##1{%
- \noexpand\ifcase##1\relax
- \noexpand\ifdim\tabu@target>\z@
- \noexpand\tabu@warn@usetabu
- \noexpand\fi
- \tabu@target \the\tabu@target\relax
- \tabucolX \the\tabucolX\relax
- \the\toks1%
- \gdef\noexpand\tabu@usetabu{%
- \the\toks1%
- \def\noexpand\@halignto{\tabu@halignto}%
- \tabucolX \the\tabucolX\relax
- \def\noexpand\@preamble{\the\toks0}%
- \noexpand\tabu@make@arstrutbox
- \the\toks3
- \noexpand\ifx \noexpand\tabu@align\noexpand\tabu@aligndefault@text
- \def\noexpand\tabu@align{\tabu@align}%
- \noexpand\fi}%
- \aftergroup\noexpand\tabu@usetabu
- \noexpand\else
- \noexpand\ifdim\tabu@target=\z@
- \tabu@target \the\tabu@target\relax
- \noexpand\fi
- \gdef\noexpand\tabu@preamble{%
- \noexpand\ifx \noexpand\tabu@align\noexpand\tabu@aligndefault@text
- \def\noexpand\tabu@align{\tabu@align}%
- \noexpand\fi}%
- \aftergroup\noexpand\tabu@preamble
- \noexpand\fi
- \the\toks2}%
- \tabu@message@save{#1}}%
- \fi}%
+ \tabu@sanitizearg{#1}\tabu@temp
+ \ifx \tabu@temp\@empty \tabu@savewarn{}{The tabu will not be saved}\else
+ \@ifundefined{tabu@saved@\tabu@temp}{}{\tabu@savewarn{#1}{Overwritting}}%
+ \ifdefined\tabu@restored \expandafter\let
+ \csname tabu@saved@\tabu@temp \endcsname \tabu@restored
+ \else {\tabu@save}%
+ \fi
+ \fi}%
}% \savetabu
-\def\tabu@aligndefault@text{\tabu@aligndefault}%
-\def\tabu@warn@usetabu{\PackageWarning{tabu}
- {Specifying a target with \string\usetabu\space is useless
- \MessageBreak The target cannot be changed!}}
-\def\tabu@savewd#1{%
- \ifnum#1>\tabu@nbcols \expandafter \@gobble
- \else \ifdim\tabu@wd{#1}>\z@
- \noexpand\tabu@wddef{#1}{\tabu@wd{#1}}\fi
- \expandafter\tabu@savewd % loop
- \fi{#1+1}%
-}% \tabu@savewd
-\def\tabu@make@arstrutbox{%
- \@tempdima \ht \strutbox
- \@tempdimb \dp \strutbox
- \advance \@tempdima by\extrarowheight
- \advance \@tempdimb by\extrarowdepth
- \setbox \@arstrutbox \hbox{\vrule
- \@height \arraystretch \@tempdima
- \@depth \arraystretch \@tempdimb
- \@width \z@}%
-}% \tabu@make@arstrutbox
+\def\tabu@save {%
+ \toks0\expandafter{\tabu@saved@}%
+ \iftabu@negcoef
+ \let\tabu@wddef \relax \let\tabu@ \tabu@savewd \edef\tabu@savewd{\tabu@Xcoefs}%
+ \toks0\expandafter{\the\toks\expandafter0\tabu@savewd}\fi
+ \toks1\expandafter{\tabu@savedpream}%
+ \toks2\expandafter{\tabu@savedpreamble}%
+ \let\@preamble \relax
+ \let\tabu@savedpream \relax \let\tabu@savedparams \relax
+ \edef\tabu@preamble{%
+ \def\noexpand\tabu@aligndefault{\tabu@align}%
+ \def\tabu@savedparams {\noexpand\the\toks0}%
+ \def\tabu@savedpream {\noexpand\the\toks1}}%
+ \edef\tabu@usetabu{%
+ \def\@preamble {\noexpand\the\toks2}%
+ \tabu@target \the\tabu@target \relax
+ \tabucolX \the\tabucolX \relax
+ \tabu@nbcols \the\tabu@nbcols \relax
+ \def\noexpand\tabu@aligndefault{\tabu@align}%
+ \def\tabu@savedparams {\noexpand\the\toks0}%
+ \def\tabu@savedpream {\noexpand\the\toks1}}%
+ \let\tabu@aligndefault \relax \let\@sharp \relax
+ \edef\@tempa{\noexpand\tabu@s@ved
+ {\tabu@usetabu}
+ {\tabu@preamble}
+ {\the\toks1}}\@tempa
+ \tabu@message@save
+}% \tabu@save
+\long\def\tabu@s@ved #1#2#3{%
+ \def\tabu@usetabu{#1}% <for \tabu@message@save>
+ \expandafter\gdef\csname tabu@saved@\tabu@temp\endcsname ##1{%
+ \ifodd ##1% \usetabu
+ \tabu@measuringfalse \tabu@spreadfalse % Just in case...
+ \gdef\tabu@usetabu {%
+ \ifdim \tabu@target>\z@ \tabu@warn@usetabu \fi
+ \global\let\tabu@usetabu \@undefined
+ \def\@halignto {to\tabu@target}%
+ #1%
+ \ifx \tabu@align\tabu@aligndefault@text
+ \ifnum \tabu@nested=\z@
+ \let\tabu@align \tabu@aligndefault \fi\fi}%
+ \else % \preamble
+ \gdef\tabu@preamble {%
+ \global\let\tabu@preamble \@undefined
+ #2%
+ \ifx \tabu@align\tabu@aligndefault@text
+ \ifnum \tabu@nested=\z@
+ \let\tabu@align \tabu@aligndefault \fi\fi}%
+ \fi
+ #3}%
+}% \tabu@s@ved
+\def\tabu@aligndefault@text {\tabu@aligndefault}%
+\def\tabu@warn@usetabu {\PackageWarning{tabu}
+ {Specifying a target with \string\usetabu\space is useless
+ \MessageBreak The target cannot be changed!}}
+\def\tabu@savewd #1#2{\ifdim #2\p@<\z@ \tabu@wddef{#1}{\tabu@wd{#1}}\fi}
\def\tabu@savewarn#1#2{\PackageInfo{tabu}
- {User-name `#1' already used for \string\savetabu
- \MessageBreak #2}}%
+ {User-name `#1' already used for \string\savetabu
+ \MessageBreak #2}}%
\def\tabu@saveerr#1{\PackageError{tabu}
- {User-name `#1' is unknown for \string\usetabu
- \MessageBreak I cannot restore an unknown preamble!}\@ehd}
-\def\tabu@rowfont{\noalign{\ifnum0=`}\fi\tabu@row@font}
+ {User-name `#1' is unknown for \string\usetabu
+ \MessageBreak I cannot restore an unknown preamble!}\@ehd}
+%% \rowfont ---------------------------------------------------------
+\newskip \tabu@cellskip
+\def\tabu@rowfont{\ifdim \baselineskip=\z@\noalign\fi
+ {\ifnum0=`}\fi \tabu@row@font}
\newcommand*\tabu@row@font[2][]{%
- \global\let\tabu@rowfontreset \tabu@rowfont@reset
- \global\let\tabu@@cellleft \tabu@cellleft
- \global\let\tabu@@cellright \tabu@cellright
- \global\let\tabu@@celllalign \tabu@celllalign
- \global\let\tabu@@cellralign \tabu@cellralign
- \gdef\tabu@cellfont{#2}%
- \ifcsname tabu@cell@#1\endcsname % row alignment
- \csname tabu@cell@#1\endcsname \fi
- \toks@\expandafter {\tabu@cellleft\tabu@cellfont}% inside \noalign group ok
- \xdef\tabu@cellleft {\the\toks@}%
- \ifnum0=`{\fi}% end of noalign group
+ \ifnum7=\currentgrouptype
+ \global\let\tabu@@cellleft \tabu@cellleft
+ \global\let\tabu@@cellright \tabu@cellright
+ \global\let\tabu@@celllalign \tabu@celllalign
+ \global\let\tabu@@cellralign \tabu@cellralign
+ \global\let\tabu@@rowfontreset\tabu@rowfontreset
+ \fi
+ \global\let\tabu@rowfontreset \tabu@rowfont@reset
+ \expandafter\gdef\expandafter\tabu@cellleft\expandafter{\tabu@cellleft #2}%
+ \ifcsname tabu@cell@#1\endcsname % row alignment
+ \csname tabu@cell@#1\endcsname \fi
+ \ifnum0=`{\fi}% end of group / noalign group
}% \rowfont
-\def\tabu@ifcolorleavevmode#1{\let\color \tabu@leavevmodecolor #1\let\color\tabu@color}%
-\AtBeginDocument{%
- \ifdefined\color
- \let\tabu@color \color
- {\toks@\expandafter\expandafter\expandafter{\csname color \endcsname}
- \xdef\tabu@leavevmodecolor{\leavevmode\the\toks@}}
- \else \let\tabu@ifcolorleavevmode \@firstofone
- \fi
-}%
+\def\tabu@ifcolorleavevmode #1{\let\color \tabu@leavevmodecolor #1\let\color\tabu@color}%
\def\tabu@rowfont@reset{%
- \noalign{%
- \global\let\tabu@rowfontreset \@empty
- \global\let\tabu@cellleft \tabu@@cellleft
- \global\let\tabu@cellright \tabu@@cellright
- \global\let\tabu@cellfont \@empty
- \global\let\tabu@celllalign \tabu@@celllalign
- \global\let\tabu@cellralign \tabu@@cellralign
- }%
-}% \tabu@rowfont@reset
-\let\tabu@rowfontreset \@empty
-\def\everyrow #1{%
- \ifdim\baselineskip=\z@\noalign\fi
- {\gdef\tabu@everyrow@hook{#1}}%
-}% \everyrow
-\newif\iftabu@cellright
-\AtBeginDocument{\let\tabu@prepnext@tokORI \prepnext@tok }% original definition
+ \global\let\tabu@rowfontreset \tabu@@rowfontreset
+ \global\let\tabu@cellleft \tabu@@cellleft
+ \global\let\tabu@cellright \tabu@@cellright
+ \global\let\tabu@cellfont \@empty
+ \global\let\tabu@celllalign \tabu@@celllalign
+ \global\let\tabu@cellralign \tabu@@cellralign
+}% \tabu@@rowfontreset
+\let\tabu@rowfontreset \@empty % overwritten \AtBeginDocument if colortbl
+%% \tabu@prepnext@tok -----------------------------------------------
+\newif \iftabu@cellright
\def\tabu@prepnext@tok{%
- \ifnum \count@<\z@ % <first initialisation>
- \@tempcnta \@M % <not initialized by array.sty>
- \tabu@nbcols\z@
- \let\tabu@fornoopORI \@fornoop
- \expandafter\gdef\expandafter\tabu@global@temp\expandafter{%
- \tabu@global@temp\gdef\tabu@global@temp{}\tabu@nbcols\z@}%
- \expandafter\let\csname tabu@tok@1L\endcsname \relax
- \tabu@cellrightfalse
- \else
- \ifcase \numexpr \count@-\@tempcnta \relax % (case 0): prev. token is left
- \advance \tabu@nbcols\@ne
- \expandafter\let\csname tabu@tok@\the\tabu@nbcols R\endcsname \relax
- \expandafter\gdef\expandafter\tabu@global@temp\expandafter{%
- \tabu@global@temp \advance\tabu@nbcols\@ne}%
- \iftabu@cellright % before-previous token is right and is finished
- \tabu@cellrightfalse % <only once>
- \tabu@savetok R\tabu@preptokenright
- \fi
- \ifnum \tabu@nbcols=\@ne \tabu@savetok L\fi
- \tabu@preptokenleft
- \or % (case 1) previous token is right
- \tabu@savetok R\tabu@cellrighttrue
- \let\@fornoop \tabu@lastnoop
- \else % special column: do not change the token
- \ifnum \tabu@nbcols>\z@ %special column: always on the right of normal one
- \tabu@savetok R%
- \else % unless this is the very first column (\tabu@nbcols=0)
- \advance\tabu@nbcols\@ne \tabu@savetok L\advance\tabu@nbcols\m@ne
- \fi
- \iftabu@cellright % before-previous token is right
+ \ifnum \count@<\z@ % <first initialisation>
+ \@tempcnta \@M % <not initialized by array.sty>
+ \tabu@nbcols\z@
+ \let\tabu@fornoopORI \@fornoop
\tabu@cellrightfalse
- \tabu@preptokenright
- \fi
- \fi % \ifcase
- \fi
- \tabu@prepnext@tokORI
+ \else
+ \ifcase \numexpr \count@-\@tempcnta \relax % (case 0): prev. token is left
+ \advance \tabu@nbcols \@ne
+ \iftabu@cellright % before-previous token is right and is finished
+ \tabu@cellrightfalse % <only once>
+ \tabu@righttok
+ \fi
+ \tabu@lefttok
+ \or % (case 1) previous token is right
+ \tabu@cellrighttrue \let\@fornoop \tabu@lastnoop
+ \else % special column: do not change the token
+ \iftabu@cellright % before-previous token is right
+ \tabu@cellrightfalse
+ \tabu@righttok
+ \fi
+ \fi % \ifcase
+ \fi
+ \tabu@prepnext@tokORI
}% \tabu@prepnext@tok
-\long\def\tabu@lastnoop#1\@@#2#3{\in@\@nextchar{#2}%
- \ifin@
- \let\@fornoop \tabu@fornoopORI
- \toks0\expandafter{\expandafter\tabu@everyrowtrue \the\toks0}%
- \expandafter\prepnext@tok
- \fi
+\long\def\tabu@lastnoop#1\@@#2#3{\tabu@lastn@@p #2\@nextchar \in@\in@@}
+\def\tabu@lastn@@p #1\@nextchar #2#3\in@@{%
+ \ifx \in@#2\else
+ \let\@fornoop \tabu@fornoopORI
+ \xdef\tabu@mkpreambuffer{\tabu@nbcols\the\tabu@nbcols \tabu@mkpreambuffer}%
+ \toks0\expandafter{\expandafter\tabu@everyrowtrue \the\toks0}%
+ \expandafter\prepnext@tok
+ \fi
}% \tabu@lastnoop
-\def\tabu@preptokenright{%
- \advance \count@ \m@ne
- \toks\count@\expandafter {\the\toks\count@ \tabu@cellright \tabu@cellralign}%
- \advance \count@ \@ne
-}% \tabu@preptokenright
-\def\tabu@preptokenleft{\toks\count@\expandafter{\expandafter\tabu@celllalign
- \the\toks\count@ \tabu@cellleft}% after because of $
-}% \tabu@preptokenleft
-\def\tabu@savetok#1{\begingroup
- \expandafter\tabu@savet@k\csname tabu@tok@\the\tabu@nbcols #1\endcsname
-}% \tabu@savetok
-\def\tabu@savet@k#1{%
- \ifnum \@chclass=\@ne \toks@\toks\count@
- \else\ifnum\@chclass=5 \toks@\toks\count@
- \else \toks@{}\fi\fi
- \unless\ifx#1\relax
- \toks@\expandafter\expandafter\expandafter{%
- \expandafter#1\the\toks@}\fi
- \toks@\expandafter{\expandafter\def\expandafter#1\expandafter{%
- \the\toks@}}%
- \@temptokena\expandafter{\tabu@global@temp}%
- \xdef\tabu@global@temp {\the\@temptokena \the\toks@}%
- \expandafter\endgroup \the\toks@
-}% \tabu@savetok
+\def\tabu@righttok{%
+ \advance \count@ \m@ne
+ \toks\count@\expandafter {\the\toks\count@ \tabu@cellright \tabu@cellralign}%
+ \advance \count@ \@ne
+}% \tabu@righttok
+\def\tabu@lefttok{\toks\count@\expandafter{\expandafter\tabu@celllalign
+ \the\toks\count@ \tabu@cellleft}% after because of $
+}% \tabu@lefttok
+%% Neutralisation of glues ------------------------------------------
\let\tabu@cellleft \@empty
\let\tabu@cellright \@empty
-\def\tabu@celllalign {\tabu@cellleft}% row font spec. applies to pre-column material
+\tabu@celllalign@def{\tabu@cellleft}%
\let\tabu@cellralign \@empty
-\let\tabu@cellfont \@empty
\def\tabu@cell@align #1#2#3{%
- \toks@\expandafter{\tabu@celllalign #1}%
- \xdef\tabu@celllalign{\the\toks@}%
- \toks@\expandafter{\tabu@cellralign #2}%
- \xdef\tabu@cellralign{\the\toks@}%
- \toks@\expandafter{\tabu@cellleft #3}%
- \xdef\tabu@cellleft{\the\toks@}%
+ \let\tabu@maybesiunitx \toks@ \tabu@celllalign
+ \global \expandafter \tabu@celllalign@def \expandafter {\the\toks@ #1}%
+ \toks@\expandafter{\tabu@cellralign #2}%
+ \xdef\tabu@cellralign{\the\toks@}%
+ \toks@\expandafter{\tabu@cellleft #3}%
+ \xdef\tabu@cellleft{\the\toks@}%
}% \tabu@cell@align
\def\tabu@cell@l{% force alignment to left
\tabu@cell@align
@@ -1558,147 +2182,170 @@
%% ragged2e settings
\def\tabu@cell@L{% force alignment to left (ragged2e)
\tabu@cell@align
- {\tabu@removehfil \RaggedRight \arraybackslash
- \tabu@cellleft}
- {\tabu@flush1\tabu@ignorehfil}
- {\RaggedRight \arraybackslash}%
+ {\tabu@removehfil \RaggedRight \tabu@cellleft}
+ {\tabu@flush 1\tabu@ignorehfil}
+ \RaggedRight
}% \tabu@cell@L
\def\tabu@cell@C{% force alignment to center (ragged2e)
\tabu@cell@align
- {\tabu@removehfil \Centering \arraybackslash
- \tabu@flush{.5}\tabu@cellleft}
+ {\tabu@removehfil \Centering \tabu@flush{.5}\tabu@cellleft}
{\tabu@flush{.5}\tabu@ignorehfil}
- {\Centering \arraybackslash}%
+ \Centering
}% \tabu@cell@C
\def\tabu@cell@R{% force alignment to right (ragged2e)
\tabu@cell@align
- {\tabu@removehfil \RaggedLeft \arraybackslash
- \tabu@flush1\tabu@cellleft}
- {\tabu@ignorehfil}
- {\RaggedLeft \arraybackslash}%
+ {\tabu@removehfil \RaggedLeft \tabu@flush 1\tabu@cellleft}
+ \tabu@ignorehfil
+ \RaggedLeft
}% \tabu@cell@R
\def\tabu@cell@J{% force justification (ragged2e)
\tabu@cell@align
- {\justifying \arraybackslash \tabu@cellleft}
+ {\justifying \tabu@cellleft}
{}
- {\justifying \arraybackslash}%
+ \justifying
}% \tabu@cell@J
\def\tabu@flush#1{%
- \iftabu@colortbl % colortbl uses \hfill rather than \hfil
- \hskip \ifnum\currentgrouptype>13 \stretch{#1}%
- \else\ifdim#1pt<1pt \tabu@cellskip
- \else \stretch{#1}
- \fi\fi \relax
- \else % array.sty
- \ifnum \currentgrouptype>13\relax
- \hfil \hskip1sp
- \fi
- \fi
+ \iftabu@colortbl % colortbl uses \hfill rather than \hfil
+ \hskip \ifnum13<\currentgrouptype \stretch{#1}%
+ \else \ifdim#1pt<\p@ \tabu@cellskip
+ \else \stretch{#1}
+ \fi\fi \relax
+ \else % array.sty
+ \ifnum 13<\currentgrouptype
+ \hfil \hskip1sp \relax \fi
+ \fi
}% \tabu@flush
-\AtBeginDocument{%
- \@ifpackageloaded{ragged2e}
- {}
- {\let\tabu@cell@L \tabu@cell@l
- \let\tabu@cell@R \tabu@cell@r
- \let\tabu@cell@C \tabu@cell@c
- \let\tabu@cell@J \tabu@cell@j
- }%
-}% AtBeginDocument
-\newskip\tabu@cellskip
-\let\tabu@hfil\hfil
-\let\tabu@hfill\hfill
-\let\tabu@hskip\hskip
+\let\tabu@hfil \hfil
+\let\tabu@hfill \hfill
+\let\tabu@hskip \hskip
\def\tabu@removehfil{%
- \iftabu@colortbl
- \unkern \tabu@cellskip = \lastskip
- \ifnum\gluestretchorder\tabu@cellskip = \tw@ \hskip-\tabu@cellskip
- \else \tabu@cellskip = \z@skip
- \fi
- \else
- \ifdim\lastskip=1sp\unskip\fi
- \ifnum\gluestretchorder\lastskip = \@ne
- \hfilneg % \hfilneg for array.sty but not for colortbl...
- \fi
- \fi
+ \iftabu@colortbl
+ \unkern \tabu@cellskip =\lastskip
+ \ifnum\gluestretchorder\tabu@cellskip =\tw@ \hskip-\tabu@cellskip
+ \else \tabu@cellskip \z@skip
+ \fi
+ \else
+ \ifdim\lastskip=1sp\unskip\fi
+ \ifnum\gluestretchorder\lastskip =\@ne
+ \hfilneg % \hfilneg for array.sty but not for colortbl...
+ \fi
+ \fi
}% \tabu@removehfil
-\def\tabu@ignorehfil{%
- \aftergroup\tabu@nohfil
-}% \tabu@ignorehfil
+\def\tabu@ignorehfil{\aftergroup \tabu@nohfil}
\def\tabu@nohfil{% \hfil -> do nothing + restore original \hfil
- \def\hfil{\let\hfil\tabu@hfil}% local to (alignment template) group
+ \def\hfil{\let\hfil \tabu@hfil}% local to (alignment template) group
}% \tabu@nohfil
-\AtBeginDocument{%
- \@ifpackageloaded{colortbl}
- {%
- \def\tabu@nohfil{%
- \def\hfil{\let\hfil\tabu@hfil}% local to (alignment template) group
- \def\hfill{\let\hfill\tabu@hfill}% (colortbl uses \hfill) pfff...
- \def\hskip##1\relax{\let\hskip\tabu@hskip}}% local
- }% @ifpackageloaded colortbl
- {}%
-}% AtBeginDocument
-\def\tabu@fbox{%
- \leavevmode
- \let\color@bgroup\bgroup
- \def\color@egroup{\endgraf\egroup}%
- \afterassignment\tabu@begin@fbox
- \setbox\@tempboxa \hbox
-}% \tabu@fbox
-\def\tabu@begin@fbox{\color@bgroup\kern\fboxsep\aftergroup\tabu@end@fbox}
-\def\tabu@end@fbox{\kern\fboxsep \color@egroup \@frameb@x\relax}
-\def\tabu@color@b@x#1#2{\leavevmode
- \def\tabu@do@color@b@x{#1{#2\color@block{\wd\z@}{\ht\z@}{\dp\z@}\box\z@}}%
- \afterassignment\tabu@begin@color@b@x
- \setbox\z@ \hbox
-}% \tabu@color@b@x
-\def\tabu@begin@color@b@x{%
- \bgroup \kern\fboxsep \set@color
- \aftergroup\tabu@end@color@b@x
-}% \tabu@begin@color@b@x
-\def\tabu@end@color@b@x{\kern\fboxsep \egroup
- \dimen@\ht\z@\advance\dimen@\fboxsep\ht\z@\dimen@
- \dimen@\dp\z@\advance\dimen@\fboxsep\dp\z@\dimen@
- \tabu@do@color@b@x
-}% \tabu@end@color@b@x
-\def\tabu@temp#1#2#3{{\toks@\expandafter{#2#3}\xdef#1{\the\toks@}}}
+\def\tabu@colortblalignments {% if colortbl
+ \def\tabu@nohfil{%
+ \def\hfil {\let\hfil \tabu@hfil}% local to (alignment template) group
+ \def\hfill {\let\hfill \tabu@hfill}% (colortbl uses \hfill) pfff...
+ \def\hskip ####1\relax{\let\hskip \tabu@hskip}}% local
+}% \tabu@colortblalignments
+%% Taking care of footnotes and hyperfootnotes ----------------------
+\long\def\tabu@footnotetext #1{%
+ \edef\@tempa{\the\tabu@footnotes
+ \noexpand\footnotetext [\the\csname c@\@mpfn\endcsname]}%
+ \global\tabu@footnotes\expandafter{\@tempa {#1}}}%
+\long\def\tabu@xfootnotetext [#1]#2{%
+ \global\tabu@footnotes\expandafter{\the\tabu@footnotes
+ \footnotetext [{#1}]{#2}}}
+\let\tabu@xfootnote \@xfootnote
+\long\def\tabu@Hy@ftntext{\tabu@Hy@ftntxt {\the \c@footnote }}
+\long\def\tabu@Hy@xfootnote [#1]{%
+ \begingroup
+ \value\@mpfn #1\relax
+ \protected@xdef \@thefnmark {\thempfn}%
+ \endgroup
+ \@footnotemark \tabu@Hy@ftntxt {#1}%
+}% \tabu@Hy@xfootnote
+\long\def\tabu@Hy@ftntxt #1#2{%
+ \edef\@tempa{%
+ \the\tabu@footnotes
+ \begingroup
+ \value\@mpfn #1\relax
+ \noexpand\protected@xdef\noexpand\@thefnmark {\noexpand\thempfn}%
+ \expandafter \noexpand \expandafter
+ \tabu@Hy@footnotetext \expandafter{\Hy@footnote@currentHref}%
+ }%
+ \global\tabu@footnotes\expandafter{\@tempa {#2}%
+ \endgroup}%
+}% \tabu@Hy@ftntxt
+\long\def\tabu@Hy@footnotetext #1#2{%
+ \H@@footnotetext{%
+ \ifHy@nesting
+ \hyper@@anchor {#1}{#2}%
+ \else
+ \Hy@raisedlink{%
+ \hyper@@anchor {#1}{\relax}%
+ }%
+ \def\@currentHref {#1}%
+ \let\@currentlabelname \@empty
+ #2%
+ \fi
+ }%
+}% \tabu@Hy@footnotetext
+%% No need for \arraybackslash ! ------------------------------------
+\def\tabu@latextwoe {%
+\def\tabu@temp##1##2##3{{\toks@\expandafter{##2##3}\xdef##1{\the\toks@}}}
\tabu@temp \tabu@centering \centering \arraybackslash
\tabu@temp \tabu@raggedleft \raggedleft \arraybackslash
\tabu@temp \tabu@raggedright \raggedright \arraybackslash
+}% \tabu@latextwoe
+\def\tabu@raggedtwoe {%
+\def\tabu@temp ##1##2##3{{\toks@\expandafter{##2##3}\xdef##1{\the\toks@}}}
+\tabu@temp \tabu@Centering \Centering \arraybackslash
+\tabu@temp \tabu@RaggedLeft \RaggedLeft \arraybackslash
+\tabu@temp \tabu@RaggedRight \RaggedRight \arraybackslash
+\tabu@temp \tabu@justifying \justifying \arraybackslash
+}% \tabu@raggedtwoe
\def\tabu@normalcrbackslash{\let\\\@normalcr}
\def\tabu@trivlist{\expandafter\def\expandafter\@trivlist\expandafter{%
- \expandafter\tabu@normalcrbackslash \@trivlist}}%
-\def\tabu@fix@arrayright{%
- \@ifpackageloaded{arydshln}
- {%
- \@ifpackageloaded{colortbl}
- {%% colortbl + arydshln
- \def\tabu@endarray{%
- \adl@endarray \egroup \adl@arrayrestore \CT@end \egroup %<original>
- \@arrayright % <FC>
- \gdef\@preamble{}% <FC>
- }}% \endarray
- {%% arydshln / no colortbl
- \def\tabu@endarray{%
- \adl@endarray \egroup \adl@arrayrestore \egroup %<original>
- \@arrayright % <FC>
- \gdef\@preamble{}% <FC>
- }}% \endarray
- }%
- {%
- \@ifpackageloaded{colortbl}
- {%% colortbl / no arydshln
- \def\tabu@endarray{%
- \crcr \egroup \egroup
- \@arrayright % <FC>
- \gdef\@preamble{}\CT@end
- }}%
- {\PackageWarning{tabu}
- {\string\@arrayright\space is missing from the
- \MessageBreak definition of \string\endarray.
- \MessageBreak Comptability with delarray.sty is broken.}}%
- }%
+ \expandafter\tabu@normalcrbackslash \@trivlist}}
+%% Utilities: \fbox \fcolorbox and \tabudecimal -------------------
+\def\tabu@fbox {\leavevmode\afterassignment\tabu@beginfbox \setbox\@tempboxa\hbox}
+\def\tabu@beginfbox {\bgroup \kern\fboxsep
+ \bgroup\aftergroup\tabu@endfbox}
+\def\tabu@endfbox {\kern\fboxsep\egroup\egroup
+ \@frameb@x\relax}
+\def\tabu@color@b@x #1#2{\leavevmode \bgroup
+ \def\tabu@docolor@b@x{#1{#2\color@block{\wd\z@}{\ht\z@}{\dp\z@}\box\z@}}%
+ \afterassignment\tabu@begincolor@b@x \setbox\z@ \hbox
+}% \tabu@color@b@x
+\def\tabu@begincolor@b@x {\kern\fboxsep \bgroup
+ \aftergroup\tabu@endcolor@b@x \set@color}
+\def\tabu@endcolor@b@x {\kern\fboxsep \egroup
+ \dimen@\ht\z@ \advance\dimen@ \fboxsep \ht\z@ \dimen@
+ \dimen@\dp\z@ \advance\dimen@ \fboxsep \dp\z@ \dimen@
+ \tabu@docolor@b@x \egroup
+}% \tabu@endcolor@b@x
+%% Corrections (arydshln, delarray, colortbl) -----------------------
+\def\tabu@fix@arrayright {%% \@arrayright is missing from \endarray
+ \iftabu@colortbl
+ \ifdefined\adl@array % <colortbl + arydshln>
+ \def\tabu@endarray{%
+ \adl@endarray \egroup \adl@arrayrestore \CT@end \egroup %<original>
+ \@arrayright % <FC>
+ \gdef\@preamble{}}% <FC>
+ \else % <colortbl / no arydshln>
+ \def\tabu@endarray{%
+ \crcr \egroup \egroup %<original>
+ \@arrayright % <FC>
+ \gdef\@preamble{}\CT@end}%
+ \fi
+ \else
+ \ifdefined\adl@array % <arydshln / no colortbl>
+ \def\tabu@endarray{%
+ \adl@endarray \egroup \adl@arrayrestore \egroup %<original>
+ \@arrayright % <FC>
+ \gdef\@preamble{}}% <FC>
+ \else % <no arydshln / no colotbl + \@arrayright missing>
+ \PackageWarning{tabu}
+ {\string\@arrayright\space is missing from the
+ \MessageBreak definition of \string\endarray.
+ \MessageBreak Comptability with delarray.sty is broken.}%
+ \fi\fi
}% \tabu@fix@arrayright
-\def\tabu@adl@xarraydashrule#1#2#3{%
+\def\tabu@adl@xarraydashrule #1#2#3{%
\ifnum\@lastchclass=\adl@class@start\else
\ifnum\@lastchclass=\@ne\else
\ifnum\@lastchclass=5 \else % <FC> @-arg (class 5) and !-arg (class 1)
@@ -1714,26 +2361,141 @@
{\number#2}#3}
\fi
}% \tabu@adl@xarraydashrule
-\def\tabu@adl@act@endpbox{%
- \unskip \ifhmode \nobreak \fi \@finalstrut \@arstrutbox
- \egroup \egroup
- \adl@colhtdp \box\adl@box \hfil
+\def\tabu@adl@act@endpbox {%
+ \unskip \ifhmode \nobreak \fi \@finalstrut \@arstrutbox
+ \egroup \egroup
+ \adl@colhtdp \box\adl@box \hfil
}% \tabu@adl@act@endpbox
-\def\tabu@adl@fix{%
- \let\adl@xarraydashrule \tabu@adl@xarraydashrule % <fix> arydshln
- \let\adl@act@endpbox \tabu@adl@act@endpbox % <fix> arydshln
- \let\adl@act@@endpbox \tabu@adl@act@endpbox % <fix> arydshln
- \let\@preamerror \@preamerr % <fix> arydshln
+\def\tabu@adl@fix {%
+ \let\adl@xarraydashrule \tabu@adl@xarraydashrule % <fix> arydshln
+ \let\adl@act@endpbox \tabu@adl@act@endpbox % <fix> arydshln
+ \let\adl@act@@endpbox \tabu@adl@act@endpbox % <fix> arydshln
+ \let\@preamerror \@preamerr % <fix> arydshln
}% \tabu@adl@fix
+%% Correction for longtable' \@startbox definition ------------------
+%% => \everypar is ``missing'' : TeX should be in vertical mode
\def\tabu@LT@startpbox #1{%
- \bgroup
- \let\@footnotetext\LT@p@ftntext
- \setlength\hsize{#1}%
- \@arrayparboxrestore
- \everypar{%
- \vrule \@height \ht\@arstrutbox \@width \z@
- \everypar{}}%
+ \bgroup
+ \let\@footnotetext\LT@p@ftntext
+ \setlength\hsize{#1}%
+ \@arrayparboxrestore
+ \everypar{%
+ \vrule \@height \ht\@arstrutbox \@width \z@
+ \everypar{}}%
}% \tabu@LT@startpbox
+%% \tracingtabu and the package options ------------------
+\DeclareOption{delarray}{\AtEndOfPackage{\RequirePackage{delarray}}}
+\DeclareOption{linegoal}{%
+ \AtEndOfPackage{%
+ \RequirePackage{linegoal}[2010/12/07]%
+ \let\tabudefaulttarget \linegoal% \linegoal is \linewidth if not pdfTeX
+}}
+\DeclareOption{scantokens}{\tabuscantokenstrue}
+\DeclareOption{debugshow}{\AtEndOfPackage{\tracingtabu=\tw@}}
+\def\tracingtabu {\begingroup\@ifnextchar=%
+ {\afterassignment\tabu@tracing\count@}
+ {\afterassignment\tabu@tracing\count@1\relax}}
+\def\tabu@tracing{\expandafter\endgroup
+ \expandafter\tabu@tr@cing \the\count@ \relax
+}% \tabu@tracing
+\def\tabu@tr@cing #1\relax {%
+ \ifnum#1>\thr@@ \let\tabu@tracinglines\message
+ \else \let\tabu@tracinglines\@gobble
+ \fi
+ \ifnum#1>\tw@ \let\tabu@DBG \tabu@@DBG
+ \def\tabu@mkarstrut {\tabu@DBG@arstrut}%
+ \tabustrutrule 1.5\p@
+ \else \let\tabu@DBG \@gobble
+ \def\tabu@mkarstrut {\tabu@arstrut}%
+ \tabustrutrule \z@
+ \fi
+ \ifnum#1>\@ne \let\tabu@debug \message
+ \else \let\tabu@debug \@gobble
+ \fi
+ \ifnum#1>\z@
+ \let\tabu@message \message
+ \let\tabu@tracing@save \tabu@message@save
+ \let\tabu@starttimer \tabu@pdftimer
+ \else
+ \let\tabu@message \@gobble
+ \let\tabu@tracing@save \@gobble
+ \let\tabu@starttimer \relax
+ \fi
+}% \tabu@tr@cing
+%% Setup \AtBeginDocument
+\AtBeginDocument{\tabu@AtBeginDocument}
+\def\tabu@AtBeginDocument{\let\tabu@AtBeginDocument \@undefined
+ \ifdefined\arrayrulecolor \tabu@colortbltrue % <colortbl>
+ \tabu@colortblalignments % different glues are used
+ \else \tabu@colortblfalse \fi
+ \ifdefined\CT@arc@ \else \let\CT@arc@ \relax \fi
+ \ifdefined\CT@drsc@\else \let\CT@drsc@ \relax \fi
+ \let\tabu@arc@L \CT@arc@ \let\tabu@drsc@L \CT@drsc@
+ \ifodd 1\ifcsname siunitx_table_collect_begin:Nn\endcsname % <siunitx: ok>
+ \expandafter\ifx
+ \csname siunitx_table_collect_begin:Nn\endcsname\relax 0\fi\fi\relax
+ \tabu@siunitxtrue
+ \else \let\tabu@maybesiunitx \@firstofone % <not siunitx: setup>
+ \let\tabu@siunitx \tabu@nosiunitx
+ \tabu@siunitxfalse
+ \fi
+ \ifdefined\adl@array % <arydshln>
+ \else \let\tabu@adl@fix \relax
+ \let\tabu@adl@endtrial \@empty \fi
+ \ifdefined\longtable % <longtable>
+ \else \let\longtabu \tabu@nolongtabu \fi
+ \ifdefined\cellspacetoplimit \tabu@warn@cellspace\fi
+ \csname\ifcsname ifHy@hyperfootnotes\endcsname % <hyperfootnotes>
+ ifHy@hyperfootnotes\else iffalse\fi\endcsname
+ \let\tabu@footnotetext \tabu@Hy@ftntext
+ \let\tabu@xfootnote \tabu@Hy@xfootnote \fi
+ \ifdefined\FV@DefineCheckEnd% <fancyvrb>
+ \tabu@fancyvrb \fi
+ \ifdefined\color % <color / xcolor>
+ \let\tabu@color \color
+ \def\tabu@leavevmodecolor ##1{%
+ \def\tabu@leavevmodecolor {\leavevmode ##1}%
+ }\expandafter\tabu@leavevmodecolor\expandafter{\color}%
+ \else
+ \let\tabu@color \tabu@nocolor
+ \let\tabu@leavevmodecolor \@firstofone \fi
+ \tabu@latextwoe
+ \ifdefined\@raggedtwoe@everyselectfont % <ragged2e>
+ \tabu@raggedtwoe
+ \else
+ \let\tabu@cell@L \tabu@cell@l
+ \let\tabu@cell@R \tabu@cell@r
+ \let\tabu@cell@C \tabu@cell@c
+ \let\tabu@cell@J \tabu@cell@j \fi
+ \expandafter\in@ \expandafter\@arrayright \expandafter{\endarray}%
+ \ifin@ \let\tabu@endarray \endarray
+ \else \tabu@fix@arrayright \fi% <fix for colortbl & arydshln (delarray)>
+ \everyrow{}%
+}% \tabu@AtBeginDocument
+\def\tabu@warn@cellspace{%
+ \PackageWarning{tabu}{%
+ Package cellspace has some limitations
+ \MessageBreak And redefines some macros of array.sty.
+ \MessageBreak Please use \string\tabulinesep\space to control
+ \MessageBreak vertical spacing of lines inside tabu environnement}%
+}% \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@}%
+\def\tabu@naturalXmin {\z@}
+\def\tabu@naturalXmax {\z@}
+\let\tabu@rowfontreset \@empty
+\def\tabulineon {4pt}\let\tabulineoff \tabulineon
+\tabu@everyrowtrue
+\tracingtabu=\z@
+\newtabulinestyle {=\maxdimen}% creates the 'factory' settings \tabu@linestyle@
+\tabulinestyle{}
+\taburowcolors{}
+\let\tabudefaulttarget \linewidth
+\ProcessOptions* % \ProcessOptions* is quicker !
\endinput
%%
%% End of file `tabu.sty'.
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-25 11:59:22 +0000