summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2018-05-02 17:53:29 +0000
committerKarl Berry <karl@freefriends.org>2018-05-02 17:53:29 +0000
commite1809e9c838ac3ed386dc53e6c8b282a6eb484c3 (patch)
treee7066113febebd75930313b8b884d32b0f802202
parent121ec16e044cc1d35ef87ca003c5e7d124e087d7 (diff)
tikzsymbols (13apr18)
git-svn-id: svn://tug.org/texlive/trunk@47563 c570f23f-e606-0410-a88d-b1316a301751
Diffstat
-rw-r--r--Master/texmf-dist/doc/latex/tikzsymbols/README.md72
-rw-r--r--Master/texmf-dist/doc/latex/tikzsymbols/tikzsymbols.pdfbin517178 -> 543133 bytes
-rw-r--r--Master/texmf-dist/source/latex/tikzsymbols/tikzsymbols.dtx1214
-rw-r--r--Master/texmf-dist/source/latex/tikzsymbols/tikzsymbols.ins78
-rw-r--r--Master/texmf-dist/tex/latex/tikzsymbols/tikzsymbols.sty725
5 files changed, 1266 insertions, 823 deletions
diff --git a/Master/texmf-dist/doc/latex/tikzsymbols/README.md b/Master/texmf-dist/doc/latex/tikzsymbols/README.md
index a4245bde978..5a8d2c201ef 100644
--- a/Master/texmf-dist/doc/latex/tikzsymbols/README.md
+++ b/Master/texmf-dist/doc/latex/tikzsymbols/README.md
@@ -1,68 +1,83 @@
+
tikzsymbols
===========
Overview
--------
-The `tiksymbols` package v4.07 (September 05, 2017) contains symbols created using tikz.
+The *tikzsymbols* package v4.10 (2018/04/11) contains symbols created using tikz.
-This package provides:
+This package provides:
* various emoticons
* cooking symbols
* trees
* other symbols (e.g. Penrose-Triangle (Triban), chair, coffeecup, etc.)
+FAQ
+-------
+See documentation
+
Changes
-------
-* v1.6 Several bugs fixed and some options added.
-* v1.7 New symbols and some `bugs` fixed
+* v1.6 Several bugs fixed and some options added.
+* v1.7 New symbols and some `bugs` fixed
* v2.0
- - Bug fixed, now option `tree=on/off` is working again,
- - new symbols: `Triban`, improved BasicTree code.
+ - Bug fixed, now option `tree=on/off` is working again,
+ - new symbols: `\Triban`, improved BasicTree code.
- New option: `marvsoym` (see documentation for more details).
* v2.2
- - Included `\\@ifpackageloaded`, now symbols can have negative scale,
+ - Included `\@ifpackageloaded`, now symbols can have negative scale,
- Did something else, I can't remember.
-* v2.25 Changed some code
+* v2.25 Changed some code
* v2.5
- - New option: draftabsolute (symbols are replaced by text and LateX becomes faster again). Changed manual a bit.
+ - New option: `draftabsolute` (symbols are replaced by text and LateX becomes faster again). Changed manual a bit.
* v3.0
- - Symbols are stored inside a save-box and are used via \\usebox{},
- - New option: `draft=absolute` (old option is still useable but obsolete),
+ - Symbols are stored inside a save-box and are used via `\usebox`,
+ - New option: `draft=absolute` (old option is still useable, but obsolete),
- Changed output of `draft=absolute`,
- New option: `prefix=<prefix>`, adds a `<prefix>` to all commands,
- New option: `usebox=true/false` If false the symbols aren't stored inside a box,
- See manual for more changes.
-* v3.0a New cookingsymbols: `\\grater`, `\\bottle`
-* v3.0b Deleted some non-ASCII characters.
+* v3.0a New cooking-symbols: `\grater`, `\bottle`
+* v3.0b Deleted some non-ASCII characters.
* v3.0g
- Removed a bug caused by me messing up with commands.
- - Removed package `calc` and replaced `\\setlength` with `\\pgfmathsetlength`
+ - Removed package `calc` and replaced `\setlength` with `\pgfmathsetlength`
- Reworked some code of the symbols.
- Did not change the manual.
-* v3.0h Created a bug in the process of fixing the last bug, added the forgotten `\\fi`.
-* v3.01alpha Copied the 2e code and started rewriting the code in LaTeX3.
-* v3.38 Nearly finished rewriting.
-* v3.40 Now everything is coded in LaTeX3.
-* v3.40-v0.95 Various fixes and changes.
-* v3.95 New emoticon `\\(d)Changey`.
-* v4.0 Finished reworking the code.
+* v3.0h Created a bug in the process of fixing the last bug, added the forgotten \\fi.
+* v3.01alpha Copied the 2e code and started rewriting the code in LaTeX3.
+* v3.38 Nearly finished rewriting.
+* v3.40 Now everything is coded in LaTeX3.
+* v3.40-v3.95 Various fixes and changes.
+* v3.95 New emoticon `\(d)Changey`.
+* v4.0 Finished reworking the code.
* v4.01
- Added a known problem to the documentation.
- - New Symbol: \\rollingpin (and of course the german equivalent `\\Nudelholz`)
+ - New Symbol: `\rollingpin` (and of course the german equivalent `\Nudelholz`)
* v4.02
- - Added option `baseline=true/false` to fix a bug occuring with `todonotes`
- - New Symbols: `\\cChangey` and `\\dcChangey`
+ - Added option `baseline=true/false` to fix a bug occurring with `todonotes`
+ - New Symbols: `\cChangey` and `\dcChangey`
* v4.06
- - New Emoticon: `\\(d)Sleepey`.
- - New Emoticon: `\\SchrodingersCat`.
+ - New Emoticon: `\(d)Sleepey`.
+ - New Emoticon: `\SchrodingersCat`.
- New option: `global-scale`.
- New option: `symbol-scale`.
- - `\\tikzsymbolsset` now raises a warning if a load-time option is used.
+ - `\tikzsymbolsset` now raises a warning if a load-time option is used.
- Some minor fixes.
* v4.07 Option `usebox` is now usable during the document.
+* v4.10
+ - Added FAQ.
+ - All files are now derived from the .dtx file.
+ - New option: `append-style`.
+ - New option: `remember-picture`.
+ - Internal change: `baseline`.
+ - Deleted invisible sign.
+ - New symbolpair: `\Knoblauchpresse` and `\garlicpress`.
+ - Option `draft` and `final` now set the internal draft boolean locally.
+ - Reworked sizes of the plain vanilla draft boxes.
-Requirements
+Requirements
------------
* expl3 & xparse
@@ -71,7 +86,6 @@ Requirements
* xspace
* l3keys2e
-
This file contains
------------------
diff --git a/Master/texmf-dist/doc/latex/tikzsymbols/tikzsymbols.pdf b/Master/texmf-dist/doc/latex/tikzsymbols/tikzsymbols.pdf
index 86fbc9647fc..f3a2246f1bf 100644
--- a/Master/texmf-dist/doc/latex/tikzsymbols/tikzsymbols.pdf
+++ b/Master/texmf-dist/doc/latex/tikzsymbols/tikzsymbols.pdf
Binary files differ
diff --git a/Master/texmf-dist/source/latex/tikzsymbols/tikzsymbols.dtx b/Master/texmf-dist/source/latex/tikzsymbols/tikzsymbols.dtx
index c226cd4f663..83a064ff04b 100644
--- a/Master/texmf-dist/source/latex/tikzsymbols/tikzsymbols.dtx
+++ b/Master/texmf-dist/source/latex/tikzsymbols/tikzsymbols.dtx
@@ -1,31 +1,176 @@
-% \iffalse meta-comment
+% \iffalse meta-comment
% !TEX encoding = UTF-8 Unicode
+% !TEX program = pdfLaTeX
%
-% \fi
-%
-% \iffalse meta-comment
-%
-% Copyright (C) 2013--2017 by Ben Vitecek (current Maintainer)
-%
-% This work may be distributed and/or modified under the
-% conditions of the LaTeX Project Public License, either version 1.3c
-% of this license or (at your option) any later version.
-% The latest version of this license is in
-% http://www.latex-project.org/lppl.txt
-% and version 1.3c or later is part of all distributions of LaTeX
-% version 2005/12/01 or later.
-%
-% This work has the LPPL maintenance status `maintained'.
-%
-% This work consists of the files README.md, tikzsymbols.dtx,
-% tikzsymbols.ins and the derived files tikzsymbols.sty.
-%
-% \fi
%
-% \iffalse
+%<*internal>
+\iffalse
+%</internal>
+%<*readme>
+
+tikzsymbols
+===========
+
+Overview
+--------
+
+The *tikzsymbols* package v4.10 (2018/04/11) contains symbols created using tikz.
+
+This package provides:
+ * various emoticons
+ * cooking symbols
+ * trees
+ * other symbols (e.g. Penrose-Triangle (Triban), chair, coffeecup, etc.)
+
+FAQ
+-------
+See documentation
+
+
+Changes
+-------
+* v1.6 Several bugs fixed and some options added.
+* v1.7 New symbols and some `bugs` fixed
+* v2.0
+ - Bug fixed, now option `tree=on/off` is working again,
+ - new symbols: `\Triban`, improved BasicTree code.
+ - New option: `marvsoym` (see documentation for more details).
+* v2.2
+ - Included `\@ifpackageloaded`, now symbols can have negative scale,
+ - Did something else, I can't remember.
+* v2.25 Changed some code
+* v2.5
+ - New option: `draftabsolute` (symbols are replaced by text and LateX becomes faster again). Changed manual a bit.
+* v3.0
+ - Symbols are stored inside a save-box and are used via `\usebox`,
+ - New option: `draft=absolute` (old option is still useable, but obsolete),
+ - Changed output of `draft=absolute`,
+ - New option: `prefix=<prefix>`, adds a `<prefix>` to all commands,
+ - New option: `usebox=true/false` If false the symbols aren't stored inside a box,
+ - See manual for more changes.
+* v3.0a New cooking-symbols: `\grater`, `\bottle`
+* v3.0b Deleted some non-ASCII characters.
+* v3.0g
+ - Removed a bug caused by me messing up with commands.
+ - Removed package `calc` and replaced `\setlength` with `\pgfmathsetlength`
+ - Reworked some code of the symbols.
+ - Did not change the manual.
+* v3.0h Created a bug in the process of fixing the last bug, added the forgotten \\fi.
+* v3.01alpha Copied the 2e code and started rewriting the code in LaTeX3.
+* v3.38 Nearly finished rewriting.
+* v3.40 Now everything is coded in LaTeX3.
+* v3.40-v3.95 Various fixes and changes.
+* v3.95 New emoticon `\(d)Changey`.
+* v4.0 Finished reworking the code.
+* v4.01
+ - Added a known problem to the documentation.
+ - New Symbol: `\rollingpin` (and of course the german equivalent `\Nudelholz`)
+* v4.02
+ - Added option `baseline=true/false` to fix a bug occurring with `todonotes`
+ - New Symbols: `\cChangey` and `\dcChangey`
+* v4.06
+ - New Emoticon: `\(d)Sleepey`.
+ - New Emoticon: `\SchrodingersCat`.
+ - New option: `global-scale`.
+ - New option: `symbol-scale`.
+ - `\tikzsymbolsset` now raises a warning if a load-time option is used.
+ - Some minor fixes.
+* v4.07 Option `usebox` is now usable during the document.
+* v4.10
+ - Added FAQ.
+ - All files are now derived from the .dtx file.
+ - New option: `append-style`.
+ - New option: `remember-picture`.
+ - Internal change: `baseline`.
+ - Deleted invisible sign.
+ - New symbolpair: `\Knoblauchpresse` and `\garlicpress`.
+ - Option `draft` and `final` now set the internal draft boolean locally.
+ - Reworked sizes of the plain vanilla draft boxes.
+
+Requirements
+------------
+
+ * expl3 & xparse
+ * tikz
+ * xcolor
+ * xspace
+ * l3keys2e
+
+
+This file contains
+------------------
+
+ * README
+ * tikzsymbols.pdf
+ * tikzsymbols.dtx
+ * tikzsymbols.ins
+
+License
+-------
+This ma­te­rial is sub­ject to the LATEX Project Public Li­cense 1.3c. See
+
+ http://www.ctan.org/tex-archive/help/Catalogue/licenses.lppl.html
+
+for the details of that license.
+
+%</readme>
+%<*internal>
+\fi
+\def\nameofplainTeX{plain}
+\ifx\fmtname\nameofplainTeX\else
+ \expandafter\begingroup
+\fi
+%</internal>
+%<*install>
+\input l3docstrip.tex
+%\keepsilent
+\askforoverwritefalse
+\preamble
+
+ Copyright (C) 2013--2018 by Ben Vitecek (current Maintainer)
+
+ This work may be distributed and/or modified under the
+ conditions of the LaTeX Project Public License, either version 1.3c
+ of this license or (at your option) any later version.
+ The latest version of this license is in
+ http://www.latex-project.org/lppl.txt
+ and version 1.3c or later is part of all distributions of LaTeX
+ version 2005/12/01 or later.
+
+ This work has the LPPL maintenance status `maintained'.
+
+ This work consists of the files README.md, tikzsymbols.dtx,
+ tikzsymbols.ins and the derived files tikzsymbols.sty.
+
+\endpreamble
+%\postamble
+
+%\endpostamble
+\usedir{tex/latex/tikzsymbols}
+\generate{
+ \file{\jobname.sty}{\from{\jobname.dtx}{package}}
+}
+%</install>
+%<install>\endbatchfile
+%<*internal>
+\usedir{source/latex/tikzsymbols}
+\generate{
+ \file{\jobname.ins}{\from{\jobname.dtx}{install}}
+}
+\nopreamble\nopostamble
+\usedir{doc/latex/tikzsymbols}
+\generate{
+ \file{README.md}{\from{\jobname.dtx}{readme}}
+}
+\ifx\fmtname\nameofplainTeX
+ \expandafter\endbatchfile
+\else
+ \expandafter\endgroup
+\fi
+%</internal>
%<*driver>
\documentclass[onlydoc,11pt,english]{l3doc}
-
+%: documentclass
\usepackage[utf8]{inputenc}
\usepackage[T1]{fontenc}
\usepackage{lmodern}
@@ -47,7 +192,6 @@
\RecordChanges
\AtEndDocument { \PrintChanges \PrintIndex }
-%: Ganz oben
\makeatletter
\ExplSyntaxOn
@@ -66,10 +210,15 @@
\newcommand{\Option}{\texttt}
\newcommand{\opt}{\texttt}
\newcommand{\Makro}{\cs}
+\newcommand{\mycs}{\cs}
\newcommand{\makrouse}[1]{\use:c{#1}}
-\renewcommand{\arg}[1]{\texttt{<#1>}}
\newcommand{\Meta}[1]{\meta{#1}}
+\colorlet{mybracegreen}{green!50!black}
+\renewcommand\marg[1]{\textcolor{mybracegreen}{\texttt{\char`\{}}%
+ \meta{#1}%
+ \textcolor{mybracegreen}{\texttt{\char`\}}}%
+}
\hfuzz=500pt
@@ -120,12 +269,16 @@
}
+%\tikzsymbolsset { marvosym=true }
+
+
\ExplSyntaxOff
\makeatother
+
\begin{document}
-\DocInput{tikzsymbols.dtx}
+\DocInput{\jobname.dtx}
\end{document}
%</driver>
% \fi
@@ -157,7 +310,7 @@
%
%
%
-% \GetFileInfo{tikzsymbols.sty}
+% \GetFileInfo{\jobname.sty}
%
% \iffalse meta-comment
%: DoNotIndex
@@ -247,6 +400,7 @@
% The package should behave the same way as the \enquote{old} \LaTeXe\ release.
%
% \begin{description}
+% \item[2018] Option \opt{draft} and \opt{final} are now local.
% \item[2017] Option \Option{usebox} can be used during the document.
% \item[old] The horribly named command
% \Makro{tikzsymbolsaftersymbolinput} is not defined anymore by this
@@ -335,19 +489,19 @@
% You may also use the option \Option{prefix} (\cref{sec:prefix}).
%
%
-% \subsubsection{prefix (\arg{string})}
+% \subsubsection{prefix (\meta{string})}
% \label{sec:prefix}
%
-% This option takes a string as value: \Option{prefix=\arg{string}} and
+% This option takes a string as value: \Option{prefix=\meta{string}} and
% adds this prefix to every command defined by this package. So
-% setting \Option{prefix=<prefix>} adds \arg{prefix} to all commands of
-% this package: \Makro{<prefix>command}.
+% setting \Option{prefix=\meta{prefix}} adds \meta{prefix} to all commands of
+% this package: \Makro{\meta{prefix}command}.
%
-%\arg{prefix} should neither contain
+%\meta{prefix} should neither contain
% any special characters (e.g., \"a, \"u, \ss, etc.) nor spaces.
%
% By default it is empty, so no prefix is given, if this option is given
-% without an argument \arg{prefix} is set to \Option{tikzsymbols}.
+% without an argument \meta{prefix} is set to \Option{tikzsymbols}.
%
% Can only be set as a load-time option.
%
@@ -370,7 +524,7 @@
% This command takes the name of the symbol \emph{without}
% backslash and prints the symbol (or raises an error if the symbol
% is not defined). Using this command you don't have to worry about
-% a \arg{prefix}, just write the command name and this command adds
+% a \meta{prefix}, just write the command name and this command adds
% automatically the given prefix to the command name.
%
%
@@ -402,16 +556,18 @@
%
% \begin{function}{draft}
% \begin{syntax}
-% draft = \arg{true/false}
+% draft = \meta{true/false}
% \end{syntax}
%
% While working on the document it is recommended to set this option
% to \Option{true} because creating many symbols may takes some time
% to compile and by setting this option to \Option{true} the symbols
-% are replaced by plain vanilla rectangles (with the same height and width as
-% the symbols\footnote{At least I hope.}) which are faster to
+% are replaced by plain vanilla rectangles (with approximately the same height and width as
+% the symbols) which are faster to
% create.
%
+% You can also set this option during the document.
+%
% The old option \Option{draft=absolute} is
% obsolete and should therefore not be used.
%
@@ -422,7 +578,7 @@
%
% \begin{function}{final}
% \begin{syntax}
-% final= \arg{true/false}
+% final= \meta{true/false}
% \end{syntax}
%
% This key has the opposite behavior of the option \Option{draft}.
@@ -443,7 +599,7 @@
%
% \begin{function}{tree}
% \begin{syntax}
-% tree= \arg{true/on/false/off}
+% tree= \meta{true/on/false/off}
% \end{syntax}
%
% This key accepts \Option{true}, \Option{false} and furthermore
@@ -467,7 +623,7 @@
%
%
%
-% \subsubsection{after-symbol (\arg{string or command})}
+% \subsubsection{after-symbol (\meta{string or command})}
% \label{sec:after-symbol}
%
% \begin{function}{after-symbol}
@@ -482,8 +638,8 @@
% \end{function}
%
%
-% \subsubsection{global-scale (\arg{number}) \\
-% symbol-scale (\arg{key-value list})}
+% \subsubsection{global-scale (\meta{number}) \\
+% symbol-scale (\meta{key-value list})}
% \label{sec:global-scale}
%
% \begin{function}{global-scale, symbol-scale}
@@ -535,17 +691,24 @@
% does the same thing.
% \end{mynote}
%
-% \subsubsection{baseline (true/false)}
-% \label{sec:baseline}
+%
+%
+% \subsubsection{append-style (\meta{tikz' keyval})}
+% \label{sec:append-style}
%
-% \begin{function}{baseline}
+% \begin{function}{append-style}
% \begin{syntax}
-% baseline = \marg{true/false}
+% append-style = \marg{tikz' keyval}
% \end{syntax}
-% This option mainly exists to let the commands of this package work inside
-% \pkg{todonotes}' \cs{todo} command. If set to \Option{true} it adds to each symbol of this package
-% the tikz option \Option{baseline=default}. If you do not want this, set this option
-% to \Option{false}. It is set to \Option{true} by default.
+%
+% With this option you can append \pkg{tikz}' \meta{keyval}
+% to \pkg{tikzsymbols} internal style.
+%
+% \begin{mynote}
+% The style is called \verb|__tikzsymbols| and while the name
+% will probably not change, you are discouraged to use it directly
+% unless it is \emph{really} necessary (e.g.\ if I did something wrong).
+% \end{mynote}
% \end{function}
%
%
@@ -567,6 +730,38 @@
%
%
%
+% \subsubsection{baseline (true/false)}
+% \label{sec:baseline}
+%
+% \begin{function}{baseline}
+% \begin{syntax}
+% baseline = \marg{true/false}
+% \end{syntax}
+% This option mainly exists to let the commands of this package work inside
+% \pkg{todonotes}' \cs{todo} command. If set to \Option{true} it adds to each
+% symbol of this package
+% the tikz option \Option{baseline=default}. If you do not want this, set this option
+% to \Option{false}. It is set to \Option{true} by default.
+% \end{function}
+%
+% \subsubsection{remember-picture (true/false)}
+% \label{sec:rem-picture}
+%
+% \begin{function}{remember-picture}
+% \begin{syntax}
+% remember-picture = \marg{true/false}
+% \end{syntax}
+%
+% Adds to each symbol created by this package the \pkg{tikz}
+% option \opt{remember picture=\meta{true/false}}.
+% It is not added by default.
+%
+% \end{function}
+%
+%
+%
+%
+%
%
%
% \section {Symbols}
@@ -581,7 +776,6 @@
%
%
% \subsection{Cooking-symbols \texorpdfstring{\Kochtopf}{Kochtopf}}
-%
%
% \begin{function}
% {
@@ -616,7 +810,8 @@
% \Flasche,
% \bottle,
% \Nudelholz,
-% \rollingpin
+% \rollingpin ,
+% \Knoblauchpresse , \garlicpress
% }
%
% The following table shows all available cooking-symbols and their
@@ -649,7 +844,6 @@
%
%
%
-%
%\subsection{Emoticons \texorpdfstring{\Smiley}{Smiley}}
%
%\subsubsection{\enquote{Normal} Emoticons \texorpdfstring{\Cat}{Cat}}
@@ -957,6 +1151,7 @@
%
% \CreateExample{Strichmaxerl}{[][54][28]}
%
+% \CreateExample{Strichmaxerl}{[][45][45][45][45]}
%
%
% \begin{function}
@@ -1051,7 +1246,7 @@
% \end{verbatim}
%
%
-%
+% \begin{comment}
% \section{Known errors \& Problems}
%
% \subsection*{marvosym}
@@ -1083,7 +1278,104 @@
% \end{verbatim}
% to your preamble. This should (hopefully) fix the problem.
%
+% \end{comment}
+%
+%
+%
+%
+%
+%
+% \section{FAQ (Known errors and problems)}
+%
+% Or \enquote{Questions I assume would be frequently asked, if people would
+% frequently ask questions}.
+%
+% \subsection{How to get rid of the space after each symbol?}
+%
+% By default the package adds \cs{xspace} after each command.
+% To remove it use the option \opt{after-symbol}. Using
+% \begin{verbatim}
+% \tikzsymbolsset{after-symbol={}}
+% \end{verbatim}
+% removes the \cs{xspace} command and thus the unwanted space.
+%
+%^^A This was done way back and today I most probably wouldn't do it anymore,
+%^^A but it stayed now for around $4$ years and I don't know if I really should get
+%^^A rid of it by default.
+%
+%
+%
+%
+% \subsection{Using the symbols causes unwanted \meta{problem}. How could I get rid of it?}
+%
+% This could have something to do with question \ref{sec:Q:store-symbol}
+% (after you made sure that the symbols cause the problem).
+% Try using setting the option \opt{usebox=false} and recompile a few
+% times. If the problem persists, please send a bug report (\cref{sec:bug}).
+%
+% \subsection{I am getting the error-message \texttt{Argument of \textbackslash pgffor@next has an extra \}}}
+%
+% If you encounter an error message like
+% \begin{verbatim}
+% Argument of \pgffor@next has an extra }
+% \end{verbatim}
+% while using \pkg{babel} with e.g. language \enquote{francais}
+% and for example \cs{Cooley} you may add
+% \begin{verbatim}
+% \usetikzlibrary{babel}
+% \end{verbatim}
+% to your preamble. This should (hopefully) fix the problem.
+%
+%
+% \subsection{Another package I load already defines \meta{symbol}.}
+%
+% You can override pretty much every symbol simply by loading
+% \pkg{tikzsymbols} last as it defines the symbols via
+% \cs{DeclareDocumentCommand} (see \pkg{xparse}).
+%
+% If you want to use the symbols of both packages you may have
+% a look at option \opt{prefix}.
+%
+%
+%^^A \subsection{Why is it important to know that this package stores symbols in boxes
+%^^A and reuses them instead of creating a new picture every time?}
+% \subsection{Does this package store symbols in boxes
+% and reuses them instead of creating a new picture every time?}
+% \label{sec:Q:store-symbol}
+%
+% Yes, it does. It can become a problem if \LaTeX\ runs out of boxes. If this happens,
+% use \opt{usebox=false}.
+%
+% Furthermore, \pkg{tikz} allows to reference pictures using e.g.\
+% \opt{remember picture}. This also influences the symbols
+% of \pkg{tikzsymbols}. As those symbols are stored and
+% copied for printing, labels attached to the symbols get repeated.
+% In this case, also try using \opt{usebox=false} (or try the option
+% \opt{remember-picture=false}).
+%
+%^^A Another problem is that if a label is added to a symbol
+%^^A (for example by the \pkg{tikz} option \opt{remember picture})
+%^^A then this label is repeated every time the symbol is used. If you have
+%^^A already used the symbol \emph{before} the label is added, nothing happens
+%^^A as a copy of the symbol without the label is used. If it is used the first time,
+%^^A then the label is also stored and repeated every time the symbol is used later.
+%^^A This behavior can also be fixed by \opt{usebox=false} or adding
+%^^A a \pkg{tikz} style by \opt{append-style}.
+%
+%
+% \subsection{Are the symbols created with the environment \texttt{tikzpicture}?}
+%
+% Yes, they are.
+%
+%
+%
+%
+%
+%
+%
+%
% \section{Nobody is perfect}
+% \label{sec:bug}
%
% If you find a bug please send me a mail (or report it on GitHub)
% involving a \emph{minimal example}
@@ -1096,6 +1388,9 @@
% This can also be the reason why I may need some time to answer
% the mail.
%
+% As I am also new to GitHub, I also may take longer to answer, at least until I
+% figured out how to get a mail if a new issue is created.
+%
% Suggestions are also welcome.
%
%
@@ -1134,16 +1429,17 @@
%
% \section{\LaTeX3 code}
%
-%\iffalse
-% !TEX root = tikzsymbols.dtx
-% !TEX encoding = UTF-8 Unicode
-%\fi
%
%
% \begin{macrocode}
%<@@=tikzsymbols>
% \end{macrocode}
%
+% \begin{macrocode}
+%<*package>
+% \end{macrocode}
+%
+%
%\changes {v1.0} {2013/01/19} {Initial version}
%\changes {v1.05} {2013/02/13} {Deleted a \enquote{t} in the BasicTree-code, shortened the trunk from the tree a bit, renamed some codes, made an index}
%\changes {v1.6} {2013/02/14} {Now \enquote{Person} can be used in sections, etc.}
@@ -1209,12 +1505,19 @@
% \changes{v4.03}{2017/08/08}{New symbols: \cs{Sleepey} and \cs{dSleepey}.}
% \changes{v4.04}{2017/08/08}{New symbol: \cs{SchrodingersCat}.}
%
+% \changes{v4.10}{2018/04/11}{New option: \opt{append-style}.}
+% \changes{v4.10}{2018/04/11}{New option: \opt{remember-picture}.}
+% \changes{v4.10}{2018/04/11}{Change how \opt{baseline} works (internal).}
+% \changes{v4.10}{2018/04/11}{Delete invisible sign (I \emph{hate} those).}
+% \changes{v4.10}{2018/04/11}{New symbolpair: \cs{Knoblauchpresse} and \cs{garlicpress}.}
+% \changes{v4.10}{2018/04/11}{Option \opt{draft} and \opt{final} are local now.}
+%
% The first lines are always the same: What do I need, what is the
% package named.
% \begin{macrocode}
\@ifpackageloaded{xparse}{}{\RequirePackage{xparse}}
\@ifpackageloaded{expl3}{}{\RequirePackage{expl3}}
-\@ifpackagelater{expl3}{2017/04/01}
+\@ifpackagelater{expl3}{2018/02/21}
{}
{%
\PackageError { tikzsymbols }{ Support~package~expl3~too~old }
@@ -1227,8 +1530,8 @@
}
\ProvidesExplPackage
{tikzsymbols}
- {2017/09/05}
- {4.07}
+ {2018/04/11}
+ {4.10} % v4.10
{Some symbols created using tikz and LaTeX3.}
\@ifpackageloaded { tikz } {} { \RequirePackage { tikz } }
\@ifpackageloaded { xcolor } {} { \RequirePackage { xcolor } }
@@ -1248,7 +1551,7 @@
% \begin{macro}{
% \l_@@_if_scale_negative_bool ,
% \g_@@_if_opt_tree_print_bool ,
-% \g_@@_if_opt_draft_bool ,
+% \l_@@_if_opt_draft_bool ,
% \g_@@_if_opt_marvosym_bool ,
% }
% Booleans we later need, \cs{l_@@_if_scale_negative_bool} is set true
@@ -1258,7 +1561,7 @@
% \begin{macrocode}
\bool_new:N \l_@@_if_scale_negative_bool
\bool_new:N \g_@@_if_opt_tree_print_bool
-\bool_new:N \g_@@_if_opt_draft_bool
+\bool_new:N \l_@@_if_opt_draft_bool
\bool_new:N \g_@@_if_opt_marvosym_bool
% \end{macrocode}
% \end{macro}
@@ -1316,7 +1619,12 @@
% \end{macrocode}
%
% \begin{macrocode}
-\tl_new:N \l_@@_used_only_once_because_no_better_idea_tl
+\tl_new:N \l_@@_save_global_scale_for_later_because_no_better_idea_tl
+% \end{macrocode}
+%
+% \begin{macrocode}
+\tl_new:N \l_@@_symbol_name_tl
+\tl_new:N \l_@@_symbol_options_clist
% \end{macrocode}
%
% \begin{macrocode}
@@ -1395,6 +1703,14 @@
% \end{macro}
%
%
+% \begin{macro}{\l_@@_tmpa_tl }
+% Some scratch variables
+% \begin{macrocode}
+\tl_new:N \l_@@_tmpa_tl
+% \end{macrocode}
+% \end{macro}
+%
+%
% \subsection{Messages}
%
% Nothing special happens in this subsection.
@@ -1558,7 +1874,7 @@
% \end{macrocode}
% \end{macro}
%
-% \begin{macro}{ package-option }
+% \begin{macro}{ symbol-name-unknown }
% \changes{v4.05}{2017/08/09}{New}
% \begin{macrocode}
\msg_new:nnnn { tikzsymbols } { symbol-name-unknown }
@@ -1587,21 +1903,6 @@
%
%
%
-% \begin{macro}{ \@@_Basic_Tree_aux:nnnnn }
-% I am still using a similar construction as in the \LaTeXe\
-% code. Inside this command is safed either
-% \Makro{@@_Basic_Tree_on:nnnnn} or \Makro{@@_Basic_Tree_off:nnnnn}
-% depending on the package options.
-% \begin{macrocode}
-%\cs_new:Npn \@@_Basic_Tree_aux:nnnnn { }
-\cs_set:Npn \@@_Basic_Tree_aux:nnnnn
- {
- \bool_if:NTF \g_@@_if_opt_tree_print_bool
- { \@@_Basic_Tree_on:nnnnn }
- { \@@_Basic_Tree_off:nnnnn }
- }
-% \end{macrocode}
-% \end{macro}
%
%^^A The command \Makro{BasicTree} is split up into two commands, named
%^^A \texttt{on} and \texttt{off}. The helper command
@@ -1635,9 +1936,9 @@
% Sets \Makro{l_@@_scale_abs_tl} to the absolute input value. I made
% this to write less which is always a good idea (mostly).
% \begin{macrocode}
-\cs_new:Npn \@@_set_scale_abs_tl:n #1
+\cs_new:Npn \@@_set_scale_abs_tl:n #1
{
- \tl_set:Nx \l_@@_scale_abs_tl { \fp_eval:n { abs (#1) } }
+ \tl_set:Nn \l_@@_scale_abs_tl { \fp_abs:n {#1} }
}
% \end{macrocode}
% \end{macro}
@@ -1651,6 +1952,8 @@
% the draftbox. The draftbox itself contains just the vbox and hbox
% commands to set the height and length of the box surrounded by a
% frame.
+%
+% Note to self: DO NOT USE DIM! Multiplications do not work.
% \begin{macrocode}
\cs_new:Npn \@@_create_draftbox:nn #1#2
{
@@ -1682,10 +1985,8 @@
% \end{macro}
%
%
-% \begin{macro}{ \@@_if_savebox_undefined_aux:nT }
-% I may misuse the naming scheme because the command ends with
-% \texttt{nT}, but is not a conditional
-% function. \Makro{l_@@_current_situation_tl} is used here. The box
+% \begin{macro}{ \@@_provide_savebox:nn }
+% \Makro{l_@@_current_situation_tl} is used here. The box
% is only defined if it not defined yet. I don't know how those
% boxes work, but if the same box (alias the same command in the
% same font size and the same color and same options) is used again
@@ -1694,11 +1995,11 @@
% \Makro{global} and \Makro{sbox} because I didn't find the \LaTeX3
% equivalents.
% \begin{macrocode}
-\cs_new:Npn \@@_if_savebox_undefined:nT #1#2
+\cs_new:Npn \@@_provide_savebox:nn #1#2
{
\tl_set:Nx \l_@@_current_situation_tl
{
- \bool_if:NTF \g_@@_if_opt_draft_bool { T } { F } _
+ \bool_if:NTF \l_@@_if_opt_draft_bool { T } { F } _
\current@color _ \f@size
}
\box_if_exist:cF { g_@@_savebox_ \l_@@_current_situation_tl _ #1 _box }
@@ -1728,25 +2029,26 @@
%
%
%
-% \begin{macro}{\@@_provide_savebox_and_use:nT}
+% \begin{macro}{\@@_provide_savebox_and_use_default:nn,
+% \@@_provide_savebox_and_use:nn }
% Again to support my laziness. It creates the box (if it isn't
% defined yet) and uses the box immediately afterwards.
% \begin{macrocode}
-\cs_new:Npn \@@_provide_savebox_and_use_aux:nT #1#2
+\cs_new:Npn \@@_provide_savebox_and_use_default:nn #1#2
{
- \@@_if_savebox_undefined:nT {#1} {#2}
+ \@@_provide_savebox:nn {#1} {#2}
\@@_use_savebox:n {#1}
}
-\cs_set_eq:NN
- \@@_provide_savebox_and_use:nT
- \@@_provide_savebox_and_use_aux:nT
+\cs_set_eq:NN \@@_provide_savebox_and_use:nn
+ \@@_provide_savebox_and_use_default:nn
% \end{macrocode}
% \end{macro}
%
%
% To make this package \pkg{todonotes} safe:
% \begin{macrocode}
-\pgfkeys{ /@@/.style= { baseline=default } }
+\pgfkeys{ /@@/baseline /.style= { baseline=default } }
+\pgfkeys{ /@@/.style= { /@@/baseline } }
% \end{macrocode}
%
%
@@ -1764,7 +2066,7 @@
% \begin{macro}{ final }
% Its the final option, deddepi, deedidbtutp. Nothing special.
% \begin{macrocode}
- final .bool_gset_inverse:N = \g_@@_if_opt_draft_bool ,
+ final .bool_set_inverse:N = \l_@@_if_opt_draft_bool ,
final .default:n = { true } ,
% \end{macrocode}
% \end{macro}
@@ -1781,14 +2083,14 @@
{
\int_case:nn { \l_keys_choice_int }
{
- { 1 } { \bool_gset_true:N \g_@@_if_opt_draft_bool }
- { 2 } { \bool_gset_false:N \g_@@_if_opt_draft_bool }
+ { 1 } { \bool_set_true:N \l_@@_if_opt_draft_bool }
+ { 2 } { \bool_set_false:N \l_@@_if_opt_draft_bool }
{ 3 }
- {
- \msg_error:nnnn { tikzsymbols } { obsolete-option }
- { draft = absolute } { draft = true }
- \bool_gset_true:N \g_@@_if_opt_draft_bool
- }
+ {
+ \msg_error:nnnn { tikzsymbols } { obsolete-option }
+ { draft = absolute } { draft = true }
+ \bool_set_true:N \l_@@_if_opt_draft_bool
+ }
}
} ,
draft .default:n= { false } ,
@@ -1803,7 +2105,7 @@
{
\msg_error:nnnn { tikzsymbols } { obsolete-option }
{ draftabsolute } { draft = true }
- \bool_gset_true:N \g_@@_if_opt_draft_bool
+ \bool_set_true:N \l_@@_if_opt_draft_bool
} ,
% \end{macrocode}
% \end{macro}
@@ -1813,7 +2115,7 @@
% \begin{macrocode}
marvosym .bool_gset:N = \g_@@_if_opt_marvosym_bool ,
marvosym .default:n = { true } ,
- marvosym .groups:n = { package } ,
+ marvosym .groups:n = { only-package } ,
% \end{macrocode}
% \end{macro}
%
@@ -1823,18 +2125,18 @@
% \begin{macrocode}
usebox .choice: ,
usebox/true .code:n =
- { 
+ {
\cs_set_eq:NN
- \@@_provide_savebox_and_use:nT
- \@@_provide_savebox_and_use_aux:nT
+ \@@_provide_savebox_and_use:nn
+ \@@_provide_savebox_and_use_default:nn
} ,
usebox/false .code:n =
- { 
+ {
\cs_set_eq:NN
- \@@_provide_savebox_and_use:nT
+ \@@_provide_savebox_and_use:nn
\use_ii:nn
} ,
- usebox .default:n = { true } ,
+ usebox .default:n = { true } ,
% \end{macrocode}
% \end{macro}
%
@@ -1845,7 +2147,7 @@
% \begin{macrocode}
prefix .tl_gset:N = \g_@@_command_prefix_tl ,
prefix .default:n = { tikzsymbols } ,
- prefix .groups:n = { package } ,
+ prefix .groups:n = { only-package } ,
% \end{macrocode}
% \end{macro}
%
@@ -1875,15 +2177,31 @@
% \end{macrocode}
% \end{macro}
%
+% \begin{macro}{ append-style }
+% \begin{macrocode}
+ append-style .code:n = { \pgfkeys{ /@@/.append ~ style= {#1} } } ,
+ append-style .default:n = { } ,
+% \end{macrocode}
+% \end{macro}
+%
% \begin{macro}{ baseline }
% \begin{macrocode}
baseline .choice: ,
- baseline / true .code:n = { \pgfkeys{ /@@/.style={ baseline=default } } } ,
- baseline / false .code:n = { \pgfkeys{ /@@/.style={ } } } ,
+ baseline / true .code:n = { \pgfkeys{ /@@/baseline/.style={ baseline=default } } } ,
+ baseline / false .code:n = { \pgfkeys{ /@@/baseline/.style={ } } } ,
baseline .default:n = { true } ,
% \end{macrocode}
% \end{macro}
%
+% \begin{macro}{ remember-picture }
+% \begin{macrocode}
+ remember-picture .choice: ,
+ remember-picture / true .meta:n = { append-style = { /tikz/remember~picture = true } } ,
+ remember-picture / false .meta:n = { append-style = { /tikz/remember~picture = false } } ,
+ remember-picture .default:n = { false } ,
+% \end{macrocode}
+% \end{macro}
+%
% \begin{macro}{ global-scale }
% \begin{macrocode}
global-scale .fp_set:N = \l_@@_global_scale_fp ,
@@ -1897,7 +2215,7 @@
% \begin{macrocode}
symbol-scale .code:n =
{
- \tl_set:Nn \l_@@_used_only_once_because_no_better_idea_tl
+ \tl_set:Nn \l_@@_save_global_scale_for_later_because_no_better_idea_tl
{
symbol-scale = {#1} ,
}
@@ -1907,6 +2225,8 @@
% \end{macro}
%
%
+%
+%
% Now we end the key definitions.
% \begin{macrocode}
}
@@ -1983,8 +2303,8 @@
% \begin{macrocode}
\cs_new_protected:Npn \@@_parse_command_options:nn #1#2
{
- \clist_clear:N \l_tmpa_clist
- \tl_set:Nn \l_tmpa_tl {#1}
+ \clist_clear:N \l_@@_symbol_options_clist
+ \tl_set:Nn \l_@@_symbol_name_tl {#1}
\@@_parse_command_options:N #2
\q_recursion_tail \q_recursion_tail \q_recursion_tail \q_recursion_stop
}
@@ -2003,7 +2323,7 @@
{ \@@_parse_option_type_O:w #1 }
{
\tl_if_eq:NNTF #1 S
- { \@@_parse_option_type_S:Vw \l_tmpa_tl #1 }
+ { \@@_parse_option_type_S:Vw \l_@@_symbol_name_tl #1 }
{ \@@_parse_option_type:w #1 }
}
}
@@ -2020,7 +2340,7 @@
{ m } { }
}
{ \msg_error:nnn { tikzsymbols } { internal-message } { internal-parsing } }
- \clist_put_right:Nn \l_tmpa_clist {#1}
+ \clist_put_right:Nn \l_@@_symbol_options_clist {#1}
\@@_parse_command_options:N
}
% \end{macrocode}
@@ -2032,7 +2352,8 @@
% \begin{macrocode}
\cs_new_protected:Npn \@@_parse_option_type_O:w #1#2
{
- \clist_put_right:Nn \l_tmpa_clist { >{ \@@_if_empty:Tn {#2} } O{#2} }
+ \clist_put_right:Nn \l_@@_symbol_options_clist
+ { >{ \@@_if_empty:Tn {#2} } O{#2} }
\@@_parse_command_options:N
}
% \end{macrocode}
@@ -2043,7 +2364,8 @@
% \begin{macrocode}
\cs_new_protected:Npn \@@_parse_option_type_S:nw #1#2
{
- \clist_put_right:Nn \l_tmpa_clist { >{ \@@_scale_if_empty:nTn {#1} { 1 } } O{ 1 } }
+ \clist_put_right:Nn \l_@@_symbol_options_clist
+ { >{ \@@_scale_if_empty:nTn {#1} { 1 } } O{ 1 } }
\@@_parse_command_options:N
}
\cs_generate_variant:Nn \@@_parse_option_type_S:nw { Vw }
@@ -2054,7 +2376,7 @@
% \begin{macro}{ \@@_Declare_Document_Command:nnn }
% Main Command to define the command of this package. It runs
% through the second input (argument specifications), stores the
-% arguments in a \verb|\l_tmpa_clist| and adds
+% arguments in a \verb|\l_@@_symbol_options_clist| and adds
% \verb|>{ \@@_if_empty:Tn {#2} }| if an optional argument is
% found. Yeah. I think the rest is self-explaining.
% \begin{macrocode}
@@ -2065,7 +2387,7 @@
\@@_parse_command_options:nn {#1} {#2}
\exp_args:Ncx \DeclareDocumentCommand
{ \g_@@_command_prefix_tl #1 }
- { \clist_use:Nn \l_tmpa_clist {} }
+ { \clist_use:Nn \l_@@_symbol_options_clist { } }
{
\cs_if_exist:NT \tikzsymbolsaftersymbolinput
{
@@ -2132,11 +2454,12 @@
% \begin{macrocode}
\tl_const:Nn \c_@@_tikz_set_tl
{
- \tikzset
+ \pgfkeys
{
+ /tikz/.cd ,
@@_ld/.style={ level ~ distance=#1ex },
@@_lw/.style={ line ~ width=#1ex },
- level ~ 1/.style={ @@_ld=0.60, @@_trunk, @@_lw=0.1 ,sibling ~ angle=60 },
+ level ~ 1/.style={ @@_ld=0.60, @@_trunk, @@_lw=0.1 ,sibling ~ angle=60 },
level ~ 2/.style={ @@_ld=0.20, @@_trunk!80!@@_leaf ~ a, @@_lw=.073,sibling ~ angle=70 },
level ~ 3/.style={ @@_ld=0.25, @@_trunk!60!@@_leaf ~ a, @@_lw=.05,sibling ~ angle=70 },
level ~ 4/.style={ @@_ld=0.10, @@_trunk!40!@@_leaf ~ a, @@_lw=.025,sibling ~ angle=60 },
@@ -2148,6 +2471,24 @@
% \end{macro}
%
%
+% \begin{macro}{ \@@_Basic_Tree_aux:nnnnn }
+% I am still using a similar construction as in the \LaTeXe\
+% code. Inside this command is safed either
+% \Makro{@@_Basic_Tree_on:nnnnn} or \Makro{@@_Basic_Tree_off:nnnnn}
+% depending on the package options.
+% \begin{macrocode}
+\cs_set:Npn \@@_Basic_Tree_aux:nnnnn
+ {
+ \bool_if:NTF \l_@@_if_opt_draft_bool
+ { \@@_Basic_Tree_draft:nnnnn }
+ {
+ \bool_if:NTF \g_@@_if_opt_tree_print_bool
+ { \@@_Basic_Tree_on:nnnnn }
+ { \@@_Basic_Tree_off:nnnnn }
+ }
+ }
+% \end{macrocode}
+% \end{macro}
%
%
% \begin{macro}{ \@@_Basic_Tree_off:nnnnn }
@@ -2156,43 +2497,45 @@
% lines. If the last argument is 'leaf', the box has a bottom line, if
% it is empty the bottom line disappears.
% \begin{macrocode}
-\cs_new:Npn \@@_Basic_Tree_off:nnnnn #1#2#3#4#5
+\cs_new:Npn \@@_Basic_Tree_draft:nnnnn #1#2#3#4#5
{
\group_begin:
- \@@_set_scale_abs_tl:n {#1}
- \dim_set:Nn \l_tmpa_dim { \fp_to_dim:n { abs( #1 + 0.02 ex ) } }
+ \@@_set_scale_abs_tl:n { #1pt + 0.02ex }
\tl_set:Nn \l_tmpa_tl {#5}
- \bool_if:NTF \g_@@_if_opt_draft_bool
+ \tl_if_eq:NNTF \c_@@_leaf_tl \l_tmpa_tl
{
- \tl_if_eq:NNTF \c_@@_leaf_tl \l_tmpa_tl
- {
- \@@_create_draftbox:nn
- { (1.6772ex+0.4pt) * \l_tmpa_dim }
- { (1.42ex-0.2pt+0.4pt) * \l_tmpa_dim }
- }{
- \@@_create_draftbox:nn
- { (1.3996ex+0.4pt) * \l_tmpa_dim }
- { (1.28ex-0.2pt+0.4pt) * \l_tmpa_dim }
- }
+ \@@_create_draftbox:nn
+ { (1.669825ex+0.4pt) * \l_@@_scale_abs_tl }
+ { (1.412645 ex + 0.2pt) * \l_@@_scale_abs_tl } %% 0.2pt = -0.2pt+0.4pt
}{
- \begin{tikzpicture}[ /@@ , scale=#1+0.02ex,x=1ex,y=1ex,
- line ~ width=0.4pt * \l_tmpa_dim]
- \tl_if_eq:NNTF \c_@@_leaf_tl \l_tmpa_tl
- {
- \draw[#2] (-0.8386,0+0.2pt) -- (-0.8386,1.42);
- \draw[#3] (-0.8386,1.42) -- (0.8386,1.42);
- \draw[#4] (0.8386,1.42) -- (0.8386,0+0.2pt);
- \draw[#3] (0.8386,0+0.2pt) -- (0,0+0.2pt);
- \draw[#4] (0,0+0.2pt) -- (-0.8386,0+0.2pt);
- }{
- \draw[#2] (-0.6998,0+0.2pt) -- (-0.6998,0.68+0.6);
- \draw[#3] (-0.6998,0.68+0.6) -- (0.6998,0.68+0.6);
- \draw[#4] (0.6998,0.68+0.6) -- (0.6998,0+0.2pt);
- }
- \end{tikzpicture}%
+ \@@_create_draftbox:nn
+ { (1.39223ex +0.4pt) * \l_@@_scale_abs_tl }
+ { (1.27265ex + 0.2pt) * \l_@@_scale_abs_tl } %% 0.2pt = -0.2pt+0.4pt
}
\group_end:
}
+\cs_new:Npn \@@_Basic_Tree_off:nnnnn #1#2#3#4#5
+ {
+ \group_begin:
+ \@@_set_scale_abs_tl:n { #1pt + 0.02ex }
+ \tl_set:Nn \l_tmpa_tl {#5}
+ \begin{tikzpicture}[ /@@ , scale=#1+0.02ex,x=1ex,y=1ex,
+ line ~ width=0.4pt * \l_@@_scale_abs_tl]
+ \tl_if_eq:NNTF \c_@@_leaf_tl \l_tmpa_tl
+ {
+ \draw[#2] (-0.8386,0+0.2pt) -- (-0.8386,1.42);
+ \draw[#3] (-0.8386,1.42) -- (0.8386,1.42);
+ \draw[#4] (0.8386,1.42) -- (0.8386,0+0.2pt);
+ \draw[#3] (0.8386,0+0.2pt) -- (0,0+0.2pt);
+ \draw[#4] (0,0+0.2pt) -- (-0.8386,0+0.2pt);
+ }{
+ \draw[#2] (-0.6998,0+0.2pt) -- (-0.6998,0.68+0.6);
+ \draw[#3] (-0.6998,0.68+0.6) -- (0.6998,0.68+0.6);
+ \draw[#4] (0.6998,0.68+0.6) -- (0.6998,0+0.2pt);
+ }
+ \end{tikzpicture}%
+ \group_end:
+ }
% \end{macrocode}
% \end{macro}
%
@@ -2206,56 +2549,52 @@
\cs_new:Npn \@@_Basic_Tree_on:nnnnn #1#2#3#4#5
{
\group_begin:
- \bool_if:NTF \g_@@_if_opt_draft_bool
- { \@@_Basic_Tree_off:nnnnn {#1} {#2} {#3} {#4} {#5} }
- {
- \@@_set_scale_abs_tl:n {#1}
- \fp_compare:nT { #1 < 0 } { \bool_set_true:N \l_@@_scale_negative_bool }
- \tl_set:Nn \l_tmpa_tl {#5}
- \tl_use:N \c_@@_tikz_set_tl
- \colorlet { @@_trunk } {#2}
- \colorlet { @@_leaf ~ a } {#3}
- \colorlet { @@_leaf ~ b } {#4}
- \begin{tikzpicture}[ /@@ , x=1ex , y=1ex , line ~ width=0.07ex]
- \pgfarrowsdeclare{leaf}{leaf}
- { \pgfarrowsleftextend { -0.1ex } \pgfarrowsrightextend { -0.05ex } }
- {
- \pgfpathmoveto { \pgfpoint { -0.01ex } { 0ex } }
- \pgfpatharc { 150 } { 30 } { 0.08ex }
- \pgfpatharc {-30} {-150} { 0.08ex }
- \pgfusepathqfill
- }
- \tl_if_eq:NNTF \c_@@_leaf_tl \l_tmpa_tl
- {
- \draw[transparent , scale=#1+0.02ex , line ~ width=0.4pt* \l_@@_scale_abs_tl ]
- (-0.8386,0+0.2pt) rectangle (0.8386, 1.42);
- }{
- \draw[transparent , scale=#1+0.02ex , line ~ width=0.4pt* \l_@@_scale_abs_tl ]
- (-0.6998,0+0.2pt) rectangle (0.6998,0.68+0.6);
- }
- \pgflowlevel { \pgftransformscale { #1 + 0.02ex } }
+ \@@_set_scale_abs_tl:n {#1}
+ \fp_compare:nNnT {#1} < { 0 } { \bool_set_true:N \l_@@_scale_negative_bool }
+ \tl_set:Nn \l_tmpa_tl {#5}
+ \tl_use:N \c_@@_tikz_set_tl
+ \colorlet { @@_trunk } {#2}
+ \colorlet { @@_leaf ~ a } {#3}
+ \colorlet { @@_leaf ~ b } {#4}
+ \begin{tikzpicture}[ /@@ , x=1ex , y=1ex , line ~ width=0.07ex]
+ \pgfarrowsdeclare{leaf}{leaf}
+ { \pgfarrowsleftextend { -0.1ex } \pgfarrowsrightextend { -0.05ex } }
{
- \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 }
- {
- child ~ foreach ~ \leafcolor in { @@_leaf ~ a , @@_leaf ~ b }
- { edge ~ from ~ parent ~ [color=\leafcolor,-#5]}
+ \pgfpathmoveto { \pgfpoint { -0.01ex } { 0ex } }
+ \pgfpatharc { 150 } { 30 } { 0.08ex }
+ \pgfpatharc {-30 } {-150 } { 0.08ex }
+ \pgfusepathqfill
+ }
+ \tl_if_eq:NNTF \c_@@_leaf_tl \l_tmpa_tl
+ {
+ \draw[transparent , scale=#1+0.02ex , line ~ width=0.4pt* \l_@@_scale_abs_tl ]
+ (-0.8386,0+0.2pt) rectangle (0.8386, 1.42);
+ }{
+ \draw[transparent , scale=#1+0.02ex , line ~ width=0.4pt* \l_@@_scale_abs_tl ]
+ (-0.6998,0+0.2pt) rectangle (0.6998,0.68+0.6);
+ }
+ \pgflowlevel { \pgftransformscale { #1 + 0.02ex } }
+ {
+ \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 }
+ {
+ child ~ foreach ~ \leafcolor in { @@_leaf ~ a , @@_leaf ~ b }
+ { edge ~ from ~ parent ~ [color=\leafcolor,-#5]}
+ }
}
- }
- }
- }
- edge ~ from ~ parent [shorten ~ >=-0.05ex, serif ~ cm- , line ~ cap=butt]
- };
- }
- \end{tikzpicture}
- \bool_set_false:N \l_@@_scale_negative_bool
- }
+ }
+ }
+ edge ~ from ~ parent [shorten ~ >=-0.05ex, serif ~ cm- , line ~ cap=butt]
+ };
+ }
+ \end{tikzpicture}
+ \bool_set_false:N \l_@@_scale_negative_bool
\group_end:
}
% \end{macrocode}
@@ -2284,17 +2623,18 @@
% \begin{macrocode}
\@@_Declare_Document_Commands:nnnn { Kochtopf } { pot } { S }
{
- \@@_provide_savebox_and_use:nT { Kochtopf_#1 }
+ \@@_provide_savebox_and_use:nn { Kochtopf_#1 }
{
\@@_set_scale_abs_tl:n {#1}
- \bool_if:NTF \g_@@_if_opt_draft_bool
+ \bool_if:NTF \l_@@_if_opt_draft_bool
{
\@@_create_draftbox:nn
- { 2.47ex * \l_@@_scale_abs_tl }
+ { 2.47001ex * \l_@@_scale_abs_tl }
{ 1.577ex * \l_@@_scale_abs_tl }
}{
- \begin{tikzpicture}[ /@@ , x=2ex,y=2.2ex, line ~ width=0.07ex *
- \l_@@_scale_abs_tl , scale=#1 ]
+ \begin{tikzpicture}[ /@@ , x=2ex, y=2.2ex,
+ line ~ width=0.07ex * \l_@@_scale_abs_tl ,
+ scale=#1 ]
% \end{macrocode}
% Let's draw the pot.
% \begin{macrocode}
@@ -2334,13 +2674,13 @@
% \begin{macrocode}
\@@_Declare_Document_Commands:nnnn { Bratpfanne } { fryingpan } { S }
{
- \@@_provide_savebox_and_use:nT { Bratpfanne_#1 }
+ \@@_provide_savebox_and_use:nn { Bratpfanne_#1 }
{
\@@_set_scale_abs_tl:n {#1}
- \bool_if:NTF \g_@@_if_opt_draft_bool
+ \bool_if:NTF \l_@@_if_opt_draft_bool
{
\@@_create_draftbox:nn
- { 3.5535ex * \l_@@_scale_abs_tl }
+ { 3.55349ex * \l_@@_scale_abs_tl }
{ 1.4525ex * \l_@@_scale_abs_tl }
}{
\begin{tikzpicture}
@@ -2382,13 +2722,13 @@
% \begin{macrocode}
\@@_Declare_Document_Commands:nnnn { Schneebesen } { eggbeater } { S }
{
- \@@_provide_savebox_and_use:nT { Schneebesen_#1 }
+ \@@_provide_savebox_and_use:nn { Schneebesen_#1 }
{
\@@_set_scale_abs_tl:n {#1}
- \bool_if:NTF \g_@@_if_opt_draft_bool
+ \bool_if:NTF \l_@@_if_opt_draft_bool
{
\@@_create_draftbox:nn
- { 0.5697ex * \l_@@_scale_abs_tl }
+ { 0.56969 ex * \l_@@_scale_abs_tl }
{ 1.57985ex * \l_@@_scale_abs_tl }
}{
\begin{tikzpicture}
@@ -2422,14 +2762,14 @@
% \begin{macrocode}
\@@_Declare_Document_Commands:nnnn { Sieb } { sieve } { S }
{
- \@@_provide_savebox_and_use:nT { Sieb_#1 }
+ \@@_provide_savebox_and_use:nn { Sieb_#1 }
{
\@@_set_scale_abs_tl:n {#1}
- \bool_if:NTF \g_@@_if_opt_draft_bool
+ \bool_if:NTF \l_@@_if_opt_draft_bool
{
\@@_create_draftbox:nn
- { 3.478ex * \l_@@_scale_abs_tl }
- { 1.175ex * \l_@@_scale_abs_tl }
+ { 3.47799 ex * \l_@@_scale_abs_tl }
+ { 1.17501 ex * \l_@@_scale_abs_tl }
}{
\begin{tikzpicture}
[
@@ -2547,10 +2887,10 @@
% \begin{macrocode}
\@@_Declare_Document_Commands:nnnn { Purierstab } { blender } { S }
{
- \@@_provide_savebox_and_use:nT { Purierstab_#1 }
+ \@@_provide_savebox_and_use:nn { Purierstab_#1 }
{
\@@_set_scale_abs_tl:n {#1}
- \bool_if:NTF \g_@@_if_opt_draft_bool
+ \bool_if:NTF \l_@@_if_opt_draft_bool
{
\@@_create_draftbox:nn
{ 0.76ex * \l_@@_scale_abs_tl }
@@ -2581,10 +2921,10 @@
% \begin{macrocode}
\@@_Declare_Document_Commands:nnnn { Dreizack } { trident } { S }
{
- \@@_provide_savebox_and_use:nT { Dreizack_#1 }
+ \@@_provide_savebox_and_use:nn { Dreizack_#1 }
{
\@@_set_scale_abs_tl:n {#1}
- \bool_if:NTF \g_@@_if_opt_draft_bool
+ \bool_if:NTF \l_@@_if_opt_draft_bool
{
\@@_create_draftbox:nn
{ 0.265ex * \l_@@_scale_abs_tl }
@@ -2615,13 +2955,13 @@
% \begin{macrocode}
\@@_Declare_Document_Commands:nnnn { Backblech } { bakingplate } { S }
{
- \@@_provide_savebox_and_use:nT { Backblech_#1 }
+ \@@_provide_savebox_and_use:nn { Backblech_#1 }
{
\@@_set_scale_abs_tl:n {#1}
- \bool_if:NTF \g_@@_if_opt_draft_bool
+ \bool_if:NTF \l_@@_if_opt_draft_bool
{
\@@_create_draftbox:nn
- { 2.3155ex * \l_@@_scale_abs_tl }
+ { 2.31545ex * \l_@@_scale_abs_tl }
{ 1.57ex * \l_@@_scale_abs_tl }
}{
\begin{tikzpicture}
@@ -2651,10 +2991,10 @@
% \begin{macrocode}
\@@_Declare_Document_Commands:nnnn { Ofen } { oven } { S }
{
- \@@_provide_savebox_and_use:nT { Ofen_#1 }
+ \@@_provide_savebox_and_use:nn { Ofen_#1 }
{
\@@_set_scale_abs_tl:n {#1}
- \bool_if:NTF \g_@@_if_opt_draft_bool
+ \bool_if:NTF \l_@@_if_opt_draft_bool
{
\@@_create_draftbox:nn
{ 2.07ex * \l_@@_scale_abs_tl }
@@ -2686,10 +3026,10 @@
% \begin{macrocode}
\@@_Declare_Document_Commands:nnnn { Pfanne } { pan } { S }
{
- \@@_provide_savebox_and_use:nT { Pfanne_#1 }
+ \@@_provide_savebox_and_use:nn { Pfanne_#1 }
{
\@@_set_scale_abs_tl:n {#1}
- \bool_if:NTF \g_@@_if_opt_draft_bool
+ \bool_if:NTF \l_@@_if_opt_draft_bool
{
\@@_create_draftbox:nn
{ 3.034ex * \l_@@_scale_abs_tl }
@@ -2730,10 +3070,10 @@
% \begin{macrocode}
\@@_Declare_Document_Commands:nnnn { Herd } { cooker } { S }
{
- \@@_provide_savebox_and_use:nT { Herd_#1 }
+ \@@_provide_savebox_and_use:nn { Herd_#1 }
{
\@@_set_scale_abs_tl:n {#1}
- \bool_if:NTF \g_@@_if_opt_draft_bool
+ \bool_if:NTF \l_@@_if_opt_draft_bool
{
\@@_create_draftbox:nn
{ 2.08ex * \l_@@_scale_abs_tl }
@@ -2765,10 +3105,10 @@
% \begin{macrocode}
\@@_Declare_Document_Commands:nnnn { Saftpresse } { squeezer } { S }
{
- \@@_provide_savebox_and_use:nT { Saftpresse_#1 }
+ \@@_provide_savebox_and_use:nn { Saftpresse_#1 }
{
\@@_set_scale_abs_tl:n {#1}
- \bool_if:NTF \g_@@_if_opt_draft_bool
+ \bool_if:NTF \l_@@_if_opt_draft_bool
{
\@@_create_draftbox:nn
{ 1.87ex * \l_@@_scale_abs_tl }
@@ -2810,10 +3150,10 @@
% \begin{macrocode}
\@@_Declare_Document_Commands:nnnn { Schussel } { bowl } { S }
{
- \@@_provide_savebox_and_use:nT { Schussel_#1 }
+ \@@_provide_savebox_and_use:nn { Schussel_#1 }
{
\@@_set_scale_abs_tl:n {#1}
- \bool_if:NTF \g_@@_if_opt_draft_bool
+ \bool_if:NTF \l_@@_if_opt_draft_bool
{
\@@_create_draftbox:nn
{ 2.32ex * \l_@@_scale_abs_tl }
@@ -2843,10 +3183,10 @@
% \begin{macrocode}
\@@_Declare_Document_Commands:nnnn { Schaler } { peeler } { S }
{
- \@@_provide_savebox_and_use:nT { Schaler_#1 }
+ \@@_provide_savebox_and_use:nn { Schaler_#1 }
{
\@@_set_scale_abs_tl:n {#1}
- \bool_if:NTF \g_@@_if_opt_draft_bool
+ \bool_if:NTF \l_@@_if_opt_draft_bool
{
\@@_create_draftbox:nn
{ 1.15ex * \l_@@_scale_abs_tl }
@@ -2877,10 +3217,10 @@
% \begin{macrocode}
\@@_Declare_Document_Commands:nnnn { Reibe } { grater } { S }
{
- \@@_provide_savebox_and_use:nT { Reibe_#1 }
+ \@@_provide_savebox_and_use:nn { Reibe_#1 }
{
\@@_set_scale_abs_tl:n {#1}
- \bool_if:NTF \g_@@_if_opt_draft_bool
+ \bool_if:NTF \l_@@_if_opt_draft_bool
{
\@@_create_draftbox:nn
{ 1.08ex * \l_@@_scale_abs_tl }
@@ -2911,10 +3251,10 @@
% \begin{macrocode}
\@@_Declare_Document_Commands:nnnn { Flasche } { bottle } { S }
{
- \@@_provide_savebox_and_use:nT { Flasche_#1 }
+ \@@_provide_savebox_and_use:nn { Flasche_#1 }
{
\@@_set_scale_abs_tl:n {#1}
- \bool_if:NTF \g_@@_if_opt_draft_bool
+ \bool_if:NTF \l_@@_if_opt_draft_bool
{
\@@_create_draftbox:nn
{ 0.78ex * \l_@@_scale_abs_tl }
@@ -2949,13 +3289,13 @@
% \begin{macrocode}
\@@_Declare_Document_Commands:nnnn { Nudelholz } { rollingpin } { S }
{
- \@@_provide_savebox_and_use:nT { Nudelholz_#1 }
+ \@@_provide_savebox_and_use:nn { Nudelholz_#1 }
{
\@@_set_scale_abs_tl:n {#1}
- \bool_if:NTF \g_@@_if_opt_draft_bool
+ \bool_if:NTF \l_@@_if_opt_draft_bool
{
\@@_create_draftbox:nn
- { 4.508ex * \l_@@_scale_abs_tl }%%
+ { 4.516ex * \l_@@_scale_abs_tl }%%
{ 0.9ex * \l_@@_scale_abs_tl }
}{
\begin{tikzpicture}
@@ -2981,6 +3321,44 @@
% \end{macro}
%
%
+% \begin{macro}{ \Knoblauchpresse \garlicpress }
+% I always forget that the line width is added only once to the
+% draft box.
+%
+% The design is similar to the one I own.
+% \begin{macrocode}
+\@@_Declare_Document_Commands:nnnn { Knoblauchpresse } { garlicpress } { S }
+ {
+ \@@_provide_savebox_and_use:nn { Knoblauchpresse_#1 }
+ {
+ \@@_set_scale_abs_tl:n {#1}
+ \bool_if:NTF \l_@@_if_opt_draft_bool
+ {
+ \@@_create_draftbox:nn
+ { 4.3ex * \l_@@_scale_abs_tl }
+ { 1.6ex * \l_@@_scale_abs_tl }
+ }{
+ \begin{tikzpicture}
+ [
+ /@@ ,
+ x=1ex, y=1ex, scale=#1, line ~ width=0.1ex * \l_@@_scale_abs_tl ,
+ ]
+ \draw[rounded ~ corners = 0.1ex*\l_@@_scale_abs_tl]
+ (1, 0) -- (4, 0) -- (4,-0.2) -- (1, -0.2)
+ (-0.1, 0.5) -- (4, 0.5) -- (4,0.3) -- (0, 0.3);
+ \draw [rounded ~ corners = 0.21ex*\l_@@_scale_abs_tl]
+ (0,0) -- (0,-1) -- (1,-1) -- (1,0);
+ \draw (1,0) -- (0,0) -- (0,0.4) ;
+ \draw (0,-0.85) -- (-0.2, -0.6) -- (-0.2, 0.4);
+ \draw (-0.1,0.4) circle[radius=0.1];
+ \draw (0.3, 0) rectangle +(0.4, 0.3);
+ \end{tikzpicture}
+ }
+ }
+ }
+% \end{macrocode}
+% \end{macro}
+%
%
%
%
@@ -2998,12 +3376,12 @@
% \begin{macrocode}
\@@_Declare_Document_Command:nnn { Sadey } { S O{none} }
{
- \@@_provide_savebox_and_use:nT { Sadey_#1_#2 }
+ \@@_provide_savebox_and_use:nn { Sadey_#1_#2 }
{
\@@_set_scale_abs_tl:n {#1}
- \bool_if:NTF \g_@@_if_opt_draft_bool
+ \bool_if:NTF \l_@@_if_opt_draft_bool
{
- \@@_create_squared_draftbox:n { 1.704ex * \l_@@_scale_abs_tl }
+ \@@_create_squared_draftbox:n { 1.684ex * \l_@@_scale_abs_tl }
}{
\begin{tikzpicture}
[
@@ -3027,10 +3405,10 @@
% \begin{macrocode}
\@@_Declare_Document_Command:nnn { dSadey } { S O{yellow} }
{
- \@@_provide_savebox_and_use:nT { dSadey_#1_#2 }
+ \@@_provide_savebox_and_use:nn { dSadey_#1_#2 }
{
\@@_set_scale_abs_tl:n {#1}
- \bool_if:NTF \g_@@_if_opt_draft_bool
+ \bool_if:NTF \l_@@_if_opt_draft_bool
{
\@@_create_squared_draftbox:n { 1.584ex * \l_@@_scale_abs_tl }
}{
@@ -3058,12 +3436,12 @@
% \begin{macrocode}
\@@_Declare_Document_Command:nnn { Changey } { S O{white} m }
{
- \@@_provide_savebox_and_use:nT { Changey_#1_#2_#3 }
+ \@@_provide_savebox_and_use:nn { Changey_#1_#2_#3 }
{
- \fp_compare:nT { abs(#3) > 2 }
+ \fp_compare:nNnT { abs(#3) } > { 2 }
{ \msg_error:nnn { tikzsymbols } { Changey-number-too-large } {#3} }
\@@_set_scale_abs_tl:n {#1}
- \bool_if:NTF \g_@@_if_opt_draft_bool
+ \bool_if:NTF \l_@@_if_opt_draft_bool
{
\@@_create_squared_draftbox:n { 1.704ex * \l_@@_scale_abs_tl }
}{
@@ -3095,12 +3473,12 @@
% \begin{macrocode}
\@@_Declare_Document_Command:nnn { dChangey } { S O{yellow} m }
{
- \@@_provide_savebox_and_use:nT { dChangey_#1_#2_#3 }
+ \@@_provide_savebox_and_use:nn { dChangey_#1_#2_#3 }
{
- \fp_compare:nT { abs(#3) > 2 }
+ \fp_compare:nNnT { abs(#3) } > { 2 }
{ \msg_error:nnn { tikzsymbols } { Changey-number-too-large } {#3} }
\@@_set_scale_abs_tl:n {#1}
- \bool_if:NTF \g_@@_if_opt_draft_bool
+ \bool_if:NTF \l_@@_if_opt_draft_bool
{
\@@_create_squared_draftbox:n { 1.584ex * \l_@@_scale_abs_tl }
}{
@@ -3144,13 +3522,13 @@
\cs_generate_variant:Nn \@@_cChangey_aux:nnn { x }
\@@_Declare_Document_Command:nnn { cChangey } { S O{red} O{yellow} O{green} m }
{
- \@@_provide_savebox_and_use:nT
+ \@@_provide_savebox_and_use:nn
{ cChangey_#1_#2_#3_#4_#5 }
{
- \fp_compare:nT { abs(#5) > 2 }
+ \fp_compare:nNnT { abs(#5) } > { 2 }
{ \msg_error:nnn { tikzsymbols } { cChangey-number-too-large } {#5} }
\@@_set_scale_abs_tl:n {#1}
- \bool_if:NTF \g_@@_if_opt_draft_bool
+ \bool_if:NTF \l_@@_if_opt_draft_bool
{
\@@_create_squared_draftbox:n { 1.704ex * \l_@@_scale_abs_tl }
}{
@@ -3205,13 +3583,13 @@
\cs_generate_variant:Nn \@@_dcChangey_aux:nnn { x }
\@@_Declare_Document_Command:nnn { dcChangey } { S O{red} O{yellow} O{green} m }
{
- \@@_provide_savebox_and_use:nT
+ \@@_provide_savebox_and_use:nn
{ dcChangey_#1_#2_#3_#4_#5 }
{
- \fp_compare:nT { abs(#5) > 2 }
+ \fp_compare:nNnT { abs(#5) } > { 2 }
{ \msg_error:nnn { tikzsymbols } { cChangey-number-too-large } {#5} }
\@@_set_scale_abs_tl:n {#1}
- \bool_if:NTF \g_@@_if_opt_draft_bool
+ \bool_if:NTF \l_@@_if_opt_draft_bool
{
\@@_create_squared_draftbox:n { 1.584ex * \l_@@_scale_abs_tl }
}{
@@ -3259,10 +3637,10 @@
% \begin{macrocode}
\@@_Declare_Document_Command:nnn { Annoey } { S O{none} }
{
- \@@_provide_savebox_and_use:nT { Annoey_#1_#2 }
+ \@@_provide_savebox_and_use:nn { Annoey_#1_#2 }
{
\@@_set_scale_abs_tl:n {#1}
- \bool_if:NTF \g_@@_if_opt_draft_bool
+ \bool_if:NTF \l_@@_if_opt_draft_bool
{
\@@_create_squared_draftbox:n { 1.704ex * \l_@@_scale_abs_tl }
}{
@@ -3289,10 +3667,10 @@
% \begin{macrocode}
\@@_Declare_Document_Command:nnn { dAnnoey } { S O{yellow} }
{
- \@@_provide_savebox_and_use:nT { dAnnoey_#1_#2 }
+ \@@_provide_savebox_and_use:nn { dAnnoey_#1_#2 }
{
\@@_set_scale_abs_tl:n {#1}
- \bool_if:NTF \g_@@_if_opt_draft_bool
+ \bool_if:NTF \l_@@_if_opt_draft_bool
{
\@@_create_squared_draftbox:n { 1.584ex * \l_@@_scale_abs_tl }
}{
@@ -3325,10 +3703,10 @@
{
\@@_Declare_Document_Command:nnn { Smiley } { S O{none} }
{
- \@@_provide_savebox_and_use:nT { Smiley_#1_#2 }
+ \@@_provide_savebox_and_use:nn { Smiley_#1_#2 }
{
\@@_set_scale_abs_tl:n {#1}
- \bool_if:NTF \g_@@_if_opt_draft_bool
+ \bool_if:NTF \l_@@_if_opt_draft_bool
{
\@@_create_squared_draftbox:n { 1.704ex * \l_@@_scale_abs_tl }
}{
@@ -3355,10 +3733,10 @@
% \begin{macrocode}
\@@_Declare_Document_Command:nnn { dSmiley } { S O{yellow} }
{
- \@@_provide_savebox_and_use:nT { dSmiley_#1_#2 }
+ \@@_provide_savebox_and_use:nn { dSmiley_#1_#2 }
{
\@@_set_scale_abs_tl:n {#1}
- \bool_if:NTF \g_@@_if_opt_draft_bool
+ \bool_if:NTF \l_@@_if_opt_draft_bool
{
\@@_create_squared_draftbox:n { 1.584ex * \l_@@_scale_abs_tl }
}{
@@ -3388,10 +3766,10 @@
% \begin{macrocode}
\@@_Declare_Document_Command:nnn { Laughey } { S O{none} O{none} }
{
- \@@_provide_savebox_and_use:nT { Laughey_#1_#2_#3 }
+ \@@_provide_savebox_and_use:nn { Laughey_#1_#2_#3 }
{
\@@_set_scale_abs_tl:n {#1}
- \bool_if:NTF \g_@@_if_opt_draft_bool
+ \bool_if:NTF \l_@@_if_opt_draft_bool
{
\@@_create_squared_draftbox:n { 1.704ex * \l_@@_scale_abs_tl }
}{
@@ -3419,10 +3797,10 @@
% \begin{macrocode}
\@@_Declare_Document_Command:nnn { dLaughey } { S O{yellow} O{red} }
{
- \@@_provide_savebox_and_use:nT { dLaughey_#1_#2_#3 }
+ \@@_provide_savebox_and_use:nn { dLaughey_#1_#2_#3 }
{
\@@_set_scale_abs_tl:n {#1}
- \bool_if:NTF \g_@@_if_opt_draft_bool
+ \bool_if:NTF \l_@@_if_opt_draft_bool
{
\@@_create_squared_draftbox:n { 1.584ex * \l_@@_scale_abs_tl }
}{
@@ -3457,10 +3835,10 @@
% \begin{macrocode}
\@@_Declare_Document_Command:nnn { Neutrey } { S O{none} }
{
- \@@_provide_savebox_and_use:nT { Neutrey_#1_#2 }
+ \@@_provide_savebox_and_use:nn { Neutrey_#1_#2 }
{
\@@_set_scale_abs_tl:n {#1}
- \bool_if:NTF \g_@@_if_opt_draft_bool
+ \bool_if:NTF \l_@@_if_opt_draft_bool
{
\@@_create_squared_draftbox:n { 1.704ex * \l_@@_scale_abs_tl }
}{
@@ -3485,10 +3863,10 @@
% \begin{macrocode}
\@@_Declare_Document_Command:nnn { dNeutrey } { S O{yellow} }
{
- \@@_provide_savebox_and_use:nT { Neutrey_#1_#2 }
+ \@@_provide_savebox_and_use:nn { Neutrey_#1_#2 }
{
\@@_set_scale_abs_tl:n {#1}
- \bool_if:NTF \g_@@_if_opt_draft_bool
+ \bool_if:NTF \l_@@_if_opt_draft_bool
{
\@@_create_squared_draftbox:n { 1.584ex * \l_@@_scale_abs_tl }
}{
@@ -3517,10 +3895,10 @@
% \begin{macrocode}
\@@_Declare_Document_Command:nnn { Winkey } { S O{none} }
{
- \@@_provide_savebox_and_use:nT { Winkey_#1_#2 }
+ \@@_provide_savebox_and_use:nn { Winkey_#1_#2 }
{
\@@_set_scale_abs_tl:n {#1}
- \bool_if:NTF \g_@@_if_opt_draft_bool
+ \bool_if:NTF \l_@@_if_opt_draft_bool
{
\@@_create_squared_draftbox:n { 1.704ex * \l_@@_scale_abs_tl }
}{
@@ -3545,10 +3923,10 @@
% \begin{macrocode}
\@@_Declare_Document_Command:nnn { oldWinkey } { S O{none} }
{
- \@@_provide_savebox_and_use:nT { oldWinkey_#1_#2 }
+ \@@_provide_savebox_and_use:nn { oldWinkey_#1_#2 }
{
\@@_set_scale_abs_tl:n {#1}
- \bool_if:NTF \g_@@_if_opt_draft_bool
+ \bool_if:NTF \l_@@_if_opt_draft_bool
{
\@@_create_squared_draftbox:n { 1.704ex * \l_@@_scale_abs_tl }
}{
@@ -3573,10 +3951,10 @@
% \begin{macrocode}
\@@_Declare_Document_Command:nnn { dWinkey } { S O{yellow} }
{
- \@@_provide_savebox_and_use:nT { dWinkey_#1_#2 }
+ \@@_provide_savebox_and_use:nn { dWinkey_#1_#2 }
{
\@@_set_scale_abs_tl:n {#1}
- \bool_if:NTF \g_@@_if_opt_draft_bool
+ \bool_if:NTF \l_@@_if_opt_draft_bool
{
\@@_create_squared_draftbox:n { 1.584ex * \l_@@_scale_abs_tl }
}{
@@ -3600,10 +3978,10 @@
% \begin{macrocode}
\@@_Declare_Document_Command:nnn { olddWinkey } { S O{yellow} }
{
- \@@_provide_savebox_and_use:nT { olddWinkey_#1_#2 }
+ \@@_provide_savebox_and_use:nn { olddWinkey_#1_#2 }
{
\@@_set_scale_abs_tl:n {#1}
- \bool_if:NTF \g_@@_if_opt_draft_bool
+ \bool_if:NTF \l_@@_if_opt_draft_bool
{
\@@_create_squared_draftbox:n { 1.584ex * \l_@@_scale_abs_tl }
}{
@@ -3632,10 +4010,10 @@
% \begin{macrocode}
\@@_Declare_Document_Command:nnn { Sey } { S O{none} }
{
- \@@_provide_savebox_and_use:nT { Sey_#1_#2 }
+ \@@_provide_savebox_and_use:nn { Sey_#1_#2 }
{
\@@_set_scale_abs_tl:n {#1}
- \bool_if:NTF \g_@@_if_opt_draft_bool
+ \bool_if:NTF \l_@@_if_opt_draft_bool
{
\@@_create_squared_draftbox:n { 1.704ex * \l_@@_scale_abs_tl }
}{
@@ -3661,10 +4039,10 @@
% \begin{macrocode}
\@@_Declare_Document_Command:nnn { dSey } { S O{yellow} }
{
- \@@_provide_savebox_and_use:nT { dSey_#1_#2 }
+ \@@_provide_savebox_and_use:nn { dSey_#1_#2 }
{
\@@_set_scale_abs_tl:n {#1}
- \bool_if:NTF \g_@@_if_opt_draft_bool
+ \bool_if:NTF \l_@@_if_opt_draft_bool
{
\@@_create_squared_draftbox:n { 1.584ex * \l_@@_scale_abs_tl }
}{
@@ -3693,10 +4071,10 @@
% \begin{macrocode}
\@@_Declare_Document_Command:nnn { Xey } { S O{none} }
{
- \@@_provide_savebox_and_use:nT { Xey_#1_#2 }
+ \@@_provide_savebox_and_use:nn { Xey_#1_#2 }
{
\@@_set_scale_abs_tl:n {#1}
- \bool_if:NTF \g_@@_if_opt_draft_bool
+ \bool_if:NTF \l_@@_if_opt_draft_bool
{
\@@_create_squared_draftbox:n { 1.704ex * \l_@@_scale_abs_tl }
}{
@@ -3721,10 +4099,10 @@
% \begin{macrocode}
\@@_Declare_Document_Command:nnn { dXey } { S O{yellow} }
{
- \@@_provide_savebox_and_use:nT { dXey_#1_#2 }
+ \@@_provide_savebox_and_use:nn { dXey_#1_#2 }
{
\@@_set_scale_abs_tl:n {#1}
- \bool_if:NTF \g_@@_if_opt_draft_bool
+ \bool_if:NTF \l_@@_if_opt_draft_bool
{
\@@_create_squared_draftbox:n { 1.584ex * \l_@@_scale_abs_tl }
}{
@@ -3755,19 +4133,19 @@
% \begin{macrocode}
\@@_Declare_Document_Command:nnn { Innocey } { S O{none} O{yellow} }
{
- \@@_provide_savebox_and_use:nT { Innocey_#1_#2_#3 }
+ \@@_provide_savebox_and_use:nn { Innocey_#1_#2_#3 }
{
\@@_set_scale_abs_tl:n {#1}
- \bool_if:NTF \g_@@_if_opt_draft_bool
+ \bool_if:NTF \l_@@_if_opt_draft_bool
{
\@@_create_draftbox:nn
{ 1.73ex * \l_@@_scale_abs_tl }
- { 1.909ex * \l_@@_scale_abs_tl }
+ { 1.90899 ex * \l_@@_scale_abs_tl }
}{
\begin{tikzpicture}
[
/@@ ,
- x=2.4ex, y=2.4ex, line ~ width=0.12ex* \l_@@_scale_abs_tl ,scale=#1
+ x=2.4ex, y=2.4ex, line ~ width=0.12ex* \l_@@_scale_abs_tl, scale=#1
]
\filldraw[fill=#2] (0,0) circle [radius=0.33];
\fill (-0.1,0.1) circle [radius=0.05];
@@ -3813,14 +4191,14 @@
% \begin{macrocode}
\@@_Declare_Document_Command:nnn { dInnocey } { S O{yellow} O{yellow} }
{
- \@@_provide_savebox_and_use:nT { dInnocey_#1_#2_#3 }
+ \@@_provide_savebox_and_use:nn { dInnocey_#1_#2_#3 }
{
\@@_set_scale_abs_tl:n {#1}
- \bool_if:NTF \g_@@_if_opt_draft_bool
+ \bool_if:NTF \l_@@_if_opt_draft_bool
{
\@@_create_draftbox:nn
{ 1.73ex * \l_@@_scale_abs_tl }
- { 1.849ex * \l_@@_scale_abs_tl }
+ { 1.84898ex * \l_@@_scale_abs_tl }
}{
\begin{tikzpicture}
[
@@ -3858,10 +4236,10 @@
% \begin{macrocode}
\@@_Declare_Document_Command:nnn { Cooley } { S O{none} }
{
- \@@_provide_savebox_and_use:nT { Cooley_#1_#2 }
+ \@@_provide_savebox_and_use:nn { Cooley_#1_#2 }
{
\@@_set_scale_abs_tl:n {#1}
- \bool_if:NTF \g_@@_if_opt_draft_bool
+ \bool_if:NTF \l_@@_if_opt_draft_bool
{
\@@_create_squared_draftbox:n { 1.704ex * \l_@@_scale_abs_tl }
}{
@@ -3890,10 +4268,10 @@
% \begin{macrocode}
\@@_Declare_Document_Command:nnn { dCooley } { S O{yellow} }
{
- \@@_provide_savebox_and_use:nT { dCooley_#1_#2 }
+ \@@_provide_savebox_and_use:nn { dCooley_#1_#2 }
{
\@@_set_scale_abs_tl:n {#1}
- \bool_if:NTF \g_@@_if_opt_draft_bool
+ \bool_if:NTF \l_@@_if_opt_draft_bool
{
\@@_create_squared_draftbox:n { 1.584ex * \l_@@_scale_abs_tl }
}{
@@ -3928,10 +4306,10 @@
% \begin{macrocode}
\@@_Declare_Document_Command:nnn { Tongey } { S O{none} O{none} }
{
- \@@_provide_savebox_and_use:nT { Tongey_#1_#2_#3 }
+ \@@_provide_savebox_and_use:nn { Tongey_#1_#2_#3 }
{
\@@_set_scale_abs_tl:n {#1}
- \bool_if:NTF \g_@@_if_opt_draft_bool
+ \bool_if:NTF \l_@@_if_opt_draft_bool
{
\@@_create_squared_draftbox:n { 1.704ex * \l_@@_scale_abs_tl }
}{
@@ -3963,10 +4341,10 @@
% \begin{macrocode}
\@@_Declare_Document_Command:nnn { dTongey } { S O{yellow} O{red} }
{
- \@@_provide_savebox_and_use:nT { dTongey_#1_#2_#3 }
+ \@@_provide_savebox_and_use:nn { dTongey_#1_#2_#3 }
{
\@@_set_scale_abs_tl:n {#1}
- \bool_if:NTF \g_@@_if_opt_draft_bool
+ \bool_if:NTF \l_@@_if_opt_draft_bool
{
\@@_create_squared_draftbox:n { 1.584ex * \l_@@_scale_abs_tl }
}{
@@ -4002,10 +4380,10 @@
% \begin{macrocode}
\@@_Declare_Document_Command:nnn { Nursey } { S O{none} O{none} O{} }
{
- \@@_provide_savebox_and_use:nT { Nursey_#1_#2_#3_#4 }
+ \@@_provide_savebox_and_use:nn { Nursey_#1_#2_#3_#4 }
{
\@@_set_scale_abs_tl:n {#1}
- \bool_if:NTF \g_@@_if_opt_draft_bool
+ \bool_if:NTF \l_@@_if_opt_draft_bool
{
\@@_create_draftbox:nn
{ 1.5ex * \l_@@_scale_abs_tl }
@@ -4039,14 +4417,14 @@
% \begin{macrocode}
\@@_Declare_Document_Command:nnn { dNursey } { S O{yellow} O{white} O{red} }
{
- \@@_provide_savebox_and_use:nT { dNursey_#1_#2_#3_#4 }
+ \@@_provide_savebox_and_use:nn { dNursey_#1_#2_#3_#4 }
{
\@@_set_scale_abs_tl:n {#1}
- \bool_if:NTF \g_@@_if_opt_draft_bool
+ \bool_if:NTF \l_@@_if_opt_draft_bool
{
\@@_create_draftbox:nn
{ 1.38ex * \l_@@_scale_abs_tl }
- { 1.98ex * \l_@@_scale_abs_tl }
+ { 1.98001ex * \l_@@_scale_abs_tl }
}{
\begin{tikzpicture}
[
@@ -4085,13 +4463,13 @@
% \begin{macrocode}
\@@_Declare_Document_Command:nnn { Vomey } { S O{none} O{opacity=0} }
{
- \@@_provide_savebox_and_use:nT { Vomey_#1_#2_#3 }
+ \@@_provide_savebox_and_use:nn { Vomey_#1_#2_#3 }
{
\@@_set_scale_abs_tl:n {#1}
- \bool_if:NTF \g_@@_if_opt_draft_bool
+ \bool_if:NTF \l_@@_if_opt_draft_bool
{
\@@_create_draftbox:nn
- { 3.0335ex * \l_@@_scale_abs_tl }
+ { 3.03335ex * \l_@@_scale_abs_tl }
{ 1.743ex * \l_@@_scale_abs_tl }
}{
\begin{tikzpicture}
@@ -4129,13 +4507,13 @@
% \begin{macrocode}
\@@_Declare_Document_Command:nnn { dVomey } { S O{yellow} O{brown!10!olive} }
{
- \@@_provide_savebox_and_use:nT { dVomey_#1_#2_#3 }
+ \@@_provide_savebox_and_use:nn { dVomey_#1_#2_#3 }
{
\@@_set_scale_abs_tl:n {#1}
- \bool_if:NTF \g_@@_if_opt_draft_bool
+ \bool_if:NTF \l_@@_if_opt_draft_bool
{
\@@_create_draftbox:nn
- { 3.2435ex * \l_@@_scale_abs_tl }
+ { 2.94336 ex * \l_@@_scale_abs_tl }
{ 1.653ex * \l_@@_scale_abs_tl }
}{
\begin{tikzpicture}
@@ -4178,10 +4556,10 @@
% \begin{macrocode}
\@@_Declare_Document_Command:nnn { Walley } { S O{none} O{none} }
{
- \@@_provide_savebox_and_use:nT { Walley_#1_#2_#3 }
+ \@@_provide_savebox_and_use:nn { Walley_#1_#2_#3 }
{
\@@_set_scale_abs_tl:n {#1}
- \bool_if:NTF \g_@@_if_opt_draft_bool
+ \bool_if:NTF \l_@@_if_opt_draft_bool
{
\@@_create_draftbox:nn
{ 2.341ex * \l_@@_scale_abs_tl }
@@ -4225,10 +4603,10 @@
% \begin{macrocode}
\@@_Declare_Document_Command:nnn { rWalley } { S O{none} O{none} }
{
- \@@_provide_savebox_and_use:nT { rWalley_#1_#2_#3 }
+ \@@_provide_savebox_and_use:nn { rWalley_#1_#2_#3 }
{
\@@_set_scale_abs_tl:n {#1}
- \bool_if:NTF \g_@@_if_opt_draft_bool
+ \bool_if:NTF \l_@@_if_opt_draft_bool
{
\@@_create_draftbox:nn
{ 2.341ex * \l_@@_scale_abs_tl }
@@ -4263,13 +4641,13 @@
% \begin{macrocode}
\@@_Declare_Document_Command:nnn { dWalley } { S O{yellow} }
{
- \@@_provide_savebox_and_use:nT { dWalley_#1_#2 }
+ \@@_provide_savebox_and_use:nn { dWalley_#1_#2 }
{
\@@_set_scale_abs_tl:n {#1}
- \bool_if:NTF \g_@@_if_opt_draft_bool
+ \bool_if:NTF \l_@@_if_opt_draft_bool
{
\@@_create_draftbox:nn
- { 2.4288ex * \l_@@_scale_abs_tl }
+ { 2.42879ex * \l_@@_scale_abs_tl }
{ 1.6008ex * \l_@@_scale_abs_tl }
}{
\begin{tikzpicture}
@@ -4305,13 +4683,13 @@
% \begin{macrocode}
\@@_Declare_Document_Command:nnn { drWalley } { S O{yellow} }
{
- \@@_provide_savebox_and_use:nT { drWalley_#1_#2 }
+ \@@_provide_savebox_and_use:nn { drWalley_#1_#2 }
{
\@@_set_scale_abs_tl:n {#1}
- \bool_if:NTF \g_@@_if_opt_draft_bool
+ \bool_if:NTF \l_@@_if_opt_draft_bool
{
\@@_create_draftbox:nn
- { 2.4288ex * \l_@@_scale_abs_tl }
+ { 2.42879ex * \l_@@_scale_abs_tl }
{ 1.6008ex * \l_@@_scale_abs_tl }
}{
\begin{tikzpicture}
@@ -4435,13 +4813,13 @@
% \begin{macrocode}
\@@_Declare_Document_Command:nnn { Cat } { S }
{
- \@@_provide_savebox_and_use:nT { Cat_#1 }
+ \@@_provide_savebox_and_use:nn { Cat_#1 }
{
\@@_set_scale_abs_tl:n {#1}
- \bool_if:NTF \g_@@_if_opt_draft_bool
+ \bool_if:NTF \l_@@_if_opt_draft_bool
{
\@@_create_draftbox:nn
- { 1.899ex * \l_@@_scale_abs_tl }
+ { 1.89899ex * \l_@@_scale_abs_tl }
{ 1.957ex * \l_@@_scale_abs_tl }
}{
\begin{tikzpicture}
@@ -4464,13 +4842,13 @@
% \begin{macrocode}
\@@_Declare_Document_Command:nnn { SchrodingersCat } { S m }
{
- \@@_provide_savebox_and_use:nT { SchrodingersCat_#1_#2 }
+ \@@_provide_savebox_and_use:nn { SchrodingersCat_#1_#2 }
{
\@@_set_scale_abs_tl:n {#1}
- \bool_if:NTF \g_@@_if_opt_draft_bool
+ \bool_if:NTF \l_@@_if_opt_draft_bool
{
\@@_create_draftbox:nn
- { 1.899ex * \l_@@_scale_abs_tl }
+ { 1.89899ex * \l_@@_scale_abs_tl }
{ 1.957ex * \l_@@_scale_abs_tl }
}{
\begin{tikzpicture}
@@ -4501,10 +4879,10 @@
% \begin{macrocode}
\@@_Declare_Document_Command:nnn { Ninja } { S O{black} O{red} O{white} }
{
- \@@_provide_savebox_and_use:nT { Ninja_#1_#2_#3_#4 }
+ \@@_provide_savebox_and_use:nn { Ninja_#1_#2_#3_#4 }
{
\@@_set_scale_abs_tl:n {#1}
- \bool_if:NTF \g_@@_if_opt_draft_bool
+ \bool_if:NTF \l_@@_if_opt_draft_bool
{
\@@_create_draftbox:nn
{ 2.149ex * \l_@@_scale_abs_tl }
@@ -4562,10 +4940,10 @@
% \begin{macrocode}
\@@_Declare_Document_Command:nnn { dNinja } { S O{black} O{red} O{white} }
{
- \@@_provide_savebox_and_use:nT { dNinja_#1_#2_#3_#4 }
+ \@@_provide_savebox_and_use:nn { dNinja_#1_#2_#3_#4 }
{
\@@_set_scale_abs_tl:n {#1}
- \bool_if:NTF \g_@@_if_opt_draft_bool
+ \bool_if:NTF \l_@@_if_opt_draft_bool
{
\@@_create_draftbox:nn
{ 2.1498ex * \l_@@_scale_abs_tl }
@@ -4601,10 +4979,10 @@
} , ball ~ color=#3
]
decorate {(-0.33,0) -- (0.3465,0) }
- {arc [start ~ angle=0, end ~ angle=42, x ~ radius=0.34,y~ radius=0.345]}
+ {arc [start ~ angle=0, end ~ angle=42, x ~ radius=0.34,y~ radius=0.345]}
decorate {-- (-0.25,0.24)}
- { arc [start ~ angle=-42, end ~ angle=0, x ~ radius=-0.375,y~ radius=-0.345]};
-% Frag mich nicht, was das macht.
+ { arc [start ~ angle=-42, end ~ angle=0, x ~ radius=-0.375,y~ radius=-0.345]};
+% Frag mich nicht, was das macht.
% \shade[ball ~ color=#4] (0.129,0.1425) arc [start ~ angle=55, end ~ angle=-180, radius=0.05];
% \shade[ball ~ color=#4] (-0.129,0.1425) arc [start ~ angle=-55, end ~ angle=180, radius=-0.05];
\shade[top ~ color=#4!80!black, bottom ~ color=#4]
@@ -4626,10 +5004,10 @@
% \begin{macrocode}
\@@_Declare_Document_Command:nnn { Sleepey } { S O{none} O{none} O{black} }
{
- \@@_provide_savebox_and_use:nT { Sleepey_#1_#2_#3_#4 }
+ \@@_provide_savebox_and_use:nn { Sleepey_#1_#2_#3_#4 }
{
\@@_set_scale_abs_tl:n {#1}
- \bool_if:NTF \g_@@_if_opt_draft_bool
+ \bool_if:NTF \l_@@_if_opt_draft_bool
{
\@@_create_draftbox:nn
{ 2.084866ex * \l_@@_scale_abs_tl }
@@ -4687,10 +5065,10 @@
% \begin{macrocode}
\@@_Declare_Document_Command:nnn { dSleepey } { S O{yellow} O{blue} O{black} }
{
- \@@_provide_savebox_and_use:nT { dSleepey_#1_#2_#3_#4 }
+ \@@_provide_savebox_and_use:nn { dSleepey_#1_#2_#3_#4 }
{
\@@_set_scale_abs_tl:n {#1}
- \bool_if:NTF \g_@@_if_opt_draft_bool
+ \bool_if:NTF \l_@@_if_opt_draft_bool
{
\@@_create_draftbox:nn
{ 2.033865ex * \l_@@_scale_abs_tl }
@@ -4750,13 +5128,13 @@
% \begin{macrocode}
\@@_Declare_Document_Command:nnn { NiceReapey } { S O{black!20!white} }
{
- \@@_provide_savebox_and_use:nT { NiceReapey_#1_#2 }
+ \@@_provide_savebox_and_use:nn { NiceReapey_#1_#2 }
{
\@@_set_scale_abs_tl:n {#1}
- \bool_if:NTF \g_@@_if_opt_draft_bool
+ \bool_if:NTF \l_@@_if_opt_draft_bool
{
\@@_create_draftbox:nn
- { (1.1067em+0.07ex) * \l_@@_scale_abs_tl }
+ { (1.10667em + 0.07ex) * \l_@@_scale_abs_tl }
{ (0.693em+0.07ex) * \l_@@_scale_abs_tl }
}{
\begin{tikzpicture}
@@ -4764,7 +5142,7 @@
/@@ ,
x=0.11em,y=0.11em, line ~ width=0.07ex* \l_@@_scale_abs_tl ,scale=#1
]
- \draw[] (1.7,-1) arc [start ~ angle=360, end ~ angle=180, x ~ radius=1.7, y ~ radius=2]
+ \draw (1.7,-1) arc [start ~ angle=360, end ~ angle=180, x ~ radius=1.7, y ~ radius=2]
arc [start ~ angle=260, end ~ angle=110, x ~ radius=1.5,y ~ radius=2]
.. controls (-1,3.3) and (1,3.3) .. (1.9,2.97)
arc [start ~ angle=260, end ~ angle=100, x ~ radius=-1.3, y ~ radius=-2] -- cycle;
@@ -4790,18 +5168,19 @@
% \subsection{Other symbols(s)}
%
%\begin{macro}{ \@@_Strichmaxerl_x_check:N }
-% A helper command.
+% A helper command. This command checks if the length is greater then
+% the radius of the circle.
% \begin{macrocode}
\cs_new:Npn \@@_Strichmaxerl_x_check:N #1
{
- \fp_compare:nTF { #1 > 0 }
+ \fp_compare:nNnTF {#1} > { 0 }
{
- \fp_compare:nTF { #1 < 0.18 }
+ \fp_compare:nNnTF {#1} < { 0.18 }
{ \fp_zero:N #1 }
{ \fp_set:Nn #1 { #1 - 0.18 } }
}
{
- \fp_compare:nTF { #1 > - 0.18 }
+ \fp_compare:nNnTF {#1} > { - 0.18 }
{ \fp_zero:N #1 }
{ \fp_set:Nn #1 { #1 + 0.18 } }
}
@@ -4819,7 +5198,7 @@
% \begin{macrocode}
\cs_new:Npn \@@_Strichmaxerl_if_smaller_zero_set_zero:N #1
{
- \fp_compare:nT { #1 < 0 } { \fp_zero:N #1 }
+ \fp_compare:nNnT {#1} < { 0 } { \fp_zero:N #1 }
}
% \end{macrocode}
%\end{macro}
@@ -4834,11 +5213,11 @@
\@@_Declare_Document_Command:nnn { Strichmaxerl }
{ S O{-22} O{22} O{27} O{-27} }
{
- \@@_provide_savebox_and_use:nT
+ \@@_provide_savebox_and_use:nn
{ Strichmaxerl_#1_#2_#3_#4_#5 }
{
\@@_set_scale_abs_tl:n {#1}
- \bool_if:NTF \g_@@_if_opt_draft_bool
+ \bool_if:NTF \l_@@_if_opt_draft_bool
{
% \end{macrocode}
%
@@ -4853,8 +5232,8 @@
% \begin{macrocode}
\fp_set:Nn \l_@@_Strichmaxerl_x_LA_fp { -0.27 * cosd (#2) }
\fp_set:Nn \l_@@_Strichmaxerl_x_RA_fp { 0.27 * cosd (#3) }
- \fp_set:Nn \l_@@_Strichmaxerl_x_LB_fp { 0.34 * sind (#4) }
- \fp_set:Nn \l_@@_Strichmaxerl_x_RB_fp { 0.34 * sind (#5) }
+ \fp_set:Nn \l_@@_Strichmaxerl_x_RB_fp { 0.34 * sind (#4) }
+ \fp_set:Nn \l_@@_Strichmaxerl_x_LB_fp { 0.34 * sind (#5) }
% \end{macrocode}
%
% Now the height (\verb|y|): \par
@@ -4864,9 +5243,9 @@
% \verb|RB| for \enquote{rechtes Bein} (\emph{right leg}). \par
% \begin{macrocode}
\fp_set:Nn \l_@@_Strichmaxerl_y_LA_fp { 0.27 * sind (#2) }
- \fp_set:Nn \l_@@_Strichmaxerl_y_RA_fp { -0.27 * sind (#3) }
- \fp_set:Nn \l_@@_Strichmaxerl_y_LB_fp { 0.34 * cosd (#4) }
- \fp_set:Nn \l_@@_Strichmaxerl_y_RB_fp { 0.34 * cosd (#5) }
+ \fp_set:Nn \l_@@_Strichmaxerl_y_RA_fp { 0.27 * sind (#3) }
+ \fp_set:Nn \l_@@_Strichmaxerl_y_RB_fp { 0.34 * cosd (#4) }
+ \fp_set:Nn \l_@@_Strichmaxerl_y_LB_fp { 0.34 * cosd (#5) }
% \end{macrocode}
% Well then, lets start our calculations. Firstly the length.
%
@@ -4943,29 +5322,32 @@
\@@_create_draftbox:nn
{
(
- 0.606ex+1.35ex * \@@_Strichmaxerl_x_max_fp
+ 0.60597ex +1.35ex * \@@_Strichmaxerl_x_max_fp
-1.35ex * \@@_Strichmaxerl_x_min_fp
) * \l_@@_scale_abs_tl
}{
- ( 1.173ex + 1.35ex * \@@_Strichmaxerl_y_max) * \l_@@_scale_abs_tl
+ ( 1.173ex + 1.35ex * \@@_Strichmaxerl_y_max
+ ) * \l_@@_scale_abs_tl
}
}{
-% {
\begin{tikzpicture}
[
/@@ ,
line ~ width=0.12ex* \l_@@_scale_abs_tl , scale=#1, x=1.35ex, y=1.35ex
]
\char_set_catcode_other:N :
- \draw[rotate \space around= { #5 \token_to_str:N : ( 0.15 , 0.2 ) } ] (0.15,0.2) -- (0.15,-0.14);
- \draw[rotate \space around= { #4 \token_to_str:N : ( 0.15 , 0.2 ) } ] (0.15,0.2) -- (0.15,-0.14);
+ %% LB
+ \draw[red,rotate \space around= { #5 \token_to_str:N : ( 0.15 , 0.2 ) } ] (0.15,0.2) -- (0.15,-0.14);
+ %% RB
+ \draw[blue,rotate \space around= { #4 \token_to_str:N : ( 0.15 , 0.2 ) } ] (0.15,0.2) -- (0.15,-0.14);
\draw (.15,.2) -- (.15,.4);
- \draw[rotate \space around={ #3 \token_to_str:N : ( 0.15 , 0.4) } ] (0.15,0.4) -- (0.42,0.4);
+ %% RA
+ \draw[green,rotate \space around={ #3 \token_to_str:N : ( 0.15 , 0.4) } ] (0.15,0.4) -- (0.42,0.4);
+ %% LA
\draw[rotate \space around={ #2 \token_to_str:N : ( 0.15 , 0.4) } ] (0.15,0.4) -- (-0.12,0.4);
\draw (.15, .4) -- (.15, .53);
\draw (.15,.8) circle [radius=0.18];
- \end{tikzpicture}%
-% }
+ \end{tikzpicture}
}
}
}
@@ -4997,13 +5379,13 @@
% \begin{macrocode}
\@@_Declare_Document_Command:nnn { Candle } { S }
{
- \@@_provide_savebox_and_use:nT { Candle_#1 }
+ \@@_provide_savebox_and_use:nn { Candle_#1 }
{
\@@_set_scale_abs_tl:n {#1}
- \bool_if:NTF \g_@@_if_opt_draft_bool
+ \bool_if:NTF \l_@@_if_opt_draft_bool
{
\@@_create_draftbox:nn
- { 0.64ex * \l_@@_scale_abs_tl }
+ { 0.639976ex * \l_@@_scale_abs_tl }
{ (1.255ex+2.2pt) * \l_@@_scale_abs_tl }
}{
\begin{tikzpicture}
@@ -5033,14 +5415,14 @@
% \begin{macrocode}
\@@_Declare_Document_Command:nnn { Fire } { S }
{
- \@@_provide_savebox_and_use:nT { Fire_#1 }
+ \@@_provide_savebox_and_use:nn { Fire_#1 }
{
\@@_set_scale_abs_tl:n {#1}
- \bool_if:NTF \g_@@_if_opt_draft_bool
+ \bool_if:NTF \l_@@_if_opt_draft_bool
{
\@@_create_draftbox:nn
- { 1.576ex * \l_@@_scale_abs_tl }
- { 1.639ex * \l_@@_scale_abs_tl }
+ { 1.58612ex * \l_@@_scale_abs_tl }
+ { 1.652901ex * \l_@@_scale_abs_tl }
}{
\begin{tikzpicture}
[
@@ -5090,10 +5472,10 @@
{
\@@_Declare_Document_Command:nnn { Coffeecup } { S }
{
- \@@_provide_savebox_and_use:nT { Coffeecup_#1 }
+ \@@_provide_savebox_and_use:nn { Coffeecup_#1 }
{
\@@_set_scale_abs_tl:n {#1}
- \bool_if:NTF \g_@@_if_opt_draft_bool
+ \bool_if:NTF \l_@@_if_opt_draft_bool
{
\@@_create_draftbox:nn
{ 1.82ex * \l_@@_scale_abs_tl }
@@ -5133,16 +5515,16 @@
% \begin{macrocode}
\@@_Declare_Document_Command:nnn { Chair } { S }
{
- \@@_provide_savebox_and_use:nT { Chair_#1 }
+ \@@_provide_savebox_and_use:nn { Chair_#1 }
{
\@@_set_scale_abs_tl:n {#1}
- \bool_if:NTF \g_@@_if_opt_draft_bool
+ \bool_if:NTF \l_@@_if_opt_draft_bool
{
\@@_create_draftbox:nn
{ 0.97ex * \l_@@_scale_abs_tl }
{ 1.69ex * \l_@@_scale_abs_tl }
}{
- \fp_compare:nT { #1 < 0 } { \bool_set_true:N \l_@@_if_scale_negative_bool }
+ \fp_compare:nNnT {#1} < { 0 } { \bool_set_true:N \l_@@_if_scale_negative_bool }
\begin{tikzpicture}
[
/@@ ,
@@ -5172,10 +5554,10 @@
% \begin{macrocode}
\@@_Declare_Document_Command:nnn { Bed } { S }
{
- \@@_provide_savebox_and_use:nT { Bed_#1 }
+ \@@_provide_savebox_and_use:nn { Bed_#1 }
{
\@@_set_scale_abs_tl:n {#1}
- \bool_if:NTF \g_@@_if_opt_draft_bool
+ \bool_if:NTF \l_@@_if_opt_draft_bool
{
\@@_create_draftbox:nn
{ 3.08ex * \l_@@_scale_abs_tl }
@@ -5209,14 +5591,14 @@
\@@_Declare_Document_Command:nnn { Tribar }
{ S O{opacity=0} O{opacity=0} O{opacity=0} }
{
- \@@_provide_savebox_and_use:nT { Tribar_#1_#2_#3_#4 }
+ \@@_provide_savebox_and_use:nn { Tribar_#1_#2_#3_#4 }
{
\@@_set_scale_abs_tl:n {#1}
- \bool_if:NTF \g_@@_if_opt_draft_bool
+ \bool_if:NTF \l_@@_if_opt_draft_bool
{
\@@_create_draftbox:nn
- { 1.7175ex * \l_@@_scale_abs_tl }
- { 1.685ex * \l_@@_scale_abs_tl }
+ { 1.71746ex * \l_@@_scale_abs_tl }
+ { 1.68497ex * \l_@@_scale_abs_tl }
}{
\begin{tikzpicture}
[
@@ -5253,22 +5635,22 @@
% \begin{macrocode}
\@@_Declare_Document_Command:nnn { Moai } { S }
{
- \@@_provide_savebox_and_use:nT { Moai_#1 }
+ \@@_provide_savebox_and_use:nn { Moai_#1 }
{
\@@_set_scale_abs_tl:n {#1}
- \fp_compare:nTF { abs (#1) < 2 }
+ \fp_compare:nNnTF { \l_@@_scale_abs_tl } < { 2 }
{
\dim_set:Nn \l_@@_Moai_thickness_dim { 0.05ex }
}{
- \fp_compare:nTF { abs (#1) < 5 }
+ \fp_compare:nNnTF { \l_@@_scale_abs_tl } < { 5 }
{ \dim_set:Nn \l_@@_Moai_thickness_dim { 0.035ex } }
{ \dim_set:Nn \l_@@_Moai_thickness_dim { 0.03ex } }
}
- \bool_if:NTF \g_@@_if_opt_draft_bool
+ \bool_if:NTF \l_@@_if_opt_draft_bool
{
\@@_create_draftbox:nn
- { ( 1.001ex + \l_@@_Moai_thickness_dim ) * \l_@@_scale_abs_tl }
- { ( 1.664ex + \l_@@_Moai_thickness_dim ) * \l_@@_scale_abs_tl }
+ { ( 1.00102ex + \l_@@_Moai_thickness_dim ) * \l_@@_scale_abs_tl }
+ { ( 1.66404ex + \l_@@_Moai_thickness_dim ) * \l_@@_scale_abs_tl }
}{
\begin{tikzpicture}
[
@@ -5314,14 +5696,14 @@
% \begin{macrocode}
\@@_Declare_Document_Command:nnn { Snowman } { S }
{
- \@@_provide_savebox_and_use:nT { Snowman_#1 }
+ \@@_provide_savebox_and_use:nn { Snowman_#1 }
{
\@@_set_scale_abs_tl:n {#1}
- \bool_if:NTF \g_@@_if_opt_draft_bool
+ \bool_if:NTF \l_@@_if_opt_draft_bool
{
\@@_create_draftbox:nn
{ 1.545ex * \l_@@_scale_abs_tl }
- { 1.772ex * \l_@@_scale_abs_tl }
+ { 1.77157ex * \l_@@_scale_abs_tl }
}{
\begin{tikzpicture}
[
@@ -5383,19 +5765,15 @@
% \begin{macrocode}
\cs_new:Npn \@@_Basic_Tree:nnnnn #1#2#3#4#5
{
- \@@_provide_savebox_and_use:nT
+ \@@_provide_savebox_and_use:nn
{ BasicTree_#1_#2_#3_#4_#5 }
{
\tl_set:Nn \l_tmpa_tl {#5}
- \bool_if:nTF
- {
- \tl_if_eq_p:NN \l_tmpa_tl \c_@@_leaf_tl ||
- \tl_if_empty_p:n {#5}
- }{
- \@@_Basic_Tree_aux:nnnnn {#1} {#2} {#3} {#4} {#5}
- }{
- \msg_error:nnn { tikzsymbols } { tree } {#5}
- }
+ \bool_lazy_or:nnTF
+ { \tl_if_eq_p:NN \l_tmpa_tl \c_@@_leaf_tl }
+ { \tl_if_empty_p:n {#5} }
+ { \@@_Basic_Tree_aux:nnnnn {#1} {#2} {#3} {#4} {#5} }
+ { \msg_error:nnn { tikzsymbols } { tree } {#5} }
}
}
% \end{macrocode}
@@ -5421,10 +5799,10 @@
% \begin{macrocode}
\@@_Declare_Document_Command:nnn { WorstTree } { S }
{
- \@@_provide_savebox_and_use:nT { WorstTree_#1 }
+ \@@_provide_savebox_and_use:nn { WorstTree_#1 }
{
\@@_set_scale_abs_tl:n {#1}
- \bool_if:NTF \g_@@_if_opt_draft_bool
+ \bool_if:NTF \l_@@_if_opt_draft_bool
{
\@@_create_draftbox:nn
{ 1.64ex * \l_@@_scale_abs_tl }
@@ -5578,7 +5956,7 @@
% \begin{macrocode}
\NewDocumentCommand \tikzsymbolsset { m }
{
- \keys_set_filter:nnnN { tikzsymbols } { package } {#1} \l_tmpa_tl
+ \keys_set_filter:nnnN { tikzsymbols } { only-package } {#1} \l_tmpa_tl
\tl_if_empty:NF \l_tmpa_tl
{
\keyval_parse:NNV
@@ -5596,12 +5974,12 @@
{
\msg_error:nnn { tikzsymbols } { package-option } {#1}
}
-\exp_args:NV \tikzsymbolsset \l_@@_used_only_once_because_no_better_idea_tl
+\exp_args:NV \tikzsymbolsset \l_@@_save_global_scale_for_later_because_no_better_idea_tl
% \end{macrocode}
%\end{macro}
%
%
-%\iffalse
+%^^A\iffalse
%<*ignore>
\tkzsymbls@Declare@Robust@Command{@@@@@@@@Keep@Cool@@@@I}{%
\begin{tikzpicture}[ /@@ ,x=1em, y=1em, line ~ width=0.03em]
@@ -5628,19 +6006,21 @@
\tikzsymbolsaftersymbolinput%
}
%</ignore>
-%\fi
+%^^A\fi
%
-%
-%
+% \begin{macrocode}
+%</package>
+% \end{macrocode}
%
% \end{implementation}
%
-% \iffalse meta-comment
-%: Final
+%
%
% \endinput
+%
+%
+%
% Local Variables:
% mode: doctex
% TeX-master: t
% End:
-% \fi
diff --git a/Master/texmf-dist/source/latex/tikzsymbols/tikzsymbols.ins b/Master/texmf-dist/source/latex/tikzsymbols/tikzsymbols.ins
index 9c3bfa16a78..484527a3688 100644
--- a/Master/texmf-dist/source/latex/tikzsymbols/tikzsymbols.ins
+++ b/Master/texmf-dist/source/latex/tikzsymbols/tikzsymbols.ins
@@ -1,48 +1,52 @@
-%%
-%% Copyright (C) 2013--2017 by Ben Vitecek (current Maintainer)
-%%
-%% This work may be distributed and/or modified under the
-%% conditions of the LaTeX Project Public License, either version 1.3c
-%% of this license or (at your option) any later version.
-%% The latest version of this license is in
-%% http://www.latex-project.org/lppl.txt
-%% and version 1.3c or later is part of all distributions of LaTeX
-%% version 2005/12/01 or later.
%%
-%% This work has the LPPL maintenance status `maintained'.
+%% This is file `tikzsymbols.ins',
+%% generated with the docstrip utility.
%%
-%% This work consists of the files README.md, tikzsymbols.dtx and tikzsymbols.ins
-%% and the derived file tikzsymbols.sty.
-
+%% The original source files were:
+%%
+%% tikzsymbols.dtx (with options: `install')
+%%
+%% Copyright (C) 2013--2018 by Ben Vitecek (current Maintainer)
+%%
+%% This work may be distributed and/or modified under the
+%% conditions of the LaTeX Project Public License, either version 1.3c
+%% of this license or (at your option) any later version.
+%% The latest version of this license is in
+%% http://www.latex-project.org/lppl.txt
+%% and version 1.3c or later is part of all distributions of LaTeX
+%% version 2005/12/01 or later.
+%%
+%% This work has the LPPL maintenance status `maintained'.
+%%
+%% This work consists of the files README.md, tikzsymbols.dtx,
+%% tikzsymbols.ins and the derived files tikzsymbols.sty.
+%%
\input l3docstrip.tex
-
\askforoverwritefalse
-%\keepsilent
-
-\usedir{tex/latex/tikzsymbols}
+\preamble
-\preamble
-This is a generated file.
+ Copyright (C) 2013--2018 by Ben Vitecek (current Maintainer)
-Copyright (C) 2013--2017 by Ben Vitecek (current Maintainer)
+ This work may be distributed and/or modified under the
+ conditions of the LaTeX Project Public License, either version 1.3c
+ of this license or (at your option) any later version.
+ The latest version of this license is in
+ http://www.latex-project.org/lppl.txt
+ and version 1.3c or later is part of all distributions of LaTeX
+ version 2005/12/01 or later.
-This work may be distributed and/or modified under the
-conditions of the LaTeX Project Public License, either version 1.3c
-of this license or (at your option) any later version.
-The latest version of this license is in
- http://www.latex-project.org/lppl.txt
-and version 1.3c or later is part of all distributions of LaTeX
-version 2005/12/01 or later.
+ This work has the LPPL maintenance status `maintained'.
-This work has the LPPL maintenance status `maintained'.
+ This work consists of the files README.md, tikzsymbols.dtx,
+ tikzsymbols.ins and the derived files tikzsymbols.sty.
-This work consists of the files README.md, tikzsymbols.dtx and tikzsymbols.ins
-and the derived file tikzsymbols.sty.
\endpreamble
-\generate
- {
- \file{tikzsymbols.sty}{\from{tikzsymbols.dtx}{package}}
- }
-
-\endbatchfile \ No newline at end of file
+\usedir{tex/latex/tikzsymbols}
+\generate{
+ \file{\jobname.sty}{\from{\jobname.dtx}{package}}
+}
+\endbatchfile
+\endinput
+%%
+%% End of file `tikzsymbols.ins'.
diff --git a/Master/texmf-dist/tex/latex/tikzsymbols/tikzsymbols.sty b/Master/texmf-dist/tex/latex/tikzsymbols/tikzsymbols.sty
index 4627dea675e..b469a2c2dd2 100644
--- a/Master/texmf-dist/tex/latex/tikzsymbols/tikzsymbols.sty
+++ b/Master/texmf-dist/tex/latex/tikzsymbols/tikzsymbols.sty
@@ -5,25 +5,25 @@
%% The original source files were:
%%
%% tikzsymbols.dtx (with options: `package')
-%% This is a generated file.
%%
-%% Copyright (C) 2013--2017 by Ben Vitecek (current Maintainer)
+%% Copyright (C) 2013--2018 by Ben Vitecek (current Maintainer)
%%
-%% This work may be distributed and/or modified under the
-%% conditions of the LaTeX Project Public License, either version 1.3c
-%% of this license or (at your option) any later version.
-%% The latest version of this license is in
-%% http://www.latex-project.org/lppl.txt
-%% and version 1.3c or later is part of all distributions of LaTeX
-%% version 2005/12/01 or later.
+%% This work may be distributed and/or modified under the
+%% conditions of the LaTeX Project Public License, either version 1.3c
+%% of this license or (at your option) any later version.
+%% The latest version of this license is in
+%% http://www.latex-project.org/lppl.txt
+%% and version 1.3c or later is part of all distributions of LaTeX
+%% version 2005/12/01 or later.
%%
-%% This work has the LPPL maintenance status `maintained'.
+%% This work has the LPPL maintenance status `maintained'.
+%%
+%% This work consists of the files README.md, tikzsymbols.dtx,
+%% tikzsymbols.ins and the derived files tikzsymbols.sty.
%%
-%% This work consists of the files README.md, tikzsymbols.dtx and tikzsymbols.ins
-%% and the derived file tikzsymbols.sty.
\@ifpackageloaded{xparse}{}{\RequirePackage{xparse}}
\@ifpackageloaded{expl3}{}{\RequirePackage{expl3}}
-\@ifpackagelater{expl3}{2017/04/01}
+\@ifpackagelater{expl3}{2018/02/21}
{}
{%
\PackageError { tikzsymbols }{ Support~package~expl3~too~old }
@@ -36,8 +36,8 @@
}
\ProvidesExplPackage
{tikzsymbols}
- {2017/09/05}
- {4.07}
+ {2018/04/11}
+ {4.10} % v4.10
{Some symbols created using tikz and LaTeX3.}
\@ifpackageloaded { tikz } {} { \RequirePackage { tikz } }
\@ifpackageloaded { xcolor } {} { \RequirePackage { xcolor } }
@@ -48,7 +48,7 @@
\ExplSyntaxOn
\bool_new:N \l__tikzsymbols_if_scale_negative_bool
\bool_new:N \g__tikzsymbols_if_opt_tree_print_bool
-\bool_new:N \g__tikzsymbols_if_opt_draft_bool
+\bool_new:N \l__tikzsymbols_if_opt_draft_bool
\bool_new:N \g__tikzsymbols_if_opt_marvosym_bool
\bool_gset_true:N \g__tikzsymbols_if_opt_tree_print_bool
\tl_clear_new:N \g__tikzsymbols_command_prefix_tl
@@ -58,7 +58,9 @@
\tl_const:Nn \c__tikzsymbols_leaf_tl { leaf }
\tl_const:Nn \c__tikzsymbols_black_tl { black }
\tl_gset:Nn \l__tikzsymbols_tikzsymbols_after_symbol_tl { \xspace }
-\tl_new:N \l__tikzsymbols_used_only_once_because_no_better_idea_tl
+\tl_new:N \l__tikzsymbols_save_global_scale_for_later_because_no_better_idea_tl
+\tl_new:N \l__tikzsymbols_symbol_name_tl
+\tl_new:N \l__tikzsymbols_symbol_options_clist
\fp_new:N \l__tikzsymbols_global_scale_fp
\fp_set:Nn \l__tikzsymbols_global_scale_fp { 1.0 }
\fp_new:N \l__tikzsymbols_Strichmaxerl_x_LA_fp
@@ -74,6 +76,7 @@
\dim_new:N \l__tikzsymbols_Moai_thickness_dim
\clist_new:N \g_tikzsymbols_list_of_printing_cooking_with_argument_commands_clist
\prop_new:N \g__tikzsymbols_english_commands_prop
+\tl_new:N \l__tikzsymbols_tmpa_tl
\msg_new:nnnn { tikzsymbols } { obsolete-option }
{
Option \ '#1' \ is \ obsolete. \
@@ -179,12 +182,6 @@
Perhaps \ you \ have \ misspelled it.
\msg_see_documentation_text:n { tikzsymbols }
}
-\cs_set:Npn \__tikzsymbols_Basic_Tree_aux:nnnnn
- {
- \bool_if:NTF \g__tikzsymbols_if_opt_tree_print_bool
- { \__tikzsymbols_Basic_Tree_on:nnnnn }
- { \__tikzsymbols_Basic_Tree_off:nnnnn }
- }
\cs_new:Npn \__tikzsymbols_symbol_scale_i:n #1
{
\__tikzsymbols_symbol_scale_ii:nn {#1} { 1.0 }
@@ -202,7 +199,7 @@
}
\cs_new:Npn \__tikzsymbols_set_scale_abs_tl:n #1
{
- \tl_set:Nx \l__tikzsymbols_scale_abs_tl { \fp_eval:n { abs (#1) } }
+ \tl_set:Nn \l__tikzsymbols_scale_abs_tl { \fp_abs:n {#1} }
}
\cs_new:Npn \__tikzsymbols_create_draftbox:nn #1#2
{
@@ -223,11 +220,11 @@
{
\__tikzsymbols_create_draftbox:nn {#1} {#1}
}
-\cs_new:Npn \__tikzsymbols_if_savebox_undefined:nT #1#2
+\cs_new:Npn \__tikzsymbols_provide_savebox:nn #1#2
{
\tl_set:Nx \l__tikzsymbols_current_situation_tl
{
- \bool_if:NTF \g__tikzsymbols_if_opt_draft_bool { T } { F } _
+ \bool_if:NTF \l__tikzsymbols_if_opt_draft_bool { T } { F } _
\current@color _ \f@size
}
\box_if_exist:cF { g__tikzsymbols_savebox_ \l__tikzsymbols_current_situation_tl _ #1 _box }
@@ -242,32 +239,32 @@
\exp_args:Nc \usebox
{ g__tikzsymbols_savebox_ \l__tikzsymbols_current_situation_tl _ #1 _box }
}
-\cs_new:Npn \__tikzsymbols_provide_savebox_and_use_aux:nT #1#2
+\cs_new:Npn \__tikzsymbols_provide_savebox_and_use_default:nn #1#2
{
- \__tikzsymbols_if_savebox_undefined:nT {#1} {#2}
+ \__tikzsymbols_provide_savebox:nn {#1} {#2}
\__tikzsymbols_use_savebox:n {#1}
}
-\cs_set_eq:NN
- \__tikzsymbols_provide_savebox_and_use:nT
- \__tikzsymbols_provide_savebox_and_use_aux:nT
-\pgfkeys{ /__tikzsymbols/.style= { baseline=default } }
+\cs_set_eq:NN \__tikzsymbols_provide_savebox_and_use:nn
+ \__tikzsymbols_provide_savebox_and_use_default:nn
+\pgfkeys{ /__tikzsymbols/baseline /.style= { baseline=default } }
+\pgfkeys{ /__tikzsymbols/.style= { /__tikzsymbols/baseline } }
\keys_define:nn { tikzsymbols }
{
- final .bool_gset_inverse:N = \g__tikzsymbols_if_opt_draft_bool ,
+ final .bool_set_inverse:N = \l__tikzsymbols_if_opt_draft_bool ,
final .default:n = { true } ,
draft .choices:nn =
{ true , false , absolute }
{
\int_case:nn { \l_keys_choice_int }
{
- { 1 } { \bool_gset_true:N \g__tikzsymbols_if_opt_draft_bool }
- { 2 } { \bool_gset_false:N \g__tikzsymbols_if_opt_draft_bool }
+ { 1 } { \bool_set_true:N \l__tikzsymbols_if_opt_draft_bool }
+ { 2 } { \bool_set_false:N \l__tikzsymbols_if_opt_draft_bool }
{ 3 }
- {
- \msg_error:nnnn { tikzsymbols } { obsolete-option }
- { draft = absolute } { draft = true }
- \bool_gset_true:N \g__tikzsymbols_if_opt_draft_bool
- }
+ {
+ \msg_error:nnnn { tikzsymbols } { obsolete-option }
+ { draft = absolute } { draft = true }
+ \bool_set_true:N \l__tikzsymbols_if_opt_draft_bool
+ }
}
} ,
draft .default:n= { false } ,
@@ -275,28 +272,28 @@
{
\msg_error:nnnn { tikzsymbols } { obsolete-option }
{ draftabsolute } { draft = true }
- \bool_gset_true:N \g__tikzsymbols_if_opt_draft_bool
+ \bool_set_true:N \l__tikzsymbols_if_opt_draft_bool
} ,
marvosym .bool_gset:N = \g__tikzsymbols_if_opt_marvosym_bool ,
marvosym .default:n = { true } ,
- marvosym .groups:n = { package } ,
+ marvosym .groups:n = { only-package } ,
usebox .choice: ,
usebox/true .code:n =
- { 
+ {
\cs_set_eq:NN
- \__tikzsymbols_provide_savebox_and_use:nT
- \__tikzsymbols_provide_savebox_and_use_aux:nT
+ \__tikzsymbols_provide_savebox_and_use:nn
+ \__tikzsymbols_provide_savebox_and_use_default:nn
} ,
usebox/false .code:n =
- { 
+ {
\cs_set_eq:NN
- \__tikzsymbols_provide_savebox_and_use:nT
+ \__tikzsymbols_provide_savebox_and_use:nn
\use_ii:nn
} ,
- usebox .default:n = { true } ,
+ usebox .default:n = { true } ,
prefix .tl_gset:N = \g__tikzsymbols_command_prefix_tl ,
prefix .default:n = { tikzsymbols } ,
- prefix .groups:n = { package } ,
+ prefix .groups:n = { only-package } ,
tree .choices:nn =
{ true , on , false , off }
{
@@ -307,15 +304,21 @@
tree .default:n = { true } ,
after-symbol .tl_set:N = \l__tikzsymbols_tikzsymbols_after_symbol_tl ,
after-symbol .default:n= { \xspace } ,
+ append-style .code:n = { \pgfkeys{ /__tikzsymbols/.append ~ style= {#1} } } ,
+ append-style .default:n = { } ,
baseline .choice: ,
- baseline / true .code:n = { \pgfkeys{ /__tikzsymbols/.style={ baseline=default } } } ,
- baseline / false .code:n = { \pgfkeys{ /__tikzsymbols/.style={ } } } ,
+ baseline / true .code:n = { \pgfkeys{ /__tikzsymbols/baseline/.style={ baseline=default } } } ,
+ baseline / false .code:n = { \pgfkeys{ /__tikzsymbols/baseline/.style={ } } } ,
baseline .default:n = { true } ,
+ remember-picture .choice: ,
+ remember-picture / true .meta:n = { append-style = { /tikz/remember~picture = true } } ,
+ remember-picture / false .meta:n = { append-style = { /tikz/remember~picture = false } } ,
+ remember-picture .default:n = { false } ,
global-scale .fp_set:N = \l__tikzsymbols_global_scale_fp ,
global-scale .default:n = { 1 } ,
symbol-scale .code:n =
{
- \tl_set:Nn \l__tikzsymbols_used_only_once_because_no_better_idea_tl
+ \tl_set:Nn \l__tikzsymbols_save_global_scale_for_later_because_no_better_idea_tl
{
symbol-scale = {#1} ,
}
@@ -348,8 +351,8 @@
}
\cs_new_protected:Npn \__tikzsymbols_parse_command_options:nn #1#2
{
- \clist_clear:N \l_tmpa_clist
- \tl_set:Nn \l_tmpa_tl {#1}
+ \clist_clear:N \l__tikzsymbols_symbol_options_clist
+ \tl_set:Nn \l__tikzsymbols_symbol_name_tl {#1}
\__tikzsymbols_parse_command_options:N #2
\q_recursion_tail \q_recursion_tail \q_recursion_tail \q_recursion_stop
}
@@ -360,7 +363,7 @@
{ \__tikzsymbols_parse_option_type_O:w #1 }
{
\tl_if_eq:NNTF #1 S
- { \__tikzsymbols_parse_option_type_S:Vw \l_tmpa_tl #1 }
+ { \__tikzsymbols_parse_option_type_S:Vw \l__tikzsymbols_symbol_name_tl #1 }
{ \__tikzsymbols_parse_option_type:w #1 }
}
}
@@ -371,17 +374,19 @@
{ m } { }
}
{ \msg_error:nnn { tikzsymbols } { internal-message } { internal-parsing } }
- \clist_put_right:Nn \l_tmpa_clist {#1}
+ \clist_put_right:Nn \l__tikzsymbols_symbol_options_clist {#1}
\__tikzsymbols_parse_command_options:N
}
\cs_new_protected:Npn \__tikzsymbols_parse_option_type_O:w #1#2
{
- \clist_put_right:Nn \l_tmpa_clist { >{ \__tikzsymbols_if_empty:Tn {#2} } O{#2} }
+ \clist_put_right:Nn \l__tikzsymbols_symbol_options_clist
+ { >{ \__tikzsymbols_if_empty:Tn {#2} } O{#2} }
\__tikzsymbols_parse_command_options:N
}
\cs_new_protected:Npn \__tikzsymbols_parse_option_type_S:nw #1#2
{
- \clist_put_right:Nn \l_tmpa_clist { >{ \__tikzsymbols_scale_if_empty:nTn {#1} { 1 } } O{ 1 } }
+ \clist_put_right:Nn \l__tikzsymbols_symbol_options_clist
+ { >{ \__tikzsymbols_scale_if_empty:nTn {#1} { 1 } } O{ 1 } }
\__tikzsymbols_parse_command_options:N
}
\cs_generate_variant:Nn \__tikzsymbols_parse_option_type_S:nw { Vw }
@@ -392,7 +397,7 @@
\__tikzsymbols_parse_command_options:nn {#1} {#2}
\exp_args:Ncx \DeclareDocumentCommand
{ \g__tikzsymbols_command_prefix_tl #1 }
- { \clist_use:Nn \l_tmpa_clist {} }
+ { \clist_use:Nn \l__tikzsymbols_symbol_options_clist { } }
{
\cs_if_exist:NT \tikzsymbolsaftersymbolinput
{
@@ -419,11 +424,12 @@
}
\tl_const:Nn \c__tikzsymbols_tikz_set_tl
{
- \tikzset
+ \pgfkeys
{
+ /tikz/.cd ,
__tikzsymbols_ld/.style={ level ~ distance=#1ex },
__tikzsymbols_lw/.style={ line ~ width=#1ex },
- level ~ 1/.style={ __tikzsymbols_ld=0.60, __tikzsymbols_trunk, __tikzsymbols_lw=0.1 ,sibling ~ angle=60 },
+ level ~ 1/.style={ __tikzsymbols_ld=0.60, __tikzsymbols_trunk, __tikzsymbols_lw=0.1 ,sibling ~ angle=60 },
level ~ 2/.style={ __tikzsymbols_ld=0.20, __tikzsymbols_trunk!80!__tikzsymbols_leaf ~ a, __tikzsymbols_lw=.073,sibling ~ angle=70 },
level ~ 3/.style={ __tikzsymbols_ld=0.25, __tikzsymbols_trunk!60!__tikzsymbols_leaf ~ a, __tikzsymbols_lw=.05,sibling ~ angle=70 },
level ~ 4/.style={ __tikzsymbols_ld=0.10, __tikzsymbols_trunk!40!__tikzsymbols_leaf ~ a, __tikzsymbols_lw=.025,sibling ~ angle=60 },
@@ -431,111 +437,120 @@
level ~ 6/.style={ __tikzsymbols_ld=0.08, __tikzsymbols_leaf ~ a, __tikzsymbols_lw=.021,sibling ~ angle=60 },
}
}
-\cs_new:Npn \__tikzsymbols_Basic_Tree_off:nnnnn #1#2#3#4#5
+\cs_set:Npn \__tikzsymbols_Basic_Tree_aux:nnnnn
+ {
+ \bool_if:NTF \l__tikzsymbols_if_opt_draft_bool
+ { \__tikzsymbols_Basic_Tree_draft:nnnnn }
+ {
+ \bool_if:NTF \g__tikzsymbols_if_opt_tree_print_bool
+ { \__tikzsymbols_Basic_Tree_on:nnnnn }
+ { \__tikzsymbols_Basic_Tree_off:nnnnn }
+ }
+ }
+\cs_new:Npn \__tikzsymbols_Basic_Tree_draft:nnnnn #1#2#3#4#5
{
\group_begin:
- \__tikzsymbols_set_scale_abs_tl:n {#1}
- \dim_set:Nn \l_tmpa_dim { \fp_to_dim:n { abs( #1 + 0.02 ex ) } }
+ \__tikzsymbols_set_scale_abs_tl:n { #1pt + 0.02ex }
\tl_set:Nn \l_tmpa_tl {#5}
- \bool_if:NTF \g__tikzsymbols_if_opt_draft_bool
+ \tl_if_eq:NNTF \c__tikzsymbols_leaf_tl \l_tmpa_tl
{
- \tl_if_eq:NNTF \c__tikzsymbols_leaf_tl \l_tmpa_tl
- {
- \__tikzsymbols_create_draftbox:nn
- { (1.6772ex+0.4pt) * \l_tmpa_dim }
- { (1.42ex-0.2pt+0.4pt) * \l_tmpa_dim }
- }{
- \__tikzsymbols_create_draftbox:nn
- { (1.3996ex+0.4pt) * \l_tmpa_dim }
- { (1.28ex-0.2pt+0.4pt) * \l_tmpa_dim }
- }
+ \__tikzsymbols_create_draftbox:nn
+ { (1.669825ex+0.4pt) * \l__tikzsymbols_scale_abs_tl }
+ { (1.412645 ex + 0.2pt) * \l__tikzsymbols_scale_abs_tl } %% 0.2pt = -0.2pt+0.4pt
}{
- \begin{tikzpicture}[ /__tikzsymbols , scale=#1+0.02ex,x=1ex,y=1ex,
- line ~ width=0.4pt * \l_tmpa_dim]
- \tl_if_eq:NNTF \c__tikzsymbols_leaf_tl \l_tmpa_tl
- {
- \draw[#2] (-0.8386,0+0.2pt) -- (-0.8386,1.42);
- \draw[#3] (-0.8386,1.42) -- (0.8386,1.42);
- \draw[#4] (0.8386,1.42) -- (0.8386,0+0.2pt);
- \draw[#3] (0.8386,0+0.2pt) -- (0,0+0.2pt);
- \draw[#4] (0,0+0.2pt) -- (-0.8386,0+0.2pt);
- }{
- \draw[#2] (-0.6998,0+0.2pt) -- (-0.6998,0.68+0.6);
- \draw[#3] (-0.6998,0.68+0.6) -- (0.6998,0.68+0.6);
- \draw[#4] (0.6998,0.68+0.6) -- (0.6998,0+0.2pt);
- }
- \end{tikzpicture}%
+ \__tikzsymbols_create_draftbox:nn
+ { (1.39223ex +0.4pt) * \l__tikzsymbols_scale_abs_tl }
+ { (1.27265ex + 0.2pt) * \l__tikzsymbols_scale_abs_tl } %% 0.2pt = -0.2pt+0.4pt
}
\group_end:
}
+\cs_new:Npn \__tikzsymbols_Basic_Tree_off:nnnnn #1#2#3#4#5
+ {
+ \group_begin:
+ \__tikzsymbols_set_scale_abs_tl:n { #1pt + 0.02ex }
+ \tl_set:Nn \l_tmpa_tl {#5}
+ \begin{tikzpicture}[ /__tikzsymbols , scale=#1+0.02ex,x=1ex,y=1ex,
+ line ~ width=0.4pt * \l__tikzsymbols_scale_abs_tl]
+ \tl_if_eq:NNTF \c__tikzsymbols_leaf_tl \l_tmpa_tl
+ {
+ \draw[#2] (-0.8386,0+0.2pt) -- (-0.8386,1.42);
+ \draw[#3] (-0.8386,1.42) -- (0.8386,1.42);
+ \draw[#4] (0.8386,1.42) -- (0.8386,0+0.2pt);
+ \draw[#3] (0.8386,0+0.2pt) -- (0,0+0.2pt);
+ \draw[#4] (0,0+0.2pt) -- (-0.8386,0+0.2pt);
+ }{
+ \draw[#2] (-0.6998,0+0.2pt) -- (-0.6998,0.68+0.6);
+ \draw[#3] (-0.6998,0.68+0.6) -- (0.6998,0.68+0.6);
+ \draw[#4] (0.6998,0.68+0.6) -- (0.6998,0+0.2pt);
+ }
+ \end{tikzpicture}%
+ \group_end:
+ }
\cs_new:Npn \__tikzsymbols_Basic_Tree_on:nnnnn #1#2#3#4#5
{
\group_begin:
- \bool_if:NTF \g__tikzsymbols_if_opt_draft_bool
- { \__tikzsymbols_Basic_Tree_off:nnnnn {#1} {#2} {#3} {#4} {#5} }
- {
- \__tikzsymbols_set_scale_abs_tl:n {#1}
- \fp_compare:nT { #1 < 0 } { \bool_set_true:N \l__tikzsymbols_scale_negative_bool }
- \tl_set:Nn \l_tmpa_tl {#5}
- \tl_use:N \c__tikzsymbols_tikz_set_tl
- \colorlet { __tikzsymbols_trunk } {#2}
- \colorlet { __tikzsymbols_leaf ~ a } {#3}
- \colorlet { __tikzsymbols_leaf ~ b } {#4}
- \begin{tikzpicture}[ /__tikzsymbols , x=1ex , y=1ex , line ~ width=0.07ex]
- \pgfarrowsdeclare{leaf}{leaf}
- { \pgfarrowsleftextend { -0.1ex } \pgfarrowsrightextend { -0.05ex } }
- {
- \pgfpathmoveto { \pgfpoint { -0.01ex } { 0ex } }
- \pgfpatharc { 150 } { 30 } { 0.08ex }
- \pgfpatharc {-30} {-150} { 0.08ex }
- \pgfusepathqfill
- }
- \tl_if_eq:NNTF \c__tikzsymbols_leaf_tl \l_tmpa_tl
- {
- \draw[transparent , scale=#1+0.02ex , line ~ width=0.4pt* \l__tikzsymbols_scale_abs_tl ]
- (-0.8386,0+0.2pt) rectangle (0.8386, 1.42);
- }{
- \draw[transparent , scale=#1+0.02ex , line ~ width=0.4pt* \l__tikzsymbols_scale_abs_tl ]
- (-0.6998,0+0.2pt) rectangle (0.6998,0.68+0.6);
- }
- \pgflowlevel { \pgftransformscale { #1 + 0.02ex } }
+ \__tikzsymbols_set_scale_abs_tl:n {#1}
+ \fp_compare:nNnT {#1} < { 0 } { \bool_set_true:N \l__tikzsymbols_scale_negative_bool }
+ \tl_set:Nn \l_tmpa_tl {#5}
+ \tl_use:N \c__tikzsymbols_tikz_set_tl
+ \colorlet { __tikzsymbols_trunk } {#2}
+ \colorlet { __tikzsymbols_leaf ~ a } {#3}
+ \colorlet { __tikzsymbols_leaf ~ b } {#4}
+ \begin{tikzpicture}[ /__tikzsymbols , x=1ex , y=1ex , line ~ width=0.07ex]
+ \pgfarrowsdeclare{leaf}{leaf}
+ { \pgfarrowsleftextend { -0.1ex } \pgfarrowsrightextend { -0.05ex } }
+ {
+ \pgfpathmoveto { \pgfpoint { -0.01ex } { 0ex } }
+ \pgfpatharc { 150 } { 30 } { 0.08ex }
+ \pgfpatharc {-30 } {-150 } { 0.08ex }
+ \pgfusepathqfill
+ }
+ \tl_if_eq:NNTF \c__tikzsymbols_leaf_tl \l_tmpa_tl
{
- \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 }
- {
- child ~ foreach ~ \leafcolor in { __tikzsymbols_leaf ~ a , __tikzsymbols_leaf ~ b }
- { edge ~ from ~ parent ~ [color=\leafcolor,-#5]}
+ \draw[transparent , scale=#1+0.02ex , line ~ width=0.4pt* \l__tikzsymbols_scale_abs_tl ]
+ (-0.8386,0+0.2pt) rectangle (0.8386, 1.42);
+ }{
+ \draw[transparent , scale=#1+0.02ex , line ~ width=0.4pt* \l__tikzsymbols_scale_abs_tl ]
+ (-0.6998,0+0.2pt) rectangle (0.6998,0.68+0.6);
+ }
+ \pgflowlevel { \pgftransformscale { #1 + 0.02ex } }
+ {
+ \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 }
+ {
+ child ~ foreach ~ \leafcolor in { __tikzsymbols_leaf ~ a , __tikzsymbols_leaf ~ b }
+ { edge ~ from ~ parent ~ [color=\leafcolor,-#5]}
+ }
}
- }
- }
- }
- edge ~ from ~ parent [shorten ~ >=-0.05ex, serif ~ cm- , line ~ cap=butt]
- };
- }
- \end{tikzpicture}
- \bool_set_false:N \l__tikzsymbols_scale_negative_bool
- }
+ }
+ }
+ edge ~ from ~ parent [shorten ~ >=-0.05ex, serif ~ cm- , line ~ cap=butt]
+ };
+ }
+ \end{tikzpicture}
+ \bool_set_false:N \l__tikzsymbols_scale_negative_bool
\group_end:
}
\__tikzsymbols_Declare_Document_Commands:nnnn { Kochtopf } { pot } { S }
{
- \__tikzsymbols_provide_savebox_and_use:nT { Kochtopf_#1 }
+ \__tikzsymbols_provide_savebox_and_use:nn { Kochtopf_#1 }
{
\__tikzsymbols_set_scale_abs_tl:n {#1}
- \bool_if:NTF \g__tikzsymbols_if_opt_draft_bool
+ \bool_if:NTF \l__tikzsymbols_if_opt_draft_bool
{
\__tikzsymbols_create_draftbox:nn
- { 2.47ex * \l__tikzsymbols_scale_abs_tl }
+ { 2.47001ex * \l__tikzsymbols_scale_abs_tl }
{ 1.577ex * \l__tikzsymbols_scale_abs_tl }
}{
- \begin{tikzpicture}[ /__tikzsymbols , x=2ex,y=2.2ex, line ~ width=0.07ex *
- \l__tikzsymbols_scale_abs_tl , scale=#1 ]
+ \begin{tikzpicture}[ /__tikzsymbols , x=2ex, y=2.2ex,
+ line ~ width=0.07ex * \l__tikzsymbols_scale_abs_tl ,
+ scale=#1 ]
\draw[rounded ~ corners=0.2ex * \l__tikzsymbols_scale_abs_tl] (0,0.5) -- (0,0) -- (1,0) -- (1,0.5);
\draw (0,0.4) arc [start ~ angle=90, end ~ angle=270, radius=0.1];
\draw (1,0.4) arc [start ~ angle=90, end ~ angle=-90, radius=0.1];
@@ -557,13 +572,13 @@
}
\__tikzsymbols_Declare_Document_Commands:nnnn { Bratpfanne } { fryingpan } { S }
{
- \__tikzsymbols_provide_savebox_and_use:nT { Bratpfanne_#1 }
+ \__tikzsymbols_provide_savebox_and_use:nn { Bratpfanne_#1 }
{
\__tikzsymbols_set_scale_abs_tl:n {#1}
- \bool_if:NTF \g__tikzsymbols_if_opt_draft_bool
+ \bool_if:NTF \l__tikzsymbols_if_opt_draft_bool
{
\__tikzsymbols_create_draftbox:nn
- { 3.5535ex * \l__tikzsymbols_scale_abs_tl }
+ { 3.55349ex * \l__tikzsymbols_scale_abs_tl }
{ 1.4525ex * \l__tikzsymbols_scale_abs_tl }
}{
\begin{tikzpicture}
@@ -590,13 +605,13 @@
}
\__tikzsymbols_Declare_Document_Commands:nnnn { Schneebesen } { eggbeater } { S }
{
- \__tikzsymbols_provide_savebox_and_use:nT { Schneebesen_#1 }
+ \__tikzsymbols_provide_savebox_and_use:nn { Schneebesen_#1 }
{
\__tikzsymbols_set_scale_abs_tl:n {#1}
- \bool_if:NTF \g__tikzsymbols_if_opt_draft_bool
+ \bool_if:NTF \l__tikzsymbols_if_opt_draft_bool
{
\__tikzsymbols_create_draftbox:nn
- { 0.5697ex * \l__tikzsymbols_scale_abs_tl }
+ { 0.56969 ex * \l__tikzsymbols_scale_abs_tl }
{ 1.57985ex * \l__tikzsymbols_scale_abs_tl }
}{
\begin{tikzpicture}
@@ -619,14 +634,14 @@
}
\__tikzsymbols_Declare_Document_Commands:nnnn { Sieb } { sieve } { S }
{
- \__tikzsymbols_provide_savebox_and_use:nT { Sieb_#1 }
+ \__tikzsymbols_provide_savebox_and_use:nn { Sieb_#1 }
{
\__tikzsymbols_set_scale_abs_tl:n {#1}
- \bool_if:NTF \g__tikzsymbols_if_opt_draft_bool
+ \bool_if:NTF \l__tikzsymbols_if_opt_draft_bool
{
\__tikzsymbols_create_draftbox:nn
- { 3.478ex * \l__tikzsymbols_scale_abs_tl }
- { 1.175ex * \l__tikzsymbols_scale_abs_tl }
+ { 3.47799 ex * \l__tikzsymbols_scale_abs_tl }
+ { 1.17501 ex * \l__tikzsymbols_scale_abs_tl }
}{
\begin{tikzpicture}
[
@@ -648,10 +663,10 @@
}
\__tikzsymbols_Declare_Document_Commands:nnnn { Purierstab } { blender } { S }
{
- \__tikzsymbols_provide_savebox_and_use:nT { Purierstab_#1 }
+ \__tikzsymbols_provide_savebox_and_use:nn { Purierstab_#1 }
{
\__tikzsymbols_set_scale_abs_tl:n {#1}
- \bool_if:NTF \g__tikzsymbols_if_opt_draft_bool
+ \bool_if:NTF \l__tikzsymbols_if_opt_draft_bool
{
\__tikzsymbols_create_draftbox:nn
{ 0.76ex * \l__tikzsymbols_scale_abs_tl }
@@ -673,10 +688,10 @@
}
\__tikzsymbols_Declare_Document_Commands:nnnn { Dreizack } { trident } { S }
{
- \__tikzsymbols_provide_savebox_and_use:nT { Dreizack_#1 }
+ \__tikzsymbols_provide_savebox_and_use:nn { Dreizack_#1 }
{
\__tikzsymbols_set_scale_abs_tl:n {#1}
- \bool_if:NTF \g__tikzsymbols_if_opt_draft_bool
+ \bool_if:NTF \l__tikzsymbols_if_opt_draft_bool
{
\__tikzsymbols_create_draftbox:nn
{ 0.265ex * \l__tikzsymbols_scale_abs_tl }
@@ -698,13 +713,13 @@
}
\__tikzsymbols_Declare_Document_Commands:nnnn { Backblech } { bakingplate } { S }
{
- \__tikzsymbols_provide_savebox_and_use:nT { Backblech_#1 }
+ \__tikzsymbols_provide_savebox_and_use:nn { Backblech_#1 }
{
\__tikzsymbols_set_scale_abs_tl:n {#1}
- \bool_if:NTF \g__tikzsymbols_if_opt_draft_bool
+ \bool_if:NTF \l__tikzsymbols_if_opt_draft_bool
{
\__tikzsymbols_create_draftbox:nn
- { 2.3155ex * \l__tikzsymbols_scale_abs_tl }
+ { 2.31545ex * \l__tikzsymbols_scale_abs_tl }
{ 1.57ex * \l__tikzsymbols_scale_abs_tl }
}{
\begin{tikzpicture}
@@ -725,10 +740,10 @@
}
\__tikzsymbols_Declare_Document_Commands:nnnn { Ofen } { oven } { S }
{
- \__tikzsymbols_provide_savebox_and_use:nT { Ofen_#1 }
+ \__tikzsymbols_provide_savebox_and_use:nn { Ofen_#1 }
{
\__tikzsymbols_set_scale_abs_tl:n {#1}
- \bool_if:NTF \g__tikzsymbols_if_opt_draft_bool
+ \bool_if:NTF \l__tikzsymbols_if_opt_draft_bool
{
\__tikzsymbols_create_draftbox:nn
{ 2.07ex * \l__tikzsymbols_scale_abs_tl }
@@ -751,10 +766,10 @@
}
\__tikzsymbols_Declare_Document_Commands:nnnn { Pfanne } { pan } { S }
{
- \__tikzsymbols_provide_savebox_and_use:nT { Pfanne_#1 }
+ \__tikzsymbols_provide_savebox_and_use:nn { Pfanne_#1 }
{
\__tikzsymbols_set_scale_abs_tl:n {#1}
- \bool_if:NTF \g__tikzsymbols_if_opt_draft_bool
+ \bool_if:NTF \l__tikzsymbols_if_opt_draft_bool
{
\__tikzsymbols_create_draftbox:nn
{ 3.034ex * \l__tikzsymbols_scale_abs_tl }
@@ -785,10 +800,10 @@
}
\__tikzsymbols_Declare_Document_Commands:nnnn { Herd } { cooker } { S }
{
- \__tikzsymbols_provide_savebox_and_use:nT { Herd_#1 }
+ \__tikzsymbols_provide_savebox_and_use:nn { Herd_#1 }
{
\__tikzsymbols_set_scale_abs_tl:n {#1}
- \bool_if:NTF \g__tikzsymbols_if_opt_draft_bool
+ \bool_if:NTF \l__tikzsymbols_if_opt_draft_bool
{
\__tikzsymbols_create_draftbox:nn
{ 2.08ex * \l__tikzsymbols_scale_abs_tl }
@@ -811,10 +826,10 @@
}
\__tikzsymbols_Declare_Document_Commands:nnnn { Saftpresse } { squeezer } { S }
{
- \__tikzsymbols_provide_savebox_and_use:nT { Saftpresse_#1 }
+ \__tikzsymbols_provide_savebox_and_use:nn { Saftpresse_#1 }
{
\__tikzsymbols_set_scale_abs_tl:n {#1}
- \bool_if:NTF \g__tikzsymbols_if_opt_draft_bool
+ \bool_if:NTF \l__tikzsymbols_if_opt_draft_bool
{
\__tikzsymbols_create_draftbox:nn
{ 1.87ex * \l__tikzsymbols_scale_abs_tl }
@@ -846,10 +861,10 @@
}
\__tikzsymbols_Declare_Document_Commands:nnnn { Schussel } { bowl } { S }
{
- \__tikzsymbols_provide_savebox_and_use:nT { Schussel_#1 }
+ \__tikzsymbols_provide_savebox_and_use:nn { Schussel_#1 }
{
\__tikzsymbols_set_scale_abs_tl:n {#1}
- \bool_if:NTF \g__tikzsymbols_if_opt_draft_bool
+ \bool_if:NTF \l__tikzsymbols_if_opt_draft_bool
{
\__tikzsymbols_create_draftbox:nn
{ 2.32ex * \l__tikzsymbols_scale_abs_tl }
@@ -870,10 +885,10 @@
}
\__tikzsymbols_Declare_Document_Commands:nnnn { Schaler } { peeler } { S }
{
- \__tikzsymbols_provide_savebox_and_use:nT { Schaler_#1 }
+ \__tikzsymbols_provide_savebox_and_use:nn { Schaler_#1 }
{
\__tikzsymbols_set_scale_abs_tl:n {#1}
- \bool_if:NTF \g__tikzsymbols_if_opt_draft_bool
+ \bool_if:NTF \l__tikzsymbols_if_opt_draft_bool
{
\__tikzsymbols_create_draftbox:nn
{ 1.15ex * \l__tikzsymbols_scale_abs_tl }
@@ -895,10 +910,10 @@
}
\__tikzsymbols_Declare_Document_Commands:nnnn { Reibe } { grater } { S }
{
- \__tikzsymbols_provide_savebox_and_use:nT { Reibe_#1 }
+ \__tikzsymbols_provide_savebox_and_use:nn { Reibe_#1 }
{
\__tikzsymbols_set_scale_abs_tl:n {#1}
- \bool_if:NTF \g__tikzsymbols_if_opt_draft_bool
+ \bool_if:NTF \l__tikzsymbols_if_opt_draft_bool
{
\__tikzsymbols_create_draftbox:nn
{ 1.08ex * \l__tikzsymbols_scale_abs_tl }
@@ -920,10 +935,10 @@
}
\__tikzsymbols_Declare_Document_Commands:nnnn { Flasche } { bottle } { S }
{
- \__tikzsymbols_provide_savebox_and_use:nT { Flasche_#1 }
+ \__tikzsymbols_provide_savebox_and_use:nn { Flasche_#1 }
{
\__tikzsymbols_set_scale_abs_tl:n {#1}
- \bool_if:NTF \g__tikzsymbols_if_opt_draft_bool
+ \bool_if:NTF \l__tikzsymbols_if_opt_draft_bool
{
\__tikzsymbols_create_draftbox:nn
{ 0.78ex * \l__tikzsymbols_scale_abs_tl }
@@ -944,13 +959,13 @@
}
\__tikzsymbols_Declare_Document_Commands:nnnn { Nudelholz } { rollingpin } { S }
{
- \__tikzsymbols_provide_savebox_and_use:nT { Nudelholz_#1 }
+ \__tikzsymbols_provide_savebox_and_use:nn { Nudelholz_#1 }
{
\__tikzsymbols_set_scale_abs_tl:n {#1}
- \bool_if:NTF \g__tikzsymbols_if_opt_draft_bool
+ \bool_if:NTF \l__tikzsymbols_if_opt_draft_bool
{
\__tikzsymbols_create_draftbox:nn
- { 4.508ex * \l__tikzsymbols_scale_abs_tl }%%
+ { 4.516ex * \l__tikzsymbols_scale_abs_tl }%%
{ 0.9ex * \l__tikzsymbols_scale_abs_tl }
}{
\begin{tikzpicture}
@@ -972,14 +987,43 @@
}
}
}
+\__tikzsymbols_Declare_Document_Commands:nnnn { Knoblauchpresse } { garlicpress } { S }
+ {
+ \__tikzsymbols_provide_savebox_and_use:nn { Knoblauchpresse_#1 }
+ {
+ \__tikzsymbols_set_scale_abs_tl:n {#1}
+ \bool_if:NTF \l__tikzsymbols_if_opt_draft_bool
+ {
+ \__tikzsymbols_create_draftbox:nn
+ { 4.3ex * \l__tikzsymbols_scale_abs_tl }
+ { 1.6ex * \l__tikzsymbols_scale_abs_tl }
+ }{
+ \begin{tikzpicture}
+ [
+ /__tikzsymbols ,
+ x=1ex, y=1ex, scale=#1, line ~ width=0.1ex * \l__tikzsymbols_scale_abs_tl ,
+ ]
+ \draw[rounded ~ corners = 0.1ex*\l__tikzsymbols_scale_abs_tl]
+ (1, 0) -- (4, 0) -- (4,-0.2) -- (1, -0.2)
+ (-0.1, 0.5) -- (4, 0.5) -- (4,0.3) -- (0, 0.3);
+ \draw [rounded ~ corners = 0.21ex*\l__tikzsymbols_scale_abs_tl]
+ (0,0) -- (0,-1) -- (1,-1) -- (1,0);
+ \draw (1,0) -- (0,0) -- (0,0.4) ;
+ \draw (0,-0.85) -- (-0.2, -0.6) -- (-0.2, 0.4);
+ \draw (-0.1,0.4) circle[radius=0.1];
+ \draw (0.3, 0) rectangle +(0.4, 0.3);
+ \end{tikzpicture}
+ }
+ }
+ }
\__tikzsymbols_Declare_Document_Command:nnn { Sadey } { S O{none} }
{
- \__tikzsymbols_provide_savebox_and_use:nT { Sadey_#1_#2 }
+ \__tikzsymbols_provide_savebox_and_use:nn { Sadey_#1_#2 }
{
\__tikzsymbols_set_scale_abs_tl:n {#1}
- \bool_if:NTF \g__tikzsymbols_if_opt_draft_bool
+ \bool_if:NTF \l__tikzsymbols_if_opt_draft_bool
{
- \__tikzsymbols_create_squared_draftbox:n { 1.704ex * \l__tikzsymbols_scale_abs_tl }
+ \__tikzsymbols_create_squared_draftbox:n { 1.684ex * \l__tikzsymbols_scale_abs_tl }
}{
\begin{tikzpicture}
[
@@ -996,10 +1040,10 @@
}
\__tikzsymbols_Declare_Document_Command:nnn { dSadey } { S O{yellow} }
{
- \__tikzsymbols_provide_savebox_and_use:nT { dSadey_#1_#2 }
+ \__tikzsymbols_provide_savebox_and_use:nn { dSadey_#1_#2 }
{
\__tikzsymbols_set_scale_abs_tl:n {#1}
- \bool_if:NTF \g__tikzsymbols_if_opt_draft_bool
+ \bool_if:NTF \l__tikzsymbols_if_opt_draft_bool
{
\__tikzsymbols_create_squared_draftbox:n { 1.584ex * \l__tikzsymbols_scale_abs_tl }
}{
@@ -1018,12 +1062,12 @@
}
\__tikzsymbols_Declare_Document_Command:nnn { Changey } { S O{white} m }
{
- \__tikzsymbols_provide_savebox_and_use:nT { Changey_#1_#2_#3 }
+ \__tikzsymbols_provide_savebox_and_use:nn { Changey_#1_#2_#3 }
{
- \fp_compare:nT { abs(#3) > 2 }
+ \fp_compare:nNnT { abs(#3) } > { 2 }
{ \msg_error:nnn { tikzsymbols } { Changey-number-too-large } {#3} }
\__tikzsymbols_set_scale_abs_tl:n {#1}
- \bool_if:NTF \g__tikzsymbols_if_opt_draft_bool
+ \bool_if:NTF \l__tikzsymbols_if_opt_draft_bool
{
\__tikzsymbols_create_squared_draftbox:n { 1.704ex * \l__tikzsymbols_scale_abs_tl }
}{
@@ -1048,12 +1092,12 @@
}
\__tikzsymbols_Declare_Document_Command:nnn { dChangey } { S O{yellow} m }
{
- \__tikzsymbols_provide_savebox_and_use:nT { dChangey_#1_#2_#3 }
+ \__tikzsymbols_provide_savebox_and_use:nn { dChangey_#1_#2_#3 }
{
- \fp_compare:nT { abs(#3) > 2 }
+ \fp_compare:nNnT { abs(#3) } > { 2 }
{ \msg_error:nnn { tikzsymbols } { Changey-number-too-large } {#3} }
\__tikzsymbols_set_scale_abs_tl:n {#1}
- \bool_if:NTF \g__tikzsymbols_if_opt_draft_bool
+ \bool_if:NTF \l__tikzsymbols_if_opt_draft_bool
{
\__tikzsymbols_create_squared_draftbox:n { 1.584ex * \l__tikzsymbols_scale_abs_tl }
}{
@@ -1088,13 +1132,13 @@
\cs_generate_variant:Nn \__tikzsymbols_cChangey_aux:nnn { x }
\__tikzsymbols_Declare_Document_Command:nnn { cChangey } { S O{red} O{yellow} O{green} m }
{
- \__tikzsymbols_provide_savebox_and_use:nT
+ \__tikzsymbols_provide_savebox_and_use:nn
{ cChangey_#1_#2_#3_#4_#5 }
{
- \fp_compare:nT { abs(#5) > 2 }
+ \fp_compare:nNnT { abs(#5) } > { 2 }
{ \msg_error:nnn { tikzsymbols } { cChangey-number-too-large } {#5} }
\__tikzsymbols_set_scale_abs_tl:n {#1}
- \bool_if:NTF \g__tikzsymbols_if_opt_draft_bool
+ \bool_if:NTF \l__tikzsymbols_if_opt_draft_bool
{
\__tikzsymbols_create_squared_draftbox:n { 1.704ex * \l__tikzsymbols_scale_abs_tl }
}{
@@ -1142,13 +1186,13 @@
\cs_generate_variant:Nn \__tikzsymbols_dcChangey_aux:nnn { x }
\__tikzsymbols_Declare_Document_Command:nnn { dcChangey } { S O{red} O{yellow} O{green} m }
{
- \__tikzsymbols_provide_savebox_and_use:nT
+ \__tikzsymbols_provide_savebox_and_use:nn
{ dcChangey_#1_#2_#3_#4_#5 }
{
- \fp_compare:nT { abs(#5) > 2 }
+ \fp_compare:nNnT { abs(#5) } > { 2 }
{ \msg_error:nnn { tikzsymbols } { cChangey-number-too-large } {#5} }
\__tikzsymbols_set_scale_abs_tl:n {#1}
- \bool_if:NTF \g__tikzsymbols_if_opt_draft_bool
+ \bool_if:NTF \l__tikzsymbols_if_opt_draft_bool
{
\__tikzsymbols_create_squared_draftbox:n { 1.584ex * \l__tikzsymbols_scale_abs_tl }
}{
@@ -1186,10 +1230,10 @@
}
\__tikzsymbols_Declare_Document_Command:nnn { Annoey } { S O{none} }
{
- \__tikzsymbols_provide_savebox_and_use:nT { Annoey_#1_#2 }
+ \__tikzsymbols_provide_savebox_and_use:nn { Annoey_#1_#2 }
{
\__tikzsymbols_set_scale_abs_tl:n {#1}
- \bool_if:NTF \g__tikzsymbols_if_opt_draft_bool
+ \bool_if:NTF \l__tikzsymbols_if_opt_draft_bool
{
\__tikzsymbols_create_squared_draftbox:n { 1.704ex * \l__tikzsymbols_scale_abs_tl }
}{
@@ -1208,10 +1252,10 @@
}
\__tikzsymbols_Declare_Document_Command:nnn { dAnnoey } { S O{yellow} }
{
- \__tikzsymbols_provide_savebox_and_use:nT { dAnnoey_#1_#2 }
+ \__tikzsymbols_provide_savebox_and_use:nn { dAnnoey_#1_#2 }
{
\__tikzsymbols_set_scale_abs_tl:n {#1}
- \bool_if:NTF \g__tikzsymbols_if_opt_draft_bool
+ \bool_if:NTF \l__tikzsymbols_if_opt_draft_bool
{
\__tikzsymbols_create_squared_draftbox:n { 1.584ex * \l__tikzsymbols_scale_abs_tl }
}{
@@ -1232,10 +1276,10 @@
{
\__tikzsymbols_Declare_Document_Command:nnn { Smiley } { S O{none} }
{
- \__tikzsymbols_provide_savebox_and_use:nT { Smiley_#1_#2 }
+ \__tikzsymbols_provide_savebox_and_use:nn { Smiley_#1_#2 }
{
\__tikzsymbols_set_scale_abs_tl:n {#1}
- \bool_if:NTF \g__tikzsymbols_if_opt_draft_bool
+ \bool_if:NTF \l__tikzsymbols_if_opt_draft_bool
{
\__tikzsymbols_create_squared_draftbox:n { 1.704ex * \l__tikzsymbols_scale_abs_tl }
}{
@@ -1255,10 +1299,10 @@
}
\__tikzsymbols_Declare_Document_Command:nnn { dSmiley } { S O{yellow} }
{
- \__tikzsymbols_provide_savebox_and_use:nT { dSmiley_#1_#2 }
+ \__tikzsymbols_provide_savebox_and_use:nn { dSmiley_#1_#2 }
{
\__tikzsymbols_set_scale_abs_tl:n {#1}
- \bool_if:NTF \g__tikzsymbols_if_opt_draft_bool
+ \bool_if:NTF \l__tikzsymbols_if_opt_draft_bool
{
\__tikzsymbols_create_squared_draftbox:n { 1.584ex * \l__tikzsymbols_scale_abs_tl }
}{
@@ -1277,10 +1321,10 @@
}
\__tikzsymbols_Declare_Document_Command:nnn { Laughey } { S O{none} O{none} }
{
- \__tikzsymbols_provide_savebox_and_use:nT { Laughey_#1_#2_#3 }
+ \__tikzsymbols_provide_savebox_and_use:nn { Laughey_#1_#2_#3 }
{
\__tikzsymbols_set_scale_abs_tl:n {#1}
- \bool_if:NTF \g__tikzsymbols_if_opt_draft_bool
+ \bool_if:NTF \l__tikzsymbols_if_opt_draft_bool
{
\__tikzsymbols_create_squared_draftbox:n { 1.704ex * \l__tikzsymbols_scale_abs_tl }
}{
@@ -1301,10 +1345,10 @@
}
\__tikzsymbols_Declare_Document_Command:nnn { dLaughey } { S O{yellow} O{red} }
{
- \__tikzsymbols_provide_savebox_and_use:nT { dLaughey_#1_#2_#3 }
+ \__tikzsymbols_provide_savebox_and_use:nn { dLaughey_#1_#2_#3 }
{
\__tikzsymbols_set_scale_abs_tl:n {#1}
- \bool_if:NTF \g__tikzsymbols_if_opt_draft_bool
+ \bool_if:NTF \l__tikzsymbols_if_opt_draft_bool
{
\__tikzsymbols_create_squared_draftbox:n { 1.584ex * \l__tikzsymbols_scale_abs_tl }
}{
@@ -1329,10 +1373,10 @@
}
\__tikzsymbols_Declare_Document_Command:nnn { Neutrey } { S O{none} }
{
- \__tikzsymbols_provide_savebox_and_use:nT { Neutrey_#1_#2 }
+ \__tikzsymbols_provide_savebox_and_use:nn { Neutrey_#1_#2 }
{
\__tikzsymbols_set_scale_abs_tl:n {#1}
- \bool_if:NTF \g__tikzsymbols_if_opt_draft_bool
+ \bool_if:NTF \l__tikzsymbols_if_opt_draft_bool
{
\__tikzsymbols_create_squared_draftbox:n { 1.704ex * \l__tikzsymbols_scale_abs_tl }
}{
@@ -1351,10 +1395,10 @@
}
\__tikzsymbols_Declare_Document_Command:nnn { dNeutrey } { S O{yellow} }
{
- \__tikzsymbols_provide_savebox_and_use:nT { Neutrey_#1_#2 }
+ \__tikzsymbols_provide_savebox_and_use:nn { Neutrey_#1_#2 }
{
\__tikzsymbols_set_scale_abs_tl:n {#1}
- \bool_if:NTF \g__tikzsymbols_if_opt_draft_bool
+ \bool_if:NTF \l__tikzsymbols_if_opt_draft_bool
{
\__tikzsymbols_create_squared_draftbox:n { 1.584ex * \l__tikzsymbols_scale_abs_tl }
}{
@@ -1373,10 +1417,10 @@
}
\__tikzsymbols_Declare_Document_Command:nnn { Winkey } { S O{none} }
{
- \__tikzsymbols_provide_savebox_and_use:nT { Winkey_#1_#2 }
+ \__tikzsymbols_provide_savebox_and_use:nn { Winkey_#1_#2 }
{
\__tikzsymbols_set_scale_abs_tl:n {#1}
- \bool_if:NTF \g__tikzsymbols_if_opt_draft_bool
+ \bool_if:NTF \l__tikzsymbols_if_opt_draft_bool
{
\__tikzsymbols_create_squared_draftbox:n { 1.704ex * \l__tikzsymbols_scale_abs_tl }
}{
@@ -1395,10 +1439,10 @@
}
\__tikzsymbols_Declare_Document_Command:nnn { oldWinkey } { S O{none} }
{
- \__tikzsymbols_provide_savebox_and_use:nT { oldWinkey_#1_#2 }
+ \__tikzsymbols_provide_savebox_and_use:nn { oldWinkey_#1_#2 }
{
\__tikzsymbols_set_scale_abs_tl:n {#1}
- \bool_if:NTF \g__tikzsymbols_if_opt_draft_bool
+ \bool_if:NTF \l__tikzsymbols_if_opt_draft_bool
{
\__tikzsymbols_create_squared_draftbox:n { 1.704ex * \l__tikzsymbols_scale_abs_tl }
}{
@@ -1417,10 +1461,10 @@
}
\__tikzsymbols_Declare_Document_Command:nnn { dWinkey } { S O{yellow} }
{
- \__tikzsymbols_provide_savebox_and_use:nT { dWinkey_#1_#2 }
+ \__tikzsymbols_provide_savebox_and_use:nn { dWinkey_#1_#2 }
{
\__tikzsymbols_set_scale_abs_tl:n {#1}
- \bool_if:NTF \g__tikzsymbols_if_opt_draft_bool
+ \bool_if:NTF \l__tikzsymbols_if_opt_draft_bool
{
\__tikzsymbols_create_squared_draftbox:n { 1.584ex * \l__tikzsymbols_scale_abs_tl }
}{
@@ -1439,10 +1483,10 @@
}
\__tikzsymbols_Declare_Document_Command:nnn { olddWinkey } { S O{yellow} }
{
- \__tikzsymbols_provide_savebox_and_use:nT { olddWinkey_#1_#2 }
+ \__tikzsymbols_provide_savebox_and_use:nn { olddWinkey_#1_#2 }
{
\__tikzsymbols_set_scale_abs_tl:n {#1}
- \bool_if:NTF \g__tikzsymbols_if_opt_draft_bool
+ \bool_if:NTF \l__tikzsymbols_if_opt_draft_bool
{
\__tikzsymbols_create_squared_draftbox:n { 1.584ex * \l__tikzsymbols_scale_abs_tl }
}{
@@ -1461,10 +1505,10 @@
}
\__tikzsymbols_Declare_Document_Command:nnn { Sey } { S O{none} }
{
- \__tikzsymbols_provide_savebox_and_use:nT { Sey_#1_#2 }
+ \__tikzsymbols_provide_savebox_and_use:nn { Sey_#1_#2 }
{
\__tikzsymbols_set_scale_abs_tl:n {#1}
- \bool_if:NTF \g__tikzsymbols_if_opt_draft_bool
+ \bool_if:NTF \l__tikzsymbols_if_opt_draft_bool
{
\__tikzsymbols_create_squared_draftbox:n { 1.704ex * \l__tikzsymbols_scale_abs_tl }
}{
@@ -1483,10 +1527,10 @@
}
\__tikzsymbols_Declare_Document_Command:nnn { dSey } { S O{yellow} }
{
- \__tikzsymbols_provide_savebox_and_use:nT { dSey_#1_#2 }
+ \__tikzsymbols_provide_savebox_and_use:nn { dSey_#1_#2 }
{
\__tikzsymbols_set_scale_abs_tl:n {#1}
- \bool_if:NTF \g__tikzsymbols_if_opt_draft_bool
+ \bool_if:NTF \l__tikzsymbols_if_opt_draft_bool
{
\__tikzsymbols_create_squared_draftbox:n { 1.584ex * \l__tikzsymbols_scale_abs_tl }
}{
@@ -1505,10 +1549,10 @@
}
\__tikzsymbols_Declare_Document_Command:nnn { Xey } { S O{none} }
{
- \__tikzsymbols_provide_savebox_and_use:nT { Xey_#1_#2 }
+ \__tikzsymbols_provide_savebox_and_use:nn { Xey_#1_#2 }
{
\__tikzsymbols_set_scale_abs_tl:n {#1}
- \bool_if:NTF \g__tikzsymbols_if_opt_draft_bool
+ \bool_if:NTF \l__tikzsymbols_if_opt_draft_bool
{
\__tikzsymbols_create_squared_draftbox:n { 1.704ex * \l__tikzsymbols_scale_abs_tl }
}{
@@ -1527,10 +1571,10 @@
}
\__tikzsymbols_Declare_Document_Command:nnn { dXey } { S O{yellow} }
{
- \__tikzsymbols_provide_savebox_and_use:nT { dXey_#1_#2 }
+ \__tikzsymbols_provide_savebox_and_use:nn { dXey_#1_#2 }
{
\__tikzsymbols_set_scale_abs_tl:n {#1}
- \bool_if:NTF \g__tikzsymbols_if_opt_draft_bool
+ \bool_if:NTF \l__tikzsymbols_if_opt_draft_bool
{
\__tikzsymbols_create_squared_draftbox:n { 1.584ex * \l__tikzsymbols_scale_abs_tl }
}{
@@ -1551,19 +1595,19 @@
}
\__tikzsymbols_Declare_Document_Command:nnn { Innocey } { S O{none} O{yellow} }
{
- \__tikzsymbols_provide_savebox_and_use:nT { Innocey_#1_#2_#3 }
+ \__tikzsymbols_provide_savebox_and_use:nn { Innocey_#1_#2_#3 }
{
\__tikzsymbols_set_scale_abs_tl:n {#1}
- \bool_if:NTF \g__tikzsymbols_if_opt_draft_bool
+ \bool_if:NTF \l__tikzsymbols_if_opt_draft_bool
{
\__tikzsymbols_create_draftbox:nn
{ 1.73ex * \l__tikzsymbols_scale_abs_tl }
- { 1.909ex * \l__tikzsymbols_scale_abs_tl }
+ { 1.90899 ex * \l__tikzsymbols_scale_abs_tl }
}{
\begin{tikzpicture}
[
/__tikzsymbols ,
- x=2.4ex, y=2.4ex, line ~ width=0.12ex* \l__tikzsymbols_scale_abs_tl ,scale=#1
+ x=2.4ex, y=2.4ex, line ~ width=0.12ex* \l__tikzsymbols_scale_abs_tl, scale=#1
]
\filldraw[fill=#2] (0,0) circle [radius=0.33];
\fill (-0.1,0.1) circle [radius=0.05];
@@ -1591,14 +1635,14 @@
}
\__tikzsymbols_Declare_Document_Command:nnn { dInnocey } { S O{yellow} O{yellow} }
{
- \__tikzsymbols_provide_savebox_and_use:nT { dInnocey_#1_#2_#3 }
+ \__tikzsymbols_provide_savebox_and_use:nn { dInnocey_#1_#2_#3 }
{
\__tikzsymbols_set_scale_abs_tl:n {#1}
- \bool_if:NTF \g__tikzsymbols_if_opt_draft_bool
+ \bool_if:NTF \l__tikzsymbols_if_opt_draft_bool
{
\__tikzsymbols_create_draftbox:nn
{ 1.73ex * \l__tikzsymbols_scale_abs_tl }
- { 1.849ex * \l__tikzsymbols_scale_abs_tl }
+ { 1.84898ex * \l__tikzsymbols_scale_abs_tl }
}{
\begin{tikzpicture}
[
@@ -1622,10 +1666,10 @@
}
\__tikzsymbols_Declare_Document_Command:nnn { Cooley } { S O{none} }
{
- \__tikzsymbols_provide_savebox_and_use:nT { Cooley_#1_#2 }
+ \__tikzsymbols_provide_savebox_and_use:nn { Cooley_#1_#2 }
{
\__tikzsymbols_set_scale_abs_tl:n {#1}
- \bool_if:NTF \g__tikzsymbols_if_opt_draft_bool
+ \bool_if:NTF \l__tikzsymbols_if_opt_draft_bool
{
\__tikzsymbols_create_squared_draftbox:n { 1.704ex * \l__tikzsymbols_scale_abs_tl }
}{
@@ -1648,10 +1692,10 @@
}
\__tikzsymbols_Declare_Document_Command:nnn { dCooley } { S O{yellow} }
{
- \__tikzsymbols_provide_savebox_and_use:nT { dCooley_#1_#2 }
+ \__tikzsymbols_provide_savebox_and_use:nn { dCooley_#1_#2 }
{
\__tikzsymbols_set_scale_abs_tl:n {#1}
- \bool_if:NTF \g__tikzsymbols_if_opt_draft_bool
+ \bool_if:NTF \l__tikzsymbols_if_opt_draft_bool
{
\__tikzsymbols_create_squared_draftbox:n { 1.584ex * \l__tikzsymbols_scale_abs_tl }
}{
@@ -1674,10 +1718,10 @@
}
\__tikzsymbols_Declare_Document_Command:nnn { Tongey } { S O{none} O{none} }
{
- \__tikzsymbols_provide_savebox_and_use:nT { Tongey_#1_#2_#3 }
+ \__tikzsymbols_provide_savebox_and_use:nn { Tongey_#1_#2_#3 }
{
\__tikzsymbols_set_scale_abs_tl:n {#1}
- \bool_if:NTF \g__tikzsymbols_if_opt_draft_bool
+ \bool_if:NTF \l__tikzsymbols_if_opt_draft_bool
{
\__tikzsymbols_create_squared_draftbox:n { 1.704ex * \l__tikzsymbols_scale_abs_tl }
}{
@@ -1703,10 +1747,10 @@
}
\__tikzsymbols_Declare_Document_Command:nnn { dTongey } { S O{yellow} O{red} }
{
- \__tikzsymbols_provide_savebox_and_use:nT { dTongey_#1_#2_#3 }
+ \__tikzsymbols_provide_savebox_and_use:nn { dTongey_#1_#2_#3 }
{
\__tikzsymbols_set_scale_abs_tl:n {#1}
- \bool_if:NTF \g__tikzsymbols_if_opt_draft_bool
+ \bool_if:NTF \l__tikzsymbols_if_opt_draft_bool
{
\__tikzsymbols_create_squared_draftbox:n { 1.584ex * \l__tikzsymbols_scale_abs_tl }
}{
@@ -1732,10 +1776,10 @@
}
\__tikzsymbols_Declare_Document_Command:nnn { Nursey } { S O{none} O{none} O{} }
{
- \__tikzsymbols_provide_savebox_and_use:nT { Nursey_#1_#2_#3_#4 }
+ \__tikzsymbols_provide_savebox_and_use:nn { Nursey_#1_#2_#3_#4 }
{
\__tikzsymbols_set_scale_abs_tl:n {#1}
- \bool_if:NTF \g__tikzsymbols_if_opt_draft_bool
+ \bool_if:NTF \l__tikzsymbols_if_opt_draft_bool
{
\__tikzsymbols_create_draftbox:nn
{ 1.5ex * \l__tikzsymbols_scale_abs_tl }
@@ -1763,14 +1807,14 @@
}
\__tikzsymbols_Declare_Document_Command:nnn { dNursey } { S O{yellow} O{white} O{red} }
{
- \__tikzsymbols_provide_savebox_and_use:nT { dNursey_#1_#2_#3_#4 }
+ \__tikzsymbols_provide_savebox_and_use:nn { dNursey_#1_#2_#3_#4 }
{
\__tikzsymbols_set_scale_abs_tl:n {#1}
- \bool_if:NTF \g__tikzsymbols_if_opt_draft_bool
+ \bool_if:NTF \l__tikzsymbols_if_opt_draft_bool
{
\__tikzsymbols_create_draftbox:nn
{ 1.38ex * \l__tikzsymbols_scale_abs_tl }
- { 1.98ex * \l__tikzsymbols_scale_abs_tl }
+ { 1.98001ex * \l__tikzsymbols_scale_abs_tl }
}{
\begin{tikzpicture}
[
@@ -1799,13 +1843,13 @@
}
\__tikzsymbols_Declare_Document_Command:nnn { Vomey } { S O{none} O{opacity=0} }
{
- \__tikzsymbols_provide_savebox_and_use:nT { Vomey_#1_#2_#3 }
+ \__tikzsymbols_provide_savebox_and_use:nn { Vomey_#1_#2_#3 }
{
\__tikzsymbols_set_scale_abs_tl:n {#1}
- \bool_if:NTF \g__tikzsymbols_if_opt_draft_bool
+ \bool_if:NTF \l__tikzsymbols_if_opt_draft_bool
{
\__tikzsymbols_create_draftbox:nn
- { 3.0335ex * \l__tikzsymbols_scale_abs_tl }
+ { 3.03335ex * \l__tikzsymbols_scale_abs_tl }
{ 1.743ex * \l__tikzsymbols_scale_abs_tl }
}{
\begin{tikzpicture}
@@ -1836,13 +1880,13 @@
}
\__tikzsymbols_Declare_Document_Command:nnn { dVomey } { S O{yellow} O{brown!10!olive} }
{
- \__tikzsymbols_provide_savebox_and_use:nT { dVomey_#1_#2_#3 }
+ \__tikzsymbols_provide_savebox_and_use:nn { dVomey_#1_#2_#3 }
{
\__tikzsymbols_set_scale_abs_tl:n {#1}
- \bool_if:NTF \g__tikzsymbols_if_opt_draft_bool
+ \bool_if:NTF \l__tikzsymbols_if_opt_draft_bool
{
\__tikzsymbols_create_draftbox:nn
- { 3.2435ex * \l__tikzsymbols_scale_abs_tl }
+ { 2.94336 ex * \l__tikzsymbols_scale_abs_tl }
{ 1.653ex * \l__tikzsymbols_scale_abs_tl }
}{
\begin{tikzpicture}
@@ -1875,10 +1919,10 @@
}
\__tikzsymbols_Declare_Document_Command:nnn { Walley } { S O{none} O{none} }
{
- \__tikzsymbols_provide_savebox_and_use:nT { Walley_#1_#2_#3 }
+ \__tikzsymbols_provide_savebox_and_use:nn { Walley_#1_#2_#3 }
{
\__tikzsymbols_set_scale_abs_tl:n {#1}
- \bool_if:NTF \g__tikzsymbols_if_opt_draft_bool
+ \bool_if:NTF \l__tikzsymbols_if_opt_draft_bool
{
\__tikzsymbols_create_draftbox:nn
{ 2.341ex * \l__tikzsymbols_scale_abs_tl }
@@ -1916,10 +1960,10 @@
}
\__tikzsymbols_Declare_Document_Command:nnn { rWalley } { S O{none} O{none} }
{
- \__tikzsymbols_provide_savebox_and_use:nT { rWalley_#1_#2_#3 }
+ \__tikzsymbols_provide_savebox_and_use:nn { rWalley_#1_#2_#3 }
{
\__tikzsymbols_set_scale_abs_tl:n {#1}
- \bool_if:NTF \g__tikzsymbols_if_opt_draft_bool
+ \bool_if:NTF \l__tikzsymbols_if_opt_draft_bool
{
\__tikzsymbols_create_draftbox:nn
{ 2.341ex * \l__tikzsymbols_scale_abs_tl }
@@ -1949,13 +1993,13 @@
}
\__tikzsymbols_Declare_Document_Command:nnn { dWalley } { S O{yellow} }
{
- \__tikzsymbols_provide_savebox_and_use:nT { dWalley_#1_#2 }
+ \__tikzsymbols_provide_savebox_and_use:nn { dWalley_#1_#2 }
{
\__tikzsymbols_set_scale_abs_tl:n {#1}
- \bool_if:NTF \g__tikzsymbols_if_opt_draft_bool
+ \bool_if:NTF \l__tikzsymbols_if_opt_draft_bool
{
\__tikzsymbols_create_draftbox:nn
- { 2.4288ex * \l__tikzsymbols_scale_abs_tl }
+ { 2.42879ex * \l__tikzsymbols_scale_abs_tl }
{ 1.6008ex * \l__tikzsymbols_scale_abs_tl }
}{
\begin{tikzpicture}
@@ -1986,13 +2030,13 @@
}
\__tikzsymbols_Declare_Document_Command:nnn { drWalley } { S O{yellow} }
{
- \__tikzsymbols_provide_savebox_and_use:nT { drWalley_#1_#2 }
+ \__tikzsymbols_provide_savebox_and_use:nn { drWalley_#1_#2 }
{
\__tikzsymbols_set_scale_abs_tl:n {#1}
- \bool_if:NTF \g__tikzsymbols_if_opt_draft_bool
+ \bool_if:NTF \l__tikzsymbols_if_opt_draft_bool
{
\__tikzsymbols_create_draftbox:nn
- { 2.4288ex * \l__tikzsymbols_scale_abs_tl }
+ { 2.42879ex * \l__tikzsymbols_scale_abs_tl }
{ 1.6008ex * \l__tikzsymbols_scale_abs_tl }
}{
\begin{tikzpicture}
@@ -2104,13 +2148,13 @@
}
\__tikzsymbols_Declare_Document_Command:nnn { Cat } { S }
{
- \__tikzsymbols_provide_savebox_and_use:nT { Cat_#1 }
+ \__tikzsymbols_provide_savebox_and_use:nn { Cat_#1 }
{
\__tikzsymbols_set_scale_abs_tl:n {#1}
- \bool_if:NTF \g__tikzsymbols_if_opt_draft_bool
+ \bool_if:NTF \l__tikzsymbols_if_opt_draft_bool
{
\__tikzsymbols_create_draftbox:nn
- { 1.899ex * \l__tikzsymbols_scale_abs_tl }
+ { 1.89899ex * \l__tikzsymbols_scale_abs_tl }
{ 1.957ex * \l__tikzsymbols_scale_abs_tl }
}{
\begin{tikzpicture}
@@ -2125,13 +2169,13 @@
}
\__tikzsymbols_Declare_Document_Command:nnn { SchrodingersCat } { S m }
{
- \__tikzsymbols_provide_savebox_and_use:nT { SchrodingersCat_#1_#2 }
+ \__tikzsymbols_provide_savebox_and_use:nn { SchrodingersCat_#1_#2 }
{
\__tikzsymbols_set_scale_abs_tl:n {#1}
- \bool_if:NTF \g__tikzsymbols_if_opt_draft_bool
+ \bool_if:NTF \l__tikzsymbols_if_opt_draft_bool
{
\__tikzsymbols_create_draftbox:nn
- { 1.899ex * \l__tikzsymbols_scale_abs_tl }
+ { 1.89899ex * \l__tikzsymbols_scale_abs_tl }
{ 1.957ex * \l__tikzsymbols_scale_abs_tl }
}{
\begin{tikzpicture}
@@ -2152,10 +2196,10 @@
}
\__tikzsymbols_Declare_Document_Command:nnn { Ninja } { S O{black} O{red} O{white} }
{
- \__tikzsymbols_provide_savebox_and_use:nT { Ninja_#1_#2_#3_#4 }
+ \__tikzsymbols_provide_savebox_and_use:nn { Ninja_#1_#2_#3_#4 }
{
\__tikzsymbols_set_scale_abs_tl:n {#1}
- \bool_if:NTF \g__tikzsymbols_if_opt_draft_bool
+ \bool_if:NTF \l__tikzsymbols_if_opt_draft_bool
{
\__tikzsymbols_create_draftbox:nn
{ 2.149ex * \l__tikzsymbols_scale_abs_tl }
@@ -2207,10 +2251,10 @@
}
\__tikzsymbols_Declare_Document_Command:nnn { dNinja } { S O{black} O{red} O{white} }
{
- \__tikzsymbols_provide_savebox_and_use:nT { dNinja_#1_#2_#3_#4 }
+ \__tikzsymbols_provide_savebox_and_use:nn { dNinja_#1_#2_#3_#4 }
{
\__tikzsymbols_set_scale_abs_tl:n {#1}
- \bool_if:NTF \g__tikzsymbols_if_opt_draft_bool
+ \bool_if:NTF \l__tikzsymbols_if_opt_draft_bool
{
\__tikzsymbols_create_draftbox:nn
{ 2.1498ex * \l__tikzsymbols_scale_abs_tl }
@@ -2259,10 +2303,10 @@
}
\__tikzsymbols_Declare_Document_Command:nnn { Sleepey } { S O{none} O{none} O{black} }
{
- \__tikzsymbols_provide_savebox_and_use:nT { Sleepey_#1_#2_#3_#4 }
+ \__tikzsymbols_provide_savebox_and_use:nn { Sleepey_#1_#2_#3_#4 }
{
\__tikzsymbols_set_scale_abs_tl:n {#1}
- \bool_if:NTF \g__tikzsymbols_if_opt_draft_bool
+ \bool_if:NTF \l__tikzsymbols_if_opt_draft_bool
{
\__tikzsymbols_create_draftbox:nn
{ 2.084866ex * \l__tikzsymbols_scale_abs_tl }
@@ -2308,10 +2352,10 @@
}
\__tikzsymbols_Declare_Document_Command:nnn { dSleepey } { S O{yellow} O{blue} O{black} }
{
- \__tikzsymbols_provide_savebox_and_use:nT { dSleepey_#1_#2_#3_#4 }
+ \__tikzsymbols_provide_savebox_and_use:nn { dSleepey_#1_#2_#3_#4 }
{
\__tikzsymbols_set_scale_abs_tl:n {#1}
- \bool_if:NTF \g__tikzsymbols_if_opt_draft_bool
+ \bool_if:NTF \l__tikzsymbols_if_opt_draft_bool
{
\__tikzsymbols_create_draftbox:nn
{ 2.033865ex * \l__tikzsymbols_scale_abs_tl }
@@ -2357,13 +2401,13 @@
}
\__tikzsymbols_Declare_Document_Command:nnn { NiceReapey } { S O{black!20!white} }
{
- \__tikzsymbols_provide_savebox_and_use:nT { NiceReapey_#1_#2 }
+ \__tikzsymbols_provide_savebox_and_use:nn { NiceReapey_#1_#2 }
{
\__tikzsymbols_set_scale_abs_tl:n {#1}
- \bool_if:NTF \g__tikzsymbols_if_opt_draft_bool
+ \bool_if:NTF \l__tikzsymbols_if_opt_draft_bool
{
\__tikzsymbols_create_draftbox:nn
- { (1.1067em+0.07ex) * \l__tikzsymbols_scale_abs_tl }
+ { (1.10667em + 0.07ex) * \l__tikzsymbols_scale_abs_tl }
{ (0.693em+0.07ex) * \l__tikzsymbols_scale_abs_tl }
}{
\begin{tikzpicture}
@@ -2371,7 +2415,7 @@
/__tikzsymbols ,
x=0.11em,y=0.11em, line ~ width=0.07ex* \l__tikzsymbols_scale_abs_tl ,scale=#1
]
- \draw[] (1.7,-1) arc [start ~ angle=360, end ~ angle=180, x ~ radius=1.7, y ~ radius=2]
+ \draw (1.7,-1) arc [start ~ angle=360, end ~ angle=180, x ~ radius=1.7, y ~ radius=2]
arc [start ~ angle=260, end ~ angle=110, x ~ radius=1.5,y ~ radius=2]
.. controls (-1,3.3) and (1,3.3) .. (1.9,2.97)
arc [start ~ angle=260, end ~ angle=100, x ~ radius=-1.3, y ~ radius=-2] -- cycle;
@@ -2391,39 +2435,39 @@
}
\cs_new:Npn \__tikzsymbols_Strichmaxerl_x_check:N #1
{
- \fp_compare:nTF { #1 > 0 }
+ \fp_compare:nNnTF {#1} > { 0 }
{
- \fp_compare:nTF { #1 < 0.18 }
+ \fp_compare:nNnTF {#1} < { 0.18 }
{ \fp_zero:N #1 }
{ \fp_set:Nn #1 { #1 - 0.18 } }
}
{
- \fp_compare:nTF { #1 > - 0.18 }
+ \fp_compare:nNnTF {#1} > { - 0.18 }
{ \fp_zero:N #1 }
{ \fp_set:Nn #1 { #1 + 0.18 } }
}
}
\cs_new:Npn \__tikzsymbols_Strichmaxerl_if_smaller_zero_set_zero:N #1
{
- \fp_compare:nT { #1 < 0 } { \fp_zero:N #1 }
+ \fp_compare:nNnT {#1} < { 0 } { \fp_zero:N #1 }
}
\__tikzsymbols_Declare_Document_Command:nnn { Strichmaxerl }
{ S O{-22} O{22} O{27} O{-27} }
{
- \__tikzsymbols_provide_savebox_and_use:nT
+ \__tikzsymbols_provide_savebox_and_use:nn
{ Strichmaxerl_#1_#2_#3_#4_#5 }
{
\__tikzsymbols_set_scale_abs_tl:n {#1}
- \bool_if:NTF \g__tikzsymbols_if_opt_draft_bool
+ \bool_if:NTF \l__tikzsymbols_if_opt_draft_bool
{
\fp_set:Nn \l__tikzsymbols_Strichmaxerl_x_LA_fp { -0.27 * cosd (#2) }
\fp_set:Nn \l__tikzsymbols_Strichmaxerl_x_RA_fp { 0.27 * cosd (#3) }
- \fp_set:Nn \l__tikzsymbols_Strichmaxerl_x_LB_fp { 0.34 * sind (#4) }
- \fp_set:Nn \l__tikzsymbols_Strichmaxerl_x_RB_fp { 0.34 * sind (#5) }
+ \fp_set:Nn \l__tikzsymbols_Strichmaxerl_x_RB_fp { 0.34 * sind (#4) }
+ \fp_set:Nn \l__tikzsymbols_Strichmaxerl_x_LB_fp { 0.34 * sind (#5) }
\fp_set:Nn \l__tikzsymbols_Strichmaxerl_y_LA_fp { 0.27 * sind (#2) }
- \fp_set:Nn \l__tikzsymbols_Strichmaxerl_y_RA_fp { -0.27 * sind (#3) }
- \fp_set:Nn \l__tikzsymbols_Strichmaxerl_y_LB_fp { 0.34 * cosd (#4) }
- \fp_set:Nn \l__tikzsymbols_Strichmaxerl_y_RB_fp { 0.34 * cosd (#5) }
+ \fp_set:Nn \l__tikzsymbols_Strichmaxerl_y_RA_fp { 0.27 * sind (#3) }
+ \fp_set:Nn \l__tikzsymbols_Strichmaxerl_y_RB_fp { 0.34 * cosd (#4) }
+ \fp_set:Nn \l__tikzsymbols_Strichmaxerl_y_LB_fp { 0.34 * cosd (#5) }
\__tikzsymbols_Strichmaxerl_x_check:N \l__tikzsymbols_Strichmaxerl_x_LA_fp
\__tikzsymbols_Strichmaxerl_x_check:N \l__tikzsymbols_Strichmaxerl_x_RA_fp
\__tikzsymbols_Strichmaxerl_x_check:N \l__tikzsymbols_Strichmaxerl_x_LB_fp
@@ -2461,11 +2505,12 @@
\__tikzsymbols_create_draftbox:nn
{
(
- 0.606ex+1.35ex * \__tikzsymbols_Strichmaxerl_x_max_fp
+ 0.60597ex +1.35ex * \__tikzsymbols_Strichmaxerl_x_max_fp
-1.35ex * \__tikzsymbols_Strichmaxerl_x_min_fp
) * \l__tikzsymbols_scale_abs_tl
}{
- ( 1.173ex + 1.35ex * \__tikzsymbols_Strichmaxerl_y_max) * \l__tikzsymbols_scale_abs_tl
+ ( 1.173ex + 1.35ex * \__tikzsymbols_Strichmaxerl_y_max
+ ) * \l__tikzsymbols_scale_abs_tl
}
}{
\begin{tikzpicture}
@@ -2474,14 +2519,18 @@
line ~ width=0.12ex* \l__tikzsymbols_scale_abs_tl , scale=#1, x=1.35ex, y=1.35ex
]
\char_set_catcode_other:N :
- \draw[rotate \space around= { #5 \token_to_str:N : ( 0.15 , 0.2 ) } ] (0.15,0.2) -- (0.15,-0.14);
- \draw[rotate \space around= { #4 \token_to_str:N : ( 0.15 , 0.2 ) } ] (0.15,0.2) -- (0.15,-0.14);
+ %% LB
+ \draw[red,rotate \space around= { #5 \token_to_str:N : ( 0.15 , 0.2 ) } ] (0.15,0.2) -- (0.15,-0.14);
+ %% RB
+ \draw[blue,rotate \space around= { #4 \token_to_str:N : ( 0.15 , 0.2 ) } ] (0.15,0.2) -- (0.15,-0.14);
\draw (.15,.2) -- (.15,.4);
- \draw[rotate \space around={ #3 \token_to_str:N : ( 0.15 , 0.4) } ] (0.15,0.4) -- (0.42,0.4);
+ %% RA
+ \draw[green,rotate \space around={ #3 \token_to_str:N : ( 0.15 , 0.4) } ] (0.15,0.4) -- (0.42,0.4);
+ %% LA
\draw[rotate \space around={ #2 \token_to_str:N : ( 0.15 , 0.4) } ] (0.15,0.4) -- (-0.12,0.4);
\draw (.15, .4) -- (.15, .53);
\draw (.15,.8) circle [radius=0.18];
- \end{tikzpicture}%
+ \end{tikzpicture}
}
}
}
@@ -2496,13 +2545,13 @@
}
\__tikzsymbols_Declare_Document_Command:nnn { Candle } { S }
{
- \__tikzsymbols_provide_savebox_and_use:nT { Candle_#1 }
+ \__tikzsymbols_provide_savebox_and_use:nn { Candle_#1 }
{
\__tikzsymbols_set_scale_abs_tl:n {#1}
- \bool_if:NTF \g__tikzsymbols_if_opt_draft_bool
+ \bool_if:NTF \l__tikzsymbols_if_opt_draft_bool
{
\__tikzsymbols_create_draftbox:nn
- { 0.64ex * \l__tikzsymbols_scale_abs_tl }
+ { 0.639976ex * \l__tikzsymbols_scale_abs_tl }
{ (1.255ex+2.2pt) * \l__tikzsymbols_scale_abs_tl }
}{
\begin{tikzpicture}
@@ -2522,14 +2571,14 @@
}
\__tikzsymbols_Declare_Document_Command:nnn { Fire } { S }
{
- \__tikzsymbols_provide_savebox_and_use:nT { Fire_#1 }
+ \__tikzsymbols_provide_savebox_and_use:nn { Fire_#1 }
{
\__tikzsymbols_set_scale_abs_tl:n {#1}
- \bool_if:NTF \g__tikzsymbols_if_opt_draft_bool
+ \bool_if:NTF \l__tikzsymbols_if_opt_draft_bool
{
\__tikzsymbols_create_draftbox:nn
- { 1.576ex * \l__tikzsymbols_scale_abs_tl }
- { 1.639ex * \l__tikzsymbols_scale_abs_tl }
+ { 1.58612ex * \l__tikzsymbols_scale_abs_tl }
+ { 1.652901ex * \l__tikzsymbols_scale_abs_tl }
}{
\begin{tikzpicture}
[
@@ -2569,10 +2618,10 @@
{
\__tikzsymbols_Declare_Document_Command:nnn { Coffeecup } { S }
{
- \__tikzsymbols_provide_savebox_and_use:nT { Coffeecup_#1 }
+ \__tikzsymbols_provide_savebox_and_use:nn { Coffeecup_#1 }
{
\__tikzsymbols_set_scale_abs_tl:n {#1}
- \bool_if:NTF \g__tikzsymbols_if_opt_draft_bool
+ \bool_if:NTF \l__tikzsymbols_if_opt_draft_bool
{
\__tikzsymbols_create_draftbox:nn
{ 1.82ex * \l__tikzsymbols_scale_abs_tl }
@@ -2602,16 +2651,16 @@
}
\__tikzsymbols_Declare_Document_Command:nnn { Chair } { S }
{
- \__tikzsymbols_provide_savebox_and_use:nT { Chair_#1 }
+ \__tikzsymbols_provide_savebox_and_use:nn { Chair_#1 }
{
\__tikzsymbols_set_scale_abs_tl:n {#1}
- \bool_if:NTF \g__tikzsymbols_if_opt_draft_bool
+ \bool_if:NTF \l__tikzsymbols_if_opt_draft_bool
{
\__tikzsymbols_create_draftbox:nn
{ 0.97ex * \l__tikzsymbols_scale_abs_tl }
{ 1.69ex * \l__tikzsymbols_scale_abs_tl }
}{
- \fp_compare:nT { #1 < 0 } { \bool_set_true:N \l__tikzsymbols_if_scale_negative_bool }
+ \fp_compare:nNnT {#1} < { 0 } { \bool_set_true:N \l__tikzsymbols_if_scale_negative_bool }
\begin{tikzpicture}
[
/__tikzsymbols ,
@@ -2631,10 +2680,10 @@
}
\__tikzsymbols_Declare_Document_Command:nnn { Bed } { S }
{
- \__tikzsymbols_provide_savebox_and_use:nT { Bed_#1 }
+ \__tikzsymbols_provide_savebox_and_use:nn { Bed_#1 }
{
\__tikzsymbols_set_scale_abs_tl:n {#1}
- \bool_if:NTF \g__tikzsymbols_if_opt_draft_bool
+ \bool_if:NTF \l__tikzsymbols_if_opt_draft_bool
{
\__tikzsymbols_create_draftbox:nn
{ 3.08ex * \l__tikzsymbols_scale_abs_tl }
@@ -2658,14 +2707,14 @@
\__tikzsymbols_Declare_Document_Command:nnn { Tribar }
{ S O{opacity=0} O{opacity=0} O{opacity=0} }
{
- \__tikzsymbols_provide_savebox_and_use:nT { Tribar_#1_#2_#3_#4 }
+ \__tikzsymbols_provide_savebox_and_use:nn { Tribar_#1_#2_#3_#4 }
{
\__tikzsymbols_set_scale_abs_tl:n {#1}
- \bool_if:NTF \g__tikzsymbols_if_opt_draft_bool
+ \bool_if:NTF \l__tikzsymbols_if_opt_draft_bool
{
\__tikzsymbols_create_draftbox:nn
- { 1.7175ex * \l__tikzsymbols_scale_abs_tl }
- { 1.685ex * \l__tikzsymbols_scale_abs_tl }
+ { 1.71746ex * \l__tikzsymbols_scale_abs_tl }
+ { 1.68497ex * \l__tikzsymbols_scale_abs_tl }
}{
\begin{tikzpicture}
[
@@ -2692,22 +2741,22 @@
}
\__tikzsymbols_Declare_Document_Command:nnn { Moai } { S }
{
- \__tikzsymbols_provide_savebox_and_use:nT { Moai_#1 }
+ \__tikzsymbols_provide_savebox_and_use:nn { Moai_#1 }
{
\__tikzsymbols_set_scale_abs_tl:n {#1}
- \fp_compare:nTF { abs (#1) < 2 }
+ \fp_compare:nNnTF { \l__tikzsymbols_scale_abs_tl } < { 2 }
{
\dim_set:Nn \l__tikzsymbols_Moai_thickness_dim { 0.05ex }
}{
- \fp_compare:nTF { abs (#1) < 5 }
+ \fp_compare:nNnTF { \l__tikzsymbols_scale_abs_tl } < { 5 }
{ \dim_set:Nn \l__tikzsymbols_Moai_thickness_dim { 0.035ex } }
{ \dim_set:Nn \l__tikzsymbols_Moai_thickness_dim { 0.03ex } }
}
- \bool_if:NTF \g__tikzsymbols_if_opt_draft_bool
+ \bool_if:NTF \l__tikzsymbols_if_opt_draft_bool
{
\__tikzsymbols_create_draftbox:nn
- { ( 1.001ex + \l__tikzsymbols_Moai_thickness_dim ) * \l__tikzsymbols_scale_abs_tl }
- { ( 1.664ex + \l__tikzsymbols_Moai_thickness_dim ) * \l__tikzsymbols_scale_abs_tl }
+ { ( 1.00102ex + \l__tikzsymbols_Moai_thickness_dim ) * \l__tikzsymbols_scale_abs_tl }
+ { ( 1.66404ex + \l__tikzsymbols_Moai_thickness_dim ) * \l__tikzsymbols_scale_abs_tl }
}{
\begin{tikzpicture}
[
@@ -2742,14 +2791,14 @@
}
\__tikzsymbols_Declare_Document_Command:nnn { Snowman } { S }
{
- \__tikzsymbols_provide_savebox_and_use:nT { Snowman_#1 }
+ \__tikzsymbols_provide_savebox_and_use:nn { Snowman_#1 }
{
\__tikzsymbols_set_scale_abs_tl:n {#1}
- \bool_if:NTF \g__tikzsymbols_if_opt_draft_bool
+ \bool_if:NTF \l__tikzsymbols_if_opt_draft_bool
{
\__tikzsymbols_create_draftbox:nn
{ 1.545ex * \l__tikzsymbols_scale_abs_tl }
- { 1.772ex * \l__tikzsymbols_scale_abs_tl }
+ { 1.77157ex * \l__tikzsymbols_scale_abs_tl }
}{
\begin{tikzpicture}
[
@@ -2794,19 +2843,15 @@
}
\cs_new:Npn \__tikzsymbols_Basic_Tree:nnnnn #1#2#3#4#5
{
- \__tikzsymbols_provide_savebox_and_use:nT
+ \__tikzsymbols_provide_savebox_and_use:nn
{ BasicTree_#1_#2_#3_#4_#5 }
{
\tl_set:Nn \l_tmpa_tl {#5}
- \bool_if:nTF
- {
- \tl_if_eq_p:NN \l_tmpa_tl \c__tikzsymbols_leaf_tl ||
- \tl_if_empty_p:n {#5}
- }{
- \__tikzsymbols_Basic_Tree_aux:nnnnn {#1} {#2} {#3} {#4} {#5}
- }{
- \msg_error:nnn { tikzsymbols } { tree } {#5}
- }
+ \bool_lazy_or:nnTF
+ { \tl_if_eq_p:NN \l_tmpa_tl \c__tikzsymbols_leaf_tl }
+ { \tl_if_empty_p:n {#5} }
+ { \__tikzsymbols_Basic_Tree_aux:nnnnn {#1} {#2} {#3} {#4} {#5} }
+ { \msg_error:nnn { tikzsymbols } { tree } {#5} }
}
}
\__tikzsymbols_Declare_Document_Command:nnn { BasicTree } { S m m m m }
@@ -2815,10 +2860,10 @@
}
\__tikzsymbols_Declare_Document_Command:nnn { WorstTree } { S }
{
- \__tikzsymbols_provide_savebox_and_use:nT { WorstTree_#1 }
+ \__tikzsymbols_provide_savebox_and_use:nn { WorstTree_#1 }
{
\__tikzsymbols_set_scale_abs_tl:n {#1}
- \bool_if:NTF \g__tikzsymbols_if_opt_draft_bool
+ \bool_if:NTF \l__tikzsymbols_if_opt_draft_bool
{
\__tikzsymbols_create_draftbox:nn
{ 1.64ex * \l__tikzsymbols_scale_abs_tl }
@@ -2908,7 +2953,7 @@
}
\NewDocumentCommand \tikzsymbolsset { m }
{
- \keys_set_filter:nnnN { tikzsymbols } { package } {#1} \l_tmpa_tl
+ \keys_set_filter:nnnN { tikzsymbols } { only-package } {#1} \l_tmpa_tl
\tl_if_empty:NF \l_tmpa_tl
{
\keyval_parse:NNV
@@ -2926,7 +2971,7 @@
{
\msg_error:nnn { tikzsymbols } { package-option } {#1}
}
-\exp_args:NV \tikzsymbolsset \l__tikzsymbols_used_only_once_because_no_better_idea_tl
+\exp_args:NV \tikzsymbolsset \l__tikzsymbols_save_global_scale_for_later_because_no_better_idea_tl
\endinput
%%
%% End of file `tikzsymbols.sty'.
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-06 14:29:51 +0000