From 29d242b0b7f6129629a217e2cf3ed2907ae72bcf Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sat, 2 Mar 2013 01:08:58 +0000 Subject: tikzsymbols (28feb13) git-svn-id: svn://tug.org/texlive/trunk@29257 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/tikzsymbols/README | 8 +- .../doc/latex/tikzsymbols/tikzsymbols.pdf | Bin 471415 -> 575421 bytes .../source/latex/tikzsymbols/tikzsymbols.dtx | 578 ++++++++++++++++++--- .../tex/latex/tikzsymbols/tikzsymbols.sty | 356 +++++++++++-- 4 files changed, 814 insertions(+), 128 deletions(-) (limited to 'Master') diff --git a/Master/texmf-dist/doc/latex/tikzsymbols/README b/Master/texmf-dist/doc/latex/tikzsymbols/README index 34c3bea079d..8a319ae87be 100644 --- a/Master/texmf-dist/doc/latex/tikzsymbols/README +++ b/Master/texmf-dist/doc/latex/tikzsymbols/README @@ -2,13 +2,15 @@ || tikzsymbols || || ------------|| -The `tiksymbols« package v.1.6 contains symbols created with tikz. +The `tiksymbols« package v.1.7 contains symbols created with tikz. This package provides: * various emoticons * cooking symbols * trees + * other symbols -Several bugs fixed and some options added. +v.1.6 Several bugs fixed and some options added. +v.1.7 New symbols and some "bugs" fixed - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -16,8 +18,8 @@ Requirements: * tikz * xargs * xcolor - * xkeyval * xspace +Removed "xkeyval" - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Master/texmf-dist/doc/latex/tikzsymbols/tikzsymbols.pdf b/Master/texmf-dist/doc/latex/tikzsymbols/tikzsymbols.pdf index adfbf6b97b0..a048b8f45db 100644 Binary files a/Master/texmf-dist/doc/latex/tikzsymbols/tikzsymbols.pdf and b/Master/texmf-dist/doc/latex/tikzsymbols/tikzsymbols.pdf differ diff --git a/Master/texmf-dist/source/latex/tikzsymbols/tikzsymbols.dtx b/Master/texmf-dist/source/latex/tikzsymbols/tikzsymbols.dtx index 5c953163316..6ca905d227c 100644 --- a/Master/texmf-dist/source/latex/tikzsymbols/tikzsymbols.dtx +++ b/Master/texmf-dist/source/latex/tikzsymbols/tikzsymbols.dtx @@ -21,25 +21,31 @@ \usepackage[english]{babel} \usepackage[T1]{fontenc} \usepackage{array} +\usepackage{microtype} \usepackage{longtable} \usepackage[colorlinks=true]{hyperref} \EnableCrossrefs \CodelineIndex \RecordChanges \makeatletter -\newcommand{\definedBasicTree}[5][1]{% +\DeclareRobustCommandx{\definedBasicTree}[5][1=1, usedefault]{{% \def\leaf@or@not@leaf{#5}% -\def\@leaf@is@leaf{leaf}% -\begin{tikzpicture}[scale=#1,x=1.3ex,y=1.3ex] -\draw[#2] (0,0) -- (0,1); -\draw[#3] (0,1) -- (1,1); -\draw[#4] (1,1) -- (1,0); +\def\@y@@x@y@x{0.095*#1/100} +\begin{tikzpicture}[scale=#1+0.2,x=1.3ex,y=1.3ex, line width=0.07ex*#1] \ifx\leaf@or@not@leaf\@leaf@is@leaf% -\draw[#3] (1,0) -- (0.5,0); -\draw[#4] (0.5,0) -- (0,0); +\draw[#2] (0-\@y@@x@y@x,0) -- (0-\@y@@x@y@x,1.08+0.05*#1/100); +\draw[#3] (0-\@y@@x@y@x,1.08+0.05*#1/100) -- (1.2+\@y@@x@y@x,1.08+0.05*#1/100); +\draw[#4] (1.2+\@y@@x@y@x,1.08+0.05*#1/100) -- (1.2+\@y@@x@y@x,0); +\draw[#3] (1.2+\@y@@x@y@x,0) -- (0.5,0); +\draw[#4] (0.5+0.4*#1/100,0) -- (0-\@y@@x@y@x,0); +\else +\draw[#2] (0,0) -- (0,1); +\draw[#3] (0,1) -- (1.15,1); +\draw[#4] (1.15,1) -- +(0,-1); \fi% \end{tikzpicture}% -}\makeatother +}} +\makeatother \newcommand{\mysec}[1]{\noindent\bfseries\large #1 \par} \begin{document} @@ -74,6 +80,9 @@ %\changes {v1.6} {2013/02/14} {Now an error message is generated if the last parameter of ``BasicTree'' is neither ``leaf'' nor empty.} %\changes {v1.6} {2013/02/14} { New options: draft and final. If in documentclass the option ``draft'' is defined, the package recognizes it. Plus some warnings if you use class option draft/final with package option tree=on/off.} %\changes {v1.6} {2013/02/14} { Renamed ``tikzsymbolsaftersymbolinput'' to ``tikzsymbolsaftersymbolinput''} +%\changes {v1.61} {2013/02/17} {Made an invisible box in BasicTree.} +%\changes {v1.65} {2013/02/17} {Improved BasicTree; New symbols ``Schaler/peeler'', Laughey, Walley, Ninja; but didn't improve the source-description} +%\changes {v1.7} {2013/02/28} {New symbols, etc.} % % % @@ -107,16 +116,16 @@ %\tableofcontents % % -% % \section{Short Introduction} % % There are about two emoticons available in \LaTeX{}: Smiley and Frowny. % But why aren't there more? Or why did nobody make cooking-symbols? % I thought about this questions and during a project I developed some (cooking)symbols. % Developing them was real fun and so I made some more, reworked some etc. -% And one day I had the idea ``Why not uploading these symbols in CTAN?'' -% Well, now I am here and writing this documentation about my first package. -% It's a strange feeling \dots +%^^A And one day I had the idea ``Why not uploading these symbols in CTAN?'' +%^^A Well, now I am here and writing this documentation about my first package. +%^^A It's a strange feeling \dots +% And here they are. % % \section{Options} \label{Options} %^^A This package offers exactly \textbf{one} option (and I am extremly proud of this one option. Do you know why? Because it took almost two hours to produce it. There is no thing like a ``easy'' keyval syntax! Well, maybe it took so long because it was my first time producing something like that \dots{} However, I am extremely glad that this option works \dSmiley). @@ -137,7 +146,7 @@ %^^A\vspace{1ex} % % -% +% \small % \begin{longtable}{c|c} % Options to produce normal trees: \BasicTree{black!60!}{black!40!white}{black!30!white}{leaf} & Options for ``spacefillers'': \definedBasicTree{black!60!}{black!40!white}{black!30!white}{leaf}\\\hline\vspace{-1.5ex} \endhead % \verb|\usepackage{tikzsymbols}| \\[1ex] @@ -146,7 +155,7 @@ % \verb|\documentclass[final]{class}| & \verb|\documentclass[draft]{class}| \\ % \verb|\usepackage{tikzsymbols}| & \verb|\usepackage{tikzsymbols}| % \end{longtable} -% +%\normalsize % % % Note: you shouldn't use both, \verb|tree=on/off| and class-option \verb|draft|. @@ -160,21 +169,23 @@ % % \section{Symbols} % In this section the symbols are introduced. -% They \Smiley \tiny all \dInnocey \Huge change \Kochtopf \small automaticly \Wintertree \large with \oven \normalsize the textsize \Person. +% They \Kochtopf \tiny all \dInnocey \Huge change \Moai \small automaticly \Wintertree \large with \oven \normalsize the textsize \Person. % % -% \subsection{cooking-symbols \Kochtopf} +% \subsection{cooking-symbols \texorpdfstring{\Kochtopf}{Kochtopf}} % At the following table the cooking-symbols are listed. % % The first column shows the Command (at first the german at second the english). % The second are the optional keys. % -% can be a number between 0 and $\infty$\footnote{Infinite; every positve number}, default is $1$. +% can be a number between 0 and (not exactly) $1400$\footnote{Well, you can also use a number between 0 and $-1400$ which will lead to something like this: \Laughey[-1], \Chair[-1], \Person[-1]. Note: Some symbols like +%``Kochtopf/pot'' can't be scaled in such a way. Furthermore the symbols are not designed for negative numbers and will have a bad line width.} +%, default is $1$. % The optional parameter(s) are for both, the german and the english commands the same. % % Da Umlaute nicht angezeigt werden k\"onnen, werden die Umlaute \"o, \"a, \"u ersetzt durch: o, a, u. % -% \begin{longtable}{llcc} +% \begin{longtable}{@{}llcc@{}} % \multicolumn{2}{l}{German \& English Commands} & Optional parameter(s) & Output (defaultsize) \\\hline\vspace{-1.5ex}\endhead % % \verb|\Kochtopf| & \verb|\pot| & \oarg{scale} & \Kochtopf \\ @@ -189,6 +200,7 @@ % \verb|\Herd| & \verb|\cooker| & \oarg{scale} & \cooker \\ % \verb|\Saftpresse| & \verb|\squeezer| & \oarg{scale} & \Saftpresse \\ % \verb|\Schussel| & \verb|\bowl| & \oarg{scale} & \Schussel \\ +% \verb|\Schaler| & \verb|\peeler| & \oarg{scale} & \peeler % \end{longtable} % % \Kochtopf[0] @@ -201,16 +213,17 @@ % % First column shows the commands, the second the optional paramter(s), the third the default-output. % -% can be a number between 0 and $\infty$\footnote{Infinite; every positve number}, default is $1$. +% can be a number between 0 and {not exactly} $2000$\footnote{Do you even need so large symbols?}, default is $1$. % % can be every defined color. % % -%\begin{longtable}{lcc} +%\begin{longtable}{@{}l>{\small}c@{}c@{}} % Commands & Optional parameter(s) & Output (default) \\\hline\vspace{-1.5ex}\endhead % % \verb|\Sadey| & \oarg{scale}\oarg{color} & \Sadey \\ % \verb|\Smiley| & \oarg{scale}\oarg{color} & \Smiley \\ +% \verb|\Laughey| & \oarg{scale}\oarg{color}\oarg{mouth color} & \Laughey \\ % \verb|\Annoey| & \oarg{scale}\oarg{color} & \Annoey \\ % \verb|\Neutrey| & \oarg{scale}\oarg{color} & \Neutrey \\ % \verb|\Winkey| & \oarg{scale}\oarg{color} & \Winkey \\ @@ -218,10 +231,13 @@ % \verb|\Innocey| & \oarg{scale}\oarg{color}\oarg{halo color} & \Innocey \\ % \verb|\wInnocey| & \oarg{scale} & \wInnocey \\ % \verb|\Cooley| & \oarg{scale}\oarg{color} & \Cooley \\ -% \verb|\Tongey| & \oarg{scale}\oarg{color} & \Tongey \\ +% \verb|\Tongey|& \oarg{scale}\oarg{color}\oarg{tongue color} & \Tongey \\ % \verb|\Nursey|\footnote{\label{Kreuz}The cross has nothing to do with religion meanings.}& \oarg{scale}\oarg{color}\oarg{cap color}\oarg{cross color} &\Nursey \\ % \verb|\Vomey| & \oarg{scale}\oarg{color}\oarg{vomit color} & \Vomey \\ +% \verb|\Walley| & \oarg{scale}\oarg{color}\oarg{wall color} & \Walley \\ +%^^A \verb|\rWalley|\footnote{``r'' stands ``random'' and means that the cracks in the wall are generated randomly} & \oarg{scale}\oarg{color}\oarg{wall color} & \rWalley \\ % \verb|\Cat| & \oarg{scale} & \Cat \\ +% \verb|\Ninja|& \oarg{scale}\oarg{color}\oarg{headband color}\oarg{eye color} & \Ninja \\ % \verb|\NiceReapey| & \oarg{scale} & \NiceReapey % %\end{longtable} @@ -232,6 +248,8 @@ % %\verb|\Nursey[][yellow][blue][red]|\Nursey[1][yellow][blue][red]. % +%\verb|\Ninja[1.3][][violet][red]|\Ninja[1.3][][violet][red]. +% % \verb|\colorbox{yellow}{\Winkey \Annoey \Neutrey}|\colorbox{yellow}{\Winkey \Annoey \Neutrey} % %\verb|{\color{blue}\Sey}| {\color{blue}\Sey} @@ -239,15 +257,16 @@ %\subsubsection{``3D'' Emoticons \texorpdfstring{\dSmiley}{dSmiley}} % First column shows the commands (note: the ``3D'' Emoticons begin with \verb|\d...|), the second the optional paramter(s), the third the default-output. % -% can be a number between 0 and $\infty$\footnote{Infinite; every positve number}, default is $1$. +% can be a number between 0 and a large number\footnote{over 500 for sure}, default is $1$. % can be every defined color (see examples below). % % -%\begin{longtable}{lcc} +%\begin{longtable}{@{}l@{}c@{}c@{}} % Commands & Optional parameter(s) & Output (default) \\\hline\vspace{-1.5ex}\endhead % % \verb|\dSadey| & \oarg{scale}\oarg{color} & \dSadey \\ % \verb|\dSmiley| & \oarg{scale}\oarg{color} & \dSmiley \\ +% \verb|\dLaughey| & \oarg{scale}\oarg{color}\oarg{mouth color} & \dLaughey \\ % \verb|\dAnnoey| & \oarg{scale}\oarg{color} & \dAnnoey \\ % \verb|\dNeutrey| & \oarg{scale}\oarg{color} & \dNeutrey \\ % \verb|\dWinkey| & \oarg{scale}\oarg{color} & \dWinkey \\ @@ -256,8 +275,10 @@ % \verb|\dCooley| & \oarg{scale}\oarg{color} & \dCooley \\ % \verb|\dTongey| & \oarg{scale}\oarg{color}\oarg{tongue color} & \dTongey \\ % \verb|\dNursey|$^{\ref{Kreuz}}$& \oarg{scale}\oarg{color}\oarg{cap color}\oarg{cross color} & \dNursey \\ -% \verb|\dVomey| & \oarg{scale}\oarg{color}\oarg{vomit color} & \dVomey -% +% \verb|\dVomey| & \oarg{scale}\oarg{color}\oarg{vomit color} & \dVomey \\ +% \verb|\dWalley| & \oarg{scale}\oarg{color}\oarg{wall color} & \dWalley \\ +%^^A \verb|\drWalley|\footnote{``r'' stands for ``random'' and means that the cracks in the wall are generated randomly} & \oarg{scale}\oarg{color}\oarg{wall color}& \drWalley \\ +% \verb|\dNinja| & \oarg{scale}\oarg{color}\oarg{headband color}\oarg{eye color} & \dNinja \\ %\end{longtable} % % Examples: @@ -267,27 +288,37 @@ % %\verb|\dNursey[][yellow][blue][red]|\dNursey[1][yellow][blue][red]. % +%\verb|\dNinja[1.3][][violet][red]|\dNinja[1.3][][violet][red]. +% +% \subsection{other Symbol(s) \texorpdfstring{\Moai}{Moai}} +% % -% \subsection{other Symbol(s) \Person} % \begin{longtable}{lcc} % Commands & Optional parameter(s) & Output (default) \\\hline\vspace{-1.5ex}\endhead -%\verb|\Person| & \oarg{scale} & \Person +%\verb|\Person| & \oarg{scale} & \Person \\ +%\verb|\Candle| & \oarg{scale} & \Candle\\ +%\verb|\Fire| & \oarg{scale} & \Fire\\ +%\verb|\Coffeecup| & \oarg{scale} & \Coffeecup\\ +%\verb|\Chair| & \oarg{scale} & \Chair\\ +%\verb|\Bed| & \oarg{scale} & \Bed\\ +%\verb|\Moai| & \oarg{scale} & \Moai\\ %\end{longtable} % -%\subsection{Trees \BasicTree{blue!60!black}{red}{green}{leaf}}\label{Trees} +%\subsection{Trees \texorpdfstring{\BasicTree{blue!60!black}{red}{green}{leaf}}{BasicTree}}\label{Trees} % ``Hey, these trees look exactly like the ones in the tikzmanual'' -- ``NO! Not ``exatcly'', they look pretty a like\dots{} Well I changed them a bit\dots{} \dots{} Hey! The best ideas are stolen \dots'' % -% can be a number between 0 and $\infty$\footnote{Infinite; every positve number}, default is $1$. +% can be a number between 0 and $128$\footnote{if it is larger it uses too much of \LaTeX{} memory and an error message appears. Of course there are also negative numbers allowed, but a number smaller than $-2$ doesn't look good anymore.}, default is $1$. % % can be every defined color. % % \verb|{|\emph{leaf}\verb|}| uses the colors of \marg{leaf color a} and \marg{leaf color b}, you can leave this one empty, if you don't want leaves (\verb|\Wintertree| is without \emph{leave}, see examples below). % % If you are using those trees, \LaTeX{} needs longer to produce the pdf. -% So you may use the package option \verb|tree=off| (see section \ref{Options}) to make \LaTeX{} faster. +% So you may use the package option \verb|tree=off| or \verb|draft| (see section \ref{Options}) to make \LaTeX{} faster. % -% \begin{longtable}{lcc} +%\small +% \begin{longtable}{@{}l@{}cc@{}} % Commands & Optional/Needed parameter(s) & Output \\\hline\endhead % \verb|\BasicTree| & \oarg{scale}\marg{trunk color}\marg{leaf color a}\marg{leaf color b}\verb|{|\emph{leaf}\verb|}| & see below\\ % @@ -297,7 +328,7 @@ % \verb|\Wintertree| & \oarg{scale} & \Wintertree \\ % \verb|\WorstTree| & \oarg{scale} & \WorstTree % \end{longtable} -% +%\normalsize % %\noindent\verb|\BasicTree| examples: % @@ -307,7 +338,7 @@ % % \verb|\BasicTree[2]{blue!65!white}{cyan!50!white}{cyan!50!white}{}|\BasicTree[2]{blue!65!white}{cyan!50!white}{cyan!50!white}{} %\\[5ex] -% \verb|\BasicTree| example with option \verb|tree=off| (see section \ref{Options}): +% \verb|\BasicTree| example with option \verb|tree=off| or \verb|draft| (see section \ref{Options}): % % % \verb|\BasicTree{red}{orange}{yellow}{leaf}|\definedBasicTree{red}{orange}{yellow}{leaf} @@ -332,7 +363,7 @@ % If you want ``\dots'' after every symbol you can define: % \verb|\renewcommand{\tikzsymbolsaftersymbolinput}{\dots}| % \renewcommand{\tikzsymbolsaftersymbolinput}{\dots} -% which will lead to: \Smiley \Summertree \Schneebesen +% which will lead to: \Smiley\Summertree\Schneebesen % % Well that's it. % \renewcommand{\tikzsymbolsaftersymbolinput}{\xspace} @@ -340,6 +371,7 @@ % % \section{Warnings and Errors} % +% \subsection{Warnings} % You can use this symbols in chapters, sections, subsections, etc. % But the log file will print a warning, something like: % \begin{quotation} @@ -355,27 +387,42 @@ % % \verb|\subsubsection{``3D'' Emoticons \texorpdfstring{\dSmiley}{dSmiley}}| or % -%\verb|\subsection{Emoticons \texorpdfstring{\Smiley}{Smiley}]}| \\or +%\verb|\subsection{Emoticons \texorpdfstring{\Smiley}{Smiley}}| \\or % %\verb|\subsubsection{``normal'' Emoticons \texorpdfstring{\Cat}{Cat}}| %\\[1ex] % If you misspell \verb|tree=on| or \verb|tree=off| the ouptut will be something like: ``1redorangeyellowleaf''. If that happens, you misspelled something (``on'' or ``off''). % I have no idea how I can solve this (it was hard enough to make an option that works). % +% \subsection{and errors} +% If you load the package ``marvosym'' make sure you load ``tikzsymbols'' after this package because both packages define \verb|\Smiley|, ``marvosym'' via \verb|\newcommand| ``tikzsymbols'' via \verb|\DeclareRobustCommand|. +% +% If you load ``marvosym'' \emph{after} ``tikzsymbols'', \LaTeX{} generates an errormessage because ``Smiley'' has already been defined. +% +% If you load ``marvosym'' \emph{before} ``tikzsymbols'', ``tikzsymbols'' will overwrite marvosym's Smiley and no errormessage is generated. +% +% \section{Nobody is perfect} +% If you are sure that you found a bug, please send me a mail involving a \emph{minimal example} of the code which shows the bug. +% And a description would be nice. +% +% +% +% % \section[Code]{Code (do you really need this section?)} % There is not much to see, all this symbols were created with ``tikz''. % But it may helps you (somehow). +% +% %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} -[2013/02/14 v1.6 Some symbols created using tikz.] -\RequirePackage{xargs} +[2013/02/28 v1.7 Some symbols created using tikz.] \RequirePackage{tikz} +\RequirePackage{xargs} \RequirePackage{xcolor} \RequirePackage{xspace} -\RequirePackage{xkeyval} % \end{macrocode} % Furthermore we need to load some libraries from tikz: @@ -392,27 +439,9 @@ %\end{macro} % \subsection{Cookingsymbolcode} -%\begin{macro}{\Person} -% The first symbol: a person. -% In german it would be called ``Strichmaxerl''. -% I am using \verb|\DefineRobustCommand| so that the symbols can be used in \verb|\section{}|, \verb|\footnote|, \verb|\index{}|, etc. -% \begin{macrocode} -\DeclareRobustCommand{\Person}[1][1]{% - \begin{tikzpicture}[line width=0.12ex*#1,scale=#1,x=1.35ex,y=1.35ex]% - \draw (0,-0.1) -- (0.15,0.2) -- (0.3,-0.1); - \draw (.15,.2) -- (.15,.4); - \draw (.15,.4) -- (.4,.5); - \draw (.15,.4) -- (-0.1,.5); - \draw (.15, .4) -- (.15, .53); - \draw (.15,.8) circle (0.18); -\end{tikzpicture}% -\tikzsymbolsaftersymbolinput% -} -% \end{macrocode} -%\end{macro} - % %\begin{macro}{\Kochtopf = \pot} +% I am using \verb|\DefineRobustCommand| so that the symbols can be used in \verb|\section{}|, \verb|\footnote|, \verb|\index{}|, etc. % You can either use the german commands or the english ones: % \begin{macrocode} \DeclareRobustCommand{\Kochtopf}[1][1]{% @@ -503,6 +532,7 @@ \let\eggbeater\Schneebesen % \end{macrocode} %\end{macro} +% % %\begin{macro}{\Sieb = \sieve} @@ -700,12 +730,28 @@ % \end{macrocode} %\end{macro} % + % +%\begin{macro}{\Schaler = \peeler} +% I can«t believe I forgot this command. I made it and forgot to copy and paste it inside this document!!!! +% Jedenfalls wieder \"a=a: +% \begin{macrocode} +\DeclareRobustCommand{\Schaler}[1][1]{% +\begin{tikzpicture}[x=2.7ex,y=2.3ex, line width=0.07ex*#1,scale=#1] +\draw[rounded corners=0.07ex*#1] (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*#1] (0,0.6) -- (0.2,0.6); +\draw[line width=0.03ex*#1] (0,0.58) -- (0.2,0.58); +\end{tikzpicture}% +\tikzsymbolsaftersymbolinput% +} +\let\peeler\Schaler +% \end{macrocode} +%\end{macro} + % % -%\iffalse -%%%% - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -%\fi % % % @@ -796,6 +842,36 @@ %\end{macro} % +%\begin{macro}{\Laughey \dLaughey} +% A laughing Smiley +% \begin{macrocode} +\DeclareRobustCommandx{\Laughey}[3][1=1,2={opacity=0},3={opacity=0} ,usedefault]{% +\begin{tikzpicture}[x=2.4ex, y=2.4ex, line width=0.09ex*#1,scale=#1] +\fill[#2,line width=0.12ex*#1] (0,0) circle (0.33); +\draw[line width=0.12ex*#1] (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*#1, 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*#1, yshift=-0.5] +(-0.22,-0.0) .. controls (-0.13,-0.23) and (0.13,-0.23) .. (0.22,-0.0) -- cycle; +\end{tikzpicture}% +\tikzsymbolsaftersymbolinput% +} +\DeclareRobustCommandx{\dLaughey}[3][1=1,2=yellow, 3=red ,usedefault]{% +\begin{tikzpicture}[x=2.4ex, y=2.4ex, line width=0.09ex*#1,scale=#1] +\fill[ball color=#2,line width=0.12ex*#1] (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); +\shade[ball color=#3, rounded corners=0.1ex*#1, yshift=-0.3] + (-0.25,-0.0) .. controls (-0.13,-0.26) and (0.13,-0.26) .. (0.25,-0.0) -- cycle; +\end{tikzpicture}% +\tikzsymbolsaftersymbolinput% +} +% \end{macrocode} +%\end{macro} + + % %\begin{macro}{\Neutrey \dNeutrey} @@ -918,7 +994,7 @@ %\begin{macro}{\Cooley \dCooley} -% Cool +% Don't know what I shall write here. % \begin{macrocode} \DeclareRobustCommandx{\Cooley}[2][1=1,2={opacity=0} ,usedefault]{% \begin{tikzpicture}[x=2.4ex, y=2.4ex, line width=0.12ex*#1,scale=#1] @@ -957,7 +1033,7 @@ %\begin{macro}{\Tongey \dTongey} % :P % \begin{macrocode} -\DeclareRobustCommandx{\Tongey}[3][1=1,2={opacity=0},3=red ,usedefault]{% +\DeclareRobustCommandx{\Tongey}[3][1=1,2={opacity=0},3={opacity=0} ,usedefault]{% \begin{tikzpicture}[x=2.4ex, y=2.4ex, line width=0.12ex*#1,scale=#1] \fill[#2,line width=0.12ex*#1] (0,0) circle (0.33); \draw[line width=0.12ex*#1] (0,0) circle (0.33); @@ -1074,6 +1150,76 @@ %\end{macro} % +%\begin{macro}{\Walley \dWalley} +% Well \dots{} this Emoticon should be the visualization of the german saying ``Gegen eine Wand rennen'', which means something like: Not being able to solve a problem. +% \begin{macrocode} +\DeclareRobustCommandx{\Walley}[3][1=1, 2={opacity=0},3={opacity=0}, usedefault]{% +\begin{tikzpicture}[x=2.4ex, y=2.4ex, line width=0.09ex*#1,scale=#1, +decoration={random steps,segment length=0.15ex*#1, amplitude=0.1ex*#1}] +\fill[#2, line width=0.08ex*#1] (0,0) circle (0.28); +\draw[line width=0.08ex*#1] (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[line width=0.06ex*#1] (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*#1] (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*#1] (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}% +\tikzsymbolsaftersymbolinput% +} +\DeclareRobustCommandx{\rWalley}[3][1=1, 2={opacity=0},3={opacity=0}, usedefault]{% +\begin{tikzpicture}[x=2.4ex, y=2.4ex, line width=0.09ex*#1,scale=#1, +decoration={random steps,segment length=0.15ex*#1, amplitude=0.1ex*#1}] +\fill[#2, line width=0.08ex*#1] (0,0) circle (0.28); +\draw[line width=0.08ex*#1] (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*#1] (0.28,0) -- (0.5,0.25); +\draw[decorate,line width=0.06ex*#1] (0.28,0) -- (0.6,0.0); +\draw[decorate,line width=0.06ex*#1] (0.28,0) -- (0.5,-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}% +\tikzsymbolsaftersymbolinput% +} +\DeclareRobustCommandx{\dWalley}[2][1=1, 2=yellow, usedefault]{% +\begin{tikzpicture}[x=2.4ex, y=2.4ex, line width=0.09ex*#1,scale=#1, +decoration={random steps,segment length=0.15ex*#1, amplitude=0.1ex*#1}] +\shade[ball color=orange!80!black] (0.298,-0.33) rectangle (0.692,0.337); +\draw[line width=0.06ex*#1] (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*#1] (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*#1] (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); +\shade[ball color=#2, line width=0.08ex*#1] (-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}% +\tikzsymbolsaftersymbolinput% +} +\DeclareRobustCommandx{\drWalley}[2][1=1, 2=yellow, usedefault]{% +\begin{tikzpicture}[x=2.4ex, y=2.4ex, line width=0.09ex*#1,scale=#1, +decoration={random steps,segment length=0.15ex*#1, amplitude=0.1ex*#1}] +\shade[ball color=orange!80!black] (0.298,-0.33) rectangle (0.692,0.337); +\draw[decorate, line width=0.06ex*#1] (0.298,0) -- (0.5,0.25); +\draw[decorate,line width=0.06ex*#1] (0.298,0) -- (0.6,0.0); +\draw[decorate,line width=0.06ex*#1] (0.298,0) -- (0.5,-0.25); +\shade[ball color=#2, line width=0.08ex*#1] (-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}% +\tikzsymbolsaftersymbolinput% +} +% \end{macrocode} +%\end{macro} + + %\begin{macro}{\Cat} % *Miau* @@ -1085,8 +1231,10 @@ \draw[rounded corners=0.163ex*#1] (0,0.3) -- (0.35,0.5) -- (0.3,0); \fill (-0.15,.15) circle (0.05); \fill (0.15,.15) circle (0.05); -\draw[rounded corners=0.175ex*#1,yshift=-0.12ex] (0,0) -- (0,-0.1) -- (-0.1,-0.095); -\draw[rounded corners=0.175ex*#1,yshift=-0.12ex] (0,0) -- (0,-0.1) -- (0.1,-0.095); +\draw[rounded corners=0.175ex*#1,yshift=-0.12ex] + (0,0) -- (0,-0.1) -- (-0.1,-0.095); +\draw[rounded corners=0.175ex*#1,yshift=-0.12ex] + (0,0) -- (0,-0.1) -- (0.1,-0.095); \draw[rounded corners=.12ex*#1,yshift=-.15ex, line width=0.03em*(#1-.#1)] (-0.1,0.1) -- (0,0) -- (0.1,0.1) -- cycle ; \draw[line width=0.035ex*#1](-0.1,-0.05)..controls(-0.25,0)and(-0.35,0).. (-0.4,-0.05); @@ -1106,6 +1254,66 @@ %\end{macro} % +%\begin{macro}{\Ninja \dNinja} +% A Ninja. +% \begin{macrocode} +\DeclareRobustCommandx{\Ninja}[4][1=1, 2=black, 3=red, 4=white, usedefault]{% +\def\Black@is@Black{black}% +\def\Black@or@not@Black{#2}% +\begin{tikzpicture}[x=2.4ex, y=2.4ex, line width=0.09ex*#1,scale=#1, +decoration={random steps,segment length=0.1ex*#1, amplitude=0.1ex*#1}] +\fill[#2, line width=0.08ex*#1] (0,0) circle (0.33); +\draw (-0.2,-0.125) -- ++(0.4,0); +\fill[decoration={random steps,segment length=0.1ex*#1, amplitude=0.01ex*#1}, 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*#1] (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[#4] (0.129,0.1425) arc (55:-180:.05); +\fill[#4] (-0.129,0.1425) arc (-55:180:-.05); +\draw[ decorate,decoration={snake,amplitude=.1ex*#1,segment length=0.55ex*#1},decorate, #3] + (0.26,0.21) -- (0.5,0.35); +\draw[ decorate,decoration={snake,amplitude=.1ex*#1,segment length=0.5ex*#1},decorate, #3] + (0.26,0.21) -- (0.53,0.1); +\ifx\Black@or@not@Black\Black@is@Black +\else\draw[line width=0.08ex*#1] (0,0) circle (0.33);\fi +\end{tikzpicture}% +\tikzsymbolsaftersymbolinput% +} +\DeclareRobustCommandx{\dNinja}[4][1=1, 2=black, 3=red, 4=white, usedefault]{% +\def\Black@is@Black{black}% +\def\Black@or@not@Black{#2}% +\begin{tikzpicture}[x=2.4ex, y=2.4ex, line width=0.09ex*#1,scale=#1, +decoration={random steps,segment length=0.1ex*#1, amplitude=0.1ex*#1}] +\draw[ decorate,decoration={snake,amplitude=.1ex*#1, +segment length=0.55ex*#1},decorate, #3!50!black] (0.26,0.21) -- (0.5,0.35); +\draw[ decorate,decoration={snake,amplitude=.1ex*#1, +segment length=0.5ex*#1},decorate, #3!50!black] (0.26,0.21) -- (0.53,0.1); +\shade[ball color=#2, line width=0.08ex*#1] (0,0) circle (0.347); +\draw (-0.2,-0.125) -- ++(0.4,0); +\ifx\Black@or@not@Black\Black@is@Black + \draw[line width=0.08ex*#1] (0,0) circle (0.33);\fi +\fill[decoration={random steps,segment length=0.1ex*#1, amplitude=0.01ex*#1},ball color=#3] +decorate {(-0.33,0) -- (0.3465,0) } + {arc (0:42:0.34 and 0.345)} +decorate {-- (-0.25,0.24)} + { arc (-42:0:-0.375 and -0.345)}; +\shade[ball color=#4] (0.129,0.1425) arc (55:-180:.05); +\shade[ball color=#4] (-0.129,0.1425) arc (-55:180:-.05); +\shade[top color=#4!80!black, bottom color=#4] (0.129,0.1425) arc (55:-180:.05); +\shade[top color=#4!80!black, bottom color=#4] (-0.129,0.1425) arc (-55:180:-.05); +\end{tikzpicture}% +\tikzsymbolsaftersymbolinput% +} +% \end{macrocode} +%\end{macro} +% + + %\begin{macro}{\NiceReapey} % Not very well made. @@ -1134,7 +1342,186 @@ % % -%%%% - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +% \section{Other symbols(s)} +%\begin{macro}{\Person} +% My first symbol: a person. +% In german it would be called ``Strichmaxerl''. +% \begin{macrocode} +\DeclareRobustCommand{\Person}[1][1]{% + \begin{tikzpicture}[line width=0.12ex*#1,scale=#1,x=1.35ex,y=1.35ex]% + \draw (0,-0.1) -- (0.15,0.2) -- (0.3,-0.1); + \draw (.15,.2) -- (.15,.4); + \draw (.15,.4) -- (.4,.5); + \draw (.15,.4) -- (-0.1,.5); + \draw (.15, .4) -- (.15, .53); + \draw (.15,.8) circle (0.18); +\end{tikzpicture}% +\tikzsymbolsaftersymbolinput% +} +% \end{macrocode} +%\end{macro} + +%\begin{macro}{\candle} +% A burning candle +% \begin{macrocode} +\DeclareRobustCommand{\Candle}[1][1]{% +\begin{tikzpicture}[x=1ex, y=1ex, scale=#1, line width=0.07ex*#1] +\draw[rounded corners=0.04ex*#1] (0,0) -- (0.2,0) -- +(0,1) -- (0,1) -- cycle; +\draw[line width=0.05ex*#1] (0.1,1) -- (0.1,1.2); +\draw[xshift=0.95, yshift=2.2, line width=0.04ex*#1] + (-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*#1] + (-0.1,0.6) .. controls (0.2,0.8) and (-0.1,1) .. (-0.1,1.2); +\end{tikzpicture}% +\tikzsymbolsaftersymbolinput% +} +% \end{macrocode} +%\end{macro} +% + +%\begin{macro}{\fire} +% Just a fire. +% \begin{macrocode} +\DeclareRobustCommand{\Fire}[1][1]{% +\begin{tikzpicture}[x=1ex,y=1ex, line width=0.07ex*#1,rotate=45, scale=#1] +\fill (-0.05,0) -- (0.05,0) -- (0.05,0.95) -- (-0.05,0.95) -- cycle; +\fill (-0.74,0.7) -- (0.19,0.7) -- (0.19,0.8) -- (-0.74,0.8) -- cycle; +\fill[rotate=-20, xshift=-1.3, yshift=-0.1] + (-0.05,0.07) -- (0.05,0.07) -- (0.05,0.9) -- (-0.05,0.9) -- cycle; +\fill[rotate=-70, xshift=-3.3, yshift=-2.3] + (-0.05,0.07) -- (0.05,0.07) -- (0.05,0.9) -- (-0.05,0.9) -- cycle; +\fill[rotate=135, xshift=2.5, yshift=-3.8] + (-0.05,0.07) -- (0.05,0.07) -- (0.05,0.9) -- (-0.05,0.9) -- cycle; +\draw[rotate=-45, xshift=-2.6, yshift=1.5,line width=0.04ex*#1, x=0.5ex, y=0.5ex] +(-0.1,0.29) .. controls (-0.7,0.6) and (0,1.2) .. (0.05,1.7); +\draw[rotate=-45, xshift=-2.1,yshift=1.5,line width=0.04ex*#1, x=0.5ex, y=0.5ex] +(-0.1,0.29) .. controls (0.7,0.6) and (-0.1,1.2) .. (-0.15,1.7); +\draw[rotate=-45, xshift=-2.5] (-0.1,0.29) .. controls (-0.7,0.6) and (0,1.2) .. (0,1.5); +\draw[rotate=-45, xshift=-2] (-0.1,0.29) .. controls (0.7,0.6) and (-0.1,1.2) .. (-0.1,1.5); +\end{tikzpicture}% +\tikzsymbolsaftersymbolinput% +} +% \end{macrocode} +%\end{macro} +% + +%\begin{macro}{\cofeecup} +% Just a cup of coffee. +% \begin{macrocode} +\DeclareRobustCommand{\Coffeecup}[1][1]{% +\begin{tikzpicture}[x=0.7ex,y=0.7ex, scale=#1, line width=0.07ex*#1] +\draw (0,0) arc (180:269:0.8 and 1) -- ++(0.5,0) arc (269:360:0.8 and 1) -- cycle; +\draw (2.1,-0.15) -- (2.2,-0.15) arc (90:-90:0.3) -- (1.8, -0.75); +\draw[line width=0.05ex*#1, decorate, + decoration={snake,amplitude=.05ex*#1,segment length=0.408ex*#1}] + (0.4,0.3) -- +(0,1); +\draw[line width=0.05ex*#1, decorate, + decoration={snake,amplitude=.05ex*#1,segment length=0.408ex*#1}] + (1,0.3) -- +(0,1); +\draw[line width=0.05ex*#1, decorate, + decoration={snake,amplitude=.05ex*#1,segment length=0.408ex*#1}] + (1.6,0.3) -- +(0,1); +\draw (0,-1.05) -- (2.1,-1.05); +\end{tikzpicture}% +\tikzsymbolsaftersymbolinput% +} +% \end{macrocode} +%\end{macro} + +%\begin{macro}{\chair} +% A chair. +% \begin{macrocode} +\DeclareRobustCommand{\Chair}[1][1]{% +\begin{tikzpicture}[x=0.9ex,y=0.9ex, scale=#1, line width=0.07ex*#1] +\draw (0,-0.5) -- (0,0.7) -- (0.5,1) -- (0.5,0.25); +\draw[line width=0.06ex*#1] (0,0.4) -- (0.5,0.7); +\draw (0,0) -- (0.5,0.3) -- (1,0) --(1,-0.5); +\draw (0.5,-0.3) -- (0.5,-0.8); +\draw (1,0) -- (0.5,-0.3) -- (0,0); +\end{tikzpicture}% +\tikzsymbolsaftersymbolinput% +} +% \end{macrocode} +%\end{macro} + +%\begin{macro}{\bed} +% A chair. +% \begin{macrocode} +\DeclareRobustCommand{\Bed}[1][1]{% +\begin{tikzpicture}[x=1ex,y=1ex, scale=#1, line width=0.08ex*#1] +\draw (0,0) -- (0,1.6); +\draw (3,0) -- (3,1.2); +\draw (0,0.5) -- (3,0.5); +\draw (0,0.35) -- (3,0.35); +\draw (0.7,0.5) arc (0:90:0.7); +\draw (0.7,0.5) arc(180:30:1.231 and 0.6); +\end{tikzpicture}% +\tikzsymbolsaftersymbolinput% +} +% \end{macrocode} +%\end{macro} +% +% +% +%\begin{macro}{\tikzsymbolsMoaiscale} +%\begin{macro}{\tikzsymbolsMoaithickness} +%\begin{macro}{\tikzsymbolsMoaiCheckI} +%\begin{macro}{\tikzsymbolsMoaiCheckII} +% *sight* \verb|\ifnum| cannot compare decimals and to make it possible to scale Moai with decimals (e.g. 0.6, 2.6, 9.345234) I had to define lengths, because \LaTeX{} can compare decimals in lenghts. +% +% At first we define the length \verb|\tikzsymbolsMoaiscale|: it will contain the scaling number. +% +% At second \verb|\tikzsymbolsMoaithickness|: the line width of the Moai; depends on \verb|\tikzsymbolsMoaiscale|. +% +% \verb|\tikzsymbolsMoaiCheckI| and \verb|\tikzsymbolsMoaiCheckII|: to be able to ``check'' if \verb|\tikzsymbolsMoaiscale| is greater than 2 or 5 or not. +% \begin{macrocode} +\newlength{\tikzsymbolsMoaiscale} +\newlength{\tikzsymbolsMoaithickness} +\newlength{\tikzsymbolsMoaiCheckI}\setlength{\tikzsymbolsMoaiCheckI}{2ex} +\newlength{\tikzsymbolsMoaiCheckII}\setlength{\tikzsymbolsMoaiCheckII}{5ex} +% \end{macrocode} +%\end{macro} +%\end{macro} +%\end{macro} +%\end{macro} + +% +%\begin{macro}{\Moai} +% From the Easter Island: a Moai. +% \begin{macrocode} +\DeclareRobustCommandx{\Moai}[1][1=1,usedefault]{% +\setlength{\tikzsymbolsMoaiscale}{#1ex}% +\ifnum \tikzsymbolsMoaiscale<\tikzsymbolsMoaiCheckI% +\setlength{\tikzsymbolsMoaithickness}{0.05ex}% +\else% +\ifnum \tikzsymbolsMoaiscale<\tikzsymbolsMoaiCheckII% +\setlength{\tikzsymbolsMoaithickness}{0.035ex}% +\else% +\setlength{\tikzsymbolsMoaithickness}{0.03ex}% +\fi\fi% +\begin{tikzpicture}[x=.13ex, y=.13ex, rounded corners=0.01ex,scale=#1, + line width=\tikzsymbolsMoaithickness*#1] +\draw (-2.6,-4.25) -- (-2.5,-5.8) +..controls (-2,-6.8) and (1.5,-6.8) .. (2.2,-5.8) -- (2.4,-3.95); +\draw(-2.5,2.5) .. controls (-2.9,4.6) and (2,5) .. (3.3,2.5) -- (2.9,-3.4) +.. controls (2,-5) and (-4,-5) .. (-3.1,-3) -- cycle; +\draw (-2.5,3) -- (-2,5) .. controls (0,6) and (2,5.8) .. (3.1,4.7) -- (3.3,2.5); +\draw[line width=0.02ex*#1] (-2.2,-1.8) .. controls (-1,-1.3) and (0,-1.7) .. (1,-2); +\draw[line width=0.02ex*#1] (-2.2,-1.8) .. controls (-1,-1) and (0,-1.4) .. (1,-2); +\draw[line width=0.02ex*#1] (-2.2,-1.8) .. controls (-1,-2) and (0,-2) .. (1,-2); +\draw (-0.8,4) .. controls (-0.8,3) and (-0.8,2) .. (-1.6,0.5) -- (-1.8,-0.4) +.. controls (-1,0.2) and (0,0.2) .. (0.6,-0.4) -- (0.7,0.4) +.. controls (0,1) and (0,2) .. (0.8,4); +\draw (-1.8,-0.4) .. controls (-0.5,-0.5) and (0,-0.5) .. (0.6,-0.4); +\draw (3.2,3.5) -- (3.7,3.5) .. controls (3.5,2) and (3.5,2) .. (3.6,-1.5) -- (3,-1.9); +\draw (-2.5,3) .. controls (-2.7,2) and (-3,1) .. (-2.88,-1); +\draw (-2.5,2.8) .. controls (-2,2.5) and (-1,3) .. (-0.8,3.1); +\draw (0.5,3.3) .. controls (1,3) and (1,2.5) .. (3.3,2.4); +\end{tikzpicture}% +\tikzsymbolsaftersymbolinput% +} +% \end{macrocode} +%\end{macro} % @@ -1166,12 +1553,12 @@ % \begin{macrocode} \DeclareRobustCommand{\@Tree@SetUp}[1][1]{\tikzset{% ld/.style={level distance=##1ex},lw/.style={line width=##1ex},% -level 1/.style={ld=0.60, trunk, lw=0.1*#1 ,sibling angle=60},% -level 2/.style={ld=0.20, trunk!80!leaf a,lw=.073*#1,sibling angle=70},% -level 3/.style={ld=0.25,trunk!60!leaf a,lw=.05*#1,sibling angle=70}, % -level 4/.style={ld=0.10, trunk!40!leaf a,lw=.025*#1,sibling angle=60},% -level 5/.style={ld=0.15, trunk!20!leaf a,lw=.02*#1,sibling angle=60},% -level 6/.style={ld=0.08,leaf a, lw=.021*#1,sibling angle=60},% +level 1/.style={ld=0.60, trunk, lw=0.1*#1 ,sibling angle=60},% +level 2/.style={ld=0.20, trunk!80!leaf a, lw=.073*#1,sibling angle=70},% +level 3/.style={ld=0.25, trunk!60!leaf a, lw=.05*#1,sibling angle=70}, % +level 4/.style={ld=0.10, trunk!40!leaf a, lw=.025*#1,sibling angle=60},% +level 5/.style={ld=0.15, trunk!20!leaf a, lw=.02*#1,sibling angle=60},% +level 6/.style={ld=0.08, leaf a, lw=.021*#1,sibling angle=60},% }}% % \end{macrocode} %\end{macro} @@ -1180,6 +1567,7 @@ level 6/.style={ld=0.08,leaf a, lw=.021*#1,sibling angle=60},% % Now we define our \verb|\Basic@Tree|. We will need it later for our package option (basic code is also from ``tikz'' manual). % \begin{macrocode} \DeclareRobustCommandx{\Basic@Tree}[5][1=1, usedefault]{{% +\def\leaf@or@not@leaf{#5}% \@Tree@SetUp[#1]% \pgfarrowsdeclare{leaf}{leaf}% {\pgfarrowsleftextend{-.1ex} \pgfarrowsrightextend{-0.05ex}}% @@ -1191,7 +1579,12 @@ level 6/.style={ld=0.08,leaf a, lw=.021*#1,sibling angle=60},% }% \colorlet{trunk}{#2}% \colorlet{leaf a}{#3}% -\colorlet{leaf b}{#4}\begin{tikzpicture}[x=1ex,y=1ex,scale=#1]% +\colorlet{leaf b}{#4}\begin{tikzpicture}[x=1ex,y=1ex, scale=#1+0.2, line width=0.07ex*#1]% +\ifx\leaf@or@not@leaf\@leaf@is@leaf% +\draw[opacity=0] (-0.82-0.1* #1/100,0) rectangle (0.82+0.1*#1/100, 1.415+0.01*#1/100); +\else +\draw[opacity=0] (-0.75,0.1) rectangle (0.75,1.3); +\fi \coordinate (root) [grow cyclic,rotate=90] child { child [line cap=round] foreach \a in {0,1, 2} { child foreach \b in {0,1} { child foreach \c in {0,1,2} { child foreach \d in {0,1} { @@ -1206,14 +1599,14 @@ child foreach \leafcolor in {leaf a,leaf b} { edge from parent [color=\leafcolor %\begin{macro}{draft} % If the class option \verb|draft|, then Squares instead of trees. Furthermore we set \verb|\@drafttrue| and \verb|\@finalfalse| for some warnings: % \begin{macrocode} -\DeclareOptionX{draft}{\@tikzsymbols@drafttrue\@tikzsymbols@finalfalse +\DeclareOption{draft}{\@tikzsymbols@drafttrue\@tikzsymbols@finalfalse \def\Basic@Tree{\Basic@Tree@off}} % \end{macrocode} %\end{macro} %\begin{macro}{final} % If the class option \verb|final|, then trees. Same as before: % \begin{macrocode} -\DeclareOptionX{final}{\@tikzsymbols@draftfalse\@tikzsymbols@finaltrue +\DeclareOption{final}{\@tikzsymbols@draftfalse\@tikzsymbols@finaltrue \def\Basic@Tree{\Basic@Tree@on}} % \end{macrocode} % It's extremely annoying: you are working almost a day to find out how this package recognizes \verb|draft| and at the end there are just two lines of code. @@ -1223,7 +1616,7 @@ child foreach \leafcolor in {leaf a,leaf b} { edge from parent [color=\leafcolor %\begin{macro}{tree} % Now we declare the name of our option: ``tree'' (I could have named it stone, or wood, etc. but I used ``tree''). This code is copy \& pasted from this site: \href{http://tex.stackexchange.com/questions/13270/a-package-template-using-xkeyval}{http://tex.stackexchange.com/}. Plus some warnings, if you use class option \verb|draft| or \verb|final| with package option \verb|tree=on/off|: % \begin{macrocode} -\DeclareOptionX{tree}{% +\DeclareOption{tree}{% \def\Basic@Tree{\csname Basic@Tree@#1\endcsname}% \if@tikzsymbols@draft% \PackageWarningNoLine{tikzsymbols}{You can use class option \MessageBreak @@ -1240,17 +1633,24 @@ final with package option tree=on/off; %\end{macro} %\begin{macro}{\Basic@Tree@off} -% We define \verb|\Basic@Tree@off|; it will be shown if \verb|tree=off|. Furthermore, we check if the last parameter is ``leaf'': +% We define \verb|\Basic@Tree@off|; it will be shown if \verb|tree=off|. +% I looks a bit confusing, but this syntax provides a square, which is as large as the tree. +%Furthermore, we check if the last parameter is ``leaf'': % \begin{macrocode} \DeclareRobustCommandx{\Basic@Tree@off}[5][1=1, usedefault]{{% \def\leaf@or@not@leaf{#5}% -\begin{tikzpicture}[scale=#1,x=1.3ex,y=1.3ex] -\draw[#2] (0,0) -- (0,1); -\draw[#3] (0,1) -- (1,1); -\draw[#4] (1,1) -- (1,0); +\def\@y@@x@y@x{0.095*#1/100} +\begin{tikzpicture}[scale=#1+0.2,x=1.3ex,y=1.3ex, line width=0.07ex*#1] \ifx\leaf@or@not@leaf\@leaf@is@leaf% -\draw[#3] (1,0) -- (0.5,0); -\draw[#4] (0.5,0) -- (0,0); +\draw[#2] (0-\@y@@x@y@x,0) -- (0-\@y@@x@y@x,1.08+0.05*#1/100); +\draw[#3] (0-\@y@@x@y@x,1.08+0.05*#1/100) -- (1.2+\@y@@x@y@x,1.08+0.05*#1/100); +\draw[#4] (1.2+\@y@@x@y@x,1.08+0.05*#1/100) -- (1.2+\@y@@x@y@x,0); +\draw[#3] (1.2+\@y@@x@y@x,0) -- (0.5,0); +\draw[#4] (0.5+0.4*#1/100,0) -- (0-\@y@@x@y@x,0); +\else +\draw[#2] (0,0) -- (0,1); +\draw[#3] (0,1) -- (1.15,1); +\draw[#4] (1.15,1) -- +(0,-1); \fi% \end{tikzpicture}% }} @@ -1261,6 +1661,7 @@ final with package option tree=on/off; % We define \verb|\Basic@Tree@off|; it will be shown if \verb|tree=on|: % \begin{macrocode} \DeclareRobustCommandx{\Basic@Tree@on}[5][1=1, usedefault]{{% +\def\leaf@or@not@leaf{#5}% \@Tree@SetUp[#1]% \pgfarrowsdeclare{leaf}{leaf}% {\pgfarrowsleftextend{-.1ex} \pgfarrowsrightextend{-0.05ex}}% @@ -1272,7 +1673,12 @@ final with package option tree=on/off; }% \colorlet{trunk}{#2}% \colorlet{leaf a}{#3}% -\colorlet{leaf b}{#4}\begin{tikzpicture}[x=1ex,y=1ex,scale=#1]% +\colorlet{leaf b}{#4}\begin{tikzpicture}[x=1ex,y=1ex, scale=#1+0.2, line width=0.07ex*#1]% +\ifx\leaf@or@not@leaf\@leaf@is@leaf% +\draw[opacity=0] (-0.82-0.1* #1/100,0) rectangle (0.82+0.1*#1/100, 1.415+0.01*#1/100); +\else +\draw[opacity=0] (-0.75,0.1) rectangle (0.75,1.3); +\fi \coordinate (root) [grow cyclic,rotate=90] child { child [line cap=round] foreach \a in {0,1, 2} { child foreach \b in {0,1} { child foreach \c in {0,1,2} { child foreach \d in {0,1} { @@ -1288,7 +1694,7 @@ child foreach \leafcolor in {leaf a,leaf b} { edge from parent [color=\leafcolor %\begin{macro}{\ProcessOptionsX*} %Again a code from the internet (don't know what \verb|\relax| does): % \begin{macrocode} -\ProcessOptionsX*\relax +\ProcessOptions*\relax % \end{macrocode} %\end{macro} @@ -1361,7 +1767,7 @@ child foreach \leafcolor in {leaf a,leaf b} { edge from parent [color=\leafcolor \DeclareRobustCommandx{\Autumntree}[1][1=1, usedefault]% {\BasicTree[#1]{red!30!black}{red!75!black}{orange}{leaf}} \DeclareRobustCommandx{\Wintertree}[1][1=1, usedefault]% - {\BasicTree[#1]{black}{black!50}{black!25}{}} + {\BasicTree[#1]{black!80!}{black!50}{black!25}{}} % \end{macrocode} %\end{macro} %\end{macro}\end{macro}\end{macro} diff --git a/Master/texmf-dist/tex/latex/tikzsymbols/tikzsymbols.sty b/Master/texmf-dist/tex/latex/tikzsymbols/tikzsymbols.sty index c901383ed18..df1cd9ac432 100644 --- a/Master/texmf-dist/tex/latex/tikzsymbols/tikzsymbols.sty +++ b/Master/texmf-dist/tex/latex/tikzsymbols/tikzsymbols.sty @@ -18,29 +18,16 @@ \NeedsTeXFormat{LaTeX2e}[2011/06/27] \ProvidesPackage{tikzsymbols} -[2013/02/14 v1.6 Some symbols created using tikz.] -\RequirePackage{xargs} +[2013/02/28 v1.7 Some symbols created using tikz.] \RequirePackage{tikz} +\RequirePackage{xargs} \RequirePackage{xcolor} \RequirePackage{xspace} -\RequirePackage{xkeyval} \usetikzlibrary{arrows,decorations.pathmorphing,trees} \newcommand{\tikzsymbolsaftersymbolinput}{\xspace} -\DeclareRobustCommand{\Person}[1][1]{% - \begin{tikzpicture}[line width=0.12ex*#1,scale=#1,x=1.35ex,y=1.35ex]% - \draw (0,-0.1) -- (0.15,0.2) -- (0.3,-0.1); - \draw (.15,.2) -- (.15,.4); - \draw (.15,.4) -- (.4,.5); - \draw (.15,.4) -- (-0.1,.5); - \draw (.15, .4) -- (.15, .53); - \draw (.15,.8) circle (0.18); -\end{tikzpicture}% -\tikzsymbolsaftersymbolinput% -} - \DeclareRobustCommand{\Kochtopf}[1][1]{% \begin{tikzpicture}[x=2ex,y=2.2ex, line width=0.07ex*#1,scale=#1] \draw[rounded corners=0.2ex*#1] (0,0.5) -- (0,0) -- (1,0) -- (1,0.5); @@ -251,7 +238,19 @@ \tikzsymbolsaftersymbolinput% } \let\bowl\Schussel -%%% - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + +\DeclareRobustCommand{\Schaler}[1][1]{% +\begin{tikzpicture}[x=2.7ex,y=2.3ex, line width=0.07ex*#1,scale=#1] +\draw[rounded corners=0.07ex*#1] (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*#1] (0,0.6) -- (0.2,0.6); +\draw[line width=0.03ex*#1] (0,0.58) -- (0.2,0.58); +\end{tikzpicture}% +\tikzsymbolsaftersymbolinput% +} +\let\peeler\Schaler + \DeclareRobustCommandx{\Sadey}[2][1=1, 2={opacity=0}, usedefault]{% \begin{tikzpicture}[x=2.4ex, y=2.4ex, line width=0.09ex*#1,scale=#1] \fill[#2, line width=0.12ex*#1] (0,0) circle (0.33); @@ -312,6 +311,30 @@ \tikzsymbolsaftersymbolinput% } +\DeclareRobustCommandx{\Laughey}[3][1=1,2={opacity=0},3={opacity=0} ,usedefault]{% +\begin{tikzpicture}[x=2.4ex, y=2.4ex, line width=0.09ex*#1,scale=#1] +\fill[#2,line width=0.12ex*#1] (0,0) circle (0.33); +\draw[line width=0.12ex*#1] (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*#1, 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*#1, yshift=-0.5] +(-0.22,-0.0) .. controls (-0.13,-0.23) and (0.13,-0.23) .. (0.22,-0.0) -- cycle; +\end{tikzpicture}% +\tikzsymbolsaftersymbolinput% +} +\DeclareRobustCommandx{\dLaughey}[3][1=1,2=yellow, 3=red ,usedefault]{% +\begin{tikzpicture}[x=2.4ex, y=2.4ex, line width=0.09ex*#1,scale=#1] +\fill[ball color=#2,line width=0.12ex*#1] (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); +\shade[ball color=#3, rounded corners=0.1ex*#1, yshift=-0.3] + (-0.25,-0.0) .. controls (-0.13,-0.26) and (0.13,-0.26) .. (0.25,-0.0) -- cycle; +\end{tikzpicture}% +\tikzsymbolsaftersymbolinput% +} + \DeclareRobustCommandx{\Neutrey}[2][1=1, 2={opacity=0}, usedefault]{% \begin{tikzpicture}[x=2.4ex, y=2.4ex, line width=0.09ex*#1,scale=#1] \fill[#2,line width=0.12ex*#1] (0,0) circle (0.33); @@ -429,7 +452,7 @@ \tikzsymbolsaftersymbolinput% } -\DeclareRobustCommandx{\Tongey}[3][1=1,2={opacity=0},3=red ,usedefault]{% +\DeclareRobustCommandx{\Tongey}[3][1=1,2={opacity=0},3={opacity=0} ,usedefault]{% \begin{tikzpicture}[x=2.4ex, y=2.4ex, line width=0.12ex*#1,scale=#1] \fill[#2,line width=0.12ex*#1] (0,0) circle (0.33); \draw[line width=0.12ex*#1] (0,0) circle (0.33); @@ -528,6 +551,70 @@ \tikzsymbolsaftersymbolinput% } +\DeclareRobustCommandx{\Walley}[3][1=1, 2={opacity=0},3={opacity=0}, usedefault]{% +\begin{tikzpicture}[x=2.4ex, y=2.4ex, line width=0.09ex*#1,scale=#1, +decoration={random steps,segment length=0.15ex*#1, amplitude=0.1ex*#1}] +\fill[#2, line width=0.08ex*#1] (0,0) circle (0.28); +\draw[line width=0.08ex*#1] (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[line width=0.06ex*#1] (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*#1] (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*#1] (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}% +\tikzsymbolsaftersymbolinput% +} +\DeclareRobustCommandx{\rWalley}[3][1=1, 2={opacity=0},3={opacity=0}, usedefault]{% +\begin{tikzpicture}[x=2.4ex, y=2.4ex, line width=0.09ex*#1,scale=#1, +decoration={random steps,segment length=0.15ex*#1, amplitude=0.1ex*#1}] +\fill[#2, line width=0.08ex*#1] (0,0) circle (0.28); +\draw[line width=0.08ex*#1] (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*#1] (0.28,0) -- (0.5,0.25); +\draw[decorate,line width=0.06ex*#1] (0.28,0) -- (0.6,0.0); +\draw[decorate,line width=0.06ex*#1] (0.28,0) -- (0.5,-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}% +\tikzsymbolsaftersymbolinput% +} +\DeclareRobustCommandx{\dWalley}[2][1=1, 2=yellow, usedefault]{% +\begin{tikzpicture}[x=2.4ex, y=2.4ex, line width=0.09ex*#1,scale=#1, +decoration={random steps,segment length=0.15ex*#1, amplitude=0.1ex*#1}] +\shade[ball color=orange!80!black] (0.298,-0.33) rectangle (0.692,0.337); +\draw[line width=0.06ex*#1] (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*#1] (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*#1] (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); +\shade[ball color=#2, line width=0.08ex*#1] (-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}% +\tikzsymbolsaftersymbolinput% +} +\DeclareRobustCommandx{\drWalley}[2][1=1, 2=yellow, usedefault]{% +\begin{tikzpicture}[x=2.4ex, y=2.4ex, line width=0.09ex*#1,scale=#1, +decoration={random steps,segment length=0.15ex*#1, amplitude=0.1ex*#1}] +\shade[ball color=orange!80!black] (0.298,-0.33) rectangle (0.692,0.337); +\draw[decorate, line width=0.06ex*#1] (0.298,0) -- (0.5,0.25); +\draw[decorate,line width=0.06ex*#1] (0.298,0) -- (0.6,0.0); +\draw[decorate,line width=0.06ex*#1] (0.298,0) -- (0.5,-0.25); +\shade[ball color=#2, line width=0.08ex*#1] (-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}% +\tikzsymbolsaftersymbolinput% +} + \DeclareRobustCommandx{\Cat}[1][1=1,usedefault]{% \begin{tikzpicture}[x=2.33ex,y=2.33ex, line width=0.093ex*#1,scale=#1] \draw (0,0) circle (0.3); @@ -535,8 +622,10 @@ \draw[rounded corners=0.163ex*#1] (0,0.3) -- (0.35,0.5) -- (0.3,0); \fill (-0.15,.15) circle (0.05); \fill (0.15,.15) circle (0.05); -\draw[rounded corners=0.175ex*#1,yshift=-0.12ex] (0,0) -- (0,-0.1) -- (-0.1,-0.095); -\draw[rounded corners=0.175ex*#1,yshift=-0.12ex] (0,0) -- (0,-0.1) -- (0.1,-0.095); +\draw[rounded corners=0.175ex*#1,yshift=-0.12ex] + (0,0) -- (0,-0.1) -- (-0.1,-0.095); +\draw[rounded corners=0.175ex*#1,yshift=-0.12ex] + (0,0) -- (0,-0.1) -- (0.1,-0.095); \draw[rounded corners=.12ex*#1,yshift=-.15ex, line width=0.03em*(#1-.#1)] (-0.1,0.1) -- (0,0) -- (0.1,0.1) -- cycle ; \draw[line width=0.035ex*#1](-0.1,-0.05)..controls(-0.25,0)and(-0.35,0).. (-0.4,-0.05); @@ -553,6 +642,59 @@ \tikzsymbolsaftersymbolinput% } +\DeclareRobustCommandx{\Ninja}[4][1=1, 2=black, 3=red, 4=white, usedefault]{% +\def\Black@is@Black{black}% +\def\Black@or@not@Black{#2}% +\begin{tikzpicture}[x=2.4ex, y=2.4ex, line width=0.09ex*#1,scale=#1, +decoration={random steps,segment length=0.1ex*#1, amplitude=0.1ex*#1}] +\fill[#2, line width=0.08ex*#1] (0,0) circle (0.33); +\draw (-0.2,-0.125) -- ++(0.4,0); +\fill[decoration={random steps,segment length=0.1ex*#1, amplitude=0.01ex*#1}, 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*#1] (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[#4] (0.129,0.1425) arc (55:-180:.05); +\fill[#4] (-0.129,0.1425) arc (-55:180:-.05); +\draw[ decorate,decoration={snake,amplitude=.1ex*#1,segment length=0.55ex*#1},decorate, #3] + (0.26,0.21) -- (0.5,0.35); +\draw[ decorate,decoration={snake,amplitude=.1ex*#1,segment length=0.5ex*#1},decorate, #3] + (0.26,0.21) -- (0.53,0.1); +\ifx\Black@or@not@Black\Black@is@Black +\else\draw[line width=0.08ex*#1] (0,0) circle (0.33);\fi +\end{tikzpicture}% +\tikzsymbolsaftersymbolinput% +} +\DeclareRobustCommandx{\dNinja}[4][1=1, 2=black, 3=red, 4=white, usedefault]{% +\def\Black@is@Black{black}% +\def\Black@or@not@Black{#2}% +\begin{tikzpicture}[x=2.4ex, y=2.4ex, line width=0.09ex*#1,scale=#1, +decoration={random steps,segment length=0.1ex*#1, amplitude=0.1ex*#1}] +\draw[ decorate,decoration={snake,amplitude=.1ex*#1, +segment length=0.55ex*#1},decorate, #3!50!black] (0.26,0.21) -- (0.5,0.35); +\draw[ decorate,decoration={snake,amplitude=.1ex*#1, +segment length=0.5ex*#1},decorate, #3!50!black] (0.26,0.21) -- (0.53,0.1); +\shade[ball color=#2, line width=0.08ex*#1] (0,0) circle (0.347); +\draw (-0.2,-0.125) -- ++(0.4,0); +\ifx\Black@or@not@Black\Black@is@Black + \draw[line width=0.08ex*#1] (0,0) circle (0.33);\fi +\fill[decoration={random steps,segment length=0.1ex*#1, amplitude=0.01ex*#1},ball color=#3] +decorate {(-0.33,0) -- (0.3465,0) } + {arc (0:42:0.34 and 0.345)} +decorate {-- (-0.25,0.24)} + { arc (-42:0:-0.375 and -0.345)}; +\shade[ball color=#4] (0.129,0.1425) arc (55:-180:.05); +\shade[ball color=#4] (-0.129,0.1425) arc (-55:180:-.05); +\shade[top color=#4!80!black, bottom color=#4] (0.129,0.1425) arc (55:-180:.05); +\shade[top color=#4!80!black, bottom color=#4] (-0.129,0.1425) arc (-55:180:-.05); +\end{tikzpicture}% +\tikzsymbolsaftersymbolinput% +} + \DeclareRobustCommandx{\NiceReapey}[1][1=1,usedefault]{% \begin{tikzpicture}[x=0.11em,y=0.11em, line width=0.07ex*#1,scale=#1] \draw (1.7,-1) arc (360:180:1.7 and 2) @@ -572,7 +714,126 @@ \tikzsymbolsaftersymbolinput% } -%%% - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +\DeclareRobustCommand{\Person}[1][1]{% + \begin{tikzpicture}[line width=0.12ex*#1,scale=#1,x=1.35ex,y=1.35ex]% + \draw (0,-0.1) -- (0.15,0.2) -- (0.3,-0.1); + \draw (.15,.2) -- (.15,.4); + \draw (.15,.4) -- (.4,.5); + \draw (.15,.4) -- (-0.1,.5); + \draw (.15, .4) -- (.15, .53); + \draw (.15,.8) circle (0.18); +\end{tikzpicture}% +\tikzsymbolsaftersymbolinput% +} + +\DeclareRobustCommand{\Candle}[1][1]{% +\begin{tikzpicture}[x=1ex, y=1ex, scale=#1, line width=0.07ex*#1] +\draw[rounded corners=0.04ex*#1] (0,0) -- (0.2,0) -- +(0,1) -- (0,1) -- cycle; +\draw[line width=0.05ex*#1] (0.1,1) -- (0.1,1.2); +\draw[xshift=0.95, yshift=2.2, line width=0.04ex*#1] + (-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*#1] + (-0.1,0.6) .. controls (0.2,0.8) and (-0.1,1) .. (-0.1,1.2); +\end{tikzpicture}% +\tikzsymbolsaftersymbolinput% +} + +\DeclareRobustCommand{\Fire}[1][1]{% +\begin{tikzpicture}[x=1ex,y=1ex, line width=0.07ex*#1,rotate=45, scale=#1] +\fill (-0.05,0) -- (0.05,0) -- (0.05,0.95) -- (-0.05,0.95) -- cycle; +\fill (-0.74,0.7) -- (0.19,0.7) -- (0.19,0.8) -- (-0.74,0.8) -- cycle; +\fill[rotate=-20, xshift=-1.3, yshift=-0.1] + (-0.05,0.07) -- (0.05,0.07) -- (0.05,0.9) -- (-0.05,0.9) -- cycle; +\fill[rotate=-70, xshift=-3.3, yshift=-2.3] + (-0.05,0.07) -- (0.05,0.07) -- (0.05,0.9) -- (-0.05,0.9) -- cycle; +\fill[rotate=135, xshift=2.5, yshift=-3.8] + (-0.05,0.07) -- (0.05,0.07) -- (0.05,0.9) -- (-0.05,0.9) -- cycle; +\draw[rotate=-45, xshift=-2.6, yshift=1.5,line width=0.04ex*#1, x=0.5ex, y=0.5ex] +(-0.1,0.29) .. controls (-0.7,0.6) and (0,1.2) .. (0.05,1.7); +\draw[rotate=-45, xshift=-2.1,yshift=1.5,line width=0.04ex*#1, x=0.5ex, y=0.5ex] +(-0.1,0.29) .. controls (0.7,0.6) and (-0.1,1.2) .. (-0.15,1.7); +\draw[rotate=-45, xshift=-2.5] (-0.1,0.29) .. controls (-0.7,0.6) and (0,1.2) .. (0,1.5); +\draw[rotate=-45, xshift=-2] (-0.1,0.29) .. controls (0.7,0.6) and (-0.1,1.2) .. (-0.1,1.5); +\end{tikzpicture}% +\tikzsymbolsaftersymbolinput% +} + +\DeclareRobustCommand{\Coffeecup}[1][1]{% +\begin{tikzpicture}[x=0.7ex,y=0.7ex, scale=#1, line width=0.07ex*#1] +\draw (0,0) arc (180:269:0.8 and 1) -- ++(0.5,0) arc (269:360:0.8 and 1) -- cycle; +\draw (2.1,-0.15) -- (2.2,-0.15) arc (90:-90:0.3) -- (1.8, -0.75); +\draw[line width=0.05ex*#1, decorate, + decoration={snake,amplitude=.05ex*#1,segment length=0.408ex*#1}] + (0.4,0.3) -- +(0,1); +\draw[line width=0.05ex*#1, decorate, + decoration={snake,amplitude=.05ex*#1,segment length=0.408ex*#1}] + (1,0.3) -- +(0,1); +\draw[line width=0.05ex*#1, decorate, + decoration={snake,amplitude=.05ex*#1,segment length=0.408ex*#1}] + (1.6,0.3) -- +(0,1); +\draw (0,-1.05) -- (2.1,-1.05); +\end{tikzpicture}% +\tikzsymbolsaftersymbolinput% +} + +\DeclareRobustCommand{\Chair}[1][1]{% +\begin{tikzpicture}[x=0.9ex,y=0.9ex, scale=#1, line width=0.07ex*#1] +\draw (0,-0.5) -- (0,0.7) -- (0.5,1) -- (0.5,0.25); +\draw[line width=0.06ex*#1] (0,0.4) -- (0.5,0.7); +\draw (0,0) -- (0.5,0.3) -- (1,0) --(1,-0.5); +\draw (0.5,-0.3) -- (0.5,-0.8); +\draw (1,0) -- (0.5,-0.3) -- (0,0); +\end{tikzpicture}% +\tikzsymbolsaftersymbolinput% +} + +\DeclareRobustCommand{\Bed}[1][1]{% +\begin{tikzpicture}[x=1ex,y=1ex, scale=#1, line width=0.08ex*#1] +\draw (0,0) -- (0,1.6); +\draw (3,0) -- (3,1.2); +\draw (0,0.5) -- (3,0.5); +\draw (0,0.35) -- (3,0.35); +\draw (0.7,0.5) arc (0:90:0.7); +\draw (0.7,0.5) arc(180:30:1.231 and 0.6); +\end{tikzpicture}% +\tikzsymbolsaftersymbolinput% +} +\newlength{\tikzsymbolsMoaiscale} +\newlength{\tikzsymbolsMoaithickness} +\newlength{\tikzsymbolsMoaiCheckI}\setlength{\tikzsymbolsMoaiCheckI}{2ex} +\newlength{\tikzsymbolsMoaiCheckII}\setlength{\tikzsymbolsMoaiCheckII}{5ex} + +\DeclareRobustCommandx{\Moai}[1][1=1,usedefault]{% +\setlength{\tikzsymbolsMoaiscale}{#1ex}% +\ifnum \tikzsymbolsMoaiscale<\tikzsymbolsMoaiCheckI% +\setlength{\tikzsymbolsMoaithickness}{0.05ex}% +\else% +\ifnum \tikzsymbolsMoaiscale<\tikzsymbolsMoaiCheckII% +\setlength{\tikzsymbolsMoaithickness}{0.035ex}% +\else% +\setlength{\tikzsymbolsMoaithickness}{0.03ex}% +\fi\fi% +\begin{tikzpicture}[x=.13ex, y=.13ex, rounded corners=0.01ex,scale=#1, + line width=\tikzsymbolsMoaithickness*#1] +\draw (-2.6,-4.25) -- (-2.5,-5.8) +..controls (-2,-6.8) and (1.5,-6.8) .. (2.2,-5.8) -- (2.4,-3.95); +\draw(-2.5,2.5) .. controls (-2.9,4.6) and (2,5) .. (3.3,2.5) -- (2.9,-3.4) +.. controls (2,-5) and (-4,-5) .. (-3.1,-3) -- cycle; +\draw (-2.5,3) -- (-2,5) .. controls (0,6) and (2,5.8) .. (3.1,4.7) -- (3.3,2.5); +\draw[line width=0.02ex*#1] (-2.2,-1.8) .. controls (-1,-1.3) and (0,-1.7) .. (1,-2); +\draw[line width=0.02ex*#1] (-2.2,-1.8) .. controls (-1,-1) and (0,-1.4) .. (1,-2); +\draw[line width=0.02ex*#1] (-2.2,-1.8) .. controls (-1,-2) and (0,-2) .. (1,-2); +\draw (-0.8,4) .. controls (-0.8,3) and (-0.8,2) .. (-1.6,0.5) -- (-1.8,-0.4) +.. controls (-1,0.2) and (0,0.2) .. (0.6,-0.4) -- (0.7,0.4) +.. controls (0,1) and (0,2) .. (0.8,4); +\draw (-1.8,-0.4) .. controls (-0.5,-0.5) and (0,-0.5) .. (0.6,-0.4); +\draw (3.2,3.5) -- (3.7,3.5) .. controls (3.5,2) and (3.5,2) .. (3.6,-1.5) -- (3,-1.9); +\draw (-2.5,3) .. controls (-2.7,2) and (-3,1) .. (-2.88,-1); +\draw (-2.5,2.8) .. controls (-2,2.5) and (-1,3) .. (-0.8,3.1); +\draw (0.5,3.3) .. controls (1,3) and (1,2.5) .. (3.3,2.4); +\end{tikzpicture}% +\tikzsymbolsaftersymbolinput% +} \def\@leaf@is@leaf{leaf} @@ -581,15 +842,16 @@ \DeclareRobustCommand{\@Tree@SetUp}[1][1]{\tikzset{% ld/.style={level distance=##1ex},lw/.style={line width=##1ex},% -level 1/.style={ld=0.60, trunk, lw=0.1*#1 ,sibling angle=60},% -level 2/.style={ld=0.20, trunk!80!leaf a,lw=.073*#1,sibling angle=70},% -level 3/.style={ld=0.25,trunk!60!leaf a,lw=.05*#1,sibling angle=70}, % -level 4/.style={ld=0.10, trunk!40!leaf a,lw=.025*#1,sibling angle=60},% -level 5/.style={ld=0.15, trunk!20!leaf a,lw=.02*#1,sibling angle=60},% -level 6/.style={ld=0.08,leaf a, lw=.021*#1,sibling angle=60},% +level 1/.style={ld=0.60, trunk, lw=0.1*#1 ,sibling angle=60},% +level 2/.style={ld=0.20, trunk!80!leaf a, lw=.073*#1,sibling angle=70},% +level 3/.style={ld=0.25, trunk!60!leaf a, lw=.05*#1,sibling angle=70}, % +level 4/.style={ld=0.10, trunk!40!leaf a, lw=.025*#1,sibling angle=60},% +level 5/.style={ld=0.15, trunk!20!leaf a, lw=.02*#1,sibling angle=60},% +level 6/.style={ld=0.08, leaf a, lw=.021*#1,sibling angle=60},% }}% \DeclareRobustCommandx{\Basic@Tree}[5][1=1, usedefault]{{% +\def\leaf@or@not@leaf{#5}% \@Tree@SetUp[#1]% \pgfarrowsdeclare{leaf}{leaf}% {\pgfarrowsleftextend{-.1ex} \pgfarrowsrightextend{-0.05ex}}% @@ -601,7 +863,12 @@ level 6/.style={ld=0.08,leaf a, lw=.021*#1,sibling angle=60},% }% \colorlet{trunk}{#2}% \colorlet{leaf a}{#3}% -\colorlet{leaf b}{#4}\begin{tikzpicture}[x=1ex,y=1ex,scale=#1]% +\colorlet{leaf b}{#4}\begin{tikzpicture}[x=1ex,y=1ex, scale=#1+0.2, line width=0.07ex*#1]% +\ifx\leaf@or@not@leaf\@leaf@is@leaf% +\draw[opacity=0] (-0.82-0.1* #1/100,0) rectangle (0.82+0.1*#1/100, 1.415+0.01*#1/100); +\else +\draw[opacity=0] (-0.75,0.1) rectangle (0.75,1.3); +\fi \coordinate (root) [grow cyclic,rotate=90] child { child [line cap=round] foreach \a in {0,1, 2} { child foreach \b in {0,1} { child foreach \c in {0,1,2} { child foreach \d in {0,1} { @@ -611,12 +878,12 @@ child foreach \leafcolor in {leaf a,leaf b} { edge from parent [color=\leafcolor \end{tikzpicture}% }} -\DeclareOptionX{draft}{\@tikzsymbols@drafttrue\@tikzsymbols@finalfalse +\DeclareOption{draft}{\@tikzsymbols@drafttrue\@tikzsymbols@finalfalse \def\Basic@Tree{\Basic@Tree@off}} -\DeclareOptionX{final}{\@tikzsymbols@draftfalse\@tikzsymbols@finaltrue +\DeclareOption{final}{\@tikzsymbols@draftfalse\@tikzsymbols@finaltrue \def\Basic@Tree{\Basic@Tree@on}} -\DeclareOptionX{tree}{% +\DeclareOption{tree}{% \def\Basic@Tree{\csname Basic@Tree@#1\endcsname}% \if@tikzsymbols@draft% \PackageWarningNoLine{tikzsymbols}{You can use class option \MessageBreak @@ -632,18 +899,24 @@ final with package option tree=on/off; \DeclareRobustCommandx{\Basic@Tree@off}[5][1=1, usedefault]{{% \def\leaf@or@not@leaf{#5}% -\begin{tikzpicture}[scale=#1,x=1.3ex,y=1.3ex] -\draw[#2] (0,0) -- (0,1); -\draw[#3] (0,1) -- (1,1); -\draw[#4] (1,1) -- (1,0); +\def\@y@@x@y@x{0.095*#1/100} +\begin{tikzpicture}[scale=#1+0.2,x=1.3ex,y=1.3ex, line width=0.07ex*#1] \ifx\leaf@or@not@leaf\@leaf@is@leaf% -\draw[#3] (1,0) -- (0.5,0); -\draw[#4] (0.5,0) -- (0,0); +\draw[#2] (0-\@y@@x@y@x,0) -- (0-\@y@@x@y@x,1.08+0.05*#1/100); +\draw[#3] (0-\@y@@x@y@x,1.08+0.05*#1/100) -- (1.2+\@y@@x@y@x,1.08+0.05*#1/100); +\draw[#4] (1.2+\@y@@x@y@x,1.08+0.05*#1/100) -- (1.2+\@y@@x@y@x,0); +\draw[#3] (1.2+\@y@@x@y@x,0) -- (0.5,0); +\draw[#4] (0.5+0.4*#1/100,0) -- (0-\@y@@x@y@x,0); +\else +\draw[#2] (0,0) -- (0,1); +\draw[#3] (0,1) -- (1.15,1); +\draw[#4] (1.15,1) -- +(0,-1); \fi% \end{tikzpicture}% }} \DeclareRobustCommandx{\Basic@Tree@on}[5][1=1, usedefault]{{% +\def\leaf@or@not@leaf{#5}% \@Tree@SetUp[#1]% \pgfarrowsdeclare{leaf}{leaf}% {\pgfarrowsleftextend{-.1ex} \pgfarrowsrightextend{-0.05ex}}% @@ -655,7 +928,12 @@ final with package option tree=on/off; }% \colorlet{trunk}{#2}% \colorlet{leaf a}{#3}% -\colorlet{leaf b}{#4}\begin{tikzpicture}[x=1ex,y=1ex,scale=#1]% +\colorlet{leaf b}{#4}\begin{tikzpicture}[x=1ex,y=1ex, scale=#1+0.2, line width=0.07ex*#1]% +\ifx\leaf@or@not@leaf\@leaf@is@leaf% +\draw[opacity=0] (-0.82-0.1* #1/100,0) rectangle (0.82+0.1*#1/100, 1.415+0.01*#1/100); +\else +\draw[opacity=0] (-0.75,0.1) rectangle (0.75,1.3); +\fi \coordinate (root) [grow cyclic,rotate=90] child { child [line cap=round] foreach \a in {0,1, 2} { child foreach \b in {0,1} { child foreach \c in {0,1,2} { child foreach \d in {0,1} { @@ -665,7 +943,7 @@ child foreach \leafcolor in {leaf a,leaf b} { edge from parent [color=\leafcolor \end{tikzpicture}% }} -\ProcessOptionsX*\relax +\ProcessOptions*\relax \newcommand\BasicTree[5][1]{% \def\leaf@or@not@leaf{#5}% @@ -709,7 +987,7 @@ child foreach \leafcolor in {leaf a,leaf b} { edge from parent [color=\leafcolor \DeclareRobustCommandx{\Autumntree}[1][1=1, usedefault]% {\BasicTree[#1]{red!30!black}{red!75!black}{orange}{leaf}} \DeclareRobustCommandx{\Wintertree}[1][1=1, usedefault]% - {\BasicTree[#1]{black}{black!50}{black!25}{}} + {\BasicTree[#1]{black!80!}{black!50}{black!25}{}} \DeclareRobustCommand{\@Keep@Cool@I}{% \begin{tikzpicture}[x=1em, y=1em, line width=0.03em] -- cgit v1.2.3