tabvar (7jul11)

git-svn-id: svn://tug.org/texlive/trunk@23278 c570f23f-e606-0410-a88d-b1316a301751

4 files changed, 20 insertions, 5 deletions

diff --git a/Master/texmf-dist/tex/latex/tabvar/tabvar.1 b/Master/texmf-dist/tex/latex/tabvar/tabvar.1
index 28907d3e5fa..1eaedf56868 100644
--- a/Master/texmf-dist/tex/latex/tabvar/tabvar.1
+++ b/Master/texmf-dist/tex/latex/tabvar/tabvar.1
@@ -2,7 +2,7 @@
 %%BoundingBox: -1 -1 25 13 
 %%HiResBoundingBox: -0.09962 -0.09962 24.0099 12.05476 
 %%Creator: MetaPost 1.211
-%%CreationDate: 2011.03.10:1728
+%%CreationDate: 2011.07.07:0920
 %%Pages: 1
 %%BeginProlog
 %%EndProlog
diff --git a/Master/texmf-dist/tex/latex/tabvar/tabvar.2 b/Master/texmf-dist/tex/latex/tabvar/tabvar.2
index 56f872825a1..477da3b4832 100644
--- a/Master/texmf-dist/tex/latex/tabvar/tabvar.2
+++ b/Master/texmf-dist/tex/latex/tabvar/tabvar.2
@@ -2,7 +2,7 @@
 %%BoundingBox: -1 -1 25 13 
 %%HiResBoundingBox: -0.09962 -0.09962 24.0099 12.05476 
 %%Creator: MetaPost 1.211
-%%CreationDate: 2011.03.10:1728
+%%CreationDate: 2011.07.07:0920
 %%Pages: 1
 %%BeginProlog
 %%EndProlog
diff --git a/Master/texmf-dist/tex/latex/tabvar/tabvar.3 b/Master/texmf-dist/tex/latex/tabvar/tabvar.3
index 04285ea2e10..059c586827a 100644
--- a/Master/texmf-dist/tex/latex/tabvar/tabvar.3
+++ b/Master/texmf-dist/tex/latex/tabvar/tabvar.3
@@ -2,7 +2,7 @@
 %%BoundingBox: -1 -2 25 2 
 %%HiResBoundingBox: -0.09962 -1.63043 24.0099 1.63043 
 %%Creator: MetaPost 1.211
-%%CreationDate: 2011.03.10:1728
+%%CreationDate: 2011.07.07:0920
 %%Pages: 1
 %%BeginProlog
 %%EndProlog
diff --git a/Master/texmf-dist/tex/latex/tabvar/tabvar.sty b/Master/texmf-dist/tex/latex/tabvar/tabvar.sty
index 39aa7655537..10f29c9812f 100644
--- a/Master/texmf-dist/tex/latex/tabvar/tabvar.sty
+++ b/Master/texmf-dist/tex/latex/tabvar/tabvar.sty
@@ -25,7 +25,7 @@
 %%
 \NeedsTeXFormat{LaTeX2e}[1997/06/01]
 \ProvidesFile{tabvar.sty}
-             [2011/03/10 v1.5 (Daniel Flipo)]
+             [2011/07/07 v1.6 (Daniel Flipo)]
 \newif\ifFlechesMP \FlechesMPfalse
 \DeclareOption{FlechesMP}{\FlechesMPtrue}
 \DeclareOption{FlechesPS}{\FlechesMPfalse}
@@ -139,9 +139,17 @@
 \newdimen\TVcolorRightSep
 \setlength{\TVcolorLeftSep}{\TVarraycolsep}
 \setlength{\TVcolorRightSep}{\TVarraycolsep}
-\newcolumntype{N}{%
+\newcolumntype{U}{%
    >{\columncolor{TVcolor}[\TVcolorLeftSep][\TVcolorRightSep]}
    c}
+\AtBeginDocument{%
+  \@ifundefined{NC@find@N}%
+     {\newcolumntype{N}{U}}%
+     {\PackageWarning{tabvar}{Le type de colonne N est d\'efini par
+                              ailleurs. \MessageBreak Remplacer N par
+                              U dans \protect\begin{tabvar}{...N...}
+                              \MessageBreak}}%
+}
 \newcommand{\decroit}{\FlecheD
                       \global\advance\@pos by -1
                       \ifnum\@pos<1
@@ -227,6 +235,13 @@
          \MessageBreak soit '<' soit '>'}}%
      }%
 }
+\newcommand*{\TVcenter}[1]{%
+  \@tempcnta=\@niveaux \advance\@tempcnta by -1 \divide\@tempcnta by 2
+  \@tempdimb=\@tempcnta\baselineskip
+  \ifodd\@niveaux\else\advance\@tempdimb by .5\baselineskip\fi
+  \@pos=1\raisebox{\@tempdimb}{\ensuremath{#1}}%
+}
+
 \newcommand{\TVarraystretch}{1.5}
 \setlength{\TVarraycolsep}{1pt}
 \newenvironment{tabvar}[1]