tkz-tab (5jun11)

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

1 files changed, 22 insertions, 23 deletions

diff --git a/Master/texmf-dist/tex/latex/tkz-tab/tkz-tab.sty b/Master/texmf-dist/tex/latex/tkz-tab/tkz-tab.sty
index 47eb933d973..05aa18acb34 100644
--- a/Master/texmf-dist/tex/latex/tkz-tab/tkz-tab.sty
+++ b/Master/texmf-dist/tex/latex/tkz-tab/tkz-tab.sty
@@ -1,4 +1,3 @@
-% $Id: tkz-tab.sty  2009-02-22 12h22 alain matthes $
 % Copyright (C) 2009 Alain Matthes  
 %
 % This file may be distributed and/or modified
@@ -27,7 +26,7 @@
 %% Objet :  Création de tableaux (signes et variations)
 %<----------------------------------------------------------------------------->
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{tkz-tab}[2011/01/25 v1.3c  variations  (ctan  version)  ]
+\ProvidesPackage{tkz-tab}[2011/04/17 v1.4c  variations  (ctan  version)  ]
 %<----------------------------------------------------------------------------->
 \RequirePackage{etex}
 \RequirePackage{ifthen}
@@ -38,14 +37,15 @@
 %<------------------------------ Initialisation ----------------------------->
 
 %<------------------------------   Styles       ----------------------------->
+%<------------------------------   Colors       ----------------------------->
 \def\tkzTabDefaultWritingColor{black}
 \def\tkzTabDefaultBackgroundColor{white}
 \def\tkzTabDefaultLineWidth{0.4pt}
 \def\tkzTabDefaultArrowStyle{latex'}
 \def\tkzTabDefaultSep{2pt}
+\def\cmdTAB@backgroundcolor{white}
+\def\cmdTAB@writecolor{black}
 \def\cmdTAB@TTS@doubledistance{1pt}
-\def\cmdTAB@backgroundcolor{fondpaille}
-\def\cmdTAB@writecolor{Maroon}
 \def\cmdTAB@TG@hcolor{gray}
 \let\cmdTAB@TG@patterncolor\cmdTAB@writecolor
 \def\cmdTAB@TG@patternstyle{north west lines}
@@ -53,7 +53,7 @@
 \let\cmdTAB@tbs@colorT\cmdTAB@backgroundcolor
 \let\cmdTAB@VA@color\cmdTAB@writecolor
 \let\cmdTAB@arrowcolor\cmdTAB@writecolor
-
+%<-------------------------------------------------------------------------->
 \tikzset{node style/.style  = {inner sep   =  \tkzTabDefaultSep,
                                outer sep   =  \tkzTabDefaultSep,
                                fill        =  \tkzTabDefaultBackgroundColor}} 
@@ -66,7 +66,7 @@
 \tikzset{on double/.style   = {fill        =  \tkzTabDefaultBackgroundColor}}
 \tikzset{tan style/.style   = {>           =  \tkzTabDefaultArrowStyle,
                                ->,
-                               color       =  \tkzTabDefaultBackgroundColor}}
+                               color       =  \tkzTabDefaultWritingColor}}
 \tikzset{arrow style/.style = {\tkzTabDefaultWritingColor,
                                ->,
                                >            = \tkzTabDefaultArrowStyle,
@@ -115,18 +115,18 @@
 \presetkeys     [TAB] {TTC} {color            = black,
                              backgroundcolor  = white}{}
 \newcommand*{\tkzTabColors}[1][]{% 
-\setkeys[TAB]{TTC}{#1}   
+\setkeys[TAB]{TTC}{#1}
 \let\tkzTabDefaultWritingColor\cmdTAB@TTC@color
 \let\tkzTabDefaultBackgroundColor\cmdTAB@TTC@backgroundcolor
-\tikzset{fondC/.style={fill = \tkzTabDefaultBackgroundColor}}
-\tikzset{fondL/.style={fill = \tkzTabDefaultBackgroundColor}}
-\tikzset{fondT/.style={fill = \tkzTabDefaultBackgroundColor}}
-\tikzset{fondV/.style={fill = \tkzTabDefaultBackgroundColor}}
 \let\cmdTAB@backgroundcolor\cmdTAB@TTC@backgroundcolor
-\let\cmdTAB@writecolor\cmdTAB@TTC@color   
+\let\cmdTAB@writecolor\cmdTAB@TTC@color
 \let\cmdTAB@doublecolor\cmdTAB@TTC@backgroundcolor 
 \let\cmdTAB@patterncolor\cmdTAB@TTC@color
 \let\cmdTAB@tcolor\cmdTAB@TTC@color 
+\tikzset{fondC/.style={fill = \tkzTabDefaultBackgroundColor}}
+\tikzset{fondL/.style={fill = \tkzTabDefaultBackgroundColor}}
+\tikzset{fondT/.style={fill = \tkzTabDefaultBackgroundColor}}
+\tikzset{fondV/.style={fill = \tkzTabDefaultBackgroundColor}}
 }
 %<--------------------------------------------------------------------------->
 %<--------------------------------------------------------------------------->
@@ -331,8 +331,11 @@
     \path (\tkz@tab@dx,\tkz@tab@dy) coordinate(F\thetkz@cnt@temp);}%
 % 
 %<--------------------- Colorisation du fond ------------------------------>
-%\clip (T00) rectangle (T2\maxtkz@cnt@lg);
-\ifTAB@tbs@color 
+\tikzset{fondC/.style={fill = \cmdTAB@tbs@colorC}}
+\tikzset{fondL/.style={fill = \cmdTAB@tbs@colorL}}
+\tikzset{fondT/.style={fill = \cmdTAB@tbs@colorT}}
+\tikzset{fondV/.style={fill = \cmdTAB@tbs@colorV}}  
+\ifTAB@tbs@color
   \draw[fondC] (T01) rectangle (T1\maxtkz@cnt@lg);
   \draw[fondL] (T11) rectangle (T20);
   \draw[fondT] (T11) rectangle (T2\maxtkz@cnt@lg);
@@ -516,7 +519,7 @@
 %<--------------------------------------------------------------------------->
 \define@boolkey[TAB]{VA}{help}[true]{}
 \define@cmdkey[TAB]{VA}{color}{}
-\presetkeys[TAB]{VA}{color = black,
+\presetkeys[TAB]{VA}{color = \tkzTabDefaultWritingColor,
                      help  = false}{}
 %<--------------------------------------------------------------------------->
 \newcommand*{\tkzTabVar}[2][]{%
@@ -879,10 +882,10 @@
 %      5----> image
 \define@cmdkey [TAB] {TA} {pos}[below]{}
 \define@cmdkey [TAB] {TA} {color}{}
-\define@boolkey [TAB] {TA} {draw}[true]{}
+\define@boolkey[TAB] {TA} {draw}[true]{}
 \define@cmdkey [TAB] {TA} {remember}{}
 \presetkeys    [TAB] {TA} {draw     = false,
-                           color    = black,
+                           color    = \tkzTabDefaultWritingColor,
                            pos      = above,
                            remember = lastval}{}
 %<--------------------------------------------------------------------------->
@@ -899,9 +902,7 @@
 \path coordinate (\cmdTAB@TA@remember) at (tgt);
 \draw[tan style] (tgt) -- ++(.75,0);
 \draw[tan style] (tgt) -- ++(-.75,0);
-\ifTAB@TA@draw%
-   \draw[from style] (N#41) to (tgt);
-\fi
+\ifTAB@TA@draw \draw[from style] (N#41) to (tgt); \fi
 }%
 %<--------------------------------------------------------------------------->
 %<--------------------------------------------------------------------------->
@@ -918,9 +919,7 @@
     \path coordinate (\cmdTAB@TA@remember) at (tgt);
     \draw[arrow style] (tgt) -- ++(.75,0);
     \draw[arrow style] (tgt) -- ++(-.75,0);
-    \ifTAB@TA@draw
-          \draw[from style] (#4) -- (tgt);
-      \fi
+    \ifTAB@TA@draw \draw[from style] (#4) -- (tgt); \fi
 }%
 %<--------------------------------------------------------------------------->
 %<---------------------- dérivée droite gauche ------------------------------>