tikzsymbols (2oct15)

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

1 files changed, 258 insertions, 360 deletions

diff --git a/Master/texmf-dist/tex/latex/tikzsymbols/tikzsymbols.sty b/Master/texmf-dist/tex/latex/tikzsymbols/tikzsymbols.sty
index 5b78c4deae1..d9001cd3adf 100644
--- a/Master/texmf-dist/tex/latex/tikzsymbols/tikzsymbols.sty
+++ b/Master/texmf-dist/tex/latex/tikzsymbols/tikzsymbols.sty
@@ -23,16 +23,14 @@
 %% 
 %% This work consists of the files README, tikzsymbols.dtx and tikzsymbols.ins
 %% and the derived file tikzsymbols.sty.
-%% \CheckSum{0}
 \NeedsTeXFormat{LaTeX2e}[2011/06/27]
 \ProvidesPackage{tikzsymbols}
-[2014/10/31 v3.0f Some symbols created using tikz.]
+[2015/10/01 v3.0g Some symbols created using tikz.]
 \@ifpackageloaded{tikz}{}{\RequirePackage{tikz}}
 \@ifpackageloaded{xargs}{}{\RequirePackage{xargs}}
 \@ifpackageloaded{xcolor}{}{\RequirePackage{xcolor}}
 \@ifpackageloaded{xkeyval}{}{\RequirePackage{xkeyval}}
 \@ifpackageloaded{xspace}{}{\RequirePackage{xspace}}
-\@ifpackageloaded{calc}{}{\RequirePackage{calc}}
  \usetikzlibrary{arrows,decorations.pathmorphing,trees}
 \newif\if@tkzssmbls@neg
 \newif\iftikzymbols@draftabsolute
@@ -79,14 +77,14 @@
 }
 \ProcessOptionsX*<tikzsymbols>\relax
  \newcommand*{\tikzsymbolsaftersymbolinput}{\xspace}
- \newcommand*{\@leaf@is@leaf}{leaf}
+ \newcommand*{\tikzsymbols@leaf@is@leaf}{leaf}
 \newlength{\tkzsymbls@scl}
-\newcommand*{\set@tkzsymblsscl}[1]{\setlength{\tkzsymbls@scl}{#1pt}}
+\newcommand*{\set@tkzsymblsscl}[1]{\pgfmathsetlength{\tkzsymbls@scl}{#1pt}}
 \newlength{\tikzsymbols@draftboxlength}
 \newlength{\tikzsymbols@draftboxheight}
 \newcommand*{\tikzsymbols@draftbox}[2]{%
-  \setlength{\tikzsymbols@draftboxlength}{#1}%
-  \setlength{\tikzsymbols@draftboxheight}{#2}%
+  \pgfmathsetlength{\tikzsymbols@draftboxlength}{#1}%
+  \pgfmathsetlength{\tikzsymbols@draftboxheight}{#2}%
   \frame{%
     {\vbadness=\maxdimen%
     \frame{\vbox to \tikzsymbols@draftboxheight{%
@@ -166,18 +164,18 @@
     \pgfmathsetmacro\tikzsymbols@Tree@absolute@scale{#1+0.02ex}%
     \edef\tkzsymbls@Prmtr{\ifdim\tkzsymbls@scl<0pt-\fi\tikzsymbols@Tree@absolute@scale}%
     \ifdim\tkzsymbls@scl<0pt \set@tkzsymblsscl{-#1}\fi%
-    \def\leaf@or@not@leaf{#5}%
+    \def\tikzsymbols@leaf@or@not@leaf{#5}%
     \iftikzymbols@draftabsolute%
-      \ifx\leaf@or@not@leaf\@leaf@is@leaf%
-        \tikzsymbols@draftbox{(1.6772ex+0.4pt)*\real{\tkzsymbls@Prmtr}}
-        {(1.42ex-0.2pt+0.4pt)*\real{\tkzsymbls@Prmtr}}%
+      \ifx\tikzsymbols@leaf@or@not@leaf\tikzsymbols@leaf@is@leaf%
+        \tikzsymbols@draftbox{(1.6772ex+0.4pt)*\tkzsymbls@Prmtr}
+        {(1.42ex-0.2pt+0.4pt)*\tkzsymbls@Prmtr}%
       \else
-        \tikzsymbols@draftbox{(1.3996ex+0.4pt)*\real{\tkzsymbls@Prmtr}}
-        {(1.28ex-0.2pt+0.4pt)*\real{\tkzsymbls@Prmtr}}%
+        \tikzsymbols@draftbox{(1.3996ex+0.4pt)*\tkzsymbls@Prmtr}
+        {(1.28ex-0.2pt+0.4pt)*\tkzsymbls@Prmtr}%
       \fi
     \else%
       \begin{tikzpicture}[scale=#1+0.02ex,x=1ex,y=1ex, line width=0.4pt*\tkzsymbls@scl]
-        \ifx\leaf@or@not@leaf\@leaf@is@leaf%
+        \ifx\tikzsymbols@leaf@or@not@leaf\tikzsymbols@leaf@is@leaf%
           \draw[#2] (-0.8386,0+0.2pt) -- (-0.8386,1.42);
           \draw[#3] (-0.8386,1.42) -- (0.8386,1.42);
           \draw[#4] (0.8386,1.42) -- (0.8386,0+0.2pt);
@@ -197,7 +195,7 @@
   \else%
     \set@tkzsymblsscl{#1}%
     \ifdim\tkzsymbls@scl<0pt \set@tkzsymblsscl{-#1}\@tkzssmbls@negtrue\fi%
-    \def\leaf@or@not@leaf{#5}%
+    \def\tikzsymbols@leaf@or@not@leaf{#5}%
     \@Tree@SetUp%
     \colorlet{trunk}{#2}%
     \colorlet{leaf a}{#3}%
@@ -211,12 +209,12 @@
         \pgfpatharc{-30}{-150}{0.08ex}%
         \pgfusepathqfill%
       }%
-      \ifx\leaf@or@not@leaf\@leaf@is@leaf%
-      \draw[opacity=0,scale=#1+0.02ex, line width=0.4pt*\tkzsymbls@scl]
+      \ifx\tikzsymbols@leaf@or@not@leaf\tikzsymbols@leaf@is@leaf%
+      \draw[transparent,scale=#1+0.02ex, line width=0.4pt*\tkzsymbls@scl]
       (-0.8386,0+0.2pt) rectangle
       (0.8386, 1.42);
       \else %
-      \draw[opacity=0,scale=#1+0.02ex, line width=0.4pt*\tkzsymbls@scl]
+      \draw[transparent,scale=#1+0.02ex, line width=0.4pt*\tkzsymbls@scl]
       (-0.6998,0+0.2pt) rectangle (0.6998,0.68+0.6);
       \fi
       \pgflowlevel{\pgftransformscale{#1+0.02ex}}{%
@@ -235,25 +233,25 @@
 \set@tkzsymblsscl{#1}%
 \iftikzymbols@draftabsolute%
 \tksymbls@bx@Prmtrstore{#1}%
-\tikzsymbols@draftbox{2.47ex*\real{\tkzsymbls@Prmtr}}{1.577ex*\real{\tkzsymbls@Prmtr}}%
+\tikzsymbols@draftbox{2.47ex*\tkzsymbls@Prmtr}{1.577ex*\tkzsymbls@Prmtr}%
 \else%
 \ifdim\tkzsymbls@scl<0pt\set@tkzsymblsscl{-#1}\fi%
 \begin{tikzpicture}[x=2ex,y=2.2ex, line width=0.07ex*\tkzsymbls@scl,scale=#1]
-\draw[rounded corners=0.2ex*\tkzsymbls@scl] (0,0.5) -- (0,0) -- (1,0) -- (1,0.5);
-\draw(0,0.4) arc (90:270:0.1);
-\draw(1,0.4) arc (90:-90:0.1);
-\draw (0,0.5) -- (1,0.5) .. controls (1,0.6) and (0,0.6) .. (0,0.5);
-\draw (0.6,0.585) arc (0:180:0.1);
-\draw[decorate,
-decoration={snake,amplitude=.12ex*\tkzsymbls@scl,segment length=0.93ex*\tkzsymbls@scl}]
-(0,0.35) -- (1,0.35);
-\draw (0.1,0.25) circle (0.04);
-\draw (0.3,0.2) circle (0.04);
-\draw (0.13, 0.125) circle (0.04);
-\draw (0.6,0.25) circle (0.04);
-\draw (0.45,0.1) circle (0.04);
-\draw (0.88,0.2) circle (0.04);
-\draw (0.7,0.11) circle (0.04);
+  \draw[rounded corners=0.2ex*\tkzsymbls@scl] (0,0.5) -- (0,0) -- (1,0) -- (1,0.5);
+  \draw (0,0.4) arc (90:270:0.1);
+  \draw (1,0.4) arc (90:-90:0.1);
+  \draw (0,0.5) -- (1,0.5) .. controls (1,0.6) and (0,0.6) .. (0,0.5);
+  \draw (0.6,0.585) arc (0:180:0.1);
+  \draw[decorate,
+    decoration={snake,amplitude=.12ex*\tkzsymbls@scl,segment length=0.93ex*\tkzsymbls@scl}]
+    (0,0.35) -- (1,0.35);
+  \draw (0.45,0.1) circle (0.04);
+  \draw (0.7,0.11) circle (0.04);
+  \draw (0.13, 0.125) circle (0.04);
+  \draw (0.3,0.2) circle (0.04);
+  \draw (0.88,0.2) circle (0.04);
+  \draw (0.1,0.25) circle (0.04);
+  \draw (0.6,0.25) circle (0.04);
 \end{tikzpicture}%
 \fi%
 }%
@@ -262,31 +260,26 @@ decoration={snake,amplitude=.12ex*\tkzsymbls@scl,segment length=0.93ex*\tkzsymbl
 }
 \tikzsymbols@let{pot}{Kochtopf}
 \tkzsymbls@Declare@Robust@Command{Bratpfanne}[1][1]{%
-\tikzsymbols@ifsaveboxundefined{Bratpfanne#1}{%
-\set@tkzsymblsscl{#1}%
-\iftikzymbols@draftabsolute%
-\tksymbls@bx@Prmtrstore{#1}%
-\tikzsymbols@draftbox{3.5535ex*\real{\tkzsymbls@Prmtr}}{1.4525ex*\real{\tkzsymbls@Prmtr}}%
-\else%
-\ifdim\tkzsymbls@scl<0pt\set@tkzsymblsscl{-#1}\fi%
-\begin{tikzpicture}[x=0.7ex,y=1.4ex, line width=0.07ex*\tkzsymbls@scl, scale=#1,
-decoration={snake,amplitude=.05ex*\tkzsymbls@scl,segment length=0.408ex*\tkzsymbls@scl}]
-\draw[rounded corners=0.07ex*\tkzsymbls@scl]
-(-1,0) -- (1,0) -- (1.5,0.4) -- (-1.5,0.4) -- cycle;
-\draw[ line width=0.037ex*\tkzsymbls@scl, rounded corners=0.023ex*\tkzsymbls@scl]
-(-1.4,0.3) -- (-3.5,0.3) -- (-3.5,0.25) -- (-1.3,0.25);
-\draw[line width=0.023ex*\tkzsymbls@scl] (-1.1,0.1) -- (1.1,0.1);
-\draw[line width=0.035ex*\tkzsymbls@scl, decorate]
-(-0.3,0.5) -- (-0.3,1);
-\draw[line width=0.035ex*\tkzsymbls@scl, decorate]
-   (0.3,0.5) -- (0.3,1);
-\draw[line width=0.035ex*\tkzsymbls@scl, decorate]
-(-1,0.5) -- (-1,1);
-\draw[line width=0.035ex*\tkzsymbls@scl, decorate]
-   (1,0.5) -- (1,1);
-\end{tikzpicture}%
-\fi%
-}%
+  \tikzsymbols@ifsaveboxundefined{Bratpfanne#1}{%
+    \set@tkzsymblsscl{#1}%
+    \iftikzymbols@draftabsolute%
+      \tksymbls@bx@Prmtrstore{#1}%
+      \tikzsymbols@draftbox{3.5535ex*\tkzsymbls@Prmtr}{1.4525ex*\tkzsymbls@Prmtr}%
+    \else%
+      \ifdim\tkzsymbls@scl<0pt\set@tkzsymblsscl{-#1}\fi%
+      \begin{tikzpicture}[x=0.7ex,y=1.4ex, line width=0.07ex*\tkzsymbls@scl, scale=#1,
+        decoration={snake,amplitude=.05ex*\tkzsymbls@scl,
+        segment length=0.408ex*\tkzsymbls@scl}]
+      \draw[rounded corners=0.07ex*\tkzsymbls@scl]
+      (-1,0) -- (1,0) -- (1.5,0.4) -- (-1.5,0.4) -- cycle;
+      \draw[line width=0.037ex*\tkzsymbls@scl, rounded corners=0.023ex*\tkzsymbls@scl]
+      (-1.4,0.3) -- (-3.5,0.3) -- (-3.5,0.25) -- (-1.3,0.25);
+      \draw[line width=0.023ex*\tkzsymbls@scl] (-1.1,0.1) -- (1.1,0.1);
+      \foreach \tikzsymbols@x in { -0.3, 0.3, -1 , 1 }
+        \draw[line width=0.035ex*\tkzsymbls@scl, decorate] (\tikzsymbols@x,0.5) -- (\tikzsymbols@x,1);
+      \end{tikzpicture}%
+    \fi%
+  }%
 \tikzsymbols@use@box{Bratpfanne#1}%
 \tikzsymbolsaftersymbolinput%
 }
@@ -296,20 +289,13 @@ decoration={snake,amplitude=.05ex*\tkzsymbls@scl,segment length=0.408ex*\tkzsymb
 \set@tkzsymblsscl{#1}%
 \iftikzymbols@draftabsolute%
 \tksymbls@bx@Prmtrstore{#1}%
-\tikzsymbols@draftbox{0.5697ex*\real{\tkzsymbls@Prmtr}}{1.57985ex*\real{\tkzsymbls@Prmtr}}%
+\tikzsymbols@draftbox{0.5697ex*\tkzsymbls@Prmtr}{1.57985ex*\tkzsymbls@Prmtr}%
 \else%
 \ifdim\tkzsymbls@scl<0pt\set@tkzsymblsscl{-#1}\fi%
 \begin{tikzpicture}[y=2.1ex,x=1.4ex, scale=#1,
-   line width=0.01ex*\tkzsymbls@scl*\real{0.97}]
-\draw (0,0) .. controls (0.2,0.0) and  (0.2,0.2) ..  (0,0.4);
-\draw (0,0) .. controls (-0.2,0.0) and  (-0.2,0.2) ..  (0,0.4);
-\draw  (0,0) .. controls (-0.1,0.0) and  (-0.1,0.2) ..  (0,0.4);
-\draw (0,0) .. controls (0.1,0.0) and  (0.1,0.2) ..  (0,0.4);
-\draw (0,0) .. controls (-0.15,0.0) and  (-0.15,0.2) ..  (0,0.4);
-\draw (0,0) .. controls (0.15,0.0) and  (0.15,0.2) ..  (0,0.4);
-\draw (0,0) .. controls (-0.05,0.0) and  (-0.05,0.2) ..  (0,0.4);
-\draw  (0,0) .. controls (0.05,0.0) and  (0.05,0.2) ..  (0,0.4);
-\draw (0,0) --(0,0.4);
+   line width=0.01ex*\tkzsymbls@scl*0.97]
+  \foreach \x in { -0.2 , -0.15, -0.1, -0.05, 0, 0.05, 0.1, 0.15, 0.2 }
+    \draw  (0,0) .. controls (\x,0.0) and  (\x,0.2) ..  (0,0.4);
 \fill[line width=0.05ex*\tkzsymbls@scl, rounded corners=0.07ex*\tkzsymbls@scl]
    (-0.05,0.37) -- (0.05,0.37) -- (0.05,0.75) -- (-0.05,0.75) -- cycle;
 \end{tikzpicture}%
@@ -324,54 +310,30 @@ decoration={snake,amplitude=.05ex*\tkzsymbls@scl,segment length=0.408ex*\tkzsymb
 \set@tkzsymblsscl{#1}%
 \iftikzymbols@draftabsolute%
 \tksymbls@bx@Prmtrstore{#1}%
-\tikzsymbols@draftbox{3.478ex*\real{\tkzsymbls@Prmtr}}{1.175ex*\real{\tkzsymbls@Prmtr}}%
+\tikzsymbols@draftbox{3.478ex*\tkzsymbls@Prmtr}{1.175ex*\tkzsymbls@Prmtr}%
 \else%
 \ifdim\tkzsymbls@scl<0pt\set@tkzsymblsscl{-#1}\fi%
 \begin{tikzpicture}[x=2.8ex, y=2.8ex,line width=0.02ex*\tkzsymbls@scl ,scale=#1]
 \draw[line width=0.09ex*\tkzsymbls@scl] (-0.2,0) -- (1.01,0);
-\draw (0.2,0) arc (180:360:0.4);
-\draw(0.25,0) arc (180:360:0.35);
-\draw (0.3,0) arc (180:360:0.3);
-\draw (0.35,0) arc (180:360:0.25);
-\draw (0.4,0) arc (180:360:0.2);
-\draw (0.45,0) arc (180:360:0.15);
-\draw (0.5,0) arc (180:360:0.1);
-\draw (0.55,0) arc (180:360:0.05);
-\draw (.95,0) -- (0.95,-0.194);
-\draw (.9,0) -- (0.9,-0.265);
-\draw (.85,0) -- (0.85,-0.313);
-\draw (.8,0) -- (0.8,-0.345);
-\draw (.75,0) -- (0.75,-0.37);
-\draw (.7,0) -- (0.7,-0.39);
-\draw (.65,0) -- (0.65,-0.4);
-\draw (.6,0) -- (0.6,-0.4);
-\draw (.55,0) -- (0.55,-0.4);
-\draw (.5,0) -- (0.5,-0.39);
-\draw (.45,0) -- (0.45,-0.37);
-\draw (.4,0) -- (0.4,-0.348);
-\draw (.35,0) -- (0.35,-0.314);
-\draw (.3,0) -- (0.3,-0.265);
-\draw (.25,0) -- (0.25,-0.194);
-\draw (0.2,-0.05) -- (1,-0.05);
-\draw (0.21,-0.1) -- (0.99,-0.1);
-\draw (0.23,-0.15) -- (0.97,-0.15);
-\draw (0.255,-0.2) -- (0.945,-0.2);
-\draw (0.289,-0.25) -- (0.911,-0.25);
-\draw (0.335,-0.3) -- (0.865,-0.3);
-\draw (0.406,-0.35) -- (0.794,-0.35);
+\foreach \pos in { 0.2,0.25,...,0.551 }
+  \draw (\pos,0) arc [start angle=180, end angle=360, radius=0.6-\pos];
+\foreach \x in  { 0.95,0.9,...,0.249 }
+  \draw (\x,0) -- (\x,{ -0.4*sin(acos(( \x - 0.6 ) /0.4))});
+\foreach \y in  { -0.05,-0.1,...,-0.351 }
+  \pgfmathsetmacro{\x}{0.4*cos( asin( \y /0.4 ) )}
+  \draw ({0.6 - \x },\y) --  ({ 0.6 +\x},\y);
 \end{tikzpicture}%
 \fi%
 }%
 \tikzsymbols@use@box{Sieb#1}%
 \tikzsymbolsaftersymbolinput%
-}
-\tikzsymbols@let{sieve}{Sieb}
+}\tikzsymbols@let{sieve}{Sieb}
 \tkzsymbls@Declare@Robust@Command{Purierstab}[1][1]{%
 \tikzsymbols@ifsaveboxundefined{Purierstab#1}{%
 \set@tkzsymblsscl{#1}%
 \iftikzymbols@draftabsolute%
 \tksymbls@bx@Prmtrstore{#1}%
-\tikzsymbols@draftbox{0.76ex*\real{\tkzsymbls@Prmtr}}{1.575ex*\real{\tkzsymbls@Prmtr}}%
+\tikzsymbols@draftbox{0.76ex*\tkzsymbls@Prmtr}{1.575ex*\tkzsymbls@Prmtr}%
 \else%
 \ifdim\tkzsymbls@scl<0pt\set@tkzsymblsscl{-#1}\fi%
 \begin{tikzpicture}[x=2.3ex, y=2.2ex, line width=0.07ex*\tkzsymbls@scl,scale=#1]
@@ -391,7 +353,7 @@ decoration={snake,amplitude=.05ex*\tkzsymbls@scl,segment length=0.408ex*\tkzsymb
 \set@tkzsymblsscl{#1}%
 \iftikzymbols@draftabsolute%
 \tksymbls@bx@Prmtrstore{#1}%
-\tikzsymbols@draftbox{0.265ex*\real{\tkzsymbls@Prmtr}}{1.575ex*\real{\tkzsymbls@Prmtr}}%
+\tikzsymbols@draftbox{0.265ex*\tkzsymbls@Prmtr}{1.575ex*\tkzsymbls@Prmtr}%
 \else%
 \ifdim\tkzsymbls@scl<0pt\set@tkzsymblsscl{-#1}\fi%
 \begin{tikzpicture}[x=2.3ex, y=2.2ex, line width=0.035ex*\tkzsymbls@scl,scale=#1]
@@ -412,19 +374,17 @@ decoration={snake,amplitude=.05ex*\tkzsymbls@scl,segment length=0.408ex*\tkzsymb
 \set@tkzsymblsscl{#1}%
 \iftikzymbols@draftabsolute%
 \tksymbls@bx@Prmtrstore{#1}%
-\tikzsymbols@draftbox{2.3155ex*\real{\tkzsymbls@Prmtr}}{1.57ex*\real{\tkzsymbls@Prmtr}}%
+\tikzsymbols@draftbox{2.3155ex*\tkzsymbls@Prmtr}{1.57ex*\tkzsymbls@Prmtr}%
 \else%
 \ifdim\tkzsymbls@scl<0pt\set@tkzsymblsscl{-#1}\fi%
 \begin{tikzpicture}[x=6.53ex,y=5ex, line width=0.07ex*\tkzsymbls@scl,scale=#1]
 \filldraw[rounded corners=0.09ex*\tkzsymbls@scl] (0,0) rectangle (0.3,0.3);
-\draw[rounded corners=0.07ex*\tkzsymbls@scl, line width=0.03ex*\tkzsymbls@scl]
-   (0.1,0) -- (-0.025,0) -- (-0.025,0.3) -- (0.1,0.3);
-\draw[rounded corners=0.07ex*\tkzsymbls@scl, line width=0.03ex*\tkzsymbls@scl]
-   (0.2,0) -- (.325,0) -- (.325,0.3) -- (0.2,0.3);
+\foreach \xI/\xII in { 0.1/-0.025 , 0.2/0.325 }
+  \draw[rounded corners=0.07ex*\tkzsymbls@scl, line width=0.03ex*\tkzsymbls@scl]
+     (\xI,0) -- (\xII,0) -- (\xII,0.3) -- (\xI,0.3);
 \foreach \@BackblechlochX in {0.007,0.293}
-\foreach \@BackblechlochY in {0.007,0.293}
-\fill[white] (\@BackblechlochX,
-\@BackblechlochY) circle (0.02ex);
+  \foreach \@BackblechlochY in {0.007,0.293}
+    \fill[white] (\@BackblechlochX, \@BackblechlochY) circle (0.02ex);
 \end{tikzpicture}%
 \fi%
 }%
@@ -437,14 +397,14 @@ decoration={snake,amplitude=.05ex*\tkzsymbls@scl,segment length=0.408ex*\tkzsymb
 \set@tkzsymblsscl{#1}%
 \iftikzymbols@draftabsolute%
 \tksymbls@bx@Prmtrstore{#1}%
-\tikzsymbols@draftbox{2.07ex*\real{\tkzsymbls@Prmtr}}{1.57ex*\real{\tkzsymbls@Prmtr}}%
+\tikzsymbols@draftbox{2.07ex*\tkzsymbls@Prmtr}{1.57ex*\tkzsymbls@Prmtr}%
 \else%
 \ifdim\tkzsymbls@scl<0pt\set@tkzsymblsscl{-#1}\fi%
 \begin{tikzpicture}[x=0.50ex,y=0.5ex, line width=0.07ex*\tkzsymbls@scl,scale=#1]
 \draw (0,0) rectangle (4,3);
 \draw (0.25,0.25) rectangle (3.75,2);
 \foreach \@Ofenschalter in {0.5,1.1,2.9,3.5}
-\fill (\@Ofenschalter,2.5) circle (0.22);
+  \fill (\@Ofenschalter,2.5) circle (0.22);
 \draw (1.5,2.28) rectangle  (2.5,2.72);
 \draw[line width=0.05ex*\tkzsymbls@scl] (1,1.75) -- (3,1.75);
 \end{tikzpicture}%
@@ -459,7 +419,7 @@ decoration={snake,amplitude=.05ex*\tkzsymbls@scl,segment length=0.408ex*\tkzsymb
 \set@tkzsymblsscl{#1}%
 \iftikzymbols@draftabsolute%
 \tksymbls@bx@Prmtrstore{#1}%
-\tikzsymbols@draftbox{3.034ex*\real{\tkzsymbls@Prmtr}}{0.78ex*\real{\tkzsymbls@Prmtr}}%
+\tikzsymbols@draftbox{3.034ex*\tkzsymbls@Prmtr}{0.78ex*\tkzsymbls@Prmtr}%
 \else%
 \ifdim\tkzsymbls@scl<0pt\set@tkzsymblsscl{-#1}\fi%
 \begin{tikzpicture}[x=2.3ex,y=2.3ex, line width=0.09ex*\tkzsymbls@scl,scale=#1]
@@ -482,17 +442,16 @@ decoration={snake,amplitude=.05ex*\tkzsymbls@scl,segment length=0.408ex*\tkzsymb
 \set@tkzsymblsscl{#1}%
 \iftikzymbols@draftabsolute%
 \tksymbls@bx@Prmtrstore{#1}%
-\tikzsymbols@draftbox{2.08ex*\real{\tkzsymbls@Prmtr}}{1.58ex*\real{\tkzsymbls@Prmtr}}%
+\tikzsymbols@draftbox{2.08ex*\tkzsymbls@Prmtr}{1.58ex*\tkzsymbls@Prmtr}%
 \else%
 \ifdim\tkzsymbls@scl<0pt\set@tkzsymblsscl{-#1}\fi%
 \begin{tikzpicture}[x=1ex,y=1ex,line width=0.04ex*\tkzsymbls@scl,scale=#1]
 \draw[line width=0.08ex*\tkzsymbls@scl] (0,0) rectangle (2,1.5);
-\draw (0.5,0.45) circle (0.35);
-\draw (0.5,0.45) circle (0.2);
+\foreach \y/\radius in { 0.45/0.35 , 0.45/0.2 , 1.15/0.21 }
+  \draw (0.5,\y) circle (\radius);
+\draw (1.45,1.15) circle (0.15);
 \draw (1.45,0.45) circle (0.3);
-\draw (0.5,1.15) circle (0.21);
 \draw (1.05,0.95) rectangle (1.85,1.35);
-\draw (1.45,1.15) circle (0.15);
 \end{tikzpicture}%
 \fi%
 }%
@@ -505,19 +464,18 @@ decoration={snake,amplitude=.05ex*\tkzsymbls@scl,segment length=0.408ex*\tkzsymb
 \set@tkzsymblsscl{#1}%
 \iftikzymbols@draftabsolute%
 \tksymbls@bx@Prmtrstore{#1}%
-\tikzsymbols@draftbox{1.87ex*\real{\tkzsymbls@Prmtr}}{1.62ex*\real{\tkzsymbls@Prmtr}}%
+\tikzsymbols@draftbox{1.87ex*\tkzsymbls@Prmtr}{1.62ex*\tkzsymbls@Prmtr}%
 \else%
 \ifdim\tkzsymbls@scl<0pt\set@tkzsymblsscl{-#1}\fi%
 \begin{tikzpicture}[x=1.2ex,y=1ex,line width=0.07ex*\tkzsymbls@scl,scale=#1]
 \draw[rounded corners=0.1ex*\tkzsymbls@scl]
-   (0,0.85) -- (0,0) -- (1.5,0) -- (1.5,0.85) -- cycle;
+   (0,0) rectangle (1.5,0.85) -- cycle;
 \draw (0,0.7) -- (1.5,0.7);
-\draw[rounded corners=0.1ex*\tkzsymbls@scl] (0.3,0.7) -- (0.75,1.55) -- (1.2,0.7);
-\draw[rounded corners=0.1ex*\tkzsymbls@scl] (0.45,0.7) -- (0.75,1.55) -- (1.05,0.7);
-\draw[rounded corners=0.1ex*\tkzsymbls@scl]
-   (0.65,0.7) -- (0.75,1.55) -- (0.85,0.7);
+\foreach \xi/\xii in { 0.3/1.2 , 0.45/1.05 , 0.65/0.85 }
+  \draw[rounded corners=0.1ex*\tkzsymbls@scl]
+    (\xi,0.7) -- (0.75,1.55) -- (\xii,0.7);
 \draw[line width=0.05ex*\tkzsymbls@scl, decorate,
-   decoration={snake,amplitude=.05ex*\tkzsymbls@scl,
+   decoration={snake,amplitude=0.05ex*\tkzsymbls@scl,
    segment length=0.48ex*\tkzsymbls@scl}]  (0,0.3) -- (1.5,0.3);
 \end{tikzpicture}%
 \fi%
@@ -531,14 +489,14 @@ decoration={snake,amplitude=.05ex*\tkzsymbls@scl,segment length=0.408ex*\tkzsymb
 \set@tkzsymblsscl{#1}%
 \iftikzymbols@draftabsolute%
 \tksymbls@bx@Prmtrstore{#1}%
-\tikzsymbols@draftbox{2.32ex*\real{\tkzsymbls@Prmtr}}{1.47ex*\real{\tkzsymbls@Prmtr}}%
+\tikzsymbols@draftbox{2.32ex*\tkzsymbls@Prmtr}{1.47ex*\tkzsymbls@Prmtr}%
 \else%
 \ifdim\tkzsymbls@scl<0pt\set@tkzsymblsscl{-#1}\fi%
 \begin{tikzpicture}[x=1ex,y=1ex,line width=0.07ex*\tkzsymbls@scl, scale=#1]
 \draw[rounded corners=0.5ex*\tkzsymbls@scl]
    (-0.02,1.4) -- (0,1.4) -- (0,0.05) -- (1.5,0.05) -- (1.5,1.4) -- (1.52,1.4);
 \draw (0.35,0) -- (1.15,0);
-\draw[opacity=00] (-0.4,0) -- (1.85,0);
+\draw[transparent] (-0.4,0) -- (1.85,0);
 \end{tikzpicture}%
 \fi%
 }%
@@ -551,7 +509,7 @@ decoration={snake,amplitude=.05ex*\tkzsymbls@scl,segment length=0.408ex*\tkzsymb
 \set@tkzsymblsscl{#1}%
 \iftikzymbols@draftabsolute%
 \tksymbls@bx@Prmtrstore{#1}%
-\tikzsymbols@draftbox{1.15ex*\real{\tkzsymbls@Prmtr}}{1.565ex*\real{\tkzsymbls@Prmtr}}%
+\tikzsymbols@draftbox{1.15ex*\tkzsymbls@Prmtr}{1.565ex*\tkzsymbls@Prmtr}%
 \else%
 \ifdim\tkzsymbls@scl<0pt\set@tkzsymblsscl{-#1}\fi%
 \begin{tikzpicture}[x=2.7ex,y=2.3ex, line width=0.07ex*\tkzsymbls@scl,scale=#1]
@@ -559,8 +517,7 @@ decoration={snake,amplitude=.05ex*\tkzsymbls@scl,segment length=0.408ex*\tkzsymb
    (0,0.4) -- (0,0.1) arc (0:180:-0.1) -- (0.2,0.4)
    -- (0.3,0.5) -- (0.3,0.65) -- (0.2,0.65) -- (0.2,0.5) -- (0,0.5) -- (0,0.65) --
    (-0.1,0.65) -- (-0.1,0.5)  -- cycle;
-\draw[line width=0.03ex*\tkzsymbls@scl] (0,0.6) -- (0.2,0.6);
-\draw[line width=0.03ex*\tkzsymbls@scl] (0,0.58) -- (0.2,0.58);
+\draw[line width=0.03ex*\tkzsymbls@scl] (0,0.58) rectangle (0.2,0.6);
 \end{tikzpicture}%
 \fi%
 }%
@@ -573,7 +530,7 @@ decoration={snake,amplitude=.05ex*\tkzsymbls@scl,segment length=0.408ex*\tkzsymb
 \set@tkzsymblsscl{#1}%
 \iftikzymbols@draftabsolute%
 \tksymbls@bx@Prmtrstore{#1}%
-\tikzsymbols@draftbox{1.08ex*\real{\tkzsymbls@Prmtr}}{1.58ex*\real{\tkzsymbls@Prmtr}}%
+\tikzsymbols@draftbox{1.08ex*\tkzsymbls@Prmtr}{1.58ex*\tkzsymbls@Prmtr}%
 \else%
 \ifdim\tkzsymbls@scl<0pt\set@tkzsymblsscl{-#1}\fi%
 \begin{tikzpicture}[x=1ex,y=1ex, line width=0.08ex*\tkzsymbls@scl, scale=#1]%
@@ -594,29 +551,29 @@ decoration={snake,amplitude=.05ex*\tkzsymbls@scl,segment length=0.408ex*\tkzsymb
 \set@tkzsymblsscl{#1}%
 \iftikzymbols@draftabsolute%
 \tksymbls@bx@Prmtrstore{#1}%
-\tikzsymbols@draftbox{0.78ex*\real{\tkzsymbls@Prmtr}}{1.58ex*\real{\tkzsymbls@Prmtr}}%
+\tikzsymbols@draftbox{0.78ex*\tkzsymbls@Prmtr}{1.58ex*\tkzsymbls@Prmtr}%
 \else%
 \ifdim\tkzsymbls@scl<0pt\set@tkzsymblsscl{-#1}\fi%
-\begin{tikzpicture}[x=1ex,y=1ex, line width=0.08ex, rounded corners=0.08ex*\tkzsymbls@scl, scale=#1]
+\begin{tikzpicture}[x=1ex,y=1ex, line width=0.08ex*\tkzsymbls@scl,
+rounded corners=0.08ex*\tkzsymbls@scl, scale=#1]
 \draw (0, 1.5) -- (0,1.2) -- (-0.15,0.8) -- (-0.15,0) --++ (0.6,0) --++ (0,0.8) --++ (-0.15,0.4) --++ (0,0.3) -- cycle;
-\draw[opacity=00] (-0.2,0) --++ (0.7,0);
+\draw[transparent] (-0.2,0) --++ (0.7,0);
 \end{tikzpicture}\fi%
 }%
 \tikzsymbols@use@box{Flasche#1}%
 \tikzsymbolsaftersymbolinput%
 }
 \tikzsymbols@let{bottle}{Flasche}
-\tkzsymbls@Declare@Robust@Commandx{Sadey}[2][1=1, 2={opacity=0}, usedefault]{%
+\tkzsymbls@Declare@Robust@Commandx{Sadey}[2][1=1, 2={none}, usedefault]{%
 \tikzsymbols@ifsaveboxundefined{Sadey#1#2}{%
 \set@tkzsymblsscl{#1}%
 \iftikzymbols@draftabsolute%
 \tksymbls@bx@Prmtrstore{#1}%
-\tikzsymbols@draftQbox{1.704ex*\real{\tkzsymbls@Prmtr}}%
+\tikzsymbols@draftQbox{1.704ex*\tkzsymbls@Prmtr}%
 \else%
 \ifdim\tkzsymbls@scl<0pt\set@tkzsymblsscl{-#1}\fi%
 \begin{tikzpicture}[x=2.4ex, y=2.4ex, line width=0.09ex*\tkzsymbls@scl,scale=#1]
-\fill[#2, line width=0.1ex*\tkzsymbls@scl] (0,0) circle (0.33);
-\draw[line width=0.12ex*\tkzsymbls@scl] (0,0) circle (0.33);
+\filldraw[fill=#2, line width=0.1ex*\tkzsymbls@scl] (0,0) circle (0.33);
 \fill (0.1,0.1) circle (0.05);
 \fill (-0.1,0.1) circle (0.05);
 \draw (-0.2,-0.15) .. controls (-0.1,-0.06) and (0.1,-0.06) .. (0.2,-0.15);
@@ -631,7 +588,7 @@ decoration={snake,amplitude=.05ex*\tkzsymbls@scl,segment length=0.408ex*\tkzsymb
 \set@tkzsymblsscl{#1}%
 \iftikzymbols@draftabsolute%
 \tksymbls@bx@Prmtrstore{#1}%
-\tikzsymbols@draftQbox{1.584ex*\real{\tkzsymbls@Prmtr}}%
+\tikzsymbols@draftQbox{1.584ex*\tkzsymbls@Prmtr}%
 \else%
 \ifdim\tkzsymbls@scl<0pt\set@tkzsymblsscl{-#1}\fi%
 \begin{tikzpicture}[x=2.4ex, y=2.4ex, line width=0.09ex*\tkzsymbls@scl,scale=#1]
@@ -645,17 +602,16 @@ decoration={snake,amplitude=.05ex*\tkzsymbls@scl,segment length=0.408ex*\tkzsymb
 \tikzsymbols@use@box{dSadey#1#2}%
 \tikzsymbolsaftersymbolinput%
 }
-\tkzsymbls@Declare@Robust@Commandx{Annoey}[2][1=1,2={opacity=0},usedefault]{%
+\tkzsymbls@Declare@Robust@Commandx{Annoey}[2][1=1,2={none},usedefault]{%
 \tikzsymbols@ifsaveboxundefined{Annoey#1#2}{%
 \set@tkzsymblsscl{#1}%
 \iftikzymbols@draftabsolute%
 \tksymbls@bx@Prmtrstore{#1}%
-\tikzsymbols@draftQbox{1.704ex*\real{\tkzsymbls@Prmtr}}%
+\tikzsymbols@draftQbox{1.704ex*\tkzsymbls@Prmtr}%
 \else%
 \ifdim\tkzsymbls@scl<0pt\set@tkzsymblsscl{-#1}\fi%
 \begin{tikzpicture}[x=2.4ex, y=2.4ex, line width=0.09ex*\tkzsymbls@scl,scale=#1]
-\fill[#2, line width=0.12ex*\tkzsymbls@scl] (0,0) circle (0.33);
-\draw[line width=0.12ex*\tkzsymbls@scl] (0,0) circle (0.33);
+\filldraw[fill=#2, line width=0.12ex*\tkzsymbls@scl] (0,0) circle (0.33);
 \draw (0.08,0.1) -- (0.22,0.1);
 \draw (-0.08,0.1) -- (-0.22,0.1);
 \draw (-0.2,-0.1) -- (0.2,-0.1);
@@ -670,7 +626,7 @@ decoration={snake,amplitude=.05ex*\tkzsymbls@scl,segment length=0.408ex*\tkzsymb
 \set@tkzsymblsscl{#1}%
 \iftikzymbols@draftabsolute%
 \tksymbls@bx@Prmtrstore{#1}%
-\tikzsymbols@draftQbox{1.584ex*\real{\tkzsymbls@Prmtr}}%
+\tikzsymbols@draftQbox{1.584ex*\tkzsymbls@Prmtr}%
 \else%
 \ifdim\tkzsymbls@scl<0pt\set@tkzsymblsscl{-#1}\fi%
 \begin{tikzpicture}[x=2.4ex, y=2.4ex, line width=0.09ex*\tkzsymbls@scl,scale=#1]
@@ -685,17 +641,16 @@ decoration={snake,amplitude=.05ex*\tkzsymbls@scl,segment length=0.408ex*\tkzsymb
 \tikzsymbolsaftersymbolinput%
 }
 \ifKV@tikzsymbols@marvosym\relax\else%
- \tkzsymbls@Declare@Robust@Commandx{Smiley}[2][1=1,2={opacity=0} ,usedefault]{%
+ \tkzsymbls@Declare@Robust@Commandx{Smiley}[2][1=1,2={none} ,usedefault]{%
  \tikzsymbols@ifsaveboxundefined{Smiley#1#2}{%
  \set@tkzsymblsscl{#1}%
   \iftikzymbols@draftabsolute%
 \tksymbls@bx@Prmtrstore{#1}%
-\tikzsymbols@draftQbox{1.704ex*\real{\tkzsymbls@Prmtr}}%
+\tikzsymbols@draftQbox{1.704ex*\tkzsymbls@Prmtr}%
 \else%
 \ifdim\tkzsymbls@scl<0pt\set@tkzsymblsscl{-#1}\fi%
 \begin{tikzpicture}[x=2.4ex, y=2.4ex, line width=0.12ex*\tkzsymbls@scl, scale=#1]
-\fill[#2] (0,0) circle (0.33);
-\draw (0,0) circle (0.33);
+\filldraw[fill=#2] (0,0) circle (0.33);
 \fill (-0.1,0.1) circle (0.05);
 \fill (0.1,0.1) circle (0.05);
 \draw (-0.2,-0.1) .. controls (-0.1,-0.2) and (0.1,-0.2) .. (0.2,-0.1);
@@ -711,7 +666,7 @@ decoration={snake,amplitude=.05ex*\tkzsymbls@scl,segment length=0.408ex*\tkzsymb
 \set@tkzsymblsscl{#1}%
  \iftikzymbols@draftabsolute%
 \tksymbls@bx@Prmtrstore{#1}%
-\tikzsymbols@draftQbox{1.584ex*\real{\tkzsymbls@Prmtr}}%
+\tikzsymbols@draftQbox{1.584ex*\tkzsymbls@Prmtr}%
 \else%
 \ifdim\tkzsymbls@scl<0pt\set@tkzsymblsscl{-#1}\fi%
  \begin{tikzpicture}[x=2.4ex, y=2.4ex, line width=0.1ex*\tkzsymbls@scl,scale=#1]
@@ -725,22 +680,19 @@ decoration={snake,amplitude=.05ex*\tkzsymbls@scl,segment length=0.408ex*\tkzsymb
 \tikzsymbols@use@box{dSmiley#1#2}%
 \tikzsymbolsaftersymbolinput%
 }
-\tkzsymbls@Declare@Robust@Commandx{Laughey}[3][1=1,2={opacity=0},3={opacity=0} ,usedefault]{%
+\tkzsymbls@Declare@Robust@Commandx{Laughey}[3][1=1,2={none},3={none} ,usedefault]{%
 \tikzsymbols@ifsaveboxundefined{Laughey#1#2#3}{%
 \set@tkzsymblsscl{#1}%
 \iftikzymbols@draftabsolute%
 \tksymbls@bx@Prmtrstore{#1}%
-\tikzsymbols@draftQbox{1.704ex*\real{\tkzsymbls@Prmtr}}%
+\tikzsymbols@draftQbox{1.704ex*\tkzsymbls@Prmtr}%
 \else%
 \ifdim\tkzsymbls@scl<0pt\set@tkzsymblsscl{-#1}\fi%
 \begin{tikzpicture}[x=2.4ex, y=2.4ex, line width=0.09ex*\tkzsymbls@scl,scale=#1]
-\fill[#2,line width=0.12ex*\tkzsymbls@scl] (0,0) circle (0.33);
-\draw[line width=0.12ex*\tkzsymbls@scl] (0,0) circle (0.33);
+\filldraw[fill=#2,line width=0.12ex*\tkzsymbls@scl] (0,0) circle (0.33);
 \draw (-0.09,0.06) .. controls (-0.11,0.16) and (-0.17,0.16) .. +(-0.1,0);
 \draw (0.09,0.06) .. controls (0.11,0.16) and (0.17,0.16) .. +(0.1,0);
-\fill[#3,rounded corners=0.1ex*\tkzsymbls@scl, yshift=-0.5]
-(-0.22,-0.0) .. controls (-0.13,-0.23) and (0.13,-0.23) .. (0.22,-0.0) -- cycle;
-\draw[rounded corners=0.1ex*\tkzsymbls@scl, yshift=-0.5]
+\filldraw[fill=#3,rounded corners=0.1ex*\tkzsymbls@scl, yshift=-0.5]
 (-0.22,-0.0) .. controls (-0.13,-0.23) and (0.13,-0.23) .. (0.22,-0.0) -- cycle;
 \end{tikzpicture}%
 \fi%
@@ -753,7 +705,7 @@ decoration={snake,amplitude=.05ex*\tkzsymbls@scl,segment length=0.408ex*\tkzsymb
 \set@tkzsymblsscl{#1}%
 \iftikzymbols@draftabsolute%
 \tksymbls@bx@Prmtrstore{#1}%
-\tikzsymbols@draftQbox{1.584ex*\real{\tkzsymbls@Prmtr}}%
+\tikzsymbols@draftQbox{1.584ex*\tkzsymbls@Prmtr}%
 \else%
 \ifdim\tkzsymbls@scl<0pt\set@tkzsymblsscl{-#1}\fi%
 \begin{tikzpicture}[x=2.4ex, y=2.4ex, line width=0.09ex*\tkzsymbls@scl,scale=#1]
@@ -768,17 +720,16 @@ decoration={snake,amplitude=.05ex*\tkzsymbls@scl,segment length=0.408ex*\tkzsymb
 \tikzsymbols@use@box{dLaughey#1#2#3}%
 \tikzsymbolsaftersymbolinput%
 }
-\tkzsymbls@Declare@Robust@Commandx{Neutrey}[2][1=1, 2={opacity=0}, usedefault]{%
+\tkzsymbls@Declare@Robust@Commandx{Neutrey}[2][1=1, 2={none}, usedefault]{%
 \tikzsymbols@ifsaveboxundefined{Neutrey#1#2}{%
  \set@tkzsymblsscl{#1}%
  \iftikzymbols@draftabsolute%
 \tksymbls@bx@Prmtrstore{#1}%
-\tikzsymbols@draftQbox{1.704ex*\real{\tkzsymbls@Prmtr}}%
+\tikzsymbols@draftQbox{1.704ex*\tkzsymbls@Prmtr}%
 \else%
 \ifdim\tkzsymbls@scl<0pt\set@tkzsymblsscl{-#1}\fi%
 \begin{tikzpicture}[x=2.4ex, y=2.4ex, line width=0.09ex*\tkzsymbls@scl,scale=#1]
-\fill[#2,line width=0.12ex*\tkzsymbls@scl] (0,0) circle (0.33);
-\draw[line width=0.12ex*\tkzsymbls@scl] (0,0) circle (0.33);
+\filldraw[fill=#2,line width=0.12ex*\tkzsymbls@scl] (0,0) circle (0.33);
 \fill (0.1,0.1) circle (0.05);
 \fill (-0.1,0.1) circle (0.05);
 \draw (-0.2,-0.1) -- (0.2,-0.1);
@@ -793,7 +744,7 @@ decoration={snake,amplitude=.05ex*\tkzsymbls@scl,segment length=0.408ex*\tkzsymb
  \set@tkzsymblsscl{#1}%
  \iftikzymbols@draftabsolute%
 \tksymbls@bx@Prmtrstore{#1}%
-\tikzsymbols@draftQbox{1.584ex*\real{\tkzsymbls@Prmtr}}%
+\tikzsymbols@draftQbox{1.584ex*\tkzsymbls@Prmtr}%
 \else%
 \ifdim\tkzsymbls@scl<0pt\set@tkzsymblsscl{-#1}\fi%
 \begin{tikzpicture}[x=2.4ex, y=2.4ex, line width=0.09ex*\tkzsymbls@scl,scale=#1]
@@ -807,17 +758,16 @@ decoration={snake,amplitude=.05ex*\tkzsymbls@scl,segment length=0.408ex*\tkzsymb
 \tikzsymbols@use@box{dNeutrey#1#2}%
 \tikzsymbolsaftersymbolinput%
 }
-\tkzsymbls@Declare@Robust@Commandx{Winkey}[2][1=1,2={opacity=0} ,usedefault]{%
+\tkzsymbls@Declare@Robust@Commandx{Winkey}[2][1=1,2={none} ,usedefault]{%
 \tikzsymbols@ifsaveboxundefined{Winkey#1#2}{%
 \set@tkzsymblsscl{#1}%
 \iftikzymbols@draftabsolute%
 \tksymbls@bx@Prmtrstore{#1}%
-\tikzsymbols@draftQbox{1.704ex*\real{\tkzsymbls@Prmtr}}%
+\tikzsymbols@draftQbox{1.704ex*\tkzsymbls@Prmtr}%
 \else%
 \ifdim\tkzsymbls@scl<0pt\set@tkzsymblsscl{-#1}\fi%
 \begin{tikzpicture}[x=2.4ex, y=2.4ex, line width=0.12ex*\tkzsymbls@scl,scale=#1]
-\fill[#2] (0,0) circle (0.33);
-\draw(0,0) circle (0.33);
+\filldraw[fill=#2] (0,0) circle (0.33);
 \draw(0.17,0.1) -- (0.05,0.1);
 \fill (-0.1,0.1) circle (0.05);
 \draw (-0.15,-0.15) .. controls (-0.05,-0.2) and (0.15,-0.2) .. (0.19,0);
@@ -827,17 +777,16 @@ decoration={snake,amplitude=.05ex*\tkzsymbls@scl,segment length=0.408ex*\tkzsymb
 \tikzsymbols@use@box{Winkey#1#2}%
 \tikzsymbolsaftersymbolinput%
 }
-\tkzsymbls@Declare@Robust@Commandx{oldWinkey}[2][1=1,2={opacity=0} ,usedefault]{%
+\tkzsymbls@Declare@Robust@Commandx{oldWinkey}[2][1=1,2={none} ,usedefault]{%
 \tikzsymbols@ifsaveboxundefined{oldWinkey#1#2}{%
 \set@tkzsymblsscl{#1}%
 \iftikzymbols@draftabsolute%
 \tksymbls@bx@Prmtrstore{#1}%
-\tikzsymbols@draftQbox{1.704ex*\real{\tkzsymbls@Prmtr}}%
+\tikzsymbols@draftQbox{1.704ex*\tkzsymbls@Prmtr}%
 \else%
 \ifdim\tkzsymbls@scl<0pt\set@tkzsymblsscl{-#1}\fi%
 \begin{tikzpicture}[x=2.4ex, y=2.4ex, line width=0.12ex*\tkzsymbls@scl,scale=#1]
-\fill[#2] (0,0) circle (0.33);
-\draw(0,0) circle (0.33);
+\filldraw[fill=#2] (0,0) circle (0.33);
 \draw(0.17,0.1) -- (0.05,0.1);
 \fill (-0.1,0.1) circle (0.05);
 \draw (-0.2,-0.1) .. controls (-0.1,-0.2) and (0.15,-0.2) .. (0.2,0);
@@ -852,7 +801,7 @@ decoration={snake,amplitude=.05ex*\tkzsymbls@scl,segment length=0.408ex*\tkzsymb
 \set@tkzsymblsscl{#1}%
 \iftikzymbols@draftabsolute%
 \tksymbls@bx@Prmtrstore{#1}%
-\tikzsymbols@draftQbox{1.584ex*\real{\tkzsymbls@Prmtr}}%
+\tikzsymbols@draftQbox{1.584ex*\tkzsymbls@Prmtr}%
 \else%
 \ifdim\tkzsymbls@scl<0pt\set@tkzsymblsscl{-#1}\fi%
 \begin{tikzpicture}[x=2.4ex, y=2.4ex, line width=0.12ex*\tkzsymbls@scl,scale=#1]
@@ -871,7 +820,7 @@ decoration={snake,amplitude=.05ex*\tkzsymbls@scl,segment length=0.408ex*\tkzsymb
 \set@tkzsymblsscl{#1}%
 \iftikzymbols@draftabsolute%
 \tksymbls@bx@Prmtrstore{#1}%
-\tikzsymbols@draftQbox{1.584ex*\real{\tkzsymbls@Prmtr}}%
+\tikzsymbols@draftQbox{1.584ex*\tkzsymbls@Prmtr}%
 \else%
 \ifdim\tkzsymbls@scl<0pt\set@tkzsymblsscl{-#1}\fi%
 \begin{tikzpicture}[x=2.4ex, y=2.4ex, line width=0.12ex*\tkzsymbls@scl,scale=#1]
@@ -885,17 +834,16 @@ decoration={snake,amplitude=.05ex*\tkzsymbls@scl,segment length=0.408ex*\tkzsymb
 \tikzsymbols@use@box{olddWinkey#1#2}%
 \tikzsymbolsaftersymbolinput%
 }
-\tkzsymbls@Declare@Robust@Commandx{Sey}[2][1=1,2={opacity=0} ,usedefault]{%
+\tkzsymbls@Declare@Robust@Commandx{Sey}[2][1=1,2={none} ,usedefault]{%
 \tikzsymbols@ifsaveboxundefined{Sey#1#2}{%
 \set@tkzsymblsscl{#1}%
 \iftikzymbols@draftabsolute%
 \tksymbls@bx@Prmtrstore{#1}%
-\tikzsymbols@draftQbox{1.704ex*\real{\tkzsymbls@Prmtr}}%
+\tikzsymbols@draftQbox{1.704ex*\tkzsymbls@Prmtr}%
 \else%
 \ifdim\tkzsymbls@scl<0pt\set@tkzsymblsscl{-#1}\fi%
 \begin{tikzpicture}[x=2.4ex, y=2.4ex, line width=0.09ex*\tkzsymbls@scl,scale=#1]
-\fill[#2, line width=0.12ex*\tkzsymbls@scl] (0,0) circle (0.33);
-\draw[line width=0.12ex*\tkzsymbls@scl] (0,0) circle (0.33);
+\filldraw[fill=#2, line width=0.12ex*\tkzsymbls@scl] (0,0) circle (0.33);
 \fill (0.1,0.1) circle (0.05);
 \fill (-0.1,0.1) circle (0.05);
 \draw (-0.2,-0.08) .. controls (-0.0,-0.2) and (0.0,0) .. (0.2,-0.12);
@@ -910,7 +858,7 @@ decoration={snake,amplitude=.05ex*\tkzsymbls@scl,segment length=0.408ex*\tkzsymb
 \set@tkzsymblsscl{#1}%
 \iftikzymbols@draftabsolute%
 \tksymbls@bx@Prmtrstore{#1}%
-\tikzsymbols@draftQbox{1.584ex*\real{\tkzsymbls@Prmtr}}%
+\tikzsymbols@draftQbox{1.584ex*\tkzsymbls@Prmtr}%
 \else%
 \ifdim\tkzsymbls@scl<0pt\set@tkzsymblsscl{-#1}\fi%
 \begin{tikzpicture}[x=2.4ex, y=2.4ex, line width=0.09ex*\tkzsymbls@scl,scale=#1]
@@ -924,21 +872,18 @@ decoration={snake,amplitude=.05ex*\tkzsymbls@scl,segment length=0.408ex*\tkzsymb
 \tikzsymbols@use@box{dSey#1#2}%
 \tikzsymbolsaftersymbolinput%
 }
-\tkzsymbls@Declare@Robust@Commandx{Xey}[2][1=1, 2={opacity=0}, usedefault]{%
+\tkzsymbls@Declare@Robust@Commandx{Xey}[2][1=1, 2={none}, usedefault]{%
 \tikzsymbols@ifsaveboxundefined{Xey#1#2}{%
 \set@tkzsymblsscl{#1}%
 \iftikzymbols@draftabsolute%
 \tksymbls@bx@Prmtrstore{#1}%
-\tikzsymbols@draftQbox{1.704ex*\real{\tkzsymbls@Prmtr}}%
+\tikzsymbols@draftQbox{1.704ex*\tkzsymbls@Prmtr}%
 \else%
 \ifdim\tkzsymbls@scl<0pt\set@tkzsymblsscl{-#1}\fi%
 \begin{tikzpicture}[x=2.4ex, y=2.4ex, line width=0.09ex*\tkzsymbls@scl,scale=#1]
-\fill[#2, line width=0.12ex*\tkzsymbls@scl] (0,0) circle (0.33);
-\draw[line width=0.12ex*\tkzsymbls@scl] (0,0) circle (0.33);
-\draw (0.05,0.05) -- ++ (0.1,0.1);
-\draw (0.15,0.05) -- ++ (-0.1,0.1);
-\draw (-0.05,0.05) -- ++ (-0.1,0.1);
-\draw (-0.15,0.05) -- ++ (0.1,0.1);
+\filldraw[fill=#2, line width=0.12ex*\tkzsymbls@scl] (0,0) circle (0.33);
+\foreach \xi in { 0.05 , -0.15 }
+    \draw (\xi,0.05) -- ++ (0.1,0.1) (-\xi,0.05) -- ++ (-0.1,0.1);
 \draw (-0.2,-0.15) .. controls (-0.1,-0.06) and (0.1,-0.06) .. (0.2,-0.15);
 \end{tikzpicture}%
 \fi%
@@ -951,15 +896,13 @@ decoration={snake,amplitude=.05ex*\tkzsymbls@scl,segment length=0.408ex*\tkzsymb
 \set@tkzsymblsscl{#1}%
 \iftikzymbols@draftabsolute%
 \tksymbls@bx@Prmtrstore{#1}%
-\tikzsymbols@draftQbox{1.584ex*\real{\tkzsymbls@Prmtr}}%
+\tikzsymbols@draftQbox{1.584ex*\tkzsymbls@Prmtr}%
 \else%
 \ifdim\tkzsymbls@scl<0pt\set@tkzsymblsscl{-#1}\fi%
 \begin{tikzpicture}[x=2.4ex, y=2.4ex, line width=0.09ex*\tkzsymbls@scl,scale=#1]
 \fill[ball color=#2, line width=0.12ex*\tkzsymbls@scl] (0,0) circle (0.33);
-\draw (0.05,0.05) -- ++ (0.1,0.1);
-\draw (0.15,0.05) -- ++ (-0.1,0.1);
-\draw (-0.05,0.05) -- ++ (-0.1,0.1);
-\draw (-0.15,0.05) -- ++ (0.1,0.1);
+\foreach \xi in { 0.05 , -0.15 }
+    \draw (\xi,0.05) -- ++ (0.1,0.1) (-\xi,0.05) -- ++ (-0.1,0.1);
 \draw (-0.2,-0.15) .. controls (-0.1,-0.06) and (0.1,-0.06) .. (0.2,-0.15);
 \end{tikzpicture}%
 \fi%
@@ -967,17 +910,16 @@ decoration={snake,amplitude=.05ex*\tkzsymbls@scl,segment length=0.408ex*\tkzsymb
 \tikzsymbols@use@box{dXey#1#2}%
 \tikzsymbolsaftersymbolinput%
 }
-\tkzsymbls@Declare@Robust@Commandx{Innocey}[3][1=1,2={opacity=0},3=yellow ,usedefault]{%
+\tkzsymbls@Declare@Robust@Commandx{Innocey}[3][1=1,2={none},3=yellow ,usedefault]{%
 \tikzsymbols@ifsaveboxundefined{Innocey#1#2#3}{%
 \set@tkzsymblsscl{#1}%
 \iftikzymbols@draftabsolute%
 \tksymbls@bx@Prmtrstore{#1}%
-\tikzsymbols@draftbox{1.73ex*\real{\tkzsymbls@Prmtr}}{1.909ex*\real{\tkzsymbls@Prmtr}}%
+\tikzsymbols@draftbox{1.73ex*\tkzsymbls@Prmtr}{1.909ex*\tkzsymbls@Prmtr}%
 \else%
 \ifdim\tkzsymbls@scl<0pt\set@tkzsymblsscl{-#1}\fi%
 \begin{tikzpicture}[x=2.4ex, y=2.4ex, line width=0.12ex*\tkzsymbls@scl,scale=#1]
-\fill[#2] (0,0) circle (0.33);
-\draw (0,0) circle (0.33);
+\filldraw[fill=#2] (0,0) circle (0.33);
 \fill (-0.1,0.1) circle (0.05);
 \fill (0.1,0.1) circle (0.05);
 \draw (-0.2,-0.1) .. controls (-0.1,-0.2) and (0.1,-0.2) .. (0.2,-0.1);
@@ -990,13 +932,13 @@ decoration={snake,amplitude=.05ex*\tkzsymbls@scl,segment length=0.408ex*\tkzsymb
 \tikzsymbols@use@box{Innocey#1#2#3}%
 \tikzsymbolsaftersymbolinput%
 }
-\tkzsymbls@Declare@Robust@Command{wInnocey}[1][1]{\Innocey[#1][opacity=0][white]}
+\tkzsymbls@Declare@Robust@Command{wInnocey}[1][1]{\Innocey[#1][none][white]}
 \tkzsymbls@Declare@Robust@Commandx{dInnocey}[3][1=1,2=yellow,3=yellow,usedefault]{%
 \tikzsymbols@ifsaveboxundefined{dInnocey#1#2#3}{%
 \set@tkzsymblsscl{#1}%
 \iftikzymbols@draftabsolute%
 \tksymbls@bx@Prmtrstore{#1}%
-\tikzsymbols@draftbox{1.73ex*\real{\tkzsymbls@Prmtr}}{1.849ex*\real{\tkzsymbls@Prmtr}}%
+\tikzsymbols@draftbox{1.73ex*\tkzsymbls@Prmtr}{1.849ex*\tkzsymbls@Prmtr}%
 \else%
 \ifdim\tkzsymbls@scl<0pt\set@tkzsymblsscl{-#1}\fi%
 \begin{tikzpicture}[x=2.4ex, y=2.4ex, line width=0.12ex*\tkzsymbls@scl,scale=#1]
@@ -1014,21 +956,19 @@ decoration={snake,amplitude=.05ex*\tkzsymbls@scl,segment length=0.408ex*\tkzsymb
 \tikzsymbols@use@box{dInnocey#1#2#3}%
 \tikzsymbolsaftersymbolinput%
 }
-\tkzsymbls@Declare@Robust@Commandx{Cooley}[2][1=1,2={opacity=0} ,usedefault]{%
+\tkzsymbls@Declare@Robust@Commandx{Cooley}[2][1=1,2={none} ,usedefault]{%
 \tikzsymbols@ifsaveboxundefined{Cooley#1#2}{%
 \set@tkzsymblsscl{#1}%
 \iftikzymbols@draftabsolute%
 \tksymbls@bx@Prmtrstore{#1}%
-\tikzsymbols@draftQbox{1.704ex*\real{\tkzsymbls@Prmtr}}%
+\tikzsymbols@draftQbox{1.704ex*\tkzsymbls@Prmtr}%
 \else%
 \ifdim\tkzsymbls@scl<0pt\set@tkzsymblsscl{-#1}\fi%
 \begin{tikzpicture}[x=2.4ex, y=2.4ex, line width=0.12ex*\tkzsymbls@scl,scale=#1]
-\fill[#2] (0,0) circle (0.33);
-\draw (0,0) circle (0.33);
-\fill[rounded corners=0.1ex*\tkzsymbls@scl]
-   (0.24,0.15) -- (0.01,0.15) -- (0.01,0) -- (0.24,0) -- cycle;
+\filldraw[fill=#2] (0,0) circle (0.33);
+\foreach \xi/\xii in { 0.24/0.01 , -0.24/-0.01 }
 \fill[rounded corners=0.1ex*\tkzsymbls@scl]
-   (-0.24,0.15) -- (-0.01,0.15) -- (-0.01,0) -- (-0.24,0) -- cycle;
+   (\xi,0.15) -- (\xii,0.15) -- (\xii,0) -- (\xi,0) -- cycle;
 \draw (-0.2,-0.1) .. controls (-0.1,-0.2) and (0.1,-0.2) .. (0.2,-0.1);
 \draw (0.02,0.1) -- (-0.02,0.1);
 \draw (-0.2,0.1) -- (-0.3,0.13);
@@ -1044,7 +984,7 @@ decoration={snake,amplitude=.05ex*\tkzsymbls@scl,segment length=0.408ex*\tkzsymb
 \set@tkzsymblsscl{#1}%
 \iftikzymbols@draftabsolute%
 \tksymbls@bx@Prmtrstore{#1}%
-\tikzsymbols@draftQbox{1.584ex*\real{\tkzsymbls@Prmtr}}%
+\tikzsymbols@draftQbox{1.584ex*\tkzsymbls@Prmtr}%
 \else%
 \ifdim\tkzsymbls@scl<0pt\set@tkzsymblsscl{-#1}\fi%
 \begin{tikzpicture}[x=2.4ex, y=2.4ex, line width=0.12ex*\tkzsymbls@scl,scale=#1]
@@ -1052,10 +992,9 @@ decoration={snake,amplitude=.05ex*\tkzsymbls@scl,segment length=0.408ex*\tkzsymb
 \draw[black] (0.02,0.1) -- (-0.02,0.1);
 \draw[black] (-0.2,0.1) -- (-0.295,0.146);
 \draw[black] (0.2,0.1) -- (0.295,0.146);
-\shade[ball color=black,rounded corners=0.1ex*\tkzsymbls@scl]
-   (0.24,0.15) -- (0.01,0.15) -- (0.01,0) -- (0.24,0) -- cycle;
-\shade[ball color=black,rounded corners=0.1ex*\tkzsymbls@scl]
-   (-0.24,0.15) -- (-0.01,0.15) -- (-0.01,0) -- (-0.24,0) -- cycle;
+\foreach \xi/\xii in { 0.24/0.01 , -0.24/-0.01 }
+  \shade[ball color=black,rounded corners=0.1ex*\tkzsymbls@scl]
+   (\xi,0.15) -- (\xii,0.15) -- (\xii,0) -- (\xi,0) -- cycle;
 \draw[black] (-0.2,-0.1) .. controls (-0.1,-0.2) and (0.1,-0.2) .. (0.2,-0.1);
 \end{tikzpicture}%
 \fi%
@@ -1063,25 +1002,22 @@ decoration={snake,amplitude=.05ex*\tkzsymbls@scl,segment length=0.408ex*\tkzsymb
 \tikzsymbols@use@box{dCooley#1#2}%
 \tikzsymbolsaftersymbolinput%
 }
-\tkzsymbls@Declare@Robust@Commandx{Tongey}[3][1=1,2={opacity=0},3={opacity=0} ,usedefault]{%
+\tkzsymbls@Declare@Robust@Commandx{Tongey}[3][1=1,2={none},3={none} ,usedefault]{%
 \tikzsymbols@ifsaveboxundefined{Tongey#1#2#3}{%
 \set@tkzsymblsscl{#1}%
 \iftikzymbols@draftabsolute%
 \tksymbls@bx@Prmtrstore{#1}%
-\tikzsymbols@draftQbox{1.704ex*\real{\tkzsymbls@Prmtr}}%
+\tikzsymbols@draftQbox{1.704ex*\tkzsymbls@Prmtr}%
 \else%
 \ifdim\tkzsymbls@scl<0pt\set@tkzsymblsscl{-#1}\fi%
 \begin{tikzpicture}[x=2.4ex, y=2.4ex, line width=0.12ex*\tkzsymbls@scl,scale=#1]
-\fill[#2] (0,0) circle (0.33);
-\draw (0,0) circle (0.33);
+\filldraw[fill=#2] (0,0) circle (0.33);
 \fill (-0.1,0.1) circle (0.05);
 \fill (0.1,0.1) circle (0.05);
-\fill[#3,line width=0.058ex*\tkzsymbls@scl, rounded corners=0.12ex*\tkzsymbls@scl]
+\filldraw[fill=#3,line width=0.058ex*\tkzsymbls@scl, rounded corners=0.12ex*\tkzsymbls@scl]
    (0,-0.09) -- (0.05,-0.2) -- (0.16,-0.23) -- (0.2,-0.15) -- (0.19,-0.03);
 \draw[line width=0.07ex*\tkzsymbls@scl, yshift=0.21ex]
    (-0.2,-0.1) .. controls (-0.1,-0.2) and (0.1,-0.2) .. (0.2,-0.1);
-\draw[line width=0.058ex*\tkzsymbls@scl, rounded corners=0.12ex*\tkzsymbls@scl]
-   (0,-0.09) -- (0.05,-0.2) -- (0.16,-0.23) -- (0.2,-0.15) -- (0.19,-0.03);
 \end{tikzpicture}%
 \fi%
 }%
@@ -1093,16 +1029,14 @@ decoration={snake,amplitude=.05ex*\tkzsymbls@scl,segment length=0.408ex*\tkzsymb
 \set@tkzsymblsscl{#1}%
 \iftikzymbols@draftabsolute%
 \tksymbls@bx@Prmtrstore{#1}%
-\tikzsymbols@draftQbox{1.584ex*\real{\tkzsymbls@Prmtr}}%
+\tikzsymbols@draftQbox{1.584ex*\tkzsymbls@Prmtr}%
 \else%
 \ifdim\tkzsymbls@scl<0pt\set@tkzsymblsscl{-#1}\fi%
 \begin{tikzpicture}[x=2.4ex, y=2.4ex, line width=0.12ex*\tkzsymbls@scl,scale=#1]
 \shade[ball color=#2] (0,0) circle (0.33);
 \shade[ball color=black] (-0.1,0.1) circle (0.05);
 \shade[ball color=black] (0.1,0.1) circle (0.05);
-\shade[ball color=#3,line width=0.058ex*\tkzsymbls@scl, rounded corners=0.12ex*\tkzsymbls@scl]
-   (0,-0.09) -- (0.05,-0.2) -- (0.16,-0.23) -- (0.2,-0.15) -- (0.19,-0.03);
-\draw[black, line width=0.058ex*\tkzsymbls@scl, rounded corners=0.12ex*\tkzsymbls@scl]
+\shadedraw[ball color=#3, draw=black,line width=0.058ex*\tkzsymbls@scl, rounded corners=0.12ex*\tkzsymbls@scl]
    (0,-0.09) -- (0.05,-0.2) -- (0.16,-0.23) -- (0.2,-0.15) -- (0.19,-0.03);
 \draw[black, line width=0.07ex*\tkzsymbls@scl, yshift=0.21ex]
    (-0.2,-0.1) .. controls (-0.1,-0.2) and (0.1,-0.2) .. (0.2,-0.1);
@@ -1113,27 +1047,25 @@ decoration={snake,amplitude=.05ex*\tkzsymbls@scl,segment length=0.408ex*\tkzsymb
 \tikzsymbolsaftersymbolinput%
 }
 \tkzsymbls@Declare@Robust@Commandx{Nursey}
-[4][1=1,2={opacity=0},3={opacity=0},4=black,usedefault]{%
+[4][1=1,2={none},3={none},4={},usedefault]{%
 \tikzsymbols@ifsaveboxundefined{Nursey#1#2#3#4}{%
 \set@tkzsymblsscl{#1}%
 \iftikzymbols@draftabsolute%
 \tksymbls@bx@Prmtrstore{#1}%
-\tikzsymbols@draftbox{1.5ex*\real{\tkzsymbls@Prmtr}}{2.19ex*\real{\tkzsymbls@Prmtr}}%
+\tikzsymbols@draftbox{1.5ex*\tkzsymbls@Prmtr}{2.19ex*\tkzsymbls@Prmtr}%
 \else%
 \ifdim\tkzsymbls@scl<0pt\set@tkzsymblsscl{-#1}\fi%
 \begin{tikzpicture}[x=2.3ex, y=2.3ex, line width=0.12ex*\tkzsymbls@scl,scale=#1]
-\fill[#3,rounded corners=.023ex*\tkzsymbls@scl]
+\fill[fill=#3,rounded corners=.023ex*\tkzsymbls@scl]
    (-0.3,0) -- (-0.3,0.3) -- (0,0.6) -- (0.3,0.3) -- (0.3,0);
-\fill[#2] (0,0) circle (0.3);
-\draw (0,0) circle (0.3);
+\filldraw[fill=#2] (0,0) circle (0.3);
 \fill (-0.1,0.1) circle (0.05);
 \fill (0.1,0.1) circle (0.05);
 \draw[line width=0.09ex*\tkzsymbls@scl, yshift=0.07ex]
    (-0.2,-0.1) .. controls (-0.1,-0.2) and (0.1,-0.2) .. (0.2,-0.1);
 \draw[rounded corners=.023ex*\tkzsymbls@scl]
    (-0.3,0) -- (-0.3,0.3) -- (0,0.6) -- (0.3,0.3) -- (0.3,0);
-\draw[#4,line width=.046ex*\tkzsymbls@scl] (0,0.35) -- (0,0.5);
-\draw[#4,line width=.046ex*\tkzsymbls@scl] (-0.05,0.45) -- (0.05,0.45);
+\draw[#4,line width=.046ex*\tkzsymbls@scl] (0,0.35) -- (0,0.5) (-0.05,0.45) -- (0.05,0.45) ;
 \end{tikzpicture}%
 \fi%
 }%
@@ -1145,7 +1077,7 @@ decoration={snake,amplitude=.05ex*\tkzsymbls@scl,segment length=0.408ex*\tkzsymb
 \set@tkzsymblsscl{#1}%
 \iftikzymbols@draftabsolute%
 \tksymbls@bx@Prmtrstore{#1}%
-\tikzsymbols@draftbox{1.38ex*\real{\tkzsymbls@Prmtr}}{1.98ex*\real{\tkzsymbls@Prmtr}}%
+\tikzsymbols@draftbox{1.38ex*\tkzsymbls@Prmtr}{1.98ex*\tkzsymbls@Prmtr}%
 \else%
 \ifdim\tkzsymbls@scl<0pt\set@tkzsymblsscl{-#1}\fi%
 \begin{tikzpicture}[x=2.3ex, y=2.3ex, line width=0.12ex*\tkzsymbls@scl,scale=#1]
@@ -1159,24 +1091,23 @@ decoration={snake,amplitude=.05ex*\tkzsymbls@scl,segment length=0.408ex*\tkzsymb
 \shade[ball color=#4,line width=.046ex*\tkzsymbls@scl]
    (-0.01,0.31) -- (-0.01,0.46) -- (0.01,0.46) -- (0.01,0.31)--cycle;
 \shade[ball color=#4,line width=.046ex*\tkzsymbls@scl]
-   (-0.05,0.4) -- (0.05,0.4) -- (0.05,0.42)--(-0.05,0.42) -- cycle;
+   (-0.05,0.4) -- (0.05,0.4) -- (0.05,0.42) -- (-0.05,0.42) -- cycle;
 \end{tikzpicture}%
 \fi%
 }%
 \tikzsymbols@use@box{dNursey#1#2#3#4}%
 \tikzsymbolsaftersymbolinput%
 }
-\tkzsymbls@Declare@Robust@Commandx{Vomey}[3][1=1,2={opacity=0},3={opacity=0},usedefault]{%
+\tkzsymbls@Declare@Robust@Commandx{Vomey}[3][1=1,2={none},3={opacity=0},usedefault]{%
 \tikzsymbols@ifsaveboxundefined{Vomey#1#2#3}{%
 \set@tkzsymblsscl{#1}%
 \iftikzymbols@draftabsolute%
 \tksymbls@bx@Prmtrstore{#1}%
-\tikzsymbols@draftbox{3.0335ex*\real{\tkzsymbls@Prmtr}}{1.743ex*\real{\tkzsymbls@Prmtr}}%
+\tikzsymbols@draftbox{3.0335ex*\tkzsymbls@Prmtr}{1.743ex*\tkzsymbls@Prmtr}%
 \else%
 \ifdim\tkzsymbls@scl<0pt\set@tkzsymblsscl{-#1}\fi%
 \begin{tikzpicture}[x=0.58ex,y=0.58ex, line width=0.09ex*\tkzsymbls@scl,scale=#1]
-\fill[#2,rounded corners=0.05ex*\tkzsymbls@scl]  (0,0)  arc (15:330:1) -- (-0.6,-0.3) -- cycle;
-\draw[rounded corners=0.05ex*\tkzsymbls@scl]  (0,0)  arc (15:330:1) -- (-0.6,-0.3) -- cycle;
+\filldraw[fill=#2,rounded corners=0.05ex*\tkzsymbls@scl]  (0,0)  arc (15:330:1) -- (-0.6,-0.3) -- cycle;
 \draw[line width=0.05ex*\tkzsymbls@scl] (-0.5,0.3) -- (-0.3,0.1);
 \fill (-0.45,0.27) arc (100:350:0.1);
 \fill[#3] (1.8,-0.5)  .. controls (2.5,-0.3) and (2.8,-0.7) .. (2.5,-1) ..
@@ -1185,8 +1116,7 @@ decoration={snake,amplitude=.05ex*\tkzsymbls@scl,segment length=0.408ex*\tkzsymb
 \fill[#3] (0,-0.4) .. controls (1,0) and (2,-1) .. (2,-1) ..
    controls (1.7,-1.2) and (1.3,-1.2) .. (1,-1) ..
    controls (0.8,-0.7) and (0.5,-0.5) .. (0,-0.4);
-\draw (0,-0.4) .. controls (1,0) and (2,-1) .. (2,-1);
-\draw (0,-0.4) .. controls (0.5,-0.5) and (0.8,-0.7) .. (1,-1);
+\draw[rounded corners=0.1ex*\tkzsymbls@scl] (1,-1) .. controls (0.8,-0.7) and (0.5,-0.5) .. (0,-0.4) .. controls (1,0) and (2,-1) .. (2,-1);
 \draw (1.8,-0.5)  .. controls (2.5,-0.3) and (2.8,-0.7) .. (2.5,-1) ..
    controls (3,-1) and (3,-1.7) .. (2,-1.5) .. controls (1.7,-2)
    and (1,-2) .. (1,-1.5) .. controls (0.5,-1.9) and (0.3,-1) .. (0.7,-0.9);
@@ -1201,7 +1131,7 @@ decoration={snake,amplitude=.05ex*\tkzsymbls@scl,segment length=0.408ex*\tkzsymb
 \set@tkzsymblsscl{#1}%
 \iftikzymbols@draftabsolute%
 \tksymbls@bx@Prmtrstore{#1}%
-\tikzsymbols@draftbox{3.2435ex*\real{\tkzsymbls@Prmtr}}{1.653ex*\real{\tkzsymbls@Prmtr}}%
+\tikzsymbols@draftbox{3.2435ex*\tkzsymbls@Prmtr}{1.653ex*\tkzsymbls@Prmtr}%
 \else%
 \ifdim\tkzsymbls@scl<0pt\set@tkzsymblsscl{-#1}\fi%
 \begin{tikzpicture}[x=0.58ex,y=0.58ex, line width=0.09ex*\tkzsymbls@scl,scale=#1]
@@ -1220,30 +1150,27 @@ decoration={snake,amplitude=.05ex*\tkzsymbls@scl,segment length=0.408ex*\tkzsymb
 \tikzsymbols@use@box{dVomey#1#2#3}%
 \tikzsymbolsaftersymbolinput%
 }
-\tkzsymbls@Declare@Robust@Commandx{Walley}[3][1=1, 2={opacity=0},3={opacity=0}, usedefault]{%
+\tkzsymbls@Declare@Robust@Commandx{Walley}[3][1=1, 2={none},3={none}, usedefault]{%
 \tikzsymbols@ifsaveboxundefined{Walley#1#2#3}{%
 \set@tkzsymblsscl{#1}%
 \iftikzymbols@draftabsolute%
 \tksymbls@bx@Prmtrstore{#1}%
-\tikzsymbols@draftbox{2.341ex*\real{\tkzsymbls@Prmtr}}{1.674ex*\real{\tkzsymbls@Prmtr}}%
+\tikzsymbols@draftbox{2.341ex*\tkzsymbls@Prmtr}{1.674ex*\tkzsymbls@Prmtr}%
 \else%
 \ifdim\tkzsymbls@scl<0pt\set@tkzsymblsscl{-#1}\fi%
 \begin{tikzpicture}[x=2.4ex, y=2.4ex, line width=0.09ex*\tkzsymbls@scl,scale=#1,
 decoration={random steps,segment length=0.15ex*\tkzsymbls@scl, amplitude=0.1ex*\tkzsymbls@scl}]
-\fill[#2, line width=0.08ex*\tkzsymbls@scl] (0,0) circle (0.28);
-\draw[line width=0.08ex*\tkzsymbls@scl] (0,0) circle (0.28);
-\fill[#3] (0.28,-0.33) rectangle (0.66,0.33);
-\draw (0.28,-0.33) rectangle (0.66,0.33);
+\filldraw[fill=#2, line width=0.08ex*\tkzsymbls@scl] (0,0) circle (0.28);
+\filldraw[fill=#3] (0.28,-0.33) rectangle (0.66,0.33);
+\draw[line width=0.06ex*\tkzsymbls@scl] (0.28,0) --++(0.05,0.07) --++(0.03,0.02) --+
+  +(0.03,-0.02) --++(0.03,0.1) --++(0.03,0.02) -- (0.5,0.25);
 \draw[line width=0.06ex*\tkzsymbls@scl]
-(0.28,0) --++(0.05,0.07) --++(0.03,0.02) --+
-+(0.03,-0.02) --++(0.03,0.1) --++(0.03,0.02) -- (0.5,0.25);
-\draw[line width=0.06ex*\tkzsymbls@scl]
-(0.28,0) --++(0.06,-0.02) --++(0.04,0.06) --+
-+(0.0,-0.08) --++(0.08,0.06) --++(0.03,-0.02) --+(0.08,0.02) -- (0.6,0.0);
+  (0.28,0) --++(0.06,-0.02) --++(0.04,0.06) --+
+  +(0.0,-0.08) --++(0.08,0.06) --++(0.03,-0.02) --+(0.08,0.02) -- (0.6,0.0);
 \draw[line width=0.06ex*\tkzsymbls@scl]
-(0.28,0) --++(0.03,-0.02)  --++(0.03,-0.07)  --+
-+(0.03,-0.01)  --++(0.01,-0.07)  --++(0.06,0.01)  --++(0.03,-0.08)   --
-(0.5,0.-0.25);
+  (0.28,0) --++(0.03,-0.02)  --++(0.03,-0.07)  --+
+  +(0.03,-0.01)  --++(0.01,-0.07)  --++(0.06,0.01)  --++(0.03,-0.08)   --
+  (0.5,0.-0.25);
 \draw[rotate=-20] (0.12,0.1) -- (0.2,0.05);
 \draw[rotate=-20] (0.27,-0.1) .. controls (0.2,-0.072) and (0.1,-0.06) .. (0.,-0.1);
 \end{tikzpicture}%
@@ -1252,23 +1179,20 @@ decoration={random steps,segment length=0.15ex*\tkzsymbls@scl, amplitude=0.1ex*\
 \tikzsymbols@use@box{Walley#1#2#3}%
 \tikzsymbolsaftersymbolinput%
 }
-\tkzsymbls@Declare@Robust@Commandx{rWalley}[3][1=1, 2={opacity=0},3={opacity=0}, usedefault]{%
+\tkzsymbls@Declare@Robust@Commandx{rWalley}[3][1=1, 2={none},3={none}, usedefault]{%
 \tikzsymbols@ifsaveboxundefined{rWalley#1#2#3}{%
 \set@tkzsymblsscl{#1}%
 \iftikzymbols@draftabsolute%
 \tksymbls@bx@Prmtrstore{#1}%
-\tikzsymbols@draftbox{2.341ex*\real{\tkzsymbls@Prmtr}}{1.674ex*\real{\tkzsymbls@Prmtr}}%
+\tikzsymbols@draftbox{2.341ex*\tkzsymbls@Prmtr}{1.674ex*\tkzsymbls@Prmtr}%
 \else%
 \ifdim\tkzsymbls@scl<0pt\set@tkzsymblsscl{-#1}\fi%
 \begin{tikzpicture}[x=2.4ex, y=2.4ex, line width=0.09ex*\tkzsymbls@scl,scale=#1,
 decoration={random steps,segment length=0.15ex*\tkzsymbls@scl, amplitude=0.1ex*\tkzsymbls@scl}]
-\fill[#2, line width=0.08ex*\tkzsymbls@scl] (0,0) circle (0.28);
-\draw[line width=0.08ex*\tkzsymbls@scl] (0,0) circle (0.28);
-\fill[#3] (0.28,-0.33) rectangle (0.66,0.33);
-\draw (0.28,-0.33) rectangle (0.66,0.33);
-\draw[decorate, line width=0.06ex*\tkzsymbls@scl] (0.28,0) -- (0.5,0.25);
-\draw[decorate,line width=0.06ex*\tkzsymbls@scl] (0.28,0) -- (0.6,0.0);
-\draw[decorate,line width=0.06ex*\tkzsymbls@scl] (0.28,0) -- (0.5,-0.25);
+\filldraw[fill=#2, line width=0.08ex*\tkzsymbls@scl] (0,0) circle (0.28);
+\filldraw[fill=#3] (0.28,-0.33) rectangle (0.66,0.33);
+\foreach \x/\y in { 0.5/0.25 , 0.6/0 , 0.5/-0.25 }
+  \draw[decorate, line width=0.06ex*\tkzsymbls@scl] (0.28,0) -- (\x,\y);
 \draw[rotate=-20] (0.12,0.1) -- (0.2,0.05);
 \draw[rotate=-20] (0.27,-0.1) .. controls (0.2,-0.072) and (0.1,-0.06) .. (0.,-0.1);
 \end{tikzpicture}%
@@ -1282,7 +1206,7 @@ decoration={random steps,segment length=0.15ex*\tkzsymbls@scl, amplitude=0.1ex*\
 \set@tkzsymblsscl{#1}%
 \iftikzymbols@draftabsolute%
 \tksymbls@bx@Prmtrstore{#1}%
-\tikzsymbols@draftbox{2.4288ex*\real{\tkzsymbls@Prmtr}}{1.6008ex*\real{\tkzsymbls@Prmtr}}%
+\tikzsymbols@draftbox{2.4288ex*\tkzsymbls@Prmtr}{1.6008ex*\tkzsymbls@Prmtr}%
 \else%
 \ifdim\tkzsymbls@scl<0pt\set@tkzsymblsscl{-#1}\fi%
 \begin{tikzpicture}[x=2.4ex, y=2.4ex, line width=0.09ex*\tkzsymbls@scl,scale=#1]
@@ -1310,16 +1234,15 @@ decoration={random steps,segment length=0.15ex*\tkzsymbls@scl, amplitude=0.1ex*\
 \set@tkzsymblsscl{#1}%
 \iftikzymbols@draftabsolute%
 \tksymbls@bx@Prmtrstore{#1}%
-\tikzsymbols@draftbox{2.4288ex*\real{\tkzsymbls@Prmtr}}{1.6008ex*\real{\tkzsymbls@Prmtr}}%
+\tikzsymbols@draftbox{2.4288ex*\tkzsymbls@Prmtr}{1.6008ex*\tkzsymbls@Prmtr}%
 \else%
 \ifdim\tkzsymbls@scl<0pt\set@tkzsymblsscl{-#1}\fi%
 \begin{tikzpicture}[x=2.4ex, y=2.4ex, line width=0.09ex*\tkzsymbls@scl,scale=#1,
 decoration={random steps,segment length=0.15ex*\tkzsymbls@scl, amplitude=0.1ex*\tkzsymbls@scl}]
 \shade[ball color=orange!80!black] (0.298,-0.33) rectangle (0.692,0.337);
-\draw[decorate, line width=0.06ex*\tkzsymbls@scl] (0.298,0) -- (0.5,0.25);
-\draw[decorate,line width=0.06ex*\tkzsymbls@scl] (0.298,0) -- (0.6,0.0);
-\draw[decorate,line width=0.06ex*\tkzsymbls@scl] (0.298,0) -- (0.5,-0.25);
-\shade[ball color=#2, line width=0.08ex*\tkzsymbls@scl] (-0.01,0) circle (0.31);
+\foreach \x/\y in { 0.5/0.25 , 0.6/0 , 0.5/-0.25 }
+  \draw[decorate, line width=0.06ex*\tkzsymbls@scl] (0.298,0) -- (\x,\y);
+\shade[ball color=#2] (-0.01,0) circle (0.31);
 \draw[rotate=-20] (0.12,0.1) -- (0.2,0.05);
 \draw[rotate=-20] (0.283,-0.1) .. controls (0.2,-0.072) and (0.1,-0.06) .. (0.,-0.1);
 \end{tikzpicture}%
@@ -1327,40 +1250,38 @@ decoration={random steps,segment length=0.15ex*\tkzsymbls@scl, amplitude=0.1ex*\
 }%
 \tikzsymbols@use@box{drWalley#1#2}%
 \tikzsymbolsaftersymbolinput%
-}
+}%    \end{macrocode}
 \tkzsymbls@Declare@Robust@Commandx{Cat}[1][1=1,usedefault]{%
 \tikzsymbols@ifsaveboxundefined{Cat#1}{%
 \set@tkzsymblsscl{#1}%
 \iftikzymbols@draftabsolute%
 \tksymbls@bx@Prmtrstore{#1}%
-\tikzsymbols@draftbox{1.899ex*\real{\tkzsymbls@Prmtr}}{1.957ex*\real{\tkzsymbls@Prmtr}}%
+\tikzsymbols@draftbox{1.899ex*\tkzsymbls@Prmtr}{1.957ex*\tkzsymbls@Prmtr}%
 \else%
 \ifdim\tkzsymbls@scl<0pt\set@tkzsymblsscl{-#1}\fi%
 \begin{tikzpicture}[x=2.33ex,y=2.33ex, line width=0.093ex*\tkzsymbls@scl,scale=#1]
 \draw (0,0) circle (0.3);
-\draw[rounded corners=0.163ex*\tkzsymbls@scl] (-0.3,0) -- (-0.35,0.5) -- (0,0.3);
-\draw[rounded corners=0.163ex*\tkzsymbls@scl] (0,0.3) -- (0.35,0.5) -- (0.3,0);
+\foreach \xi/\xii in { 0.3/0.35 }
+  {
+    \draw[rounded corners=0.163ex*\tkzsymbls@scl]
+      (-\xi,0) -- (-\xii,0.5) -- (0,\xi)  (0,\xi) -- (\xii,0.5) -- (\xi,0);
+  }
 \fill (-0.15,.15) circle (0.05);
 \fill (0.15,.15) circle (0.05);
-\draw[rounded corners=0.175ex*\tkzsymbls@scl,yshift=-0.12ex]
-   (0,0) -- (0,-0.1) -- (-0.1,-0.095);
-\draw[rounded corners=0.175ex*\tkzsymbls@scl,yshift=-0.12ex]
-   (0,0) -- (0,-0.1) -- (0.1,-0.095);
+\foreach \x in { 0.1 , -0.1 }
+  \draw[rounded corners=0.175ex*\tkzsymbls@scl,yshift=-0.12ex]
+     (0,0) -- (0,-0.1) -- (\x,-0.095);
 \draw[rounded corners=.12ex*\tkzsymbls@scl,yshift=-.15ex,
-         line width=0.03em*\real{0.9}*\tkzsymbls@scl]
-(-0.1,0.1) -- (0,0) -- (0.1,0.1) -- cycle ;
-\draw[line width=0.035ex*\tkzsymbls@scl]
-   (-0.1,-0.05)..controls(-0.25,0)and(-0.35,0).. (-0.4,-0.05);
-\draw[line width=0.035ex*\tkzsymbls@scl](-0.1,-0.05)..
-   controls(-0.25,-0.01)and(-0.35,-0.09).. (-0.4,-0.14);
-\draw[line width=0.035ex*\tkzsymbls@scl](-0.1,-0.05)..
-   controls(-0.25,-0.045)and(-0.35,-0.13).. (-0.4,-0.23);
-\draw[line width=0.035ex*\tkzsymbls@scl]
-   (0.1,-0.05)..controls(0.25,0)and(0.35,0).. (0.4,-0.05);
-\draw[line width=0.035ex*\tkzsymbls@scl]
-   (0.1,-0.05)..controls(0.25,-0.01)and(0.35,-0.09).. (0.4,-0.14);
-\draw[line width=0.035ex*\tkzsymbls@scl]
-   (0.1,-0.05)..controls(0.25,-0.045)and(0.35,-0.13).. (0.4,-0.23);
+         line width=0.03em*0.9*\tkzsymbls@scl]
+   (-0.1,0.1) -- (0,0) -- (0.1,0.1) -- cycle ;
+\foreach \a/\b/\c/\d in
+  { 0.1/0.25/0.35/0.4 , -0.1/-0.25/-0.35/-0.4 }
+  \foreach \yi/\yii/\yiii in
+    { 0/0/-0.05 , -0.01/-0.09/-0.14 , -0.045/-0.13/-0.23 }
+    {
+      \draw[line width=0.035ex*\tkzsymbls@scl]
+         (\a,-0.05)..controls(\b,\yi)and(\c,\yii).. (\d,\yiii);
+    }
 \end{tikzpicture}%
 \fi%
 }%
@@ -1372,7 +1293,7 @@ decoration={random steps,segment length=0.15ex*\tkzsymbls@scl, amplitude=0.1ex*\
 \set@tkzsymblsscl{#1}%
 \iftikzymbols@draftabsolute%
 \tksymbls@bx@Prmtrstore{#1}%
-\tikzsymbols@draftbox{2.149ex*\real{\tkzsymbls@Prmtr}}{1.717ex*\real{\tkzsymbls@Prmtr}}%
+\tikzsymbols@draftbox{2.149ex*\tkzsymbls@Prmtr}{1.717ex*\tkzsymbls@Prmtr}%
 \else%
 \ifdim\tkzsymbls@scl<0pt\set@tkzsymblsscl{-#1}\fi%
 \def\Black@is@Black{black}%
@@ -1386,18 +1307,14 @@ decoration={random steps,segment length=0.1ex*\tkzsymbls@scl, amplitude=0.1ex*\t
 \ifx\Black@or@not@Black\Black@is@Black
    \draw[line width=0.08ex*\tkzsymbls@scl] (0,0) circle (0.33);\fi
 \fill[#3] (0,0.1) -- (-0.33,0) -- (-0.26,0.23);
-\fill[#3] (0.3465,0) arc (0:42:0.34 and 0.345)  --
-  (0.2,0.23)-- (0.31,0.0) -- cycle;
-\fill[#3] (-0.3465,0) arc (0:-42:-0.34 and -0.345)  --
-   (-0.2,0.23)-- (-0.31,0.0) -- cycle;
+\fill[#3] (0.3465,0) arc (0:42:0.34 and 0.345)  -- (0.2,0.23)-- (0.31,0.0) -- cycle;
+\fill[#3] (-0.3465,0) arc (0:-42:-0.34 and -0.345)  -- (-0.2,0.23)-- (-0.31,0.0) -- cycle;
 \fill[#4] (0.129,0.1425) arc (55:-180:.05);
 \fill[#4] (-0.129,0.1425) arc (-55:180:-.05);
+\foreach \x in { (0.5,0.35) , (0.53,0.1) }
 \draw[decorate,decoration={snake,amplitude=.1ex*\tkzsymbls@scl,
  segment length=0.55ex*\tkzsymbls@scl}, #3]
-  (0.26,0.21) -- (0.5,0.35);
-\draw[decorate,decoration={snake,amplitude=.1ex*\tkzsymbls@scl,
- segment length=0.55ex*\tkzsymbls@scl}, #3]
-  (0.26,0.21) -- (0.53,0.1);
+  (0.26,0.21) -- \x;
 \ifx\Black@or@not@Black\Black@is@Black
 \else\draw[line width=0.08ex*\tkzsymbls@scl] (0,0) circle (0.33);\fi
 \end{tikzpicture}%
@@ -1411,19 +1328,17 @@ decoration={random steps,segment length=0.1ex*\tkzsymbls@scl, amplitude=0.1ex*\t
 \set@tkzsymblsscl{#1}%
 \iftikzymbols@draftabsolute%
 \tksymbls@bx@Prmtrstore{#1}%
-\tikzsymbols@draftbox{2.1498ex*\real{\tkzsymbls@Prmtr}}{1.7178ex*\real{\tkzsymbls@Prmtr}}%
+\tikzsymbols@draftbox{2.1498ex*\tkzsymbls@Prmtr}{1.7178ex*\tkzsymbls@Prmtr}%
 \else%
 \ifdim\tkzsymbls@scl<0pt\set@tkzsymblsscl{-#1}\fi%
 \def\Black@is@Black{black}%
 \def\Black@or@not@Black{#2}%
 \begin{tikzpicture}[x=2.4ex, y=2.4ex, line width=0.09ex*\tkzsymbls@scl,scale=#1,
 decoration={random steps,segment length=0.1ex*\tkzsymbls@scl, amplitude=0.1ex*\tkzsymbls@scl}]
-\draw[ decorate,decoration={snake,amplitude=.1ex*\tkzsymbls@scl,
-segment length=0.55ex*\tkzsymbls@scl},decorate, #3!50!black]
-   (0.26,0.21) -- (0.5,0.35);
-\draw[ decorate,decoration={snake,amplitude=.1ex*\tkzsymbls@scl,
-segment length=0.5ex*\tkzsymbls@scl},decorate, #3!50!black]
-   (0.26,0.21) -- (0.53,0.1);
+\foreach \length/\coord in { 0.55/{(0.5,0.35)} , 0.5/{(0.53,0.1)} }
+  \draw[decorate,decoration={snake,amplitude=.1ex*\tkzsymbls@scl,
+  segment length=\length ex*\tkzsymbls@scl},decorate, #3!50!black]
+    \coord --  (0.26,0.21);
 \shade[ball color=#2] (0,0) circle (0.347);
 \fill[decoration={random steps,segment length=0.1ex*\tkzsymbls@scl,
  amplitude=0.01ex*\tkzsymbls@scl},ball color=#3]
@@ -1440,27 +1355,25 @@ decorate  {-- (-0.25,0.24)}
 }%
 \tikzsymbols@use@box{dNinja#1#2#3#4}%
 \tikzsymbolsaftersymbolinput%
-}
+}%    \end{macrocode}
 \tkzsymbls@Declare@Robust@Commandx{NiceReapey}[2][1=1,2={black!20!white},usedefault]{%
 \tikzsymbols@ifsaveboxundefined{NiceReapey#1#2}{%
 \set@tkzsymblsscl{#1}%
 \iftikzymbols@draftabsolute%
 \tksymbls@bx@Prmtrstore{#1}%
-\tikzsymbols@draftbox{(1.1067em+0.07ex)*\real{\tkzsymbls@Prmtr}}
-                     {(0.693em+0.07ex)*\real{\tkzsymbls@Prmtr}}%
+\tikzsymbols@draftbox{(1.1067em+0.07ex)*\tkzsymbls@Prmtr}
+                     {(0.693em+0.07ex)*\tkzsymbls@Prmtr}%
 \else%
 \ifdim\tkzsymbls@scl<0pt\set@tkzsymblsscl{-#1}\fi%
 \begin{tikzpicture}[x=0.11em,y=0.11em, line width=0.07ex*\tkzsymbls@scl,scale=#1]
 \draw[] (1.7,-1) arc (360:180:1.7 and 2)
    arc (260:110:1.5 and 2) .. controls (-1,3.3) and (1,3.3) .. (1.9,2.97)
    arc (260:100:-1.3 and -2) -- cycle;
-\fill[#2] (3,3) .. controls (5,3) and (6,2) .. (7,1.5) -- (3,1.5) -- cycle;
-\draw (3,-3) -- (3,3) .. controls (5,3) and (6,2) .. (7,1.5) -- (3,1.5);
+\filldraw[fill=#2] (3,-3) -- (3,3) .. controls (5,3) and (6,2) .. (7,1.5) -- (3,1.5) -- cycle;
 \draw (0,-1.5) circle (1 and 0.5);
-\draw[line width=0.04ex*\tkzsymbls@scl] (-0.2,-1) -- (-0.2,-2);
-\draw[line width=0.04ex*\tkzsymbls@scl] (0.2,-1) -- (0.2,-2);
-\draw[line width=0.04ex*\tkzsymbls@scl] (0.6,-1) -- (0.6,-2);
-\draw[line width=0.04ex*\tkzsymbls@scl] (-0.6,-1) -- (-0.6,-2);
+\foreach  \x in { 0.2 , 0.6 }
+  \draw[line width=0.04ex*\tkzsymbls@scl]
+    (\x,-1) -- (\x,-2)  (-\x,-1) -- (-\x,-2)  ;
 \draw[line width=0.04ex*\tkzsymbls@scl] (-1,-1.5) -- (1,-1.5);
 \fill (1.25,1.25) circle ( 0.5 and 0.75);
 \fill (-1.25,1.25) circle ( 0.5 and 0.75);
@@ -1519,9 +1432,9 @@ decorate  {-- (-0.25,0.24)}
 \pgfmathsetmacro{\tikzsymbols@y@max}
 {max(\tikzsymbols@y@LA,\tikzsymbols@y@RA,\tikzsymbols@y@LB,\tikzsymbols@y@RB)}%
 \tksymbls@bx@Prmtrstore{#1}%
-\tikzsymbols@draftbox{(0.606ex+1.35ex*\real{\tikzsymbols@x@max}
-   -1.35ex*\real{\tikzsymbols@x@min})*\real{\tkzsymbls@Prmtr}}%
-{(1.173ex+1.35ex*\real{\tikzsymbols@y@max})*\real{\tkzsymbls@Prmtr}}%
+\tikzsymbols@draftbox{(0.606ex+1.35ex*\tikzsymbols@x@max
+   -1.35ex*\tikzsymbols@x@min)*\tkzsymbls@Prmtr}%
+{(1.173ex+1.35ex*\tikzsymbols@y@max)*\tkzsymbls@Prmtr}%
 \else%
 \ifdim\tkzsymbls@scl<0pt\set@tkzsymblsscl{-#1}\fi%
  \begin{tikzpicture}[line width=0.12ex*\tkzsymbls@scl, scale=#1, x=1.35ex, y=1.35ex]
@@ -1548,28 +1461,27 @@ decorate  {-- (-0.25,0.24)}
 \set@tkzsymblsscl{#1}%
 \iftikzymbols@draftabsolute%
 \tksymbls@bx@Prmtrstore{#1}%
-\tikzsymbols@draftbox{0.64ex*\real{\tkzsymbls@Prmtr}}{(1.255ex+2.2pt)*\real{\tkzsymbls@Prmtr}}%
+\tikzsymbols@draftbox{0.64ex*\tkzsymbls@Prmtr}{(1.255ex+2.2pt)*\tkzsymbls@Prmtr}%
 \else%
 \ifdim\tkzsymbls@scl<0pt\set@tkzsymblsscl{-#1}\fi%
 \begin{tikzpicture}[x=1ex, y=1ex, scale=#1, line width=0.07ex*\tkzsymbls@scl]
 \draw[rounded corners=0.04ex*\tkzsymbls@scl] (0,0) -- (0.2,0) -- +(0,1) -- (0,1) -- cycle;
 \draw[line width=0.05ex*\tkzsymbls@scl] (0.1,1) -- (0.1,1.2);
-\draw[xshift=0.95, yshift=2.2, line width=0.04ex*\tkzsymbls@scl]
-   (-0.1,0.6) .. controls (-0.4,0.8) and (-0.1,1) ..  (-0.1,1.2);
-\draw [xshift=0.95, yshift=2.2, line width=0.04ex*\tkzsymbls@scl]
-   (-0.1,0.6) .. controls (0.2,0.8) and (-0.1,1) ..  (-0.1,1.2);
+\foreach \x in { -0.4 , 0.2 }
+  \draw[xshift=0.95, yshift=2.2, line width=0.04ex*\tkzsymbls@scl]
+    (-0.1,0.6) .. controls (\x,0.8) and (-0.1,1) ..  (-0.1,1.2);
 \end{tikzpicture}%
 \fi%
 }%
 \tikzsymbols@use@box{Candle#1}%
 \tikzsymbolsaftersymbolinput%
-}
+}%    \end{macrocode}
 \tkzsymbls@Declare@Robust@Command{Fire}[1][1]{%
 \tikzsymbols@ifsaveboxundefined{Fire#1}{%
 \set@tkzsymblsscl{#1}%
 \iftikzymbols@draftabsolute%
 \tksymbls@bx@Prmtrstore{#1}%
-\tikzsymbols@draftbox{1.576ex*\real{\tkzsymbls@Prmtr}}{1.639ex*\real{\tkzsymbls@Prmtr}}%
+\tikzsymbols@draftbox{1.576ex*\tkzsymbls@Prmtr}{1.639ex*\tkzsymbls@Prmtr}%
 \else%
 \ifdim\tkzsymbls@scl<0pt\set@tkzsymblsscl{-#1}\fi%
 \begin{tikzpicture}[x=1ex,y=1ex,  line width=0.07ex*\tkzsymbls@scl,rotate=45, scale=#1]
@@ -1599,19 +1511,16 @@ decorate  {-- (-0.25,0.24)}
 \set@tkzsymblsscl{#1}%
 \iftikzymbols@draftabsolute%
 \tksymbls@bx@Prmtrstore{#1}%
-\tikzsymbols@draftbox{1.82ex*\real{\tkzsymbls@Prmtr}}{1.705ex*\real{\tkzsymbls@Prmtr}}%
+\tikzsymbols@draftbox{1.82ex*\tkzsymbls@Prmtr}{1.705ex*\tkzsymbls@Prmtr}%
 \else%
 \ifdim\tkzsymbls@scl<0pt\set@tkzsymblsscl{-#1}\fi%
 \begin{tikzpicture}[x=0.7ex,y=0.7ex, scale=#1, line width=0.07ex*\tkzsymbls@scl,
 decoration={snake,amplitude=.05ex*\tkzsymbls@scl,segment length=0.408ex*\tkzsymbls@scl}]
 \draw (0,0) arc (180:270:0.8 and 1) -- ++(0.5,0) arc (270:360:0.8 and 1) -- cycle;
 \draw (2.1,-0.15) -- (2.2,-0.15) arc (90:-90:0.3) -- (1.85, -0.75);
+\foreach \x in {0.4,1,1.6}
 \draw[line width=0.05ex*\tkzsymbls@scl, decorate]
-   (0.4,0.3) -- +(0,1);
-\draw[line width=0.05ex*\tkzsymbls@scl, decorate]
-   (1,0.3) -- +(0,1);
-\draw[line width=0.05ex*\tkzsymbls@scl, decorate]
-   (1.6,0.3) -- +(0,1);
+   (\x,0.3) -- +(0,1);
 \draw (0,-1.05) -- (2.1,-1.05);
 \end{tikzpicture}%
 \fi%
@@ -1619,13 +1528,12 @@ decoration={snake,amplitude=.05ex*\tkzsymbls@scl,segment length=0.408ex*\tkzsymb
 \tikzsymbols@use@box{Coffeecup#1}%
 \tikzsymbolsaftersymbolinput%
 }%
-\fi
 \tkzsymbls@Declare@Robust@Command{Chair}[1][1]{%
 \tikzsymbols@ifsaveboxundefined{Chair#1}{%
 \set@tkzsymblsscl{#1}%
 \iftikzymbols@draftabsolute%
 \tksymbls@bx@Prmtrstore{#1}%
-\tikzsymbols@draftbox{0.97ex*\real{\tkzsymbls@Prmtr}}{1.69ex*\real{\tkzsymbls@Prmtr}}%
+\tikzsymbols@draftbox{0.97ex*\tkzsymbls@Prmtr}{1.69ex*\tkzsymbls@Prmtr}%
 \else%
 \ifdim\tkzsymbls@scl<0pt\set@tkzsymblsscl{-#1}\@tkzssmbls@negtrue\fi%
 \begin{tikzpicture}[x=0.9ex,y=0.9ex, scale=#1, line width=0.07ex*\tkzsymbls@scl]
@@ -1647,7 +1555,7 @@ decoration={snake,amplitude=.05ex*\tkzsymbls@scl,segment length=0.408ex*\tkzsymb
 \set@tkzsymblsscl{#1}%
 \iftikzymbols@draftabsolute%
 \tksymbls@bx@Prmtrstore{#1}%
-\tikzsymbols@draftbox{3.08ex*\real{\tkzsymbls@Prmtr}}{1.68ex*\real{\tkzsymbls@Prmtr}}%
+\tikzsymbols@draftbox{3.08ex*\tkzsymbls@Prmtr}{1.68ex*\tkzsymbls@Prmtr}%
 \else%
 \ifdim\tkzsymbls@scl<0pt\set@tkzsymblsscl{-#1}\fi%
 \begin{tikzpicture}[x=1ex,y=1ex, scale=#1, line width=0.08ex*\tkzsymbls@scl]
@@ -1670,7 +1578,7 @@ decoration={snake,amplitude=.05ex*\tkzsymbls@scl,segment length=0.408ex*\tkzsymb
 \set@tkzsymblsscl{#1}%
 \iftikzymbols@draftabsolute%
 \tksymbls@bx@Prmtrstore{#1}%
-\tikzsymbols@draftbox{1.7175ex*\real{\tkzsymbls@Prmtr}}{1.685ex*\real{\tkzsymbls@Prmtr}}%
+\tikzsymbols@draftbox{1.7175ex*\tkzsymbls@Prmtr}{1.685ex*\tkzsymbls@Prmtr}%
 \else%
 \ifdim\tkzsymbls@scl<0pt\set@tkzsymblsscl{-#1}\fi%
 \begin{tikzpicture}[x=0.65ex,y=0.65ex,scale=#1,
@@ -1705,8 +1613,8 @@ decoration={snake,amplitude=.05ex*\tkzsymbls@scl,segment length=0.408ex*\tkzsymb
 \def\tikzsymbolsMoaithickness{0.03ex}%
 \fi\fi%
 \iftikzymbols@draftabsolute%
-\tikzsymbols@draftbox{(1.001ex+\tikzsymbolsMoaithickness)*\real{\tkzsymbls@Prmtr}}
-    {(1.664ex+\tikzsymbolsMoaithickness)*\real{\tkzsymbls@Prmtr}}%
+\tikzsymbols@draftbox{(1.001ex+\tikzsymbolsMoaithickness)*\tkzsymbls@Prmtr}
+    {(1.664ex+\tikzsymbolsMoaithickness)*\tkzsymbls@Prmtr}%
 \else%
 \begin{tikzpicture}[x=.13ex, y=.13ex, rounded corners=0.01ex*\tkzsymbls@scl, scale=#1,
     line width=\tikzsymbolsMoaithickness*\tkzsymbls@scl]
@@ -1740,7 +1648,7 @@ decoration={snake,amplitude=.05ex*\tkzsymbls@scl,segment length=0.408ex*\tkzsymb
 \set@tkzsymblsscl{#1}%
 \iftikzymbols@draftabsolute%
 \tksymbls@bx@Prmtrstore{#1}%
-\tikzsymbols@draftbox{1.545ex*\real{\tkzsymbls@Prmtr}}{1.772ex*\real{\tkzsymbls@Prmtr}}%
+\tikzsymbols@draftbox{1.545ex*\tkzsymbls@Prmtr}{1.772ex*\tkzsymbls@Prmtr}%
 \else%
 \ifdim\tkzsymbls@scl<0pt\set@tkzsymblsscl{-#1}\fi%
 \begin{tikzpicture}[x=0.9ex,y=0.9ex,line width=0.07ex*\tkzsymbls@scl, scale=#1]
@@ -1753,41 +1661,31 @@ decoration={snake,amplitude=.05ex*\tkzsymbls@scl,segment length=0.408ex*\tkzsymb
 \draw[rounded corners=0.07ex*\tkzsymbls@scl,line width=0.05ex*\tkzsymbls@scl,
     rotate around={-30:(0,1.14)}]
     (-0.2,1.19) arc (270:90:0.1);
-\fill (0,0.78) circle (0.04);
-\fill (0,0.63) circle (0.04);
-\fill (0,0.48) circle (0.04);
-\fill (0,0.2) circle (0.05);
-\fill (0,0) circle (0.05);
-\fill (0,-0.2) circle (0.05);
+\foreach \y in { 0.78 , 0.63 , 0.48 }
+  \fill (0,\y) circle (0.04);
+\foreach \y in { 0.2 , 0 , -0.2 }
+  \fill (0,\y) circle (0.05);
 \fill (-0.06,1.18) circle (0.045);
 \fill (0.06,1.18) circle (0.045);
-\fill (0.1,1.08) circle (0.015);
-\fill (-0.1,1.08) circle (0.015);
-\fill (0.06,1.055) circle (0.015);
-\fill (-0.06,1.055) circle (0.015);
-\fill (0.02,1.039) circle (0.015);
-\fill (-0.02,1.039) circle (0.015);
+\foreach \x/\y in { 0.1/1.08 , 0.06/1.055 , 0.02/1.039}
+  \fill (\x,\y) circle (0.015)  (-\x,\y) circle (0.015) ;
 \draw (-0.3,0.7) -- (-0.6,0.8);
-\draw (-0.6,0.8) -- (-0.75,0.7);
-\draw (-0.6,0.8) -- (-0.55,1);
-\draw (-0.6,0.8) -- (-0.8,0.9);
+\draw (0.3,0.7) -- (0.6,0.8);
 \draw[line width=0.06ex*\tkzsymbls@scl] (-0.65,0) -- (-0.65,1);
 \foreach\x in {-0.85, -0.75,-0.65,-0.55,-0.45}
 \draw[line width=0.05ex*\tkzsymbls@scl] (-0.65,1) -- (\x,1.3);
-\draw (0.3,0.7) -- (0.6,0.8);
-\draw (0.6,0.8) -- (0.75,0.7);
-\draw (0.6,0.8) -- (0.6,1);
-\draw (0.6,0.8) -- (0.8,0.9);
+\foreach \y/\x/\z in { 0.7/0.75 , 0.9/0.8 , 1/0.6/0.55 }
+  \draw (0.6,0.8) -- (\x,\y)  (-0.6,0.8) -- (-\z,\y) ;
 \end{tikzpicture}%
 \fi%
 }%
 \tikzsymbols@use@box{Snowman#1}%
 \tikzsymbolsaftersymbolinput%
-}
+}%    \end{macrocode}
 \tkzsymblsnewcommand{BasicTree}[5][1]{%
 \tikzsymbols@ifsaveboxundefined{BasicTree#1#2#3#4#5}{%
-\def\leaf@or@not@leaf{#5}%
-\ifx\leaf@or@not@leaf\@leaf@is@leaf%
+\def\tikzsymbols@leaf@or@not@leaf{#5}%
+\ifx\tikzsymbols@leaf@or@not@leaf\tikzsymbols@leaf@is@leaf%
 \Basic@Tree[#1]{#2}{#3}{#4}{#5}%
 \else%
 \ifx\\#5\\%
@@ -1805,7 +1703,7 @@ decoration={snake,amplitude=.05ex*\tkzsymbls@scl,segment length=0.408ex*\tkzsymb
 \set@tkzsymblsscl{#1}%
 \iftikzymbols@draftabsolute%
 \tksymbls@bx@Prmtrstore{#1}%
-\tikzsymbols@draftbox{1.64ex*\real{\tkzsymbls@Prmtr}}{1.84ex*\real{\tkzsymbls@Prmtr}}%
+\tikzsymbols@draftbox{1.64ex*\tkzsymbls@Prmtr}{1.84ex*\tkzsymbls@Prmtr}%
 \else%
 \ifdim\tkzsymbls@scl<0pt\set@tkzsymblsscl{-#1}\fi%
 \begin{tikzpicture}[x=1ex,y=1ex, line width=0.04ex*\tkzsymbls@scl,scale=#1]