diff options
| -rw-r--r-- | Master/texmf-dist/doc/latex/tikzsymbols/README | 9 | ||||
| -rw-r--r-- | Master/texmf-dist/doc/latex/tikzsymbols/tikzsymbols.pdf | bin | 814621 -> 813971 bytes | |||
| -rw-r--r-- | Master/texmf-dist/source/latex/tikzsymbols/tikzsymbols.dtx | 1194 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/latex/tikzsymbols/tikzsymbols.sty | 618 |
4 files changed, 907 insertions, 914 deletions
diff --git a/Master/texmf-dist/doc/latex/tikzsymbols/README b/Master/texmf-dist/doc/latex/tikzsymbols/README index 8737d83e853..fe5640b2f07 100644 --- a/Master/texmf-dist/doc/latex/tikzsymbols/README +++ b/Master/texmf-dist/doc/latex/tikzsymbols/README @@ -2,7 +2,7 @@ || tikzsymbols || || ------------|| -The `tiksymbols' package v.3.0f contains symbols created using tikz. +The `tiksymbols' package v.3.0g contains symbols created using tikz. This package provides: * various emoticons * cooking symbols @@ -27,6 +27,10 @@ v3.0 Symbols are stored inside a save-box and are used via \usebox{}, See manual for more changes. v3.0a New cookingsymbols: \grater, \bottle v3.0b Deleted some non-ASCII characters. +v3.0g Removed a bug caused by me messing up with commands. + Removed package 'calc' and replaced \setlength with \pgfmathsetlength + Reworked some code of the symbols. + Did not change the manual. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -34,9 +38,8 @@ Requirements: * tikz * xargs * xcolor - * xspace * xkeyval - * calc + * xspace - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Master/texmf-dist/doc/latex/tikzsymbols/tikzsymbols.pdf b/Master/texmf-dist/doc/latex/tikzsymbols/tikzsymbols.pdf Binary files differindex bc50773de40..58caf440fd4 100644 --- a/Master/texmf-dist/doc/latex/tikzsymbols/tikzsymbols.pdf +++ b/Master/texmf-dist/doc/latex/tikzsymbols/tikzsymbols.pdf diff --git a/Master/texmf-dist/source/latex/tikzsymbols/tikzsymbols.dtx b/Master/texmf-dist/source/latex/tikzsymbols/tikzsymbols.dtx index ae479d36fbc..b095066de21 100644 --- a/Master/texmf-dist/source/latex/tikzsymbols/tikzsymbols.dtx +++ b/Master/texmf-dist/source/latex/tikzsymbols/tikzsymbols.dtx @@ -2,7 +2,7 @@ % !TEX encoding = MacOSRoman %: CheckSum % \fi -%% \CheckSum{0} +% \CheckSum{2304} % % \iffalse meta-comment % @@ -20,8 +20,9 @@ % % This work has the LPPL maintenance status `maintained'. % -% This work consists of the files README, tikzsymbols.dtx and tikzsymbols.ins -% and the derived file tikzsymbols.sty. +% This work consists of the files README, tikzsymbols.dtx and +% tikzsymbols.ins and the derived file tikzsymbols.sty. +% % \fi % % \iffalse @@ -35,15 +36,14 @@ \usepackage{microtype} \usepackage{longtable} \usepackage{booktabs} -\usepackage{tikzsymbols} +\usepackage[]{tikzsymbols} \usepackage{csquotes} \usepackage{mathtools} % \usepackage[colorlinks=true, urlcolor=cyan]{hyperref} -\EnableCrossrefs -\CodelineIndex -\RecordChanges +\AtBeginDocument{\CodelineIndex\EnableCrossrefs\RecordChanges} +\AtEndDocument{\PrintChanges \PrintIndex} %: Ganz oben \makeatletter @@ -57,8 +57,8 @@ \newcommand{\de}[1]{#1} % % -\let\Package\textsf -\let\Option\texttt +\DeclareRobustCommand\Package{\textsf} +\DeclareRobustCommand\Option{\texttt} \let\Makro\cs %\newcommand{\Package}[1]{\textsf{#1}} %\newcommand{\Option}[1]{\texttt{#1}} @@ -126,7 +126,6 @@ % \changes{v3.0f}{2014/10/29}{\cs{tksymblsbxPrmtrstore} to \cs{tksymbls@bx@Prmtrstore}} % % -% % \GetFileInfo{tikzsymbols.sty} % % \iffalse meta-comment @@ -139,6 +138,7 @@ %\DoNotIndex {\verb||} %\DoNotIndex {\draw,\fill,\DeclareRobustCommand, \colorlet,\shade} %\DoNotIndex {\xspace,\begin,\end} +%\DoNotIndex {\fi,\filldraw,\else,\ifdim} % % % @@ -484,8 +484,8 @@ % \begin{longtable}{l@{}c@{}c} % Commands & Optional parameter(s) & Output \\\toprule\endhead % -% \verb|\Sadey| & \oarg{scale}\oarg{color} & \da{\Sadey} \\ % \verb|\Smiley| & \oarg{scale}\oarg{color} & \da{\Smiley} \\ +% \verb|\Sadey| & \oarg{scale}\oarg{color} & \da{\Sadey} \\ % \verb|\Laughey| & \oarg{scale}\oarg{color}\oarg{mouth color} & \da{\Laughey} \\ % \verb|\Annoey| & \oarg{scale}\oarg{color} & \da{\Annoey} \\ % \verb|\Neutrey| & \oarg{scale}\oarg{color} & \da{\Neutrey} \\ @@ -772,8 +772,14 @@ % \fi % \section{Nobody is perfect} % -% If you find a bug, please send me a mail involving a \emph{minimal example} which shows the bug. -% And a description would be nice. +% If you find a bug, please send me a mail +% involving a \emph{minimal example} which +% shows the bug and a short description. Please mention +% the \Package{tikzsymbols} in the header, \enquote{gmx} has +% a habit of putting mails in the spam-folder +% and it helps me to recognize those mails faster. +% This can also be the reason why I may need some time to answer +% the mail. % % % @@ -789,22 +795,24 @@ % % % \StopEventually{Well then, happy \TeX ing!} -% % -%The first lines are always the same: what do I need, how is the package named: +% +% \changes{v3.0g}{2015/10/01}{Deleted package \Package{calc}, using now \cs{pgfmathsetlength} instead of \cs{setlength}.} +% +% The first lines are always the same: what do I need, how is the +% package named: % \begin{macrocode} \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}} % \end{macrocode} -% Furthermore we need to load some libraries from \Package{tikz}: % +% Furthermore we need to load some libraries from \Package{tikz}: % \begin{macrocode} \usetikzlibrary{arrows,decorations.pathmorphing,trees} % \end{macrocode} @@ -813,9 +821,12 @@ %\begin{macro}{\if@tkzssmbls@neg} %\begin{macro}{\iftikzymbols@draftabsolute} % \changes{v3.0}{2013/07/21}{New \cs{newif}} -% We need \verb|\if@tkzssmbls@neg| (\texttt{=negative}), well \dots if something is negative (\verb|\chair| needs this). % -% \verb|\iftikzymbols@draftabsolute| is needed for option \Option{draft=absolute}. +% We need \verb|\if@tkzssmbls@neg| (\texttt{=negative}), well \dots if +% something is negative (\verb|\chair| needs this). +% +% \verb|\iftikzymbols@draftabsolute| is needed for option +% \Option{draft=absolute}. % \begin{macrocode} \newif\if@tkzssmbls@neg \newif\iftikzymbols@draftabsolute @@ -825,8 +836,10 @@ % %\begin{macro}{\Basic@Tree} % \changes{v3.0}{2013/07/21}{has now the default definition \cs{Basic@Tree@on}} -% Now we define our \verb|\Basic@Tree|. We will need it later for our package option. -% Furthermore if no option is given this will be the default definition of \verb|\Basic@Tree| inside the document. +% +% Now we define our \verb|\Basic@Tree|. We will need it later for our +% package option. Furthermore if no option is given this will be the +% default definition of \verb|\Basic@Tree| inside the document. % \begin{macrocode} \newcommand{\Basic@Tree}{\Basic@Tree@on} % \end{macrocode} @@ -835,8 +848,9 @@ %\begin{macro}{final} % \changes{v3.0}{2013/07/21}{using \Package{xkeaval}'s choicekey} % \changes{v3.0}{2013/07/21}{using \Package{xkeaval}'s boolkey} -% If final is false, \verb|\Basic@Tree| will show squares drawn by \Package{tikz}. -% If it is true, it will show trees. +% +% If final is false, \verb|\Basic@Tree| will show squares drawn by +% \Package{tikz}. If it is true, it will show trees. % \begin{macrocode} \define@boolkey{tikzsymbols}{final}[true]{% \ifKV@tikzsymbols@final @@ -851,9 +865,13 @@ % %\begin{macro}{draft} % \changes{v3.0}{2013/07/21}{using \Package{xkeaval}'s choicekey. Furthermore new option absolute is available} -% If option \Option{draft} or \Option{draft=true} is set, then squares drawn by \Package{tikz} are typed instead of trees. % -% If option \Option{draft=absolute} is set, we set \verb|\iftikzymbols@draftabsolute| to \Option{true} and \emph{all} symbols are replaced by plain vanilla rectangles drawn by \LaTeX. +% If option \Option{draft} or \Option{draft=true} is set, then squares +% drawn by \Package{tikz} are typed instead of trees. +% +% If option \Option{draft=absolute} is set, we set +% \verb|\iftikzymbols@draftabsolute| to \Option{true} and \emph{all} +% symbols are replaced by plain vanilla rectangles drawn by \LaTeX. % \begin{macrocode} \define@choicekey*{tikzsymbols}{draft}% [\tikzsymbols@draft@val\tikzsymbols@draft@nr]{false,true,absolute}[true]{% @@ -870,7 +888,9 @@ % %\begin{macro}{draftabsolute} % \changes{v3.0}{2013/07/21}{is obsolete} -% Obsolete Option \Option{draftabsolute}. You can still use it, but it gives a warning. +% +% Obsolete Option \Option{draftabsolute}. You can still use it, but it +% gives a warning. % \begin{macrocode} \define@key{tikzsymbols}{draftabsolute}{% \typeout{----------------------------}% @@ -884,7 +904,9 @@ % %\begin{macro}{marvosym} % \changes{v3.0}{2013/07/21}{using \Package{xkeaval}'s boolkey} -% Now I define the boolean option \Option{marvosym}: you may use it, if you load the package \Package{marvosym}. +% +% Now I define the boolean option \Option{marvosym}: you may use it, +% if you load the package \Package{marvosym}. % \begin{macrocode} \define@boolkey{tikzsymbols}{marvosym}[true]{} % \end{macrocode} @@ -894,9 +916,12 @@ % %\begin{macro}{usebox} % \changes{v3.0}{2013/07/21}{New option} -% If it is true, the savebox-usebox-system is used. If it is false, then the system is turned off. +% +% If it is true, the savebox-usebox-system is used. If it is false, +% then the system is turned off. % -% Furthermore it is true by default (\verb|\KV@tikzsymbols@useboxtrue|) +% Furthermore it is true by default +% (\verb|\KV@tikzsymbols@useboxtrue|) % \begin{macrocode} \define@boolkey{tikzsymbols}{usebox}[true]{} \KV@tikzsymbols@useboxtrue @@ -904,13 +929,20 @@ %\end{macro} % % -%\begin{macro}{prefix} -% \changes{v3.0}{2013/07/21}{New option. Sets all commands to \cs{<prefix>macro}} +% \begin{macro}{prefix} +% \changes{v3.0}{2013/07/21}{New option. Sets all commands to +% \cs{<prefix>macro}} %\begin{macro}{\cmdKV@tikzsymbols@prefix} % \changes{v3.0}{2013/07/23}{New macro.} -% Option \Option{prefix} changes all commands to \verb|\<prefix>command|. If only \Option{prefix} is set, \verb|<prefix>| will be \enquote{tikzsymbols}, but you can define your own prefix via \verb|prefix=<prefix>| % -% If this option is not used inside a document, \verb|\cmdKV@tikzsymbols@prefix| wouldn't be defined. So we define it and let it empty. +% Option \Option{prefix} changes all commands to +% \verb|\<prefix>command|. If only \Option{prefix} is set, +% \verb|<prefix>| will be \enquote{tikzsymbols}, but you can define +% your own prefix via \verb|prefix=<prefix>| +% +% If this option is not used inside a document, +% \verb|\cmdKV@tikzsymbols@prefix| wouldn't be defined. So we define +% it and let it empty. % \begin{macrocode} \newcommand{\cmdKV@tikzsymbols@prefix}{} \define@cmdkey{tikzsymbols}{prefix}[tikzsymbols]{} @@ -919,9 +951,13 @@ %\end{macro} % %\begin{macro}{tree} -% \changes{v3.0}{2013/07/21}{Using \Package{xkeyval}'s choicekey. Can be set: on/true, off/false} -% Now we declare the name of our option: \Option{tree} (I could have named it stone, or wood, etc., but I used \enquote{tree}). -% I am using \Package{xkeyval} now more than before and \Option{tree} can now be set to \Option{on/true} resp. \Option{off/false}. +% \changes{v3.0}{2013/07/21}{Using \Package{xkeyval}'s choicekey. Can +% be set: on/true, off/false} +% +% Now we declare the name of our option: \Option{tree} (I could have +% named it stone, or wood, etc., but I used \enquote{tree}). I am +% using \Package{xkeyval} now more than before and \Option{tree} can +% now be set to \Option{on/true} resp. \Option{off/false}. % \begin{macrocode} \define@choicekey{tikzsymbols}{tree}% [\tikzsymbols@tree@val\tikzsymbols@tree@nr]{true,on,false,off}[on]{% @@ -941,7 +977,7 @@ % % %\begin{macro}{\ProcessOptionsX*} -%We process all options. What is \verb|\relax| doing? +% We process all options. What is \verb|\relax| doing? % \begin{macrocode} \ProcessOptionsX*<tikzsymbols>\relax % \end{macrocode} @@ -949,29 +985,35 @@ % % %\begin{macro}{\tikzsymbolsaftersymbolinput} -% Now we define this strange named macro. -% This macro is inserted after the tikz-code, and is defined as \verb|\xspace|. -% If you don't want \verb|\xspace| to be inserted, you can redefine this command. +% Now we define this strange named macro. This macro is inserted +% after the tikz-code, and is defined as \verb|\xspace|. If you +% don't want \verb|\xspace| to be inserted, you can redefine this +% command. % \begin{macrocode} \newcommand*{\tikzsymbolsaftersymbolinput}{\xspace} % \end{macrocode} %\end{macro} % % -%\begin{macro}{\@leaf@is@leaf} -% We need this command for creating an error-message if the last parameter of BasicTree is neither \enquote{leaf} nor empty. +%\begin{macro}{\tikzsymbols@leaf@is@leaf} +% \changes{v3.0g}{2015/10/01}{Renamed \cs{@leaf@ist@leaf}} +% We need this command for creating an error-message if the last +% parameter of BasicTree is neither \enquote{leaf} nor empty. % \begin{macrocode} - \newcommand*{\@leaf@is@leaf}{leaf} + \newcommand*{\tikzsymbols@leaf@is@leaf}{leaf} % \end{macrocode} %\end{macro} % %\begin{macro}{\tkzsymbls@scl} -% The \oarg{scale} parameter of the commands is stored inside \verb|\tkzsymbls@scl|. +% The \oarg{scale} parameter of the commands is stored inside +% \verb|\tkzsymbls@scl|. % -% \verb|\set@tkzsymblsscl| is a short version of \verb|\setlength{\tkzsymbls@scl}{#1pt}|. I defined it to write less. +% \verb|\set@tkzsymblsscl| is a short version of +% \verb|\setlength{\tkzsymbls@scl}{#1pt}|. I defined it to write +% less. % \begin{macrocode} \newlength{\tkzsymbls@scl} -\newcommand*{\set@tkzsymblsscl}[1]{\setlength{\tkzsymbls@scl}{#1pt}} +\newcommand*{\set@tkzsymblsscl}[1]{\pgfmathsetlength{\tkzsymbls@scl}{#1pt}} % \end{macrocode} %\end{macro} % @@ -979,7 +1021,9 @@ % \changes{v3.0}{2013/07/21}{New length} %\begin{macro}{\tikzsymbols@draftboxheight} % \changes{v3.0}{2013/07/21}{New length} -% The length and the height of the plain vanilla rectangle are stored inside these lengths. +% +% The length and the height of the plain vanilla rectangle are stored +% inside these lengths. % \begin{macrocode} \newlength{\tikzsymbols@draftboxlength} \newlength{\tikzsymbols@draftboxheight} @@ -989,15 +1033,21 @@ % % %\begin{macro}{\tikzsymbols@draftbox} -% \changes{v3.0}{2013/07/21}{New macro. Draw a plain vanilla rectangle if draft is absolute} -% Our plain vanilla rectangle. -% Using \verb|\tikzsymbols@draftboxlength| and \verb|\tikzsymbols@draftboxheight| to calculate the length and the height of the box. +% \changes{v3.0}{2013/07/21}{New macro. Draw a plain vanilla +% rectangle if draft is absolute} % -% The box is drawn using \verb|\frame| and a \verb|\vbox|, \verb|\hbox| construction. \verb|\vbadness=\maxdimen| is needed because otherwise there would be many overfull v-box errors. +% Our plain vanilla rectangle. Using +% \verb|\tikzsymbols@draftboxlength| and +% \verb|\tikzsymbols@draftboxheight| to calculate the length and the +% height of the box. +% +% The box is drawn using \verb|\frame| and a \verb|\vbox|, +% \verb|\hbox| construction. \verb|\vbadness=\maxdimen| is needed +% because otherwise there would be many overfull v-box errors. % \begin{macrocode} \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{% @@ -1008,21 +1058,30 @@ %\end{macro} % %\begin{macro}{\tikzsymbols@draftQbox} -% \changes{v3.0}{2013/07/21}{New macro. Short form of \cs{tikzsymbols@draftbox}} -% Short form of \verb|\tikzsymbols@draftbox|. \enquote{Q} means \enquote{Quadrat}(\emph{square}) and just means that height and length of the box are the same. +% \changes{v3.0}{2013/07/21}{New macro. Short form of +% \cs{tikzsymbols@draftbox}} +% +% Short form of \verb|\tikzsymbols@draftbox|. \enquote{Q} means +% \enquote{Quadrat}(\emph{square}) and just means that height and +% length of the box are the same. % \begin{macrocode} \newcommand*{\tikzsymbols@draftQbox}[1]{\tikzsymbols@draftbox{#1}{#1}} % \end{macrocode} %\end{macro} % %\begin{macro}{\tkzsymbls@Prmtr} -% \changes{v3.0}{2013/07/21}{New macro. Needed for the plain vanilla rectangles} +% \changes{v3.0}{2013/07/21}{New macro. Needed for the plain vanilla +% rectangles} %\begin{macro}{\tksymbls@bx@Prmtrstore} -% \changes{v3.0}{2013/07/21}{New macro. Makes \cs{tkzsymblsPrmtr} positive (if it is negative)} +% \changes{v3.0}{2013/07/21} +% {New macro. Makes \cs{tkzsymblsPrmtr} positive (if it is negative)} % \changes{v3.0c}{2014/10/25}{Added a @ sign.} -% \verb|\tikzsymbols@draftbox| doesn't like negative numbers. -% So to be sure that only positive numbers are used, \verb|\tksymbls@bx@Prmtrstore| changes \verb|\tkzsymbls@Prmtr| to be positive (if it is negative). -% I am using \verb|\tkzsymbls@Prmtr| instead of \verb|#1| (scaling) in \verb|\tikzsymbols@draftbox| +% +% \verb|\tikzsymbols@draftbox| doesn't like negative numbers. So to +% be sure that only positive numbers are used, +% \verb|\tksymbls@bx@Prmtrstore| changes \verb|\tkzsymbls@Prmtr| to be +% positive (if it is negative). I am using \verb|\tkzsymbls@Prmtr| +% instead of \verb|#1| (scaling) in \verb|\tikzsymbols@draftbox| % \begin{macrocode} \newcommand*\tkzsymbls@Prmtr{} \newcommand*\tksymbls@bx@Prmtrstore[1]{% @@ -1032,22 +1091,41 @@ %\end{macro}\end{macro} % %\begin{macro}{\current@tikzsymbols} -% \changes{v3.0}{2013/07/21}{New macro. Current script size and text color is stored inside} -% The \verb|\sbox| and \verb|\usebox| system I am using now has one drawback: If the symbol was used inside e.g. \verb|\color{red}| all other symbols of the same type are red, even if they are in normal text, or even inside another color. +% \changes{v3.0}{2013/07/21}{New macro. Current script size and text +% color is stored inside} +% +% The \verb|\sbox| and \verb|\usebox| system I am using now has one +% drawback: If the symbol was used inside e.g. \verb|\color{red}| all +% other symbols of the same type are red, even if they are in normal +% text, or even inside another color. % -% The same with e.g. \verb|\small|. If a symbol was used the first time inside e.g. \verb|\small| all other symbols of the same type are as small as the first one. +% The same with e.g. \verb|\small|. If a symbol was used the first +% time inside e.g. \verb|\small| all other symbols of the same type +% are as small as the first one. % -% To overcome this problem, the save-boxes name depends of the current color and the current script size. These things are stored inside \verb|\current@tikzsymbols|. +% To overcome this problem, the save-boxes name depends of the +% current color and the current script size. These things are stored +% inside \verb|\current@tikzsymbols|. % \begin{macrocode} \newcommand*{\current@tikzsymbols}{} % \end{macrocode} %\end{macro} % %\begin{macro}{\tikzsymbols@ifsaveboxundefined} -% \changes{v3.0}{2013/07/21}{New macro. Checks if save-box is undefined, if true: does nothing; if false: defined new box.} -% For every symbol we define a box (using \Makro{sbox}). If a symbol of the same type is used again, it doesn't have to be recalculated. We simply use the same output as the first symbol. If the symbol has another input, a new save-box is defined. +% \changes{v3.0}{2013/07/21}{New macro. Checks if save-box is +% undefined, if true: does nothing; if false: defined new box.} +% +% For every symbol we define a box (using \Makro{sbox}). If a symbol +% of the same type is used again, it doesn't have to be +% recalculated. We simply use the same output as the first symbol. If +% the symbol has another input, a new save-box is defined. % -% For example: \verb|\Summertree[1]|\verb|\Summertree[1]|\verb|\Summertree[1]| is only calculated once because they are alike: \Summertree[1]\Summertree[1]\Summertree[1]. \verb|\Summertree[1.3]| will be saved in an own save-box because it is different then the others. +% For example: +% \verb|\Summertree[1]|\verb|\Summertree[1]|\verb|\Summertree[1]| is +% only calculated once because they are alike: +% \Summertree[1]\Summertree[1]\Summertree[1]. \verb|\Summertree[1.3]| +% will be saved in an own save-box because it is different then the +% others. % % \begin{macrocode} \newcommand*{\tikzsymbols@ifsaveboxundefined}[2]{% @@ -1082,7 +1160,10 @@ % % %\begin{macro}{\ifKV@tikzsymbols@usebox = true} -% If option \Option{usebox} is \Option{false}, then \verb|\tikzsymbols@ifsaveboxundefined| and \verb|\tikzsymbols@use@box| will be redefined so that they don't store the input inside a save-box. +% If option \Option{usebox} is \Option{false}, then +% \verb|\tikzsymbols@ifsaveboxundefined| and +% \verb|\tikzsymbols@use@box| will be redefined so that they don't +% store the input inside a save-box. % \begin{macrocode} \ifKV@tikzsymbols@usebox \relax% if true @@ -1095,13 +1176,18 @@ % %\begin{macro}{\tkzsymbls@Declare@Robust@Command} % \changes{v3.0}{2013/07/21}{New macro. Is needed for option prefix} -% To make use of the \Option{prefix} option (and to write less), I am using these commands. -% If \verb|<prefix>| is empty, the commands will be \enquote{normal}: \verb|\Smiley| -% will be \verb|\Smiley|, etc. +% +% To make use of the \Option{prefix} option (and to write less), I am +% using these commands. If \verb|<prefix>| is empty, the commands +% will be \enquote{normal}: \verb|\Smiley| will be \verb|\Smiley|, +% etc. % -% If \verb|<prefix>| is not empty the commands will be defined as \verb|\<prefix>command| e.g. \verb|\<prefix>Smiley| , etc. +% If \verb|<prefix>| is not empty the commands will be defined as +% \verb|\<prefix>command| e.g. \verb|\<prefix>Smiley| , etc. % -% Furthermore a new command is defined. \verb|tikzsymbolsuse| needs this command to specify wherever the input is a symbol of \Package{tikzsymbols} or not. +% Furthermore a new command is defined. \verb|tikzsymbolsuse| needs +% this command to specify wherever the input is a symbol of +% \Package{tikzsymbols} or not. % \begin{macrocode} \newcommand{\tkzsymbls@Declare@Robust@Command}[1]{% \expandafter\def\csname\cmdKV@tikzsymbols@prefix#1tikzsymbolsuse\endcsname{}% @@ -1112,8 +1198,8 @@ %\end{macro} % %\begin{macro}{\tkzsymbls@Declare@Robust@Commandx} -% \changes{v3.0}{2013/07/21}{New macro. Is needed for option prefix} -% Same as before +% \changes{v3.0}{2013/07/21}{New macro. Is needed for option prefix} +% Same as before % \begin{macrocode} \newcommand{\tkzsymbls@Declare@Robust@Commandx}[1]{% \expandafter\def\csname\cmdKV@tikzsymbols@prefix#1tikzsymbolsuse\endcsname{}% @@ -1124,8 +1210,8 @@ %\end{macro} % %\begin{macro}{\tkzsymblsnewcommand} -% \changes{v3.0}{2013/07/21}{New macro. Is needed for option prefix} -% Same as before +% \changes{v3.0}{2013/07/21}{New macro. Is needed for option prefix} +% Same as before % \begin{macrocode} \newcommand{\tkzsymblsnewcommand}[1]{% \expandafter\def\csname\cmdKV@tikzsymbols@prefix#1tikzsymbolsuse\endcsname{}% @@ -1138,10 +1224,13 @@ % % %\begin{macro}{\tikzsymbolsuse} -% \changes{v3.0}{2013/07/21}{New macro. Using symbols without carrying about the prefix} -% To be able to don't have to care about the prefix, I made this command. -% Simply write the name of the symbols inside without backslash. -% If the symbol is not defined, there will be an error message. +% \changes{v3.0}{2013/07/21}{New macro. Using symbols without +% carrying about the prefix} +% +% To be able to don't have to care about the prefix, I made this +% command. Simply write the name of the symbols inside without +% backslash. If the symbol is not defined, there will be an error +% message. % \begin{macrocode} \newcommand{\tikzsymbolsuse}[1]{% \ifcsname\cmdKV@tikzsymbols@prefix#1tikzsymbolsuse\endcsname% @@ -1153,9 +1242,10 @@ %\end{macro} % %\begin{macro}{\tikzsymbols@let} -% \changes{v3.0}{2013/07/21}{New macro. \cs{let} with prefix} -% \verb|\eggbeater| is the same as \verb|\Schneebesen| (\verb|\let\eggbeater\Schneebesen|). -% To make the prefix also for the \verb|\let| commands, I defined my own let-command +% \changes{v3.0}{2013/07/21}{New macro. \cs{let} with prefix} +% \verb|\eggbeater| is the same as \verb|\Schneebesen| +% (\verb|\let\eggbeater\Schneebesen|). To make the prefix also for +% the \verb|\let| commands, I defined my own let-command % \begin{macrocode} \newcommand{\tikzsymbols@let}[2]{% \expandafter\def\csname\cmdKV@tikzsymbols@prefix#1tikzsymbolsuse\endcsname{}% @@ -1171,7 +1261,9 @@ % % %\begin{macro}{\@Tree@SetUp} -% First we define our \verb|\@Tree@SetUp| (how the trees will look like) (I used the code from the \Package{tikz} manual and changed it a little bit): +% First we define our \verb|\@Tree@SetUp| (how the trees will look +% like) (I used the code from the \Package{tikz} manual and changed +% it a little bit): % \begin{macrocode} \def\@Tree@SetUp{\tikzset{% ld/.style={level distance=##1ex},lw/.style={line width=##1ex},% @@ -1187,30 +1279,32 @@ % % %\begin{macro}{\Basic@Tree} -% \verb|\Basic@Tree@off| and \verb|\Basic@Tree@on| are necessary for option \Option{tree}, \Option{draft} and \Option{final}. +% \verb|\Basic@Tree@off| and \verb|\Basic@Tree@on| are necessary for +% option \Option{tree}, \Option{draft} and \Option{final}. % % %\begin{macro}{\Basic@Tree@ff} -% \changes{v3.0}{2013/07/21}{Draft rectangle same size as normal tree. Changed parts of the code} -% \verb|\Basic@Tree@off| is used when trees are turned off. +% \changes{v3.0}{2013/07/21}{Draft rectangle same size as normal +% tree. Changed parts of the code} \verb|\Basic@Tree@off| is used +% when trees are turned off. % \begin{macrocode} \DeclareRobustCommandx{\Basic@Tree@off}[5][1=1, usedefault]{{% \set@tkzsymblsscl{#1}% \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); @@ -1228,11 +1322,12 @@ %\end{macro} % %\begin{macro}{\Basic@Tree@on} -% \changes{v3.0}{2013/07/21}{Same here} -% \changes{v3.0b}{2014/10/19}{Transfered \cs{pgfarrowsdeclare} inside -% the tikzpicture environment. It seems this command produces an -% unwanted space.} -% \verb|\Basic@Tree@on| is used when trees are turned on. +% \changes{v3.0}{2013/07/21}{Same here} +% \changes{v3.0b}{2014/10/19}{Transfered \cs{pgfarrowsdeclare} inside +% the tikzpicture environment. It seems this command produces an +% unwanted space.} +% +% \verb|\Basic@Tree@on| is used when trees are turned on. % \begin{macrocode} \DeclareRobustCommandx{\Basic@Tree@on}[5][1=1, usedefault]{{% \iftikzymbols@draftabsolute% @@ -1240,7 +1335,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}% @@ -1254,12 +1349,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}}{% @@ -1280,36 +1375,37 @@ % % \subsection{Cookingsymbolcode} % -%\begin{macro}{\Kochtopf = \pot} -% I am using \verb|\DefineRobustCommand| so that the symbols can be used inside \verb|\section{}|, \verb|\footnote|, \verb|\index{}|, etc. -% It may would have worked with \Makro{newcommand} too. +%\begin{macro}{\Kochtopf,\pot} +% I am using \verb|\DefineRobustCommand| so that the symbols can be +% used inside \verb|\section{}|, \verb|\footnote|, \verb|\index{}|, +% etc. It may would have worked with \Makro{newcommand} too. % -% You can either use the german commands or the english ones: +% You can either use the german commands or the english ones: % \begin{macrocode} \tkzsymbls@Declare@Robust@Command{Kochtopf}[1][1]{% \tikzsymbols@ifsaveboxundefined{Kochtopf#1}{% \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% }% @@ -1321,46 +1417,46 @@ decoration={snake,amplitude=.12ex*\tkzsymbls@scl,segment length=0.93ex*\tkzsymbl %\end{macro} % % -%\begin{macro}{\Bratpfanne = \fryingpan} +%\begin{macro}{\Bratpfanne,\fryingpan} +% +% \changes{v3.0g}{2015/10/01}{Added \cs{foreach} to the code.} % %^^A You may wonder why I am writing something like: \verb|amplitude=.12ex*#1|. %^^A Well it's hard to explain in english, but I try my best: %^^A After being scaled the symbols would not look so good without \verb|*#1|. %^^A The lines would be too thin, the corners not rounded enough, etc. %^^A To prevent too thin lines due to scaling I am multiplying the line width and the corners etc. so that they look the same, no matter how you scale it. -% If you wonder why I am using \verb|line width=0.07ex*\tkzsymbls@scl| instead of \verb|line width=0.07ex*#1| I will try to explain it. % -% After being multiplied by a negative number, the line widths would be too thin for the size of the symbol. -% So it is necessary that the line width is always scaled with a positive number. -% Thus I am using \verb|\tkzsymbls@scl| because it is always positive. +% If you wonder why I am using \verb|line width=0.07ex*\tkzsymbls@scl| +% instead of \verb|line width=0.07ex*#1| I will try to explain it. +% +% After being multiplied by a negative number, the line widths would +% be too thin for the size of the symbol. So it is necessary that the +% line width is always scaled with a positive number. Thus I am using +% \verb|\tkzsymbls@scl| because it is always positive. % % \begin{macrocode} \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% } @@ -1369,28 +1465,22 @@ decoration={snake,amplitude=.05ex*\tkzsymbls@scl,segment length=0.408ex*\tkzsymb %\end{macro} % % -%\begin{macro}{\Schneebesen = \eggbeater} -% The next one: +%\begin{macro}{\Schneebesen,\eggbeater} +% \changes{v3.0g}{2015/10/01}{Added \cs{foreach} to the code.} +% The next one: % \begin{macrocode} \tkzsymbls@Declare@Robust@Command{Schneebesen}[1][1]{% \tikzsymbols@ifsaveboxundefined{Schneebesen#1}{% \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}% @@ -1405,7 +1495,8 @@ decoration={snake,amplitude=.05ex*\tkzsymbls@scl,segment length=0.408ex*\tkzsymb % % % -%\begin{macro}{\Sieb = \sieve} +%\begin{macro}{\Sieb,\sieve} +% \changes{v3.0g}{2015/10/01}{Added \cs{foreach} to the code.} % Now a long one; % \begin{macrocode} \tkzsymbls@Declare@Robust@Command{Sieb}[1][1]{% @@ -1413,62 +1504,40 @@ 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} % \end{macrocode} %\end{macro} % % -%\begin{macro}{\Purierstab = \blender} -% Da es keine Umlaute gibt, werden \"a, \"u, \"o einfach zu: a, u, o. -% This symbol is far from perfect. And I know that the correct translation of \enquote{P\"urierstab} would be \enquote{immersion blender}, but I am just using \enquote{blender}: +%\begin{macro}{\Purierstab,\blender} +% Da es keine Umlaute gibt, werden \"a, \"u, \"o einfach zu: a, u, o. +% This symbol is far from perfect. And I know that the correct +% translation of \enquote{P\"urierstab} would be \enquote{immersion +% blender}, but I am just using \enquote{blender}: % \begin{macrocode} \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] @@ -1487,15 +1556,15 @@ decoration={snake,amplitude=.05ex*\tkzsymbls@scl,segment length=0.408ex*\tkzsymb %\end{macro} % % -%\begin{macro}{\Dreizack = \trident} -% Important cooking-tool for cooking: +%\begin{macro}{\Dreizack,\trident} +% Important cooking-tool for cooking: % \begin{macrocode} \tkzsymbls@Declare@Robust@Command{Dreizack}[1][1]{% \tikzsymbols@ifsaveboxundefined{Dreizack#1}{% \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] @@ -1515,7 +1584,9 @@ decoration={snake,amplitude=.05ex*\tkzsymbls@scl,segment length=0.408ex*\tkzsymb %\end{macro} % % -%\begin{macro}{\Backblech = \bakingplate} +%\begin{macro}{\Backblech,\bakingplate} +% \changes{v3.0g}{2015/10/01}{Added \cs{foreach} to the code.} +% \changes{v3.0g}{2015/10/01}{Added \cs{filldraw} to the code.} % I may have too many strange named commands: % \begin{macrocode} \tkzsymbls@Declare@Robust@Command{Backblech}[1][1]{% @@ -1523,19 +1594,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% }% @@ -1548,21 +1617,21 @@ decoration={snake,amplitude=.05ex*\tkzsymbls@scl,segment length=0.408ex*\tkzsymb % % %\begin{macro}{\Ofen = \oven} -% I may have again too many strange named commands: +% I may have again too many strange named commands: % \begin{macrocode} \tkzsymbls@Declare@Robust@Command{Ofen}[1][1]{% \tikzsymbols@ifsaveboxundefined{Ofen#1}{% \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}% @@ -1576,15 +1645,15 @@ decoration={snake,amplitude=.05ex*\tkzsymbls@scl,segment length=0.408ex*\tkzsymb %\end{macro} % % -%\begin{macro}{\Pfanne = \pan} -%A pan \dots What did you expect? +%\begin{macro}{\Pfanne,\pan} +% A pan \dots What did you expect? % \begin{macrocode} \tkzsymbls@Declare@Robust@Command{Pfanne}[1][1]{% \tikzsymbols@ifsaveboxundefined{Pfanne#1}{% \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] @@ -1606,25 +1675,25 @@ decoration={snake,amplitude=.05ex*\tkzsymbls@scl,segment length=0.408ex*\tkzsymb %\end{macro} % % -%\begin{macro}{\Herd = \cooker} -% I hope it's the right translation: +%\begin{macro}{\Herd,\cooker} +% \changes{v3.0g}{2015/10/01}{Added \cs{foreach} to the code.} +% I hope it's the right translation: % \begin{macrocode} \tkzsymbls@Declare@Robust@Command{Herd}[1][1]{% \tikzsymbols@ifsaveboxundefined{Herd#1}{% \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% }% @@ -1636,27 +1705,27 @@ decoration={snake,amplitude=.05ex*\tkzsymbls@scl,segment length=0.408ex*\tkzsymb %\end{macro} % % -%\begin{macro}{\Saftpresse = \squeezer} -% It's an old squeezer: +%\begin{macro}{\Saftpresse,\squeezer} +% \changes{v3.0g}{2015/10/01}{Added \cs{foreach} to the code.} +% It's an old squeezer: % \begin{macrocode} \tkzsymbls@Declare@Robust@Command{Saftpresse}[1][1]{% \tikzsymbols@ifsaveboxundefined{Saftpresse#1}{% \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% @@ -1669,23 +1738,23 @@ decoration={snake,amplitude=.05ex*\tkzsymbls@scl,segment length=0.408ex*\tkzsymb %\end{macro} % % -%\begin{macro}{\Schussel = \bowl} -% It may looks a bit weird, but I like it. -% Wieder dasselbe mit den Umlauten: \"u=u. +%\begin{macro}{\Schussel,\bowl} +% It may looks a bit weird, but I like it. Wieder dasselbe mit den +% Umlauten: \"u=u. % \begin{macrocode} \tkzsymbls@Declare@Robust@Command{Schussel}[1][1]{% \tikzsymbols@ifsaveboxundefined{Schussel#1}{% \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% }% @@ -1698,16 +1767,16 @@ decoration={snake,amplitude=.05ex*\tkzsymbls@scl,segment length=0.408ex*\tkzsymb % % % -%\begin{macro}{\Schaler = \peeler} -% I cannot believe I forgot this command. I made it and forgot to copy and paste it inside this document! -% Jedenfalls wieder \"a=a: +%\begin{macro}{\Schaler,\peeler} +% I cannot believe I forgot this command. I made it and forgot to +% copy and paste it inside this document! Jedenfalls wieder \"a=a: % \begin{macrocode} \tkzsymbls@Declare@Robust@Command{Schaler}[1][1]{% \tikzsymbols@ifsaveboxundefined{Schaler#1}{% \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] @@ -1715,8 +1784,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% }% @@ -1728,16 +1796,16 @@ decoration={snake,amplitude=.05ex*\tkzsymbls@scl,segment length=0.408ex*\tkzsymb %\end{macro} % % -%\begin{macro}{\Reibe = \grater} -%\changes {v3.0a} {2013/08/06} {new command: \Makro{Reibe}} -% Text hinschreiben\marginpar{Text hinschreiben} +%\begin{macro}{\Reibe,\grater} +% \changes {v3.0a} {2013/08/06} {new command: \Makro{Reibe}} Text +% hinschreiben\marginpar{Text hinschreiben} % \begin{macrocode} \tkzsymbls@Declare@Robust@Command{Reibe}[1][1]{% \tikzsymbols@ifsaveboxundefined{Reibe#1}{% \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]% @@ -1757,23 +1825,25 @@ decoration={snake,amplitude=.05ex*\tkzsymbls@scl,segment length=0.408ex*\tkzsymb %\end{macro} % % -%\begin{macro}{\Flasche = \bottle} -%\changes {v3.0a} {2013/08/14} {new command: \Makro{Flasche}} -% Text hinschreiben +%\begin{macro}{\Flasche,\bottle} +% \changes{v3.0g}{2015/10/01}{Using option \Option{transparent}.} +% \changes {v3.0a} {2013/08/14} {new command: \Makro{Flasche}} Text +% hinschreiben % \begin{macrocode} \tkzsymbls@Declare@Robust@Command{Flasche}[1][1]{% \tikzsymbols@ifsaveboxundefined{Flasche#1}{% \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 (-0.15,0.8) -- (0.45,0.8); %\draw (-0.15,0.3) -- (0.45,0.3); -\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}% @@ -1792,21 +1862,29 @@ decoration={snake,amplitude=.05ex*\tkzsymbls@scl,segment length=0.408ex*\tkzsymb % \subsection{Emoticonscode} % %\begin{macro}{\Sadey \dSadey} -% Another name of Sadey is Frowny, but I named it Sadey because there are enough Frownys in the world. -% All \enquote{3D} Emoticons start with \verb|\d...|, and all Emoticons end with an \enquote{ey} (exception: \enquote{Cat}, \enquote{Ninja}, and else). -% The \enquote{default color} of the 2D Emoticons is \verb|opacity=0|, it's useful for \verb|\colorbox{yellow}{\Sadey}| which leads to \colorbox{yellow}{\Sadey} instead of \colorbox{yellow}{\Sadey[][white]} (with default=white). -% \begin{macrocode} -\tkzsymbls@Declare@Robust@Commandx{Sadey}[2][1=1, 2={opacity=0}, usedefault]{% +% \changes{v3.0g}{2015/10/01}{Added \cs{foreach} to the code.} +% \changes{v3.0g}{2015/10/01}{Added \cs{filldraw} to the code.} +% \changes{v3.0g}{2015/10/01}{Using option \Option{none}} +% +% Another name of Sadey is Frowny, but I named it Sadey because there +% are enough Frownys in the world. All \enquote{3D} Emoticons start +% with \verb|\d...|, and all Emoticons end with an \enquote{ey} +% (exception: \enquote{Cat}, \enquote{Ninja}, and else). The +% \enquote{default color} of the 2D Emoticons is \verb|none|, +% it's useful for \verb|\colorbox{yellow}{\Sadey}| which leads to +% \colorbox{yellow}{\Sadey} instead of +% \colorbox{yellow}{\Sadey[][white]} (with default=white). +% \begin{macrocode} +\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); @@ -1821,7 +1899,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] @@ -1843,19 +1921,21 @@ decoration={snake,amplitude=.05ex*\tkzsymbls@scl,segment length=0.408ex*\tkzsymb % % %\begin{macro}{\Annoey \dAnnoey} -% An annoyed Smiley -\_- +% \changes{v3.0g}{2015/10/01}{Added \cs{filldraw} to the code.} +% \changes{v3.0g}{2015/10/01}{Using option \Option{none}} +% +% An annoyed Smiley -\_- % \begin{macrocode} -\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); @@ -1870,7 +1950,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] @@ -1890,20 +1970,21 @@ decoration={snake,amplitude=.05ex*\tkzsymbls@scl,segment length=0.408ex*\tkzsymb % % %\begin{macro}{\Smiley \dSmiley} -% A normal Smiley +% \changes{v3.0g}{2015/10/01}{Added \cs{filldraw} to the code.} +% \changes{v3.0g}{2015/10/01}{Using option \Option{none}} +% A normal Smiley % \begin{macrocode} \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); @@ -1919,7 +2000,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] @@ -1938,24 +2019,23 @@ decoration={snake,amplitude=.05ex*\tkzsymbls@scl,segment length=0.408ex*\tkzsymb % % %\begin{macro}{\Laughey \dLaughey} +% \changes{v3.0g}{2015/10/01}{Added \cs{filldraw} to the code.} +% \changes{v3.0g}{2015/10/01}{Using option \Option{none}} % A laughing Smiley % \begin{macrocode} -\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% @@ -1968,7 +2048,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] @@ -1990,19 +2070,20 @@ decoration={snake,amplitude=.05ex*\tkzsymbls@scl,segment length=0.408ex*\tkzsymb % % %\begin{macro}{\Neutrey \dNeutrey} +% \changes{v3.0g}{2015/10/01}{Added \cs{foreach} to the code.} +% \changes{v3.0g}{2015/10/01}{Using option \Option{none}} % neutral Smiley \verb+:|+ % \begin{macrocode} -\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); @@ -2017,7 +2098,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] @@ -2038,22 +2119,25 @@ decoration={snake,amplitude=.05ex*\tkzsymbls@scl,segment length=0.408ex*\tkzsymb % % %\begin{macro}{\Winkey \dWinkey} -%\changes{v3.0}{2013/07/27}{Changed the smile. Old Winkey available as \Makro{oldWinkey} and \Makro{olddWinkey}} +% \changes{v3.0}{2013/07/27}{Changed the smile. Old Winkey available +% as \Makro{oldWinkey} and \Makro{olddWinkey}} %\begin{macro}{\oldWinkey \olddWinkey} %\changes{v3.0}{2013/07/27}{Old Winkey} +% \changes{v3.0g}{2015/10/01}{Added \cs{filldraw} to the code.} +% \changes{v3.0g}{2015/10/01}{Using option \Option{none}} +% % ;) % \begin{macrocode} -\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); @@ -2063,17 +2147,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); @@ -2088,7 +2171,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] @@ -2107,7 +2190,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] @@ -2129,19 +2212,21 @@ decoration={snake,amplitude=.05ex*\tkzsymbls@scl,segment length=0.408ex*\tkzsymb % % %\begin{macro}{\Sey \dSey} +% \changes{v3.0g}{2015/10/01}{Added \cs{filldraw} to the code.} +% \changes{v3.0g}{2015/10/01}{Using option \Option{none}} +% % I can't think of a better name \verb|:S| % \begin{macrocode} -\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); @@ -2156,7 +2241,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] @@ -2175,23 +2260,24 @@ decoration={snake,amplitude=.05ex*\tkzsymbls@scl,segment length=0.408ex*\tkzsymb % % %\begin{macro}{\Xey \dXey} +% \changes{v3.0g}{2015/10/01}{Added \cs{foreach} to the code.} +% \changes{v3.0g}{2015/10/01}{Added \cs{filldraw} to the code.} +% \changes{v3.0g}{2015/10/01}{Using option \Option{none}} +% % I can't think of a better name again. % \begin{macrocode} -\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% @@ -2204,15 +2290,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% @@ -2226,19 +2310,21 @@ decoration={snake,amplitude=.05ex*\tkzsymbls@scl,segment length=0.408ex*\tkzsymb % % %\begin{macro}{\Innocey \dInnocey} +% \changes{v3.0g}{2015/10/01}{Added \cs{filldraw} to the code.} +% \changes{v3.0g}{2015/10/01}{Using option \Option{none}} +% % An innocent Smiley % \begin{macrocode} -\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); @@ -2251,13 +2337,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] @@ -2282,23 +2368,25 @@ decoration={snake,amplitude=.05ex*\tkzsymbls@scl,segment length=0.408ex*\tkzsymb % % %\begin{macro}{\Cooley \dCooley} +% \changes{v3.0g}{2015/10/01}{Added \cs{foreach} to the code.} +% \changes{v3.0g}{2015/10/01}{Added \cs{filldraw} to the code.} +% \changes{v3.0g}{2015/10/01}{Using option \Option{none}} +% % Don't know what I shall write here. % \begin{macrocode} -\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); +\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; -\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); @@ -2314,7 +2402,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] @@ -2322,10 +2410,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% @@ -2339,27 +2426,27 @@ decoration={snake,amplitude=.05ex*\tkzsymbls@scl,segment length=0.408ex*\tkzsymb % % %\begin{macro}{\Tongey \dTongey} +% \changes{v3.0g}{2015/10/01}{Added \cs{filldraw} to the code.} +% \changes{v3.0g}{2015/10/01}{Using option \Option{none}} +% % :P % \begin{macrocode} -\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% }% @@ -2371,16 +2458,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); @@ -2396,30 +2481,31 @@ decoration={snake,amplitude=.05ex*\tkzsymbls@scl,segment length=0.408ex*\tkzsymb % % %\begin{macro}{\Nursey \dNursey} +% \changes{v3.0g}{2015/10/01}{Added \cs{filldraw} to the code.} +% \changes{v3.0g}{2015/10/01}{Using option \Option{none}} +% % a Nurse. % \begin{macrocode} \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% }% @@ -2431,7 +2517,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] @@ -2445,7 +2531,7 @@ 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% }% @@ -2459,19 +2545,21 @@ decoration={snake,amplitude=.05ex*\tkzsymbls@scl,segment length=0.408ex*\tkzsymb % % %\begin{macro}{\Vomey \dVomey} -% *Bl\"a\"argh* +% \changes{v3.0g}{2015/10/01}{Added \cs{filldraw} to the code.} +% \changes{v3.0g}{2015/10/01}{Using option \Option{none}} +% +% *Bl\"a\"argh* % \begin{macrocode} -\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) .. @@ -2480,8 +2568,9 @@ 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 (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); @@ -2496,7 +2585,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] @@ -2519,33 +2608,36 @@ decoration={snake,amplitude=.05ex*\tkzsymbls@scl,segment length=0.408ex*\tkzsymb %\end{macro} % % -%\begin{macro}{\Walley \dWalley} -% Well \dots{} this Emoticon should be the visualization of the german saying \enquote{Gegen eine Wand rennen}, which means something like: Not being able to solve a problem. +%\begin{macro}{\Walley \dWalley, \rWalley, \drWalley} +% \changes{v3.0g}{2015/10/01}{Added \cs{foreach} to the code.} +% \changes{v3.0g}{2015/10/01}{Added \cs{filldraw} to the code.} +% \changes{v3.0g}{2015/10/01}{Using option \Option{none}} +% +% Well \dots{} this Emoticon should be the visualization of the +% german saying \enquote{Gegen eine Wand rennen}, which means +% something like: Not being able to solve a problem. % \begin{macrocode} -\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); + (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.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}% @@ -2554,23 +2646,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}% @@ -2584,7 +2673,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] @@ -2612,16 +2701,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}% @@ -2629,48 +2717,47 @@ decoration={random steps,segment length=0.15ex*\tkzsymbls@scl, amplitude=0.1ex*\ }% \tikzsymbols@use@box{drWalley#1#2}% \tikzsymbolsaftersymbolinput% -} -% \end{macrocode} +}% \end{macrocode} %\end{macro} % % % %\begin{macro}{\Cat} -% *Miau* +% \changes{v3.0g}{2015/10/01}{Added \cs{foreach} to the code.} +% +% *Miau* % \begin{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% }% @@ -2682,14 +2769,16 @@ decoration={random steps,segment length=0.15ex*\tkzsymbls@scl, amplitude=0.1ex*\ % % %\begin{macro}{\Ninja \dNinja} -% A Ninja. +% \changes{v3.0g}{2015/10/01}{Added \cs{foreach} to the code.} +% +% A Ninja. % \begin{macrocode} \tkzsymbls@Declare@Robust@Commandx{Ninja}[4][1=1, 2=black, 3=red, 4=white, usedefault]{% \tikzsymbols@ifsaveboxundefined{Ninja#1#2#3#4}{% \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}% @@ -2697,25 +2786,20 @@ decoration={random steps,segment length=0.15ex*\tkzsymbls@scl, amplitude=0.1ex*\ \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}] \fill[#2] (0,0) circle (0.33); -%\draw (-0.2,-0.125) -- ++(0.4,0); \fill[decoration={random steps,segment length=0.1ex*\tkzsymbls@scl, amplitude=0.01ex*\tkzsymbls@scl}, decorate,#3] (-0.33,0) -- (0.33,0) -- (0.23,0.23) -- (-0.23,0.23) -- cycle; \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}% @@ -2729,21 +2813,18 @@ 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); -%\draw (-0.2,-0.125) -- ++(0.4,0); \fill[decoration={random steps,segment length=0.1ex*\tkzsymbls@scl, amplitude=0.01ex*\tkzsymbls@scl},ball color=#3] decorate {(-0.33,0) -- (0.3465,0) } @@ -2759,37 +2840,36 @@ decorate {-- (-0.25,0.24)} }% \tikzsymbols@use@box{dNinja#1#2#3#4}% \tikzsymbolsaftersymbolinput% -} -% \end{macrocode} +}% \end{macrocode} %\end{macro} % % % % %\begin{macro}{\NiceReapey} -% Not very well made. -% But it's better than nothing +% \changes{v3.0g}{2015/10/01}{Added \cs{foreach} to the code.} +% \changes{v3.0g}{2015/10/01}{Added \cs{filldraw} to the code.} +% +% Not very well made. But it's better than nothing % \begin{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); @@ -2807,15 +2887,22 @@ decorate {-- (-0.25,0.24)} % \subsection{Other symbols(s)} % %\begin{macro}{\tikzsymbols@Strichmaxerl@XCheck} -% \changes{v3.0}{2013/07/21}{New macro. Is needed for \cs{Strichmaxerl}} -% This macro is needed for \verb|\Strichmaxerl|. -% It's not easy to explain why it does what it does, but \dots uhm \dots it has something to do with mathematics and why the plain vanilla rectangle has always the correct proportions. -% -% It is important for having \Makro{Strichmaxerl}'s plain vanilla rectangle the correct size. -% Well, at first this macro checks if \verb|#1| is greater than 0. -% If it is, it checks if \verb|#1| is smaller than $0.18$ (radius of the Strichmaxerl's head). If it is, it sets \verb|#1| to $0$ (it is smaller than the head-radius and is therefore not needed). -% If it is not, it subtracts $0.18$ from \verb|#1| (we only want the length which overhangs the head). -% Else \dots +% \changes{v3.0}{2013/07/21}{New macro. Is needed for +% \cs{Strichmaxerl}} +% +% This macro is needed for \verb|\Strichmaxerl|. It's not easy to +% explain why it does what it does, but \dots uhm \dots it has +% something to do with mathematics and why the plain vanilla rectangle +% has always the correct proportions. +% +% It is important for having \Makro{Strichmaxerl}'s plain vanilla +% rectangle the correct size. Well, at first this macro checks if +% \verb|#1| is greater than 0. If it is, it checks if \verb|#1| is +% smaller than $0.18$ (radius of the Strichmaxerl's head). If it is, +% it sets \verb|#1| to $0$ (it is smaller than the head-radius and is +% therefore not needed). If it is not, it subtracts $0.18$ from +% \verb|#1| (we only want the length which overhangs the head). Else +% \dots % \begin{macrocode} \newcommand{\tikzsymbols@Strichmaxerl@XCheck}[1]{% \ifdim #1 pt > 0pt% @@ -2836,7 +2923,9 @@ decorate {-- (-0.25,0.24)} %\end{macro} % %\begin{macro}{\tikzsymbols@Strichmaxerl@ifSmallerZero} -% \changes{v3.0}{2013/07/21}{New macro. Is needed for \cs{Strichmaxerl}. Checks if something is smaller than 0} +% \changes{v3.0}{2013/07/21}{New macro. Is needed for +% \cs{Strichmaxerl}. Checks if something is smaller than 0} +% % Checks if something is smaller than zero ($<0$). % \begin{macrocode} \newcommand{\tikzsymbols@Strichmaxerl@ifSmallerZero}[1]{% @@ -2849,9 +2938,11 @@ decorate {-- (-0.25,0.24)} % % %\begin{macro}{\Strichmaxerl} -% \changes{v3.0}{2013/07/21}{Renamed \cs{Person} to \cs{Strichmaxerl} and added great parts of code} -% My first symbol: a Strichmaxerl. -% And one of the most complex symbols in this package. +% \changes{v3.0}{2013/07/21}{Renamed \cs{Person} to \cs{Strichmaxerl} +% and added great parts of code} +% +% My first symbol: a Strichmaxerl. And one of the most complex +% symbols in this package. % \begin{macrocode} \tkzsymbls@Declare@Robust@Commandx{Strichmaxerl}[5][1=1,2=-22,3=22,4=27,5=-27,usedefault]{% \tikzsymbols@ifsaveboxundefined{Strichmaxerl#1#2#3#4#5}{% @@ -2859,7 +2950,9 @@ decorate {-- (-0.25,0.24)} \iftikzymbols@draftabsolute% % \end{macrocode} % -% Now we have to calculate the length and the height of the separate parts of the \verb|\Strichmaxerl|. +% Now we have to calculate the length and the height of the separate +% parts of the \verb|\Strichmaxerl|. +% % At first the lengths (they have all an \verb|x| in the name). \par % \verb|LA| for \enquote{linker Arm} (\emph{left arm}). \par % \verb|RA| for \enquote{rechter Arm} (\emph{right arm}). \par @@ -2887,16 +2980,20 @@ decorate {-- (-0.25,0.24)} % %^^A X % -% We use the \verb|\tikzsymbols@Strichmaxerl@XCheck| to check if \dots (see above). +% We use the \verb|\tikzsymbols@Strichmaxerl@XCheck| to check if \dots +% (see above). % \begin{macrocode} \tikzsymbols@Strichmaxerl@XCheck{\tikzsymbols@x@LA}% \tikzsymbols@Strichmaxerl@XCheck{\tikzsymbols@x@RA}% \tikzsymbols@Strichmaxerl@XCheck{\tikzsymbols@x@LB}% \tikzsymbols@Strichmaxerl@XCheck{\tikzsymbols@x@RB}% % \end{macrocode} -% We want the greatest and the smallest length for our rectangle. -% To evaluate them, we define \verb|\tikzsymbols@x@max| and \verb|\tikzsymbols@x@min| using \Package{tikz} \verb|max()| and \verb|min()|. -% The 0 is very important: if for example all lengths are negative, the greatest number is 0. (Sorry, I don't want to explain it, it has something to do with math). +% We want the greatest and the smallest length for our rectangle. To +% evaluate them, we define \verb|\tikzsymbols@x@max| and +% \verb|\tikzsymbols@x@min| using \Package{tikz} \verb|max()| and +% \verb|min()|. The 0 is very important: if for example all lengths +% are negative, the greatest number is 0. (Sorry, I don't want to +% explain it, it has something to do with math). % \begin{macrocode} \pgfmathsetmacro{\tikzsymbols@x@max} {max(0,\tikzsymbols@x@LA,\tikzsymbols@x@RA,\tikzsymbols@x@LB,\tikzsymbols@x@RB)}% @@ -2906,7 +3003,8 @@ decorate {-- (-0.25,0.24)} % %^^A Y % -% Finished the length. Now we calculate our height. Arms and legs more or less separate. +% Finished the length. Now we calculate our height. Arms and legs more +% or less separate. % % Arms: First we subtract $0.2$ (= adding $-0.2$) (torso length) % @@ -2927,7 +3025,7 @@ decorate {-- (-0.25,0.24)} \pgfmathsetmacro{\tikzsymbols@y@max} {max(\tikzsymbols@y@LA,\tikzsymbols@y@RA,\tikzsymbols@y@LB,\tikzsymbols@y@RB)}% % \end{macrocode} -% For the box-length we calculate: +% For the box-length we calculate: %\begin{equation} %(0.606ex + 1.35ex(\text{x=1.35ex})*\text{(greatest (positive) length)} - 1.35*\text{(smallest (negative) length})) * \text{scale} %\end{equation} @@ -2937,9 +3035,9 @@ decorate {-- (-0.25,0.24)} %\end{equation} % \begin{macrocode} \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] @@ -2965,42 +3063,42 @@ decorate {-- (-0.25,0.24)} %\end{macro} % %\begin{macro}{\Candle} -% A burning candle +% \changes{v3.0g}{2015/10/01}{Added \cs{foreach} to the code.} +% +% A burning candle % \begin{macrocode} \tkzsymbls@Declare@Robust@Command{Candle}[1][1]{% \tikzsymbols@ifsaveboxundefined{Candle#1}{% \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} +}% \end{macrocode} %\end{macro} % % %\begin{macro}{\Fire} -% Just a fire. +% Just a fire. % \begin{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] @@ -3029,8 +3127,11 @@ decorate {-- (-0.25,0.24)} % % %\begin{macro}{\Cofeecup} -% \changes{v3.0}{2013/07/21}{Changed angle of arc a bit. Changed a length.} -% Just a cup of coffee. +% \changes{v3.0}{2013/07/21}{Changed angle of arc a bit. Changed a +% length.} +% \changes{v3.0g}{2015/10/01}{Added \cs{foreach} to the code.} +% +% Just a cup of coffee. % \begin{macrocode} \ifKV@tikzsymbols@marvosym \else% \tkzsymbls@Declare@Robust@Command{Coffeecup}[1][1]{% @@ -3038,19 +3139,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% @@ -3058,7 +3156,6 @@ decoration={snake,amplitude=.05ex*\tkzsymbls@scl,segment length=0.408ex*\tkzsymb \tikzsymbols@use@box{Coffeecup#1}% \tikzsymbolsaftersymbolinput% }% -\fi % \end{macrocode} %\end{macro} % @@ -3070,7 +3167,7 @@ decoration={snake,amplitude=.05ex*\tkzsymbls@scl,segment length=0.408ex*\tkzsymb \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] @@ -3098,7 +3195,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] @@ -3118,7 +3215,7 @@ decoration={snake,amplitude=.05ex*\tkzsymbls@scl,segment length=0.408ex*\tkzsymb %\end{macro} % %\begin{macro}{\Tribar} -% Also called Penrose-Triangle +% Also called Penrose-Triangle. % \begin{macrocode} \tkzsymbls@Declare@Robust@Commandx{Tribar}[4] [1=1,2={opacity=0},3={opacity=0},4={opacity=0},usedefault] @@ -3127,7 +3224,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, @@ -3152,7 +3249,7 @@ decoration={snake,amplitude=.05ex*\tkzsymbls@scl,segment length=0.408ex*\tkzsymb % % %\begin{macro}{\tikzsymbolsMoaithickness} -% You may already thought it: the line width of the \verb|\Moai|. +% You may already thought it: the line width of the \verb|\Moai|. % \begin{macrocode} \newcommand{\tikzsymbolsMoaithickness}{} % \end{macrocode} @@ -3160,7 +3257,7 @@ decoration={snake,amplitude=.05ex*\tkzsymbls@scl,segment length=0.408ex*\tkzsymb % % %\begin{macro}{\Moai} -% From the Easter Island: a Moai. +% From the Easter Island: a Moai. % \begin{macrocode} \tkzsymbls@Declare@Robust@Commandx{Moai}[1][1=1,usedefault]{% \tikzsymbols@ifsaveboxundefined{Moai#1}{% @@ -3176,8 +3273,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] @@ -3210,14 +3307,16 @@ decoration={snake,amplitude=.05ex*\tkzsymbls@scl,segment length=0.408ex*\tkzsymb %\end{macro} % %\begin{macro}{\Snowman} -% A snowman. I think its smile is scary. +% \changes{v3.0g}{2015/10/01}{Added \cs{foreach} to the code.} +% +% A snowman. I think the smile is scary. % \begin{macrocode} \tkzsymbls@Declare@Robust@Command{Snowman}[1][1]{% \tikzsymbols@ifsaveboxundefined{Snowman#1}{% \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] @@ -3230,55 +3329,46 @@ 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} +}% \end{macrocode} %\end{macro} % % % % \subsection{Trees} -% Many great ideas are stolen. -% Don't know who said that, but it's true. +% Many great ideas are stolen. Don't know who said that, but it's +% true. % % % %\begin{macro}{\BasicTree} -% We define our \verb|\BasicTree|. We check if the last parameter is \enquote{leaf}, if not we check if the last parameter is empty, if not: we generate an error message: +% We define our \verb|\BasicTree|. We check if the last parameter is +% \enquote{leaf}, if not we check if the last parameter is empty, if +% not: we generate an error message: % \begin{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\\% @@ -3303,7 +3393,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] @@ -3338,18 +3428,25 @@ decoration={snake,amplitude=.05ex*\tkzsymbls@scl,segment length=0.408ex*\tkzsymb % % %\begin{macro}{\Springtree} -% \changes{v3.0}{2013/07/21}{Replaced \cs{BasicTree} by \cs{tikzsymbolsuse\{BasicTree\}} } +% \changes{v3.0}{2013/07/21}{Replaced \cs{BasicTree} by +% \cs{tikzsymbolsuse\{BasicTree\}} } %\begin{macro}{\Summertree} -% \changes{v3.0}{2013/07/21}{Replaced \cs{BasicTree} by \cs{tikzsymbolsuse\{BasicTree\}} } +% \changes{v3.0}{2013/07/21}{Replaced \cs{BasicTree} by +% \cs{tikzsymbolsuse\{BasicTree\}} } %\begin{macro}{\Autumntree} -% \changes{v3.0}{2013/07/21}{Replaced \cs{BasicTree} by \cs{tikzsymbolsuse\{BasicTree\}} } +% \changes{v3.0}{2013/07/21}{Replaced \cs{BasicTree} by +% \cs{tikzsymbolsuse\{BasicTree\}} } %\begin{macro}{\Wintertree} -% \changes{v3.0}{2013/07/21}{Replaced \cs{BasicTree} by \cs{tikzsymbolsuse\{BasicTree\}} } -% Some predefined Trees. +% \changes{v3.0}{2013/07/21}{Replaced \cs{BasicTree} by +% \cs{tikzsymbolsuse\{BasicTree\}} } +% +% Some predefined Trees. % -% \enquote{Hey that look like the trees in the \dots} -- \enquote{Yes, Yes, I know!}. +% \enquote{Hey that look like the trees in the \dots} -- +% \enquote{Yes, Yes, I know!}. % -% We don't need \verb|\tikzsymbolsaftersymbolinput| because it is already used in \verb|\BasicTree|. +% We don't need \verb|\tikzsymbolsaftersymbolinput| because it is +% already used in \verb|\BasicTree|. % \begin{macrocode} \tkzsymbls@Declare@Robust@Commandx{Springtree}[1][1=1, usedefault]% {\tikzsymbolsuse{BasicTree}[#1]{brown!70!black}{green!90!black}{green!80!black}{leaf}} @@ -3364,7 +3461,8 @@ decoration={snake,amplitude=.05ex*\tkzsymbls@scl,segment length=0.408ex*\tkzsymb %\end{macro}\end{macro}\end{macro} % %\begin{macro}{Error Message} -% If option \Option{marvosym} is active, but the package not loaded, there will be an error message. +% If option \Option{marvosym} is active, but the package not loaded, +% there will be an error message. % \begin{macrocode} \AtBeginDocument{% \ifKV@tikzsymbols@marvosym @@ -3407,16 +3505,10 @@ delete the tikzsymbols option 'marvosym'}} } %</ignore> %\fi +% % % -% -% -% -% -% -% -% -% \PrintChanges \PrintIndex +% % % % 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] |