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 --- .../tex/latex/tikzsymbols/tikzsymbols.sty | 356 ++++++++++++++++++--- 1 file changed, 317 insertions(+), 39 deletions(-) (limited to 'Master/texmf-dist/tex') 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