From 391b34c560590a9373f894975a79d205b6599492 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Tue, 13 Oct 2015 21:37:49 +0000 Subject: tikzsymbols (13oct15) git-svn-id: svn://tug.org/texlive/trunk@38629 c570f23f-e606-0410-a88d-b1316a301751 --- .../tex/latex/tikzsymbols/tikzsymbols.sty | 91 +++++++++++----------- 1 file changed, 46 insertions(+), 45 deletions(-) (limited to 'Master/texmf-dist/tex/latex/tikzsymbols/tikzsymbols.sty') diff --git a/Master/texmf-dist/tex/latex/tikzsymbols/tikzsymbols.sty b/Master/texmf-dist/tex/latex/tikzsymbols/tikzsymbols.sty index d9001cd3adf..5c7bbb497bb 100644 --- a/Master/texmf-dist/tex/latex/tikzsymbols/tikzsymbols.sty +++ b/Master/texmf-dist/tex/latex/tikzsymbols/tikzsymbols.sty @@ -25,7 +25,7 @@ %% and the derived file tikzsymbols.sty. \NeedsTeXFormat{LaTeX2e}[2011/06/27] \ProvidesPackage{tikzsymbols} -[2015/10/01 v3.0g Some symbols created using tikz.] +[2015/10/13 v3.0h Some symbols created using tikz.] \@ifpackageloaded{tikz}{}{\RequirePackage{tikz}} \@ifpackageloaded{xargs}{}{\RequirePackage{xargs}} \@ifpackageloaded{xcolor}{}{\RequirePackage{xcolor}} @@ -641,25 +641,25 @@ rounded corners=0.08ex*\tkzsymbls@scl, scale=#1] \tikzsymbolsaftersymbolinput% } \ifKV@tikzsymbols@marvosym\relax\else% - \tkzsymbls@Declare@Robust@Commandx{Smiley}[2][1=1,2={none} ,usedefault]{% - \tikzsymbols@ifsaveboxundefined{Smiley#1#2}{% - \set@tkzsymblsscl{#1}% + \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*\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] -\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); -\end{tikzpicture}% -\fi% -}% -\tikzsymbols@use@box{Smiley#1#2}% -\tikzsymbolsaftersymbolinput% -}% + \tksymbls@bx@Prmtrstore{#1}% + \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] + \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); + \end{tikzpicture}% + \fi% + }% + \tikzsymbols@use@box{Smiley#1#2}% + \tikzsymbolsaftersymbolinput% + }% \fi \tkzsymbls@Declare@Robust@Commandx{dSmiley}[2][1=1,2=yellow,usedefault]{% \tikzsymbols@ifsaveboxundefined{dSmiley#1#2}{% @@ -1250,7 +1250,7 @@ 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}% @@ -1355,7 +1355,7 @@ 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}% @@ -1475,7 +1475,7 @@ decorate {-- (-0.25,0.24)} }% \tikzsymbols@use@box{Candle#1}% \tikzsymbolsaftersymbolinput% -}% \end{macrocode} +} \tkzsymbls@Declare@Robust@Command{Fire}[1][1]{% \tikzsymbols@ifsaveboxundefined{Fire#1}{% \set@tkzsymblsscl{#1}% @@ -1506,28 +1506,29 @@ decorate {-- (-0.25,0.24)} \tikzsymbolsaftersymbolinput% } \ifKV@tikzsymbols@marvosym \else% -\tkzsymbls@Declare@Robust@Command{Coffeecup}[1][1]{% -\tikzsymbols@ifsaveboxundefined{Coffeecup#1}{% -\set@tkzsymblsscl{#1}% -\iftikzymbols@draftabsolute% -\tksymbls@bx@Prmtrstore{#1}% -\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] - (\x,0.3) -- +(0,1); -\draw (0,-1.05) -- (2.1,-1.05); -\end{tikzpicture}% -\fi% -}% -\tikzsymbols@use@box{Coffeecup#1}% -\tikzsymbolsaftersymbolinput% -}% + \tkzsymbls@Declare@Robust@Command{Coffeecup}[1][1]{% + \tikzsymbols@ifsaveboxundefined{Coffeecup#1}{% + \set@tkzsymblsscl{#1}% + \iftikzymbols@draftabsolute% + \tksymbls@bx@Prmtrstore{#1}% + \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] + (\x,0.3) -- +(0,1); + \draw (0,-1.05) -- (2.1,-1.05); + \end{tikzpicture}% + \fi% + }% + \tikzsymbols@use@box{Coffeecup#1}% + \tikzsymbolsaftersymbolinput% + }% +\fi \tkzsymbls@Declare@Robust@Command{Chair}[1][1]{% \tikzsymbols@ifsaveboxundefined{Chair#1}{% \set@tkzsymblsscl{#1}% @@ -1681,7 +1682,7 @@ decoration={snake,amplitude=.05ex*\tkzsymbls@scl,segment length=0.408ex*\tkzsymb }% \tikzsymbols@use@box{Snowman#1}% \tikzsymbolsaftersymbolinput% -}% \end{macrocode} +} \tkzsymblsnewcommand{BasicTree}[5][1]{% \tikzsymbols@ifsaveboxundefined{BasicTree#1#2#3#4#5}{% \def\tikzsymbols@leaf@or@not@leaf{#5}% -- cgit v1.2.3