From e1809e9c838ac3ed386dc53e6c8b282a6eb484c3 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Wed, 2 May 2018 17:53:29 +0000 Subject: tikzsymbols (13apr18) git-svn-id: svn://tug.org/texlive/trunk@47563 c570f23f-e606-0410-a88d-b1316a301751 --- .../tex/latex/tikzsymbols/tikzsymbols.sty | 725 +++++++++++---------- 1 file changed, 385 insertions(+), 340 deletions(-) (limited to 'Master/texmf-dist/tex/latex/tikzsymbols/tikzsymbols.sty') diff --git a/Master/texmf-dist/tex/latex/tikzsymbols/tikzsymbols.sty b/Master/texmf-dist/tex/latex/tikzsymbols/tikzsymbols.sty index 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'. -- cgit v1.2.3