tkz-doc (5jun11)

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

3 files changed, 646 insertions, 316 deletions

diff --git a/Master/texmf-dist/doc/latex/tkz-doc/README b/Master/texmf-dist/doc/latex/tkz-doc/README
index 1242f7acc2e..bd050e5e00d 100644
--- a/Master/texmf-dist/doc/latex/tkz-doc/README
+++ b/Master/texmf-dist/doc/latex/tkz-doc/README
@@ -1 +1,2 @@
 Class and package for the documentation of all tkz-* packages.
+ %%%   H I G H L Y   E X P E R I M E N T A L %%%
diff --git a/Master/texmf-dist/doc/latex/tkz-doc/tkzexample.sty b/Master/texmf-dist/doc/latex/tkz-doc/tkzexample.sty
index 8dde2148bde..54a9cc5f1d5 100644
--- a/Master/texmf-dist/doc/latex/tkz-doc/tkzexample.sty
+++ b/Master/texmf-dist/doc/latex/tkz-doc/tkzexample.sty
@@ -1,4 +1,7 @@
 % Copyright 2009 by Alain Matthes
+%
+%   H I G H L Y   E X P E R I M E N T A L
+%
 % This file may be distributed and/or modified
 %
 % 1. under the LaTeX Project Public License and/or
@@ -10,41 +13,22 @@
 %  (Copyright 2006 by Till Tantau)
 % See the file doc/generic/pgf/licenses/LICENSE for more details.
 % 
-% Diff between tkexample and codeexample
-% I removed :
-% graphicbackground 
-% I replaced  \xdef\code@temp{#1}% by \protected@xdef\code@temp{#1}}%
-% now the use of accented letters with utf8 is possible.
-% I changed  \def\code@mid{\hskip6pt}
-%  \def\code@width{\linewidth-12pt\tkzexamplewidth}%
-% into
-%      \def\code@mid{\hskip6pt\hskip2em}%
-%      \def\code@width{\linewidth-12pt-2em-\tkzexamplewidth}
-% this is  to add room for the numbers
-% I insert the next code to add numders in front of each line of code
-% \ifnum@show%
-%   \noindent%
-%   \llap{\colorbox{green!25!black}{%
-%         \textcolor{white}{%
-%         \number\value{code@cnt}}}\enspace}%
-%   \stepcounter{code@cnt}%
-% \fi
-% I changed some keys :
-% I added
-%	show num/.is if=num@show,
-%	num/.code= {\num@showtrue\setcounter{code@cnt}{1}},
-%	global	num/.code= {\num@showtrue},
-% and   latex/.code etc ...
-% I removed 	graphic/.code=	{\colorlet{graphicbackground}{#1}},
-% I removed   \raggedright
-%<----------------------------------------------------------------------------->
+%<--------------------------------------------------------------------------->
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{tkzexample}[2009/02/14 v1 beta  code and graphic  ]
-\definecolor{graphicbackground}{rgb}{0.96,0.96,0.8}%
-\definecolor{codebackground}{rgb}{0.8,0.8,1}%
-%\colorlet{codebackground}{Peach!20}%
-\colorlet{numbackground}{Peach!60!black}%
-\definecolor{numcolor}{rgb}{1,1,1}%
+\ProvidesPackage{tkzexample}[2011/06/04 v1.1 c  (code and graphic ) ]
+\RequirePackage{fixltx2e,calc,mdframed,fancyvrb}
+\newif\iftkzcodesaved           
+\DeclareOption{saved}{\tkzcodesavedtrue}
+\ProcessOptions\relax     
+%<--------------------------------------------------------------------------->
+\colorlet{graphicbackground}{white}
+\colorlet{codebackground}{white}
+\colorlet{codeonlybackground}{white}
+\colorlet{numbackground}{white}
+\colorlet{textcodecolor}{black}
+\colorlet{numcolor}{gray}
+%<---------------------------------------------------------------------------> 
+\def\code@style{\small\ttfamily}
 \makeatletter
 \newcounter{code@cnt}%
 
@@ -53,16 +37,25 @@
     (elatex) or (pdfelatex) to use this package}{}
 \fi
 
-% Define \find@example such that it doesn't destroy catcodes:
+% Define \find@tkzexample such that it doesn't destroy catcodes:
 \begingroup
 \catcode`|=0
 \catcode`[= 1
 \catcode`]=2
 \catcode`\{=12
 \catcode `\}=12
-\catcode`\\=12 |gdef|find@example#1\end{tkzexample}[|endoftkzexample[#1]]
+\catcode`\\=12 |gdef|find@tkzexample#1\end{tkzexample}[|endoftkzexample[#1]]
 |endgroup
 
+\begingroup
+\catcode`|=0
+\catcode`[= 1
+\catcode`]=2
+\catcode`\{=12
+\catcode `\}=12
+\catcode`\\=12 |gdef|find@tkzltxexample#1\end{tkzltxexample}[|endoftkzltxexample[#1]]
+|endgroup
+ 
 % define \returntospace.
 %
 % It should define NEWLINE as {}, spaces and tabs as \space.
@@ -82,147 +75,423 @@
 \gdef\@gobble@till@return@ignore#1^^M{\ignorespaces}
 \gdef\typesetcomment{\catcode`\%=13\def%{\@typeset@till@return}}
 \gdef\@typeset@till@return#1^^M{{\def%{\char`\%}\textsl{\char`\%#1}}\par}
+\gdef\typesetcommentnum{\catcode`\%=13\def%{\@typeset@till@return@num}}
+\gdef\@typeset@till@return@num#1^^M{{\def%{\char`\%}\textsl{\char`\%#1}} \@@par} 
 \endgroup
 
-
+\let\tkz@frameset\colorbox 
+\let\tkz@frameltxset\colorbox
+\newwrite\fileexample
+\newdimen\tkzexamplewidth
+\newdimen\tkz@hsep
+\tkz@hsep=0pt
+\newif\ifcode@execute 
+\newif\ifcode@saved\code@savedfalse
+\newif\ifnum@show \num@showfalse
+\newif\ifcode@overhang
+\newbox\tkzexamplebox
+\newif\ifcode@vbox \code@vboxfalse 
 
 \pgfqkeys{/tkzexample}{%
-   width/.code=  {\setlength\tkzexamplewidth{#1}},
-  graphic/.code=  {\colorlet{graphicbackground}{#1}},
-  code/.code= {\colorlet{codebackground}{#1}},
-	execute code/.is if=code@execute,
-	code only/.code=	{\code@executefalse},
-	show num/.is if=num@show,
-	num/.code= {\num@showtrue\setcounter{code@cnt}{1}},
-	global	num/.code= {\num@showtrue},
-	normal/.code=	{\def\code@size{}},
-	small/.code=	{\def\code@size{\small}},
-	very	small/.code=	{\def\code@size{\footnotesize}},
-	pre/.code=	{\def\code@pre{#1}},
-	post/.code=	{\def\code@post{#1}},
-  latex/.code= {\setlength\tkzexamplewidth{#1}%
-                 \def\code@pre{\begin{minipage}{#1}}%
-                 \def\code@post{\end{minipage}}},
-	vbox/.code=	{\def\code@pre{\vbox\bgroup\setlength{\hsize}{\linewidth-6pt}}\def\code@post{\egroup}},
-	ignorespaces/.code=	{\let\@gobble@till@return=\@gobble@till@return@ignore},
-	leave comments/.code=	{\def\code@catcode@hook{\catcode`\%=12}\let\commenthandler=\relax\let\typesetcomment=\relax},
-	every tkzexample/.style={width=8cm+7pt},
-}
-\def\code@size{}
-\def\code@pre{}
-\def\code@post{}
-\def\code@catcode@hook{}
+  execute code/.is if        = code@execute,
+  show num/.is if            = num@show,
+  overhang/.is if            = code@overhang,
+  code only/.code            = {\code@executefalse},  
+  width/.code                = {\setlength\tkzexamplewidth{#1}},
+  code/.code                 = {\colorlet{codebackground}{#1}},
+  graphic/.code              = {\colorlet{graphicbackground}{#1}},  
+  overhang/.code             = {\code@overhangtrue},
+  num/.code                  = {\num@showtrue\setcounter{code@cnt}{1}},
+  numcolor/.code             = {\colorlet{numcolor}{#1}},
+  numbkgcolor/.code          = {\colorlet{numbackground}{#1}},
+  global  num/.code          = {\num@showtrue},
+  code style/.code           = {\def\code@style{#1}},
+  normal/.code               = {\def\code@size{\normalsize}}, 
+  small/.code                = {\def\code@size{\small}},
+  very  small/.code          = {\def\code@size{\footnotesize}},
+  right margin/.code         = {\def\tkz@rightmargin{#1}},
+  left margin/.code          = {\def\tkz@leftmargin{#1}}, 
+  inner  left margin/.code   = {\def\tkz@innerleftmargin{#1}},
+  inner  right margin/.code  = {\def\tkz@innerrightmargin{#1}},
+  inner  top margin/.code    = {\def\tkz@innertopmargin{#1}},
+  inner  bottom margin/.code = {\def\tkz@innerbottommargin{#1}},
+  line frame width/.code     = {\def\tkz@linewidth{#1}},  
+  frame code/.code           = {\def\tkz@frameset{\fcolorbox{#1}}},
+  frame tex/.code            = {\def\tkz@frameltxset{\fcolorbox{#1}}},
+  above skip/.code           = {\def\tkz@above{#1}},
+  below skip/.code           = {\def\tkz@below{#1}},
+  hsep/.code                 = {\setlength\tkz@hsep{#1}},
+  pre/.code                  = {\def\code@pre{#1}},
+  post/.code                 = {\def\code@post{#1}},
+  latex/.code                = {\setlength\tkzexamplewidth{#1}%
+                               \def\code@preadd{\begin{minipage}{#1}}%
+                               \def\code@postadd{\end{minipage}}},
+  vbox/.code                 = {\code@vboxtrue
+                                \def\code@preadd{\noindent
+                                \vbox\bgroup
+                                \setlength{\hsize}{\linewidth-6pt}%
+                                }%
+                                \def\code@postadd{\egroup}},  
+  every tkzexample/.style={width=6cm},
+}%
+\def\code@size{}%
+\def\code@pre{}%
+\def\code@post{}%
+\def\code@preadd{}%
+\def\code@postadd{}%
+\def\tkz@above{\par}%
+\def\tkz@below{\par}%
 
-\newdimen\tkzexamplewidth
-\newif\ifcode@execute
-\newif\ifnum@show
-\newbox\tkzexamplebox
+% execution du code 
+\def\tkz@result{%
+ \begin{minipage}[t]{\wd\tkzexamplebox}%
+   \hrule width0pt
+   \code@size
+   \box\tkzexamplebox
+   \leavevmode 
+ \end{minipage}% 
+}%
+ 
+\newcommand\tkz@code[1]{%
+\begin{minipage}[t]{\code@width}{%
+\color{textcodecolor}%
+\parskip=\z@
+\hrule width\z@
+\vskip-.25em
+\let\do\@makeother
+\dospecials
+\frenchspacing
+\code@style\code@size
+\obeylines
+\@vobeyspaces
+\@tempswafalse
+\ifnum@show
+   \typesetcommentnum
+   \def\par{%
+         \if@tempswa
+            \leavevmode\null\@@par\penalty\interlinepenalty
+            \everypar{\setlength\fboxsep{1pt}%
+                      \noindent\parskip=0pt%  
+                      \llap{\colorbox{numbackground}{\textcolor{numcolor}{%
+                      \footnotesize\number\value{code@cnt}}}\enspace}%
+                  \stepcounter{code@cnt}}%  
+         \else
+           \@tempswatrue
+           \ifhmode\@@par\penalty\interlinepenalty\fi%
+         \fi
+         }% 
+        \everypar{\setlength\fboxsep{1pt}%  
+                  \noindent\parskip=0pt%  
+                  \llap{\colorbox{numbackground}{\textcolor{numcolor}{%
+                  \footnotesize\number\value{code@cnt}}}\enspace}%   
+                  \stepcounter{code@cnt}%
+                 }%    
+\else
+   \typesetcomment 
+     \def\par{%
+              \if@tempswa
+                 \leavevmode\null\@@par\penalty\interlinepenalty%
+              \else
+                 \@tempswatrue
+                 \ifhmode\@@par\penalty\interlinepenalty\fi%
+              \fi
+             }%
+\fi
+\obeylines
+\ifcode@saved\input{#1}\else#1\fi%
+}% end of content for the minipage 
+\end{minipage}%
+}%
+
+\newcommand\tkz@codesplit[1]{%
+\begin{mdframed}[linewidth        = \tkz@linewidth,
+                 leftmargin       = \tkz@leftmargin,
+                 rightmargin      = \tkz@rightmargin,
+                 backgroundcolor  = codeonlybackground,
+                 innerleftmargin  = \tkz@innerleftmargin,
+                 innertopmargin   = \tkz@innertopmargin]
+\begingroup 
+\color{textcodecolor}%
+\parskip=\z@
+\hrule width0pt
+\let\do\@makeother
+\dospecials
+\frenchspacing
+\code@style\code@size
+\obeylines
+\@vobeyspaces
+\@tempswafalse
+\ifnum@show
+\typesetcommentnum
+\def\par{%
+       \if@tempswa
+           \leavevmode\null\@@par\penalty\interlinepenalty
+           \everypar{\setlength\fboxsep{1pt}% 
+           \noindent\parskip=0pt%
+                     \llap{\colorbox{numbackground}{\textcolor{numcolor}{%
+                  \footnotesize\number\value{code@cnt}}}\enspace}%
+                  \stepcounter{code@cnt}}%  
+       \else
+           \@tempswatrue
+           \ifhmode\@@par\penalty\interlinepenalty\fi
+       \fi
+}% 
+\everypar{\setlength\fboxsep{1pt}%
+          \noindent\parskip=0pt%
+          \llap{\colorbox{numbackground}{\textcolor{numcolor}{%
+          \footnotesize\number\value{code@cnt}}}\enspace}%   
+          \stepcounter{code@cnt}%
+          }% 
+\else
+\typesetcomment%
+\def\par{%
+         \if@tempswa
+             \leavevmode\null\@@par\penalty\interlinepenalty%
+         \else
+             \@tempswatrue
+             \ifhmode\@@par\penalty\interlinepenalty\fi%
+         \fi
+}%
+\fi
+\obeylines  
+\ifcode@saved\input{#1}\else #1\fi
+\endgroup
+\end{mdframed}%
+}%
+
+
+\def\tkzref{\arabic{section}-\arabic{subsection}-\arabic{subsubsection}}%
+\def\tkzFileSavedPrefix{tkzFile}%
+\def\tkz@File@Saved@Name{\tkzFileSavedPrefix-\tkzref}%
+
+\iftkzcodesaved
 \def\tkzexample[#1]{%
-  %\setcounter{code@cnt}{1}%
-  \begingroup%
-  \code@executetrue
-  \pgfqkeys{/tkzexample}{every tkzexample,#1}%
-  \parindent0pt
-  \begingroup%
-  \par%
-  \medskip%
-  \let\do\@makeother%
-  \dospecials%
-  \obeylines%
-  \@vobeyspaces%
-  \catcode`\%=13%
-  \catcode`\^^M=13%
-  \code@catcode@hook%
-  \relax%
-  \find@example}
+\code@executetrue
+\normalsize
+\pgfkeys{/tkzexample/.cd,
+          right margin        =  0pt,
+          left margin         =  0pt,
+          line frame width    =  0,
+          inner left margin   =  0 pt,
+          inner right margin  =  0 pt,
+          inner top margin    =  6 pt,
+          inner bottom margin =  0 pt} 
+\pgfqkeys{/tkzexample}{every tkzexample,#1}%
+\parindent0pt
+\bgroup
+\VerbatimEnvironment 
+\killienc\begin{VerbatimOut}{\tkz@File@Saved@Name.tex}}%
+\def\endtkzexample{\end{VerbatimOut}%
+\egroup
+\ifcode@execute
+\setbox\tkzexamplebox=\hbox{\input{\tkz@File@Saved@Name.tex}}%
+\ifdim\wd\tkzexamplebox>\tkzexamplewidth%
+   \gdef\code@mid{\parskip2pt\par}%
+%   \hrule
+   %\def\code@mid{\hfill}%
+   \gdef\code@width{\linewidth}%
+\else 
+     \ifdim\tkz@hsep=0pt 
+        \gdef\code@mid{\hfill}%
+     \else
+         \gdef\code@mid{\hskip\tkz@hsep}% 
+     \fi 
+      \gdef\code@width{\linewidth-1.5em-\tkz@hsep-\tkzexamplewidth}%
+    \fi
+     \par\noindent  
+     \code@savedtrue
+       \ifcode@overhang
+         \tkz@frameset{codebackground}{\tkz@code{\tkz@File@Saved@Name.tex}}%
+      \else
+           \tkz@frameltxset{graphicbackground}{\tkz@result}%
+       \fi
+   \else% pas de code    pas clair
+       \gdef\code@mid{\hfill}% 
+       \gdef\code@width{\linewidth}%
+       \gdef\code@end{}%
+    \fi% fin pas de code     
+     \code@mid  
+     \ifcode@overhang\tkz@frameltxset{graphicbackground}{\tkz@result}%
+     \else
+       \tkz@frameset{codebackground}{\tkz@code{\tkz@File@Saved@Name.tex}}%
+      \fi   
+\tkz@below
+}%
+\else% end of code saved code et result ?
+\def\tkzexample[#1]{%
+\begingroup
+\code@executetrue 
+\pgfkeys{/tkzexample/.cd,
+          right margin        =  0pt,
+          left margin         =  0pt,
+          line frame width    =  0,
+          inner left margin   =  0 pt,
+          inner right margin  =  0 pt,
+          inner top margin    =  6 pt,
+          inner bottom margin =  0 pt,} 
+\pgfqkeys{/tkzexample}{every tkzexample,#1}%
+\parindent0pt
+\begingroup
+%\tkz@above
+\let\do\@makeother
+\dospecials
+\obeylines
+\@vobeyspaces
+\catcode`\%=13 %
+\catcode`\^^M=13 %
+\find@tkzexample}% #1 est tout ce qui se trouve dans l'environnement
 \def\endoftkzexample#1{%
-  \endgroup%
-  \ifcode@execute%
-    \setbox\tkzexamplebox=\hbox{%
-      {%
-        {%
-          \returntospace%
-          \commenthandler%
-          \protected@xdef\code@temp{#1}%added  by AM
-         }%
-       \colorbox{graphicbackground}{\color{black}\ignorespaces%
-        \code@pre\expandafter\scantokens\expandafter{\code@temp\ignorespaces}\code@post\ignorespaces}%
-    }%
-    }%
-    \ifdim\wd\tkzexamplebox>\tkzexamplewidth%
-      \def\code@start{\par}%
-      \def\code@flushstart{}%
-      \def\code@flushend{}%
-      \def\code@mid{\parskip2pt\par\noindent}%
+\endgroup
+\ifcode@execute % et \fcode@save ??
+  \setbox\tkzexamplebox=\hbox{%
+        {\commenthandler
+         \protected@xdef\code@temp{#1}}%
+  \catcode`\^^M=9 %
+  {\ignorespaces\code@preadd\code@pre
+   \expandafter\scantokens\expandafter{\code@temp\ignorespaces}%
+   \code@post\code@postadd\ignorespaces}%
+  }%
+  \ifdim\wd\tkzexamplebox>\tkzexamplewidth
+     \def\code@mid{\par}%
+     \def\code@width{\linewidth-6pt}%
+  \else 
+     \ifdim\tkz@hsep=0pt 
+        \def\code@mid{\hfill}%
+     \else
+         \def\code@mid{\hskip\tkz@hsep}% 
+     \fi%
+      \def\code@width{\linewidth-1.5em-\tkz@hsep-\tkzexamplewidth}%
+  \fi%
+   \par\noindent
+   \ifcode@overhang 
+        \tkz@frameset{codebackground}{\tkz@code{#1}}%
+   \else
+        \tkz@frameltxset{graphicbackground}{\tkz@result}%
+    \fi
+\else% pas de code execute
+      \def\code@mid{}% 
       \def\code@width{\linewidth-6pt}%
       \def\code@end{}%
+   \fi% fin pas de code
+    \code@mid%
+    \ifcode@overhang%
+       \ifcode@execute\tkz@frameltxset{graphicbackground}{\tkz@result}\fi
     \else%
-      \def\code@start{%
-        \linewidth=\textwidth%
-        \parshape \@ne 0pt \linewidth
-        \leavevmode%
-        \hbox\bgroup}%
-      \def\code@flushstart{\hfill}%
-      \def\code@flushend{\hbox{}}%
-      \def\code@mid{\hskip6pt\hskip2em}%added \hskip2em by AM
-      \def\code@width{\linewidth-12pt-2em-\tkzexamplewidth}%modified by AM -2em
-      \def\code@end{\egroup}%
-    \fi%
-    \code@start%
-    \noindent%
-    \begin{minipage}[t]{\tkzexamplewidth}\raggedright
-      \hrule width0pt%
-      \code@size\vskip-1em% 
-      \code@flushstart\box\tkzexamplebox\code@flushend%
-      \vskip-1ex%
-      \leavevmode%
-    \end{minipage}%
-  \else%
-    \def\code@mid{\par}
-    \def\code@width{\linewidth-6pt}
-    \def\code@end{}
-  \fi%
-  \code@mid%  
-  \colorbox{codebackground}{%
-    \begin{minipage}[t]{\code@width}%
-      {%
-        \let\do\@makeother
-        \dospecials
-        \frenchspacing\@vobeyspaces
-        \normalfont\ttfamily\code@size%
-        \typesetcomment%
-        \@tempswafalse
-        \def\par{%
-          \if@tempswa
-            \leavevmode\null\@@par\penalty\interlinepenalty%
-            \ifnum@show%
-              \noindent\parskip=0pt%
-              \llap{\colorbox{numbackground}{%%added by AM
-                    \textcolor{numcolor}{%%added by AM
-                    \number\value{code@cnt}}}\enspace}%%added by AM
-              \stepcounter{code@cnt}%%added by AM
-            \fi
-          \else
-          \@tempswatrue%
-          \ifhmode\@@par\penalty\interlinepenalty\fi%
-            \ifnum@show%
-              \noindent\parskip=0pt%
-              \llap{\colorbox{numbackground}{%%added by AM
-                    \textcolor{numcolor}{%%added by AM
-                    \number\value{code@cnt}}}\enspace}%%added by AM
-              \stepcounter{code@cnt}%%added by AM
-            \fi
-          \fi}%
-        \obeylines
-        \everypar \expandafter{\the\everypar \unpenalty}%
-        #1}%
-    \end{minipage}}%
-  \code@end%
-  \par%
-  \medskip
-  \end{tkzexample}
+\ifcode@execute\tkz@frameset{codebackground}{\tkz@code{#1}}\else
+  \par\vskip1em
+  \tkz@codesplit{#1}
+  %\tkz@frameset{codebackground}{\tkz@code{#1}}%
+\fi
+    \fi
+   \tkz@below
+  \end{tkzexample}%
+}%
+\def\endtkzexample{\endgroup}%
+\fi
+%<--------------------------------------------------------------------------->
+\pgfqkeys{/tkzltxexample}{%
+  width/.code                = {\setlength\tkzltxexamplewidth{#1}},
+  code/.code                 = {\colorlet{codeonlybackground}{#1}},   
+  show num/.is if            =  num@show,
+  num/.code                  = {\num@showtrue\setcounter{code@cnt}{1}},
+  global  num/.code          = {\num@showtrue},
+  numcolor/.code             = {\colorlet{numcolor}{#1}},
+  numbkgcolor/.code          = {\colorlet{numbackground}{#1}},
+  normal/.code               = {\def\code@size{\normalsize}},
+  small/.code                = {\def\code@size{\small}},
+  very  small/.code          = {\def\code@size{\footnotesize}},
+  right margin/.code         = {\def\tkz@rightmargin{#1}},
+  left margin/.code          = {\def\tkz@leftmargin{#1}}, 
+  inner  left margin/.code   = {\def\tkz@innerleftmargin{#1}},
+  inner  right margin/.code  = {\def\tkz@innerrightmargin{#1}},
+  inner  top margin/.code    = {\def\tkz@innertopmargin{#1}},
+  inner  bottom margin/.code = {\def\tkz@innerbottommargin{#1}},  
+  line frame width/.code     = {\def\tkz@linewidth{#1}},   
+  hsep/.code                 = {\def\tkz@hsep{#1}},
+  typeset listing/.code      = {#1},
+  frame code/.code           = {\def\tkz@frameset{\fcolorbox{#1}}}, 
+  ignorespaces/.code         = {\let\@gobble@till@return =%
+                                \@gobble@till@return@ignore},
+  leave comments/.code       = {\def\code@catcode@hook{\catcode`\%=12}%
+                                \let\commenthandler=\relax%
+                                \let\typesetcomment=\relax},
+  every tkzltxexample/.style = {width=8cm},
+  vbox/.code                 = {\def\code@preadd{\noindent
+                               \vbox\bgroup\setlength{\hsize}{\linewidth}}%
+                               \def\code@postadd{\egroup}}%
 }
+\def\code@size{}%
+% \def\code@pre{}
+\def\code@post{}%
+\def\code@pre{}%
+\def\code@post{}%
+\def\code@catcode@hook{}%
+
+\newdimen\tkzltxexamplewidth
+\newbox\tkzltxexamplebox
+
+\def\tkzltxexample[#1]{%
+\begingroup
+\pgfkeys{/tkzltxexample/.cd,
+          right margin        =  0pt,
+          left margin         =  0pt,
+          line frame width    =  0,
+          inner left margin   =  0 pt,
+          inner right margin  =  0 pt,
+          inner top margin    =  6 pt,
+          inner bottom margin =  0 pt,}
+\pgfqkeys{/tkzltxexample}{every tkzltxexample,#1}%
+\parindent0pt
+\begingroup%
+\let\do\@makeother
+\dospecials
+\obeylines
+\@vobeyspaces
+\catcode`\%=13 %
+\catcode`\^^M=13 %
+\code@catcode@hook%
+\relax%
+\find@tkzltxexample}
+\def\endoftkzltxexample#1{%
+\endgroup%
+\def\code@end{}%
+\par\vskip1em
+\tkz@codesplit{#1}%
+\par
+\code@post
+\end{tkzltxexample}%
+}%
+
+\def\endtkzltxexample{\endgroup}
+
+
+
+\newcommand\killienc{} 
+\@tempcnta128 
+\@whilenum\@tempcnta<\@cclvi\do{% 
+  \edef\killienc{\killienc\catcode\the\@tempcnta=12}% 
+  \advance\@tempcnta\@ne} 
+
+\def\tkz@ref{\arabic{section}-\arabic{subsection}-\arabic{subsubsection}}
+\def\tkz@File@Saved@Name{\tkzFileSavedPrefix-\tkz@ref} 
+\pgfkeys{
+/tkzsavedcode/.cd,
+  prefix/.code    = {\def\tkzFileSavedPrefix{#1}}}  
 
-\def\endtkzexample{\endgroup}
+\newcommand{\tkzSavedCode}[1][]{%
+\pgfkeys{%
+tkzsavedcode/.cd,
+  prefix  = tkzFile}
+\pgfqkeys{/tkzsavedcode}{#1}
+\renewenvironment{tkzexample}[1][]{% 
+\killienc\VerbatimOut{\tkz@File@Saved@Name.tex}}{% 
+\endVerbatimOut}}
+ 
+% \renewenvironment{tkzexample}[1][]{% 
+%  \killienc  \VerbatimOut{tkzeuc-\tkzref.tex}% 
+%   }{% 
+% \endVerbatimOut
+% }   
+% \fi  
+\endinput                                       
 
-\makeatother
diff --git a/Master/texmf-dist/tex/latex/tkz-doc/tkz-doc.cls b/Master/texmf-dist/tex/latex/tkz-doc/tkz-doc.cls
index 5d5c81043ac..4ea831fb1f3 100644
--- a/Master/texmf-dist/tex/latex/tkz-doc/tkz-doc.cls
+++ b/Master/texmf-dist/tex/latex/tkz-doc/tkz-doc.cls
@@ -1,6 +1,7 @@
-% $Id: tkz-doc.cls  2009-02-22 12h22 alain matthes $
 % Copyright (C) 2009 Alain Matthes  
-%
+% encoding : utf8
+% engine   : pdflatex   
+%   H I G H L Y   E X P E R I M E N T A L
 % This file may be distributed and/or modified
 %
 % 1. under the LaTeX Project Public License , either version 1.3
@@ -25,20 +26,21 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 %% Objet :  Classe LaTeX  et Styles pour créer des documentations.
-%<----------------------------------------------------------------------------->
-%<---------------- Définitions relatives au package --------------------------->
+%<--------------------------------------------------------------------------->
+%<-------------- Définitions relatives au package --------------------------->
 \newcommand*{\PackageName}{tkz-doc}
-\newcommand*{\PackageVersion}{0.3 beta}
-\newcommand*{\filedate}{2009/02/20}
-%<------------------------ Identification Part -------------------------------->
+\newcommand*{\PackageVersion}{1.1 c}
+\newcommand*{\filedate}{2011/05/30}
+%<---------------------- Identification Part -------------------------------->
+%
+%<--------------------------------------------------------------------------->
 \NeedsTeXFormat{LaTeX2e}[1995/12/01]
 \ProvidesClass{\PackageName}%
-[\filedate\space Version:\space\PackageVersion\space tkz  documentation class]
-%
+[\filedate\space Version:\space\PackageVersion\space tkz documentation class]
 \DeclareOption*{\PassOptionsToClass{\CurrentOption}{scrartcl}}
 \ProcessOptions\relax
 \LoadClass[titlepage,oneside]{scrartcl}
-\PassOptionsToPackage{dvipsnames}{xcolor}
+\PassOptionsToPackage{usenames,dvipsnames,svgnames}{xcolor}
 \RequirePackage{etex}
 \RequirePackage[utf8]{inputenc}
 \RequirePackage{xkeyval}[2005/11/25] 
@@ -49,14 +51,16 @@
 \RequirePackage[scaled=0.85]{berasans}
 \RequirePackage[scaled=0.85]{beramono}
 \RequirePackage[bottom,stable,ragged]{footmisc}
-\RequirePackage[automark,nouppercase]{scrpage2}
+\RequirePackage[automark,nouppercase]{scrpage2} 
+
+
 \pagestyle{scrheadings} 
 \clearscrheadings
 \clearscrplain
 \ohead{\textcolor{Peach}{\pagemark}}
 \ihead{\textcolor{Peach}{\headmark}}
-\rofoot{\textcolor{Peach}{AlterMundus}} 
-\lofoot{\textcolor{Peach}{tkz-tab.sty}}
+\rofoot{\textcolor{Peach}{\namecollection}} 
+\lofoot{\textcolor{Peach}{\nameofpack}}
 \automark[subsection]{section}
 \setheadsepline{.4pt}[\color{Peach}]
 \setfootsepline{.4pt}[\color{Peach}]
@@ -68,7 +72,9 @@
 \deffootnote{1.5em}{1em}{\makebox[1.5em][l]{%
    \thefootnotemark}}
 \addtolength{\skip\footins}{\baselineskip}%
-%<--------------------–  En-tête et pied de page ------------------------------>
+%<------------------–  En-tête et pied de page ------------------------------>
+%
+%<--------------------------------------------------------------------------->
 \pagenumbering{arabic}
 \newcommand\SectionFontStyle{\sffamily}
 \setkomafont{sectioning}{\bfseries\SectionFontStyle}
@@ -78,14 +84,29 @@
 \setkomafont{descriptionlabel}{\itshape}
 \addtokomafont{sectioning}{\color{sectioncolor}}
 \renewcommand*{\raggedsection}{\raggedright}
-%<----------------------------------------------------------------------------->
+%<--------------------------------------------------------------------------->
+%
+%<--------------------------------------------------------------------------->
 \newcounter{cnt}\setcounter{cnt}{1}
 \setcounter{secnumdepth}{3}%
-\setcounter{tocdepth}{3}
-%<--------------------  Éxécution et chargement ------------------------------->
-% --------------------–Fin    Taille des fontes ------------------------------->
-\RequirePackage{makeidx}
-\makeindex
+\setcounter{tocdepth}{3} 
+
+\color{Maroon}
+\usepackage{titlesec}
+\titleformat{\section}[frame] 
+{\normalfont}
+{\filright\footnotesize\enspace SECTION \thesection\enspace} 
+{8pt} 
+{\Large\bfseries\filcenter}
+\titleformat{\subsection}[block] {\large\bfseries\filright}{\fbox{\thesubsection}}{2em}{}%
+%<------------------  Éxécution et chargement ------------------------------->
+%
+%<--------------------------------------------------------------------------->
+% ------------------–Fin    Taille des fontes ------------------------------->
+\RequirePackage{makeidx} 
+\@twocolumnfalse
+\makeindex 
+
 \RequirePackage{calc}
 \RequirePackage{tikz}
 % We need lots of libraries...
@@ -99,99 +120,104 @@
   shapes.misc,%
   shapes.symbols,%
   shapes.arrows,%
-  shapes.callouts,%
-  shapes.multipart,%
-  automata,%
   backgrounds,%
-  chains,%
   topaths,%
   trees,%
-  petri,%
   matrix,%
-  calendar,%
   folding,%
   fadings,%
   through,%
   positioning,%
   scopes,%
-  decorations.fractals,%
   decorations.shapes,%
   decorations.text,%
-  decorations.pathmorphing,%
   decorations.pathreplacing,%
-  decorations.footprints,%
+  decorations.pathmorphing,%
   decorations.markings,%
-  shadows}
-\usetikzlibrary{snakes}
+  shadows} 
+  
 \RequirePackage{multido}
 \RequirePackage{lscape}
 \RequirePackage{graphicx}
-\RequirePackage{amsmath, amssymb}
 \RequirePackage{array}
 \RequirePackage{multicol}
 \RequirePackage{multirow} 
 \RequirePackage{tabularx,ragged2e}
 \RequirePackage{booktabs}
 \RequirePackage[bottom,stable,ragged]{footmisc}
-\RequirePackage{tkzexample}
+
+
 \raggedbottom 
-\definecolor{sectioncolor}{RGB}{0, 0, 0}
+% colors
+\definecolor{fondpaille}{cmyk}{0,0,0.1,0}
+\definecolor{bistre}{rgb}{.75,.50,.30}
+\providecolor{bistre}{rgb}{.75,.50,.30}
+\colorlet{graphicbackground}{fondpaille}
+\colorlet{codebackground}{fondpaille!92!Maroon} 
+\colorlet{sectioncolor}{Maroon}
 \definecolor{textcolor}{RGB}{0, 0, 0}
-\definecolor{shadecolor}{gray}{0.90}
-\colorlet{pdflinkcolor}{Peach}
-\colorlet{pdfurlcolor}{Peach}
+\colorlet{titlecolorbox}{fondpaille!92!Maroon}  
+\colorlet{pdflinkcolor}{blue}
+\colorlet{pdfurlcolor}{blue}
 \colorlet{pdffilecolor}{Peach}
 \colorlet{stringcolor}{green!40!black!100}
 \colorlet{commencolor}{blue!0!black!100}
-\RequirePackage[pdftex,%
-                colorlinks=true,%
-                urlcolor=pdfurlcolor,%
-                filecolor=pdffilecolor,%
-                linkcolor=pdflinkcolor,%
-                breaklinks,%
-                linktocpage=true]{hyperref}
-\RequirePackage{url}
-\def\UrlFont{\small\ttfamily}
-%<----------------------------------------------------------------------------->
-\newcommand*{\Imacro}[1]{\index{#1_1@\texttt{\textbackslash#1}}}
-\newcommand*{\IEnv}[1]{\index{#1_1@\texttt{Environnement #1}}}
-\newcommand*{\Iarg}[2]{\index{#1_2@\texttt{\textbackslash#1: arguments}!\texttt{#2}}}
+
+\newbox\tkzbox 
+
+\def\nodeshadowedone(#1,#2)#3{% 
+\node[Mahogany,above,inner sep=0pt]{\global\setbox\tkzbox=\hbox{#3}\copy\tkzbox}; 
+\node[above,yscale=#2,inner sep=0pt,xslant=#1,Peach!60]{\box\tkzbox};
+}%  
+%<--------------------------- Indexation ------------------------------------>
+\newcommand*{\Ilib}[1]{\index{Library_1@\texttt{Library}!\texttt{#1}}}
+\newcommand*{\Ienv}[1]{\index{Environment_1@\texttt{Environment}!\texttt{#1}}}
+\newcommand*{\IargEnv}[2]{\index{#1_2@\texttt{#1: arguments}!\texttt{#2}}}
+\newcommand*{\IargNameEnv}[2]{\tkzname{#2}\index{#1_2@\texttt{#1: arguments}!\texttt{#2}}}
+\newcommand*{\IoptEnv}[2]{\index{#1_3@\texttt{#1: options}!\texttt{#2}}} 
+\newcommand*{\IoptNameEnv}[2]{\tkzname{#2}\index{#1_3@\texttt{#1: options}!\texttt{#2}}}
+\newcommand*{\Imacro}[1]{\index{#1_1@\texttt{\textbackslash#1}}}%n
+\newcommand*{\Iarg}[2]{%
+                \index{#1_2@\texttt{\textbackslash#1: arguments}!\texttt{#2}}}
 \newcommand*{\IargName}[2]{\tkzname{#2}\index{#1_2@\texttt{\textbackslash#1: arguments}!\texttt{#2}}}
-\newcommand*{\IoptName}[2]{\tkzname{#2}\index{#1_3@\texttt{\textbackslash#1: options}!\texttt{#2}}}
+\newcommand*{\IoptName}[2]{\tkzname{#2}\index{#1_3@\texttt{\textbackslash#1: options}!\texttt{#2}}}     
 \newcommand*{\Iopt}[2]{\index{#1_3@\texttt{\textbackslash#1: options}!\texttt{#2}}}
-\newcommand*{\Istyle}[2]{\index{#1_3@\texttt{\textbackslash#1: styles}!\texttt{#2}}}
+\newcommand*{\Istyle}[2]{\index{#1_3@\texttt{\textbackslash#1: styles}!\texttt{#2}}} 
+\newcommand*{\IstyleEnv}[2]{\index{#1_3@\texttt{#1: styles}!\texttt{#2}}} 
 \newcommand*{\Iaccent}[2]{\index{#1@\texttt{#2}}}
-\newcommand*{\addbs}[1]{\texttt{\textbackslash#1}}
-\newcommand*{\NameLib}[1]{\index{Ti\emph{k}Z Library !#1@\texttt{#1}}}
-\newcommand*{\NameSys}[1]{\index{Système d'exploitation !#1@\texttt{#1}}}
-\newcommand*{\NameDist}[1]{\index{Distributions TeX !#1@\texttt{#1}}}
-\newcommand*{\NameFonct}[1]{\index{Fonctions !#1@\texttt{#1}}} 
+\newcommand*{\NameLib}[1]{\tkzname{#1}\index{Ti\emph{k}Z Library !#1@\texttt{#1}}}
+\newcommand*{\NameSys}[1]{\index{Operating System  !#1@\texttt{#1}}}
+\newcommand*{\NameDist}[1]{\index{TeX Distributions  !#1@\texttt{#1}}}
+\newcommand*{\NameFonct}[1]{\index{Functions !#1@\texttt{#1}}} 
 \newcommand*{\NamePack}[1]{\index{Package !#1@\texttt{#1}}}  
-%<----------------------------------------------------------------------------->
-%<----------------------------------------------------------------------------->
 
-%<------------------------------------  Couverture ---------------------------->
-%<------------------------------------  Make Title ---------------------------->
-\renewcommand\maketitle{%
+\newcommand*{\TOenvline}[3]{\IoptNameEnv{\ActivBoxName}{#1}&\tkzdft{#2}&\ttfamily #3\\}
+\newcommand*{\TOline}[3]{\IoptName{\ActivBoxName}{#1}&\tkzdft{#2}&\ttfamily  #3\\}
+\newcommand*{\TAline}[3]{\IargName{\ActivBoxName}{#1}&\tkzdft{#2}&\ttfamily  #3\\}
+\newcommand*{\TMline}[3]{\tkzcname{#1}\index{#1_1@\texttt{\textbackslash#1}}&\tkzdft{#2}&\ttfamily  #3\\}
 
+\newcommand*{\tkzNamePack}[1]{\tkzname{#1}\NamePack{#1}}
+\newcommand*{\tkzNameMacro}[1]{\tkzcname{#1}\Imacro{#1}}
+\newcommand*{\tkzNameEnv}[1]{\tkzname{#1}\Ienv{#1}} 
+%<-------------------------------------------------------------------------->
+%<-------------------------------------------------------------------------->
+\newcommand*{\addbs}[1]{\texttt{\textbackslash#1}} 
+\newcommand*{\@CellCode}[1]{}
+\newcommand*{\thead}{\noalign{\iffalse}\fi\@thead}
+\newcommand*{\@thead}[1][\em\ttfamily]{\gdef\@CellCode{#1}\iffalse{\fi}}
+\newcommand*{\tbody}{\noalign{\gdef\@CellCode{}}}
+\newcolumntype{I}{>{\@CellCode}}   
+%<---------------------------------  Couverture ---------------------------->
+%<---------------------------------  Make Title ---------------------------->
+\renewcommand\maketitle{%
 \null
 \AddToShipoutPicture*{%
 \setlength\unitlength{1mm}
 \put(0,0){\makebox(0,0)[lb]{\color{Peach!10}\rule{\paperwidth}{\paperheight}}}
 \put(0,0){\makebox(0,0)[lb]{\color{Mahogany}\rule{40mm}{\paperheight}}}
-\put(22,200){\rotatebox{90}{% 
+\put(20,270){\rotatebox{90}{% 
 \makebox(0,0)[r]{\fontsize{60}{60}\color{orange!50!white}%
-\bfseries \selectfont{\@title\ \versionofpack}}}}%
-\put(2,230){%
-        \begin{tikzpicture}
-         \draw (0,0)  node[circle,
-                           shade,%
-                           ball color=orange!50!white,
-                           minimum size = 2 cm]{};
-         \draw[snake      = expanding waves,%
-               color      = orange!50!white,%
-               line width = 3pt](0,-1.2)--(0,-4);
-        \end{tikzpicture}}
+\bfseries \selectfont{\@title\ \versionofpack}\hfill}}}%
     \put(60,80){%
     \begin{pgfpicture} 
 \pgfmathdeclarerandomlist{color}{{Peach}{Orange}{Red}{Brown}} 
@@ -211,30 +237,37 @@
   \pgfusepath{}
 }%
 \end{pgfpicture}}
-\put(80,250){\makebox(0,0)[l]{%
-\skuggadtext{Mahogany}{Peach!30}{\fontsize{50}{60}\selectfont{AlterMundus}}}}%
+\put(60,250){\makebox(0,0)[l]{%
+\begin{tikzpicture}
+\nodeshadowedone(2,-1.25){\fontsize{60}{60}\selectfont{\namecollection}};
+\end{tikzpicture}
+}}%
 \put(130,40){\makebox(0,0)[l]{%
 \fontsize{17}{21}
 \textcolor{Mahogany}{\selectfont{\authorofpack}}}} 
-\put(130,30){\makebox(0,0)[l]{%
-\textcolor{Mahogany}{\url{http://altermundus.com}}}}}
-%<------------------------------- End   Couverture ---------------------------->
+\put(130,20){\makebox(0,0)[l]{%
+\textcolor{Mahogany}{\url{\urlauthor} \ \url{\urlauthorcom}}}}
+\put(130,30){\makebox(0,0)[l]{\textcolor{Mahogany}{\today}}}}
+%<----------------------------- End   Couverture ---------------------------->
 \setcounter{footnote}{0}%
 }
-%<------------------------------- def macro arg opt---------------------------->
-
+%<----------------------------- def macro arg opt---------------------------->
+ % some of the macros below are absolete
 \def\cmd#1{\cs{\expandafter\cmd@to@cs\string#1}}
 \def\cmd@to@cs#1#2{\char\number`#2\relax}
 \DeclareRobustCommand\cs[1]{\texttt{\char`\\#1}}
-\providecommand\marg[1]{{\ttfamily\char`\{}\meta{#1}{\ttfamily\char`\}}}
-\providecommand\oarg[1]{{\ttfamily[}\meta{#1}{\ttfamily]}}
-\providecommand\parg[1]{{\ttfamily(}\meta{#1}{\ttfamily)}}
-
-\newcommand\opt[1]{{\color{black!50!green}#1}}
+\providecommand\marg[1]{{\ttfamily\char`\{}\opt{\meta{#1}}{\ttfamily\char`\}}}
+\providecommand\oarg[1]{{\ttfamily[}\opt{\meta{#1}}{\ttfamily]}}
+\providecommand\parg[1]{{\ttfamily(}\opt{\meta{#1}}{\ttfamily)}}
+\newcommand\opt[1]{{\color{Maroon}#1}}
 \newcommand\ooarg[1]{{\ttfamily[}\meta{#1}{\ttfamily]}}  
+\newcommand*{\var}[1]{\{\opt{\meta{#1}}\}}
+\newcommand*{\varp}[1]{\big(\opt{\meta{#1}}\big)}
+\newcommand*{\vara}[1]{\{#1\}}
+
 
 \DeclareRobustCommand\meta[1]{%
-     \ensuremath\langle
+\ensuremath\langle
      \ifmmode \expandafter \nfss@text \fi
      {%
       \meta@font@select
@@ -242,17 +275,19 @@
         {\hyphenchar\the\font\the\hyphenchar\font}%
       \hyphenchar\font\m@ne
       \language\l@nohyphenation
-      #1\/%
+      \/#1\/%
       \meta@hyphen@restore
      }\ensuremath\rangle
 }
 \def\meta@font@select{\itshape}
 %
-%<----------------------------- NewMacroBox ----------------------------------->
-\colorlet{titlecolorbox}{Peach!50}
+%<-------------------------- NewMacroBox ----------------------------------->
 
+\newcommand*{\ActivBoxName}{}
 \newenvironment{NewMacroBox}[2]{%
-\def\FrameCommand{\color{black}
+\parindent=0pt
+\renewcommand*{\ActivBoxName}{#1}
+\def\FrameCommand{\color{Maroon}
 {\vrule width 1pt\hspace{3pt}}%
 }%
 \MakeFramed{\advance\hsize-\width}%
@@ -261,22 +296,20 @@
 \hspace{-4pt}%
 \setlength{\fboxrule}{1pt}%
 \setlength{\fboxsep}{3pt}%
-\fcolorbox{black}{titlecolorbox}{%
+\fcolorbox{Maroon}{titlecolorbox}{%
 \rule{6pt}{0pt}%
 \makebox[\width+6pt][l]{\tkzcname{#1#2}}%
 }%
 }\\*[.5\baselineskip]%
 \noindent
 % \ignorespaces\tkzcname{#1#3}
-\Imacro{#1}
-\color{black}}{%
+\Imacro{#1}%
+\color{Maroon}}{%
 \par\noindent%
-\makebox[0pt][l]{
-
+\makebox[0pt][l]{%
 \hspace{-6pt}%
 \rule{6pt}{1pt}%
 \rule{\textwidth}{1pt}%
-
 \hspace{-1pt}%
 \rule{1pt}{10pt}%
 }%
@@ -284,36 +317,39 @@
 \noindent
 \ignorespacesafterend
 \par\medskip
-}
-%<------------------------- end NewMacroBox ----------------------------------------->
+}%
+%<----------------- end NewMacroBox ----------------------------------------->
 %<----------------------------- NewEnvBox ----------------------------------->
-\colorlet{titlecolorbox}{Peach!50}
+\let\fram@d=\MakeFramed  \let\endfram@d=\endMakeFramed
 
 \newenvironment{NewEnvBox}[1]{%
-\gdef\tkzEnvMacro{#1}
-\def\FrameCommand{\color{black}
+\parindent=0pt
+\renewcommand*{\ActivBoxName}{#1}
+%\gdef\tkzEnvMacro{#1}
+\def\FrameCommand{\color{Maroon}
 {\vrule width 1pt\hspace{3pt}}%
 }%
 \MakeFramed{\advance\hsize-\width}%
 \noindent
 \makebox[0pt][l]{%
+
 \hspace{-4pt}%
 \setlength{\fboxrule}{1pt}%
 \setlength{\fboxsep}{3pt}%
-\fcolorbox{black}{titlecolorbox}{%
+\fcolorbox{Maroon}{titlecolorbox}{%
 \rule{6pt}{0pt}%
 \makebox[\width+6pt][l]{%
- \tkzcname{\textcolor{black}{begin}\{\tkzEnvMacro\}}{\oarg{options}}%
+ \tkzcname{\textcolor{Maroon}{begin}\{\ActivBoxName\}}{\oarg{options}}%
  \hspace*{.25cm}\meta{environment contents}\hspace*{.25cm}%
- \tkzcname{\textcolor{black}{end}\{\tkzEnvMacro\}}}%
+ \tkzcname{\textcolor{Maroon}{end}\{\ActivBoxName\}}}%
 }%
 }\\*[.5\baselineskip]%
 \noindent
 % \ignorespaces\tkzcname{#1#3}
-\IEnv{#1}
-\color{black}}{%
+\Ienv{#1}
+\color{Maroon}}{%
 \par\noindent%
-\makebox[0pt][l]{
+\makebox[0pt][l]{%
 
 \hspace{-6pt}%
 \rule{6pt}{1pt}%
@@ -327,7 +363,7 @@
 \ignorespacesafterend
 \par\medskip
 }
-%<------------------------- end NewEnvBox ----------------------------------------->
+%<------------------- end NewEnvBox ----------------------------------------->
 \def\nameoffile#1{\gdef\@nameoffile{#1}}
 \def\@nameoffile{\@latex@warning@no@line{No \noexpand\nameoffile given}}
 \long\def\defoffile#1{
@@ -340,7 +376,7 @@
 }
 \let\@defoffile\@empty
 
-\newcommand*{\red}{\color{BrickRed}}
+\newcommand*{\red}{\color{red}}
 \newcommand*{\blue}{\color{BlueViolet}}
 \newcommand*{\BS}{\texttt{\char92}}
 \newcommand*{\tkz}{Ti{\em k}Z}
@@ -353,68 +389,92 @@
 \newcommand*{\pgfname}{\textsc{pgf}}
 \newcommand*{\tikzname}{Ti\emph{k}Z}
 \newcommand*{\pstricks}{\textsc{pstricks}}
-\newcommand*{\var}[1]{\{\meta{#1}\}}
-\newcommand*{\varp}[1]{(\meta{#1})}
-\newcommand*{\vara}[1]{\{#1\}}
+
+\newcommand*{\tkzdft}[1]{{\texttt{#1}}}
 \providecommand\LaTeX{%
   L\kern-.36em\raise.3ex\hbox{\sc a}\kern-.15em\TeX}
 \providecommand\LATEX{\LaTeX}  
 \renewcommand\TeX{T\kern-.1667em\lower.5ex\hbox{E}\kern-.125emX%
   \spacefactor1000 }
-%<----------------------------- presentation ---------------------------------->
-\providecommand\href[2]{\texttt{#1}}
+  \providecommand\TEX{\TeX} 
+  \newcommand*{\tkzAttention}[3]{\ \\\llap{\textcolor{#3}{#1\hskip #2}}} 
+\newcommand*{\tkzHand}{\ \\\llap{\textcolor{red}{\lefthand\hskip1em}}}
+\newcommand*{\tkzHandBomb}{\ \\\llap{\textcolor{red}{\lefthand\ \bomb\hskip1em}}}
+\newcommand*{\tkzBomb}{\ \\\llap{\textcolor{red}{\bomb\hskip1em}}}
+\newcommand*{\tkzTwoBomb}{\ \\\llap{\textcolor{red}{\bomb\ \bomb\hskip1em}}}
+
+\newcommand*{\tkzname}[1]{\textbf{\texttt{\textcolor{Maroon}{#1}}}}
+\newcommand*{\tkzimp}[1]{\textbf{#1}}
+\newcommand*{\tkzcname}[1]{\Imacro{#1}\textbf{\texttt{\textcolor{Maroon}{\textbackslash#1}}}}  
+\newcommand*{\tkzhname}[1]{\textbf{\texttt{\textcolor{Maroon}{\textbackslash#1}}}}   
+%<--------------------------- presentation ---------------------------------->
+% \providecommand\href[2]{\texttt{#1}}
 
 \newcommand\presentation{%
   \thispagestyle{empty}%
-  \noindent
-  \begin{tikzpicture}
-     \draw (0,0)  node[circle,
-                       shade,
-                       ball color=Peach,minimum size=2cm]{};
-     \draw[snake      = expanding waves,%
-           color      = Peach,%
-           line width = 3pt](1.2,0)--(4,0);
-    \end{tikzpicture}\par\vspace{1 cm}
+ \par\vspace*{3 cm}
+     \begin{center}
+     	{\Huge \@nameoffile}
+     \end{center}   
+    \par\vspace*{3 cm}
     \noindent
-  \newlength{\@lx}\settowidth{\@lx}{\huge AlterMundus}%
+  \newlength{\@lx}\settowidth{\@lx}{\huge \namecollection}%
   \advance\@lx3em\quad
-  \href{http://www.altermundus.com/}{%
-    \rotatebox{90}{\hspace*{1.5em}{\huge AlterMundus}}}
+  \href{\urlauthor}{%
+    \rotatebox{90}{\hspace*{1.5em}{\huge \namecollection}}}
   \textcolor{Mahogany}{\rule{2pt}{\@lx}}\quad%
   \begin{minipage}[b]{.90\textwidth}
     {%
     \noindent\hfill
      \raggedleft\Large
-     \href{mailto:al.ma@mac.com}{\textcolor{blue}{Alain Matthes}}\par
-     \@nameoffile\medskip\par%
+     \href{mailto:al.ma@mac.com}{\textcolor{blue}{\authorofpack}}\par
      }%
      \emph{\@defoffile}\par
-    [\nameofdoc\ \dateofdoc]\par\medskip
+    %[\nameofdoc\ \dateofdoc]\par\medskip
   \end{minipage}
 }
-%<------------------------ end  presentation ---------------------------------->
-
-\newcommand*{\tkzname}[1]{\texttt{#1}}
-\newcommand*{\tkzimp}[1]{\textbf{#1}}
-\newcommand*{\tkzcname}[1]{\texttt{\textbackslash#1}}   
-
+%<---------------------- end  presentation ---------------------------------->
 
-\definecolor{skugga}{gray}{0.7} 
-\newlength{\skuggsep} 
-\setlength{\skuggsep}{3pt} 
-\newcommand{\skuggadtext}[3]{% 
-\makebox[0pt][l]{% 
-\rule{\skuggsep}{0pt}% 
-\raisebox{-\skuggsep}{\textcolor{#2}{#3}}% 
-}% 
-\textcolor{#1}{#3}% 
+\renewcommand*{\idx@heading}{%
+ \idx@@heading{\indexname}%
+ % \@mkboth{\indexname}{\indexname}%
 }
+\renewenvironment{theindex}{%
+    \@restonecoltrue
+  \columnseprule \z@
+  \columnsep 35\p@
+  \idx@heading%
+  \index@preamble\par\nobreak
+  \thispagestyle{\indexpagestyle}\parindent\z@
+  \setlength{\parskip}{\z@ \@plus .3\p@}%
+  \setlength{\parfillskip}{\z@ \@plus 1fil}%
+  \let\item\@idxitem
+}{%
+  \if@restonecol\onecolumn\else\clearpage\fi
+} 
+  
+\def\tkz@background@color{white}
+\def\tkz@text@color{black} 
+\global\edef\tkz@suc@bkc{\tkz@background@color}
+\global\edef\tkz@suc@txt{\tkz@text@color}
+\pgfkeys{/tkzsetupcolor/.cd,
+          background/.code    = {\global\edef\tkz@suc@bkc{#1}},
+          text/.code          = {\global\edef\tkz@suc@txt{#1}}}
+          
+\def\tkzSetUpColors{\pgfutil@ifnextchar[{\tkz@SetUpColors}{%
+                                         \tkz@SetUpColors[]}} 
+\def\tkz@SetUpColors[#1]{%
+\begingroup
+\pgfkeys{tkzsetupcolor/.cd,
+         background  = \tkz@background@color,
+         text        = \tkz@text@color}
+\pgfqkeys{/tkzsetupcolor}{#1}      
+\pagecolor{\tkz@suc@bkc}
+\color{\tkz@suc@txt}} 
 
-%<----------------------------------------------------------------------------->
+%<--------------------------------------------------------------------------->
 \endinput
-%<----------------------------------------------------------------------------->
-% utf8
-% pdflatex
+%<--------------------------------------------------------------------------->
 
     %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
     %                                                               %