tikzsymbols (13oct15)

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

4 files changed, 106 insertions, 95 deletions

diff --git a/Master/texmf-dist/doc/latex/tikzsymbols/README b/Master/texmf-dist/doc/latex/tikzsymbols/README
index fe5640b2f07..81929df3486 100644
--- a/Master/texmf-dist/doc/latex/tikzsymbols/README
+++ b/Master/texmf-dist/doc/latex/tikzsymbols/README
@@ -2,7 +2,7 @@
 || tikzsymbols ||
 || ------------||
 
-The `tiksymbols' package v.3.0g contains symbols created using tikz.
+The `tiksymbols' package v.3.0h contains symbols created using tikz.
 This package provides: 
  * various emoticons
  * cooking symbols
@@ -31,6 +31,8 @@ v3.0g 	Removed a bug caused by me messing up with commands.
 	Removed package 'calc' and replaced \setlength with \pgfmathsetlength
 	Reworked some code of the symbols.
 	Did not change the manual.
+v3.0h 	Creating a bug in the process of fixing the last bug,
+	added the forgotten \fi.
 
 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 
diff --git a/Master/texmf-dist/doc/latex/tikzsymbols/tikzsymbols.pdf b/Master/texmf-dist/doc/latex/tikzsymbols/tikzsymbols.pdf
index 58caf440fd4..09620238ca3 100644
--- a/Master/texmf-dist/doc/latex/tikzsymbols/tikzsymbols.pdf
+++ b/Master/texmf-dist/doc/latex/tikzsymbols/tikzsymbols.pdf
diff --git a/Master/texmf-dist/source/latex/tikzsymbols/tikzsymbols.dtx b/Master/texmf-dist/source/latex/tikzsymbols/tikzsymbols.dtx
index b095066de21..47c6890304a 100644
--- a/Master/texmf-dist/source/latex/tikzsymbols/tikzsymbols.dtx
+++ b/Master/texmf-dist/source/latex/tikzsymbols/tikzsymbols.dtx
@@ -2,7 +2,7 @@
 % !TEX encoding = MacOSRoman
 %: CheckSum
 % \fi
-% \CheckSum{2304}
+% \CheckSum{2305}
 %
 % \iffalse meta-comment 
 % 
@@ -36,7 +36,7 @@
 \usepackage{microtype}
 \usepackage{longtable}
 \usepackage{booktabs}
-\usepackage[]{tikzsymbols} 
+\usepackage{tikzsymbols} 
 \usepackage{csquotes}
 \usepackage{mathtools}
 %
@@ -124,6 +124,8 @@
 % \changes{v3.0d}{2014/10/29}{\cs{tkzsymblsscl} to \cs{tkzsymbls@scl}}
 % \changes{v3.0e}{2014/10/29}{\cs{tkzsymblsDeclareRobustCommand} to \cs{tkzsymbls@Declare@Robust@Command}}
 % \changes{v3.0f}{2014/10/29}{\cs{tksymblsbxPrmtrstore} to \cs{tksymbls@bx@Prmtrstore}}
+% \changes{v3.0g}{2015/10/01}{Deleted package \Package{calc}, using now \cs{pgfmathsetlength} instead of \cs{setlength}.}
+% \changes{v3.0h}{2015/10/13}{Added a missing \cs{fi} into the code. }
 %
 %
 % \GetFileInfo{tikzsymbols.sty}
@@ -399,7 +401,7 @@
 % many boxes you can deactivate the storing of
 % \Package{tikzsymbols}-symbols inside boxes using
 % \Option{usebox=false} (see \ref{usebox})).
-%
+% 
 % There is a great advantage using this box-system: once calculated,
 % the symbol can be used again without any new
 % calculation\footnote{And hopefully no disadvantage\dots} (I know I
@@ -797,14 +799,13 @@
 % \StopEventually{Well then, happy \TeX ing!}
 %
 %
-% \changes{v3.0g}{2015/10/01}{Deleted package \Package{calc}, using now \cs{pgfmathsetlength} instead of \cs{setlength}.}
 %
 % The first lines are always the same: what do I need, how is the
 % package named:
 %    \begin{macrocode} 
 \NeedsTeXFormat{LaTeX2e}[2011/06/27] 
 \ProvidesPackage{tikzsymbols} 
-[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}}
@@ -1975,26 +1976,28 @@ rounded corners=0.08ex*\tkzsymbls@scl, scale=#1]
 %  A normal Smiley
 %    \begin{macrocode}
 \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
+%    \end{macrocode}
+%    \begin{macrocode}
 \tkzsymbls@Declare@Robust@Commandx{dSmiley}[2][1=1,2=yellow,usedefault]{%
 \tikzsymbols@ifsaveboxundefined{dSmiley#1#2}{%
 \set@tkzsymblsscl{#1}%
@@ -2717,7 +2720,8 @@ decoration={random steps,segment length=0.15ex*\tkzsymbls@scl, amplitude=0.1ex*\
 }%
 \tikzsymbols@use@box{drWalley#1#2}%
 \tikzsymbolsaftersymbolinput%
-}%    \end{macrocode}
+}
+%    \end{macrocode}
 %\end{macro}
 %
 %
@@ -2840,7 +2844,8 @@ decorate  {-- (-0.25,0.24)}
 }%
 \tikzsymbols@use@box{dNinja#1#2#3#4}%
 \tikzsymbolsaftersymbolinput%
-}%    \end{macrocode}
+}
+%    \end{macrocode}
 %\end{macro}
 %
 %
@@ -3086,7 +3091,8 @@ decorate  {-- (-0.25,0.24)}
 }%
 \tikzsymbols@use@box{Candle#1}%
 \tikzsymbolsaftersymbolinput%
-}%    \end{macrocode}
+}
+%    \end{macrocode}
 %\end{macro}
 %
 %
@@ -3134,28 +3140,29 @@ decorate  {-- (-0.25,0.24)}
 %  Just a cup of coffee.
 %    \begin{macrocode}
 \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
 %    \end{macrocode}
 %\end{macro}
 %
@@ -3349,7 +3356,8 @@ decoration={snake,amplitude=.05ex*\tkzsymbls@scl,segment length=0.408ex*\tkzsymb
 }%
 \tikzsymbols@use@box{Snowman#1}%
 \tikzsymbolsaftersymbolinput%
-}%    \end{macrocode}
+}
+%    \end{macrocode}
 %\end{macro}
 %
 %
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}%