From 4bc5b2eef4dde44c1ae2a1f191b7bb5ddee7c121 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Tue, 5 Sep 2017 21:56:28 +0000 Subject: tikzsymbols (5sep17) git-svn-id: svn://tug.org/texlive/trunk@45222 c570f23f-e606-0410-a88d-b1316a301751 --- .../tex/latex/tikzsymbols/tikzsymbols.sty | 1042 +++++++++++++------- 1 file changed, 664 insertions(+), 378 deletions(-) (limited to 'Master/texmf-dist/tex/latex/tikzsymbols') diff --git a/Master/texmf-dist/tex/latex/tikzsymbols/tikzsymbols.sty b/Master/texmf-dist/tex/latex/tikzsymbols/tikzsymbols.sty index f0b0139c100..4627dea675e 100644 --- a/Master/texmf-dist/tex/latex/tikzsymbols/tikzsymbols.sty +++ b/Master/texmf-dist/tex/latex/tikzsymbols/tikzsymbols.sty @@ -7,21 +7,19 @@ %% tikzsymbols.dtx (with options: `package') %% This is a generated file. %% -%% Copyright (C) 2013 by Ben Vitecek (current Maintainer) +%% Copyright (C) 2013--2017 by Ben Vitecek (current Maintainer) %% -%% This file may be distributed and/or modified under the -%% conditions of the LaTeX Project Public License, either -%% version 1.3 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 2008-05-04 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 consists of the files README, tikzsymbols.dtx and tikzsymbols.ins +%% 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}} @@ -38,8 +36,8 @@ } \ProvidesExplPackage {tikzsymbols} - {2017/05/14} - {4.02} + {2017/09/05} + {4.07} {Some symbols created using tikz and LaTeX3.} \@ifpackageloaded { tikz } {} { \RequirePackage { tikz } } \@ifpackageloaded { xcolor } {} { \RequirePackage { xcolor } } @@ -52,9 +50,7 @@ \bool_new:N \g__tikzsymbols_if_opt_tree_print_bool \bool_new:N \g__tikzsymbols_if_opt_draft_bool \bool_new:N \g__tikzsymbols_if_opt_marvosym_bool -\bool_new:N \g__tikzsymbols_if_opt_usebox_bool \bool_gset_true:N \g__tikzsymbols_if_opt_tree_print_bool -\bool_gset_true:N \g__tikzsymbols_if_opt_usebox_bool \tl_clear_new:N \g__tikzsymbols_command_prefix_tl \tl_new:N \l__tikzsymbols_tikzsymbols_after_symbol_tl \tl_new:N \l__tikzsymbols_current_situation_tl @@ -62,6 +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 +\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 \fp_new:N \l__tikzsymbols_Strichmaxerl_x_RA_fp \fp_new:N \l__tikzsymbols_Strichmaxerl_x_LB_fp @@ -73,19 +72,13 @@ \fp_new:N \__tikzsymbols_Strichmaxerl_x_max_fp \fp_new:N \__tikzsymbols_Strichmaxerl_x_min_fp \dim_new:N \l__tikzsymbols_Moai_thickness_dim -\clist_new:N \l__tikzsymbols_tmpa_clist -\clist_new:N \g_tikzsymbols_list_of_commands_clist -\clist_new:N \g_tikzsymbols_list_of_english_commands_clist -\clist_new:N \g_tikzsymbols_list_of_cooking_commands_clist -\clist_new:N \g_tikzsymbols_list_of_emoticons_commands_clist -\clist_new:N \g_tikzsymbols_list_of_other_commands_clist \clist_new:N \g_tikzsymbols_list_of_printing_cooking_with_argument_commands_clist +\prop_new:N \g__tikzsymbols_english_commands_prop \msg_new:nnnn { tikzsymbols } { obsolete-option } { Option \ '#1' \ is \ obsolete. \ Please \ use \ '#2' \ instead. - } - { + }{ The \ option \ you \ used \ is \ obsolete. \msg_see_documentation_text:n { tikzsymbols } } @@ -93,8 +86,7 @@ { Undefined \ Control \ sequence: \ '#1'. \ Did \ you \ write \ the \ name \ correctly? - } - { + }{ The \ command \ is \ not \ defined. \msg_see_documentation_text:n { tikzsymbols } } @@ -153,12 +145,116 @@ \exp_not:N\tikzsymbolsaftersymbolinput is \ not \ supported \ anymore. \msg_see_documentation_text:n { tikzsymbols } } -\cs_new:Npn \__tikzsymbols_Basic_Tree_aux:nnnnn { } +\msg_new:nnnn { tikzsymbols } { SchrodingersCat } + { + \SchrodingersCat\ only \ accepts \ '-1' \ (dead), \ '0'\ (unknown)\ or \ '1'\ + (alive) \ for \ its \ mandatroy \ argument. \ You \ have \ given \ '#1'. + }{ + Your \ input \ number \ is \ not \ allowed. + \msg_see_documentation_text:n { tikzsymbols } + } +\msg_new:nnnn { tikzsymbols } { internal-message } + { + This \ is \ an \ internal \ message \ and \ means \ that \ + I \ (the \ package \ author) \ fucked \ up. \ If \ you \ + stumble \ across \ this, \ the \ description \ message \ + is \ '#1'. + }{ + I \ apologize \ for \ that. + \msg_see_documentation_text:n { tikzsymbols } + } +\msg_new:nnnn { tikzsymbols } { package-option } + { + The \ option \ '#1' \ is \ only \ allowed \ as \ a \ package + \ option. + }{ + This \ option \ is \ not \ allowed \ to \ be \ set \ + using \ \tikzsymbolsset{}. + \msg_see_documentation_text:n { tikzsymbols } + } +\msg_new:nnnn { tikzsymbols } { symbol-name-unknown } + { + The \ symbol \ '#1' \ is \ not \ available \ by \ this \ package. + }{ + 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 } + } +\cs_new:Npn \__tikzsymbols_symbol_scale_ii:nn #1#2 + { + \prop_get:NnNTF \g__tikzsymbols_english_commands_prop {#1} \l_tmpa_tl + { + \fp_set:cn { l__tikzsymbols_ \l_tmpa_tl _scale_fp } {#2} + }{ + \fp_if_exist:cTF { l__tikzsymbols_#1_scale_fp } + { \fp_set:cn { l__tikzsymbols_#1_scale_fp } {#2} } + { \msg_error:nnn { tikzsymbols} { symbol-name-unknown } {#1} } + } + } +\cs_new:Npn \__tikzsymbols_set_scale_abs_tl:n #1 + { + \tl_set:Nx \l__tikzsymbols_scale_abs_tl { \fp_eval:n { abs (#1) } } + } +\cs_new:Npn \__tikzsymbols_create_draftbox:nn #1#2 + { + \group_begin: + \vbadness=\c_max_dim + \fp_set:Nn \l_tmpa_fp {#1} + \fp_set:Nn \l_tmpb_fp {#2} + \frame + { + \vbox_to_ht:nn { \fp_to_dim:N \l_tmpb_fp } + { + \hbox_to_wd:nn { \fp_to_dim:N \l_tmpa_fp } { } + } + } + \group_end: + } +\cs_new:Npn \__tikzsymbols_create_squared_draftbox:n #1 + { + \__tikzsymbols_create_draftbox:nn {#1} {#1} + } +\cs_new:Npn \__tikzsymbols_if_savebox_undefined:nT #1#2 + { + \tl_set:Nx \l__tikzsymbols_current_situation_tl + { + \bool_if:NTF \g__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 } + { + \box_new:c { g__tikzsymbols_savebox_ \l__tikzsymbols_current_situation_tl _ #1 _box } + \exp_args:NNc \global \sbox + { g__tikzsymbols_savebox_ \l__tikzsymbols_current_situation_tl _ #1 _box } {#2} + } + } +\cs_new:Npn \__tikzsymbols_use_savebox:n #1 + { + \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 + { + \__tikzsymbols_if_savebox_undefined:nT {#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 } } \keys_define:nn { tikzsymbols } { final .bool_gset_inverse:N = \g__tikzsymbols_if_opt_draft_bool , final .default:n = { true } , - final .groups:n = { document } , draft .choices:nn = { true , false , absolute } { @@ -170,89 +266,67 @@ { \msg_error:nnnn { tikzsymbols } { obsolete-option } { draft = absolute } { draft = true } - \bool_gset_true:N \g__tikzsymbols_if_opt_draft_bool + \bool_gset_true:N \g__tikzsymbols_if_opt_draft_bool } } } , draft .default:n= { false } , - draft .groups:n = { document } , draftabsolute .code:n = { \msg_error:nnnn { tikzsymbols } { obsolete-option } { draftabsolute } { draft = true } \bool_gset_true:N \g__tikzsymbols_if_opt_draft_bool } , - draftabsolute .groups:n = { document } , marvosym .bool_gset:N = \g__tikzsymbols_if_opt_marvosym_bool , marvosym .default:n = { true } , marvosym .groups:n = { package } , - usebox .bool_gset:N = \g__tikzsymbols_if_opt_usebox_bool , + usebox .choice: , + usebox/true .code:n = + {  + \cs_set_eq:NN + \__tikzsymbols_provide_savebox_and_use:nT + \__tikzsymbols_provide_savebox_and_use_aux:nT + } , + usebox/false .code:n = + {  + \cs_set_eq:NN + \__tikzsymbols_provide_savebox_and_use:nT + \use_ii:nn + } , usebox .default:n = { true } , - usebox .groups:n = { package } , prefix .tl_gset:N = \g__tikzsymbols_command_prefix_tl , prefix .default:n = { tikzsymbols } , prefix .groups:n = { package } , tree .choices:nn = { true , on , false , off } { - \int_compare:nTF { \l_keys_choice_int <= 2 } + \int_compare:nNnTF { \l_keys_choice_int } < { 3 } { \bool_gset_true:N \g__tikzsymbols_if_opt_tree_print_bool } { \bool_gset_false:N \g__tikzsymbols_if_opt_tree_print_bool } } , tree .default:n = { true } , - tree .groups:n = { document } , after-symbol .tl_set:N = \l__tikzsymbols_tikzsymbols_after_symbol_tl , after-symbol .default:n= { \xspace } , - after-symbol .groups:n = { document } , baseline .choice: , - baseline / true .code:n = { \pgfkeys{ /__tikzsymbols/.style={baseline=default} } } , + baseline / true .code:n = { \pgfkeys{ /__tikzsymbols/.style={ baseline=default } } } , baseline / false .code:n = { \pgfkeys{ /__tikzsymbols/.style={ } } } , baseline .default:n = { true } , - } -\pgfkeys{ /__tikzsymbols/.style={baseline=default} } -\ProcessKeysOptions { tikzsymbols } -\cs_new:Npn \__tikzsymbols_set_scale_abs_tl:n #1 - { - \tl_set:Nx \l__tikzsymbols_scale_abs_tl { \fp_to_tl:n { abs (#1) } } - } -\cs_new:Npn \__tikzsymbols_create_draftbox:nn #1#2 - { - \group_begin: - \vbadness=\c_max_dim - \fp_set:Nn \l_tmpa_fp {#1} - \fp_set:Nn \l_tmpb_fp {#2} - \frame + global-scale .fp_set:N = \l__tikzsymbols_global_scale_fp , + global-scale .default:n = { 1 } , + symbol-scale .code:n = { - \vbox_to_ht:nn { \fp_to_dim:N \l_tmpb_fp } + \tl_set:Nn \l__tikzsymbols_used_only_once_because_no_better_idea_tl { - \hbox_to_wd:nn { \fp_to_dim:N \l_tmpa_fp } { } + symbol-scale = {#1} , } - } - \group_end: - } -\cs_new:Npn \__tikzsymbols_create_squared_draftbox:n #1 - { - \__tikzsymbols_create_draftbox:nn {#1} {#1} - } -\cs_new:Npn \__tikzsymbols_if_savebox_undefined:nT #1#2 - { - \tl_set:Nx \l__tikzsymbols_current_situation_tl { \current@color _ \f@size } - \box_if_exist:cF { g__tikzsymbols_savebox_ \l__tikzsymbols_current_situation_tl _ #1 _box } - { - \box_new:c { g__tikzsymbols_savebox_ \l__tikzsymbols_current_situation_tl _ #1 _box } - \exp_args:NNc \global \sbox - { g__tikzsymbols_savebox_ \l__tikzsymbols_current_situation_tl _ #1 _box } {#2} - } - } -\cs_new:Npn \__tikzsymbols_if_savebox_undefined_define_fi_and_use_it_afterwards:nT #1#2 - { - \__tikzsymbols_if_savebox_undefined:nT {#1} {#2} - \__tikzsymbols_use_savebox:n {#1} + } , + symbol-scale .default:n = { } , } -\cs_new:Npn \__tikzsymbols_use_savebox:n #1 +\ProcessKeysOptions { tikzsymbols } +\keys_define:nn { tikzsymbols } { - \exp_args:Nc \usebox - { g__tikzsymbols_savebox_ \l__tikzsymbols_current_situation_tl _ #1 _box } + symbol-scale .code:n = + { \keyval_parse:NNn \__tikzsymbols_symbol_scale_i:n \__tikzsymbols_symbol_scale_ii:nn {#1} } } \cs_new:Npn \__tikzsymbols_if_empty:Tn #1#2 { @@ -260,10 +334,23 @@ { \tl_set:Nn \ProcessedArgument {#1} } { \tl_set:Nn \ProcessedArgument {#2} } } -\cs_new_protected:Npn \__tikzsymbols_parse_command_options:n #1 +\cs_new:Npn \__tikzsymbols_scale_if_empty:nTn #1#2#3 + { + \tl_set:Nx \ProcessedArgument + { + \fp_eval:n + { + \tl_if_empty:nTF {#3} {#2} {#3} + * \l__tikzsymbols_global_scale_fp + * \use:c { l__tikzsymbols_#1_scale_fp } + } + } + } +\cs_new_protected:Npn \__tikzsymbols_parse_command_options:nn #1#2 { \clist_clear:N \l_tmpa_clist - \__tikzsymbols_parse_command_options:N #1 + \tl_set:Nn \l_tmpa_tl {#1} + \__tikzsymbols_parse_command_options:N #2 \q_recursion_tail \q_recursion_tail \q_recursion_tail \q_recursion_stop } \cs_new_protected:Npn \__tikzsymbols_parse_command_options:N #1 @@ -271,10 +358,19 @@ \quark_if_recursion_tail_stop:N #1 \tl_if_eq:NNTF #1 O { \__tikzsymbols_parse_option_type_O:w #1 } - { \__tikzsymbols_parse_option_type:w #1 } + { + \tl_if_eq:NNTF #1 S + { \__tikzsymbols_parse_option_type_S:Vw \l_tmpa_tl #1 } + { \__tikzsymbols_parse_option_type:w #1 } + } } \cs_new_protected:Npn \__tikzsymbols_parse_option_type:w #1 { + \str_case:nnF {#1} + { + { m } { } + } + { \msg_error:nnn { tikzsymbols } { internal-message } { internal-parsing } } \clist_put_right:Nn \l_tmpa_clist {#1} \__tikzsymbols_parse_command_options:N } @@ -283,11 +379,17 @@ \clist_put_right:Nn \l_tmpa_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 } } + \__tikzsymbols_parse_command_options:N + } +\cs_generate_variant:Nn \__tikzsymbols_parse_option_type_S:nw { Vw } \cs_new:Npn \__tikzsymbols_Declare_Document_Command:nnn #1#2#3 { - \clist_put_right:Nn \g_tikzsymbols_list_of_commands_clist {#1} - \clist_put_right:Nn \l__tikzsymbols_tmpa_clist {#1} - \__tikzsymbols_parse_command_options:n {#2} + \fp_new:c { l__tikzsymbols_#1_scale_fp } + \fp_set:cn { l__tikzsymbols_#1_scale_fp } { 1.0 } + \__tikzsymbols_parse_command_options:nn {#1} {#2} \exp_args:Ncx \DeclareDocumentCommand { \g__tikzsymbols_command_prefix_tl #1 } { \clist_use:Nn \l_tmpa_clist {} } @@ -300,39 +402,21 @@ \tl_use:N \l__tikzsymbols_tikzsymbols_after_symbol_tl } } -\prop_new:N \g__tikzsymbols_english_commands_prop \cs_new:Npn \__tikzsymbols_Declare_Document_Commands:nnnn #1#2#3#4 { \clist_put_right:Nn \g_tikzsymbols_list_of_printing_cooking_with_argument_commands_clist - { - \cs{#1} & \cs{#2} & \oarg{scale} & \tikzsymbolsuse{#1} \\ - } + { + \cs{#1} & \cs{#2} & \oarg{scale} & \tikzsymbolsuse{#1} \\ + } \prop_gput:Nnn \g__tikzsymbols_english_commands_prop {#2} {#1} \__tikzsymbols_Declare_Document_Command:nnn {#1} {#3} {#4} \__tikzsymbols_let:nn {#2} {#1} } \cs_new:Npn \__tikzsymbols_let:nn #1#2 { - \clist_put_right:Nn \g_tikzsymbols_list_of_commands_clist {#1} - \clist_put_right:Nn \g_tikzsymbols_list_of_english_commands_clist {#1} - \clist_put_right:Nn \l__tikzsymbols_tmpa_clist {#1} \cs_set_eq:cc { \g__tikzsymbols_command_prefix_tl #1 } { \g__tikzsymbols_command_prefix_tl #2 } } -\AtBeginDocument - { - \bool_if:NF \g__tikzsymbols_if_opt_usebox_bool - { - \cs_set_eq:NN \__tikzsymbols_if_savebox_undefined:nT \use_ii:nn - \cs_set_eq:NN \__tikzsymbols_use_savebox:n \use_none:n - } - } -\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 } - } \tl_const:Nn \c__tikzsymbols_tikz_set_tl { \tikzset @@ -439,9 +523,9 @@ } \group_end: } -\__tikzsymbols_Declare_Document_Commands:nnnn { Kochtopf } { pot } { O{1} } +\__tikzsymbols_Declare_Document_Commands:nnnn { Kochtopf } { pot } { S } { - \__tikzsymbols_if_savebox_undefined_define_fi_and_use_it_afterwards:nT { Kochtopf_#1 } + \__tikzsymbols_provide_savebox_and_use:nT { Kochtopf_#1 } { \__tikzsymbols_set_scale_abs_tl:n {#1} \bool_if:NTF \g__tikzsymbols_if_opt_draft_bool @@ -460,20 +544,20 @@ \draw[decorate, decoration= { snake , amplitude=0.12ex*\l__tikzsymbols_scale_abs_tl , segment ~ length=0.93ex * \l__tikzsymbols_scale_abs_tl } ] (0,0.35) -- (1,0.35); - \draw (0.45,0.1) circle (0.04); - \draw (0.7,0.11) circle (0.04); - \draw (0.13, 0.125) circle (0.04); - \draw (0.3,0.2) circle (0.04); - \draw (0.88,0.2) circle (0.04); - \draw (0.1,0.25) circle (0.04); - \draw (0.6,0.25) circle (0.04); + \draw (0.45,0.1) circle [radius=0.04]; + \draw (0.7,0.11) circle [radius=0.04]; + \draw (0.13, 0.125) circle [radius=0.04]; + \draw (0.3,0.2) circle [radius=0.04]; + \draw (0.88,0.2) circle [radius=0.04]; + \draw (0.1,0.25) circle [radius=0.04]; + \draw (0.6,0.25) circle [radius=0.04]; \end{tikzpicture} } } } -\__tikzsymbols_Declare_Document_Commands:nnnn { Bratpfanne } { fryingpan } { O{1} } +\__tikzsymbols_Declare_Document_Commands:nnnn { Bratpfanne } { fryingpan } { S } { - \__tikzsymbols_if_savebox_undefined_define_fi_and_use_it_afterwards:nT { Bratpfanne_#1 } + \__tikzsymbols_provide_savebox_and_use:nT { Bratpfanne_#1 } { \__tikzsymbols_set_scale_abs_tl:n {#1} \bool_if:NTF \g__tikzsymbols_if_opt_draft_bool @@ -504,9 +588,9 @@ } } } -\__tikzsymbols_Declare_Document_Commands:nnnn { Schneebesen } { eggbeater } { O{1} } +\__tikzsymbols_Declare_Document_Commands:nnnn { Schneebesen } { eggbeater } { S } { - \__tikzsymbols_if_savebox_undefined_define_fi_and_use_it_afterwards:nT { Schneebesen_#1 } + \__tikzsymbols_provide_savebox_and_use:nT { Schneebesen_#1 } { \__tikzsymbols_set_scale_abs_tl:n {#1} \bool_if:NTF \g__tikzsymbols_if_opt_draft_bool @@ -533,9 +617,9 @@ } } } -\__tikzsymbols_Declare_Document_Commands:nnnn { Sieb } { sieve } { O{1} } +\__tikzsymbols_Declare_Document_Commands:nnnn { Sieb } { sieve } { S } { - \__tikzsymbols_if_savebox_undefined_define_fi_and_use_it_afterwards:nT { Sieb_#1 } + \__tikzsymbols_provide_savebox_and_use:nT { Sieb_#1 } { \__tikzsymbols_set_scale_abs_tl:n {#1} \bool_if:NTF \g__tikzsymbols_if_opt_draft_bool @@ -562,9 +646,9 @@ } } } -\__tikzsymbols_Declare_Document_Commands:nnnn { Purierstab } { blender } { O{1} } +\__tikzsymbols_Declare_Document_Commands:nnnn { Purierstab } { blender } { S } { - \__tikzsymbols_if_savebox_undefined_define_fi_and_use_it_afterwards:nT { Purierstab_#1 } + \__tikzsymbols_provide_savebox_and_use:nT { Purierstab_#1 } { \__tikzsymbols_set_scale_abs_tl:n {#1} \bool_if:NTF \g__tikzsymbols_if_opt_draft_bool @@ -587,9 +671,9 @@ } } } -\__tikzsymbols_Declare_Document_Commands:nnnn { Dreizack } { trident } { O{1} } +\__tikzsymbols_Declare_Document_Commands:nnnn { Dreizack } { trident } { S } { - \__tikzsymbols_if_savebox_undefined_define_fi_and_use_it_afterwards:nT { Dreizack_#1 } + \__tikzsymbols_provide_savebox_and_use:nT { Dreizack_#1 } { \__tikzsymbols_set_scale_abs_tl:n {#1} \bool_if:NTF \g__tikzsymbols_if_opt_draft_bool @@ -612,9 +696,9 @@ } } } -\__tikzsymbols_Declare_Document_Commands:nnnn { Backblech } { bakingplate } { O{1} } +\__tikzsymbols_Declare_Document_Commands:nnnn { Backblech } { bakingplate } { S } { - \__tikzsymbols_if_savebox_undefined_define_fi_and_use_it_afterwards:nT { Backblech_#1 } + \__tikzsymbols_provide_savebox_and_use:nT { Backblech_#1 } { \__tikzsymbols_set_scale_abs_tl:n {#1} \bool_if:NTF \g__tikzsymbols_if_opt_draft_bool @@ -634,14 +718,14 @@ (\xI,0) -- (\xII,0) -- (\xII,0.3) -- (\xI,0.3); \foreach \__tikzsymbols_BackblechlochX in { 0.007 , 0.293 } \foreach \__tikzsymbols_BackblechlochY in { 0.007 , 0.293 } - \fill[white] (\__tikzsymbols_BackblechlochX, \__tikzsymbols_BackblechlochY) circle (0.02ex); + \fill[white] (\__tikzsymbols_BackblechlochX, \__tikzsymbols_BackblechlochY) circle [radius=0.02ex]; \end{tikzpicture}% } } } -\__tikzsymbols_Declare_Document_Commands:nnnn { Ofen } { oven } { O{1} } +\__tikzsymbols_Declare_Document_Commands:nnnn { Ofen } { oven } { S } { - \__tikzsymbols_if_savebox_undefined_define_fi_and_use_it_afterwards:nT { Ofen_#1 } + \__tikzsymbols_provide_savebox_and_use:nT { Ofen_#1 } { \__tikzsymbols_set_scale_abs_tl:n {#1} \bool_if:NTF \g__tikzsymbols_if_opt_draft_bool @@ -658,16 +742,16 @@ \draw (0,0) rectangle (4,3); \draw (0.25,0.25) rectangle (3.75,2); \foreach \__tikzsymbols_Ofenschalter in {0.5,1.1,2.9,3.5} - \fill (\__tikzsymbols_Ofenschalter,2.5) circle (0.22); + \fill (\__tikzsymbols_Ofenschalter,2.5) circle [radius=0.22]; \draw (1.5,2.28) rectangle (2.5,2.72); \draw[line ~ width=0.05ex * \l__tikzsymbols_scale_abs_tl] (1,1.75) -- (3,1.75); \end{tikzpicture}% } } } -\__tikzsymbols_Declare_Document_Commands:nnnn { Pfanne } { pan } { O{1} } +\__tikzsymbols_Declare_Document_Commands:nnnn { Pfanne } { pan } { S } { - \__tikzsymbols_if_savebox_undefined_define_fi_and_use_it_afterwards:nT { Pfanne_#1 } + \__tikzsymbols_provide_savebox_and_use:nT { Pfanne_#1 } { \__tikzsymbols_set_scale_abs_tl:n {#1} \bool_if:NTF \g__tikzsymbols_if_opt_draft_bool @@ -699,9 +783,9 @@ } } } -\__tikzsymbols_Declare_Document_Commands:nnnn { Herd } { cooker } { O{1} } +\__tikzsymbols_Declare_Document_Commands:nnnn { Herd } { cooker } { S } { - \__tikzsymbols_if_savebox_undefined_define_fi_and_use_it_afterwards:nT { Herd_#1 } + \__tikzsymbols_provide_savebox_and_use:nT { Herd_#1 } { \__tikzsymbols_set_scale_abs_tl:n {#1} \bool_if:NTF \g__tikzsymbols_if_opt_draft_bool @@ -717,17 +801,17 @@ ] \draw[line ~ width=0.08ex* \l__tikzsymbols_scale_abs_tl ] (0,0) rectangle (2,1.5); \foreach \y/\radius in { 0.45/0.35 , 0.45/0.2 , 1.15/0.21 } - \draw (0.5,\y) circle (\radius); - \draw (1.45,1.15) circle (0.15); - \draw (1.45,0.45) circle (0.3); + \draw (0.5,\y) circle [radius=\radius]; + \draw (1.45,1.15) circle [radius=0.15]; + \draw (1.45,0.45) circle [radius=0.3]; \draw (1.05,0.95) rectangle (1.85,1.35); \end{tikzpicture}% } } } -\__tikzsymbols_Declare_Document_Commands:nnnn { Saftpresse } { squeezer } { O{1} } +\__tikzsymbols_Declare_Document_Commands:nnnn { Saftpresse } { squeezer } { S } { - \__tikzsymbols_if_savebox_undefined_define_fi_and_use_it_afterwards:nT { Saftpresse_#1 } + \__tikzsymbols_provide_savebox_and_use:nT { Saftpresse_#1 } { \__tikzsymbols_set_scale_abs_tl:n {#1} \bool_if:NTF \g__tikzsymbols_if_opt_draft_bool @@ -760,9 +844,9 @@ } } } -\__tikzsymbols_Declare_Document_Commands:nnnn { Schussel } { bowl } { O{1} } +\__tikzsymbols_Declare_Document_Commands:nnnn { Schussel } { bowl } { S } { - \__tikzsymbols_if_savebox_undefined_define_fi_and_use_it_afterwards:nT { Schussel_#1 } + \__tikzsymbols_provide_savebox_and_use:nT { Schussel_#1 } { \__tikzsymbols_set_scale_abs_tl:n {#1} \bool_if:NTF \g__tikzsymbols_if_opt_draft_bool @@ -784,9 +868,9 @@ } } } -\__tikzsymbols_Declare_Document_Commands:nnnn { Schaler } { peeler } { O{1} } +\__tikzsymbols_Declare_Document_Commands:nnnn { Schaler } { peeler } { S } { - \__tikzsymbols_if_savebox_undefined_define_fi_and_use_it_afterwards:nT { Schaler_#1 } + \__tikzsymbols_provide_savebox_and_use:nT { Schaler_#1 } { \__tikzsymbols_set_scale_abs_tl:n {#1} \bool_if:NTF \g__tikzsymbols_if_opt_draft_bool @@ -809,9 +893,9 @@ } } } -\__tikzsymbols_Declare_Document_Commands:nnnn { Reibe } { grater } { O{1} } +\__tikzsymbols_Declare_Document_Commands:nnnn { Reibe } { grater } { S } { - \__tikzsymbols_if_savebox_undefined_define_fi_and_use_it_afterwards:nT { Reibe_#1 } + \__tikzsymbols_provide_savebox_and_use:nT { Reibe_#1 } { \__tikzsymbols_set_scale_abs_tl:n {#1} \bool_if:NTF \g__tikzsymbols_if_opt_draft_bool @@ -829,14 +913,14 @@ \draw[rounded ~ corners=0.04ex] (0.05,1.2) rectangle (0.95,1.5); \foreach\x in { 0.2, 0.4 , 0.6 , 0.8} \foreach\y in { 0.2 , 0.4, 0.6 , 0.8, 1} - \fill (\x,\y) circle (0.05ex); + \fill (\x,\y) circle [radius=0.05ex]; \end{tikzpicture}% } } } -\__tikzsymbols_Declare_Document_Commands:nnnn { Flasche } { bottle } { O{1} } +\__tikzsymbols_Declare_Document_Commands:nnnn { Flasche } { bottle } { S } { - \__tikzsymbols_if_savebox_undefined_define_fi_and_use_it_afterwards:nT { Flasche_#1 } + \__tikzsymbols_provide_savebox_and_use:nT { Flasche_#1 } { \__tikzsymbols_set_scale_abs_tl:n {#1} \bool_if:NTF \g__tikzsymbols_if_opt_draft_bool @@ -858,9 +942,9 @@ } } } -\__tikzsymbols_Declare_Document_Commands:nnnn { Nudelholz } { rollingpin } { O{1} } +\__tikzsymbols_Declare_Document_Commands:nnnn { Nudelholz } { rollingpin } { S } { - \__tikzsymbols_if_savebox_undefined_define_fi_and_use_it_afterwards:nT { Nudelholz_#1 } + \__tikzsymbols_provide_savebox_and_use:nT { Nudelholz_#1 } { \__tikzsymbols_set_scale_abs_tl:n {#1} \bool_if:NTF \g__tikzsymbols_if_opt_draft_bool @@ -879,7 +963,8 @@ (3,0.75) -- (3.25,0.6) -- (3.75,0.7) -- (4.25,0.6) (3,0.25) -- ( 3.25,0.4 ) -- (3.75,0.3) -- (4.25,0.4); \draw (4.25,0.5) ellipse [x ~ radius=0.01, y ~ radius=0.1]; - \draw[rounded ~ corners=0.15ex*#1] (-0,0.75) -- (-0.25,0.6) -- (-0.75,0.7) + \draw[rounded ~ corners=0.15ex*\l__tikzsymbols_scale_abs_tl] + (-0,0.75) -- (-0.25,0.6) -- (-0.75,0.7) -- (-1.25,0.6) (-0,0.25) -- ( -0.25,0.4 ) -- (-0.75,0.3) -- (-1.25,0.4); \draw (-1.25,0.5) ellipse [x ~ radius=0.01, y ~ radius=0.1]; @@ -887,11 +972,9 @@ } } } -\clist_set_eq:NN \g_tikzsymbols_list_of_cooking_commands_clist \l__tikzsymbols_tmpa_clist -\clist_clear:N \l__tikzsymbols_tmpa_clist -\__tikzsymbols_Declare_Document_Command:nnn { Sadey } { O{1} O{none} } +\__tikzsymbols_Declare_Document_Command:nnn { Sadey } { S O{none} } { - \__tikzsymbols_if_savebox_undefined_define_fi_and_use_it_afterwards:nT { Sadey_#1_#2 } + \__tikzsymbols_provide_savebox_and_use:nT { Sadey_#1_#2 } { \__tikzsymbols_set_scale_abs_tl:n {#1} \bool_if:NTF \g__tikzsymbols_if_opt_draft_bool @@ -903,17 +986,17 @@ /__tikzsymbols , x=2.4ex , y=2.4ex, line ~ width=0.09ex * \l__tikzsymbols_scale_abs_tl , scale = #1 ] - \filldraw[fill=#2, line ~ width=0.1ex* \l__tikzsymbols_scale_abs_tl ] (0,0) circle (0.33); - \fill (0.1,0.1) circle (0.05); - \fill (-0.1,0.1) circle (0.05); + \filldraw[fill=#2, line ~ width=0.1ex* \l__tikzsymbols_scale_abs_tl ] (0,0) circle [radius=0.33]; + \fill (0.1,0.1) circle [radius=0.05]; + \fill (-0.1,0.1) circle [radius=0.05]; \draw (-0.2,-0.15) .. controls (-0.1,-0.06) and (0.1,-0.06) .. (0.2,-0.15); \end{tikzpicture} } } } -\__tikzsymbols_Declare_Document_Command:nnn { dSadey } { O{1} O{yellow} } +\__tikzsymbols_Declare_Document_Command:nnn { dSadey } { S O{yellow} } { - \__tikzsymbols_if_savebox_undefined_define_fi_and_use_it_afterwards:nT { dSadey_#1_#2 } + \__tikzsymbols_provide_savebox_and_use:nT { dSadey_#1_#2 } { \__tikzsymbols_set_scale_abs_tl:n {#1} \bool_if:NTF \g__tikzsymbols_if_opt_draft_bool @@ -925,17 +1008,17 @@ /__tikzsymbols , x=2.4ex, y=2.4ex, line ~ width=0.09ex * \l__tikzsymbols_scale_abs_tl , scale = #1 ] - \shade[ball ~ color=#2] (0,0) circle (0.33); - \shade[ball ~ color=black] (0.1,0.1) circle (0.05); - \shade[ball ~ color=black] (-0.1,0.1) circle (0.05); + \shade[ball ~ color=#2] (0,0) circle [radius=0.33]; + \shade[ball ~ color=black] (0.1,0.1) circle [radius=0.05]; + \shade[ball ~ color=black] (-0.1,0.1) circle [radius=0.05]; \draw[black] (-0.2,-0.15) .. controls (-0.1,-0.06) and (0.1,-0.06) .. (0.2,-0.15); \end{tikzpicture}% } } } -\__tikzsymbols_Declare_Document_Command:nnn { Changey } { O{1} O{white} m } +\__tikzsymbols_Declare_Document_Command:nnn { Changey } { S O{white} m } { - \__tikzsymbols_if_savebox_undefined_define_fi_and_use_it_afterwards:nT { Changey_#1_#2_#3 } + \__tikzsymbols_provide_savebox_and_use:nT { Changey_#1_#2_#3 } { \fp_compare:nT { abs(#3) > 2 } { \msg_error:nnn { tikzsymbols } { Changey-number-too-large } {#3} } @@ -949,9 +1032,9 @@ /__tikzsymbols , x=2.4ex, y=2.4ex, line ~ width=0.12ex* \l__tikzsymbols_scale_abs_tl ,scale=#1 ] - \filldraw[fill=#2] (0,0) circle (0.33); - \fill (-0.1,0.1) circle (0.05); - \fill (0.1,0.1) circle (0.05); + \filldraw[fill=#2] (0,0) circle [radius=0.33]; + \fill (-0.1,0.1) circle [radius=0.05]; + \fill (0.1,0.1) circle [radius=0.05]; \pgfmathsetmacro \l_tmpa_tl { -0.125 + 0.025*#3 } \pgfmathsetmacro \l_tmpb_tl { \l_tmpa_tl - 0.1*#3 } \draw @@ -963,9 +1046,9 @@ } } } -\__tikzsymbols_Declare_Document_Command:nnn { dChangey } { O{1} O{yellow} m } +\__tikzsymbols_Declare_Document_Command:nnn { dChangey } { S O{yellow} m } { - \__tikzsymbols_if_savebox_undefined_define_fi_and_use_it_afterwards:nT { dChangey_#1_#2_#3 } + \__tikzsymbols_provide_savebox_and_use:nT { dChangey_#1_#2_#3 } { \fp_compare:nT { abs(#3) > 2 } { \msg_error:nnn { tikzsymbols } { Changey-number-too-large } {#3} } @@ -979,9 +1062,9 @@ /__tikzsymbols , x=2.4ex, y=2.4ex, line ~ width=0.12ex* \l__tikzsymbols_scale_abs_tl ,scale=#1 ] - \shade[ball ~ color=#2] (0,0) circle (0.33); - \shade[ball ~ color=black] (-0.1,0.1) circle (0.05); - \shade[ball ~ color=black] (0.1,0.1) circle (0.05); + \shade[ball ~ color=#2] (0,0) circle [radius=0.33]; + \shade[ball ~ color=black] (-0.1,0.1) circle [radius=0.05]; + \shade[ball ~ color=black] (0.1,0.1) circle [radius=0.05]; \pgfmathsetmacro \l_tmpa_tl { -0.125 + 0.025*#3 } \pgfmathsetmacro \l_tmpb_tl { \l_tmpa_tl - 0.1*#3 } \draw[black] @@ -1003,9 +1086,9 @@ \filldraw[fill=#2!#1!#3] } \cs_generate_variant:Nn \__tikzsymbols_cChangey_aux:nnn { x } -\__tikzsymbols_Declare_Document_Command:nnn { cChangey } { O{1} O{red} O{yellow} O{green} m } +\__tikzsymbols_Declare_Document_Command:nnn { cChangey } { S O{red} O{yellow} O{green} m } { - \__tikzsymbols_if_savebox_undefined_define_fi_and_use_it_afterwards:nT + \__tikzsymbols_provide_savebox_and_use:nT { cChangey_#1_#2_#3_#4_#5 } { \fp_compare:nT { abs(#5) > 2 } @@ -1023,19 +1106,19 @@ \fp_compare:nNnT {#5} < { \c_zero } { \__tikzsymbols_cChangey:nnn {#5} {#2} {#3} - (0,0) circle (0.33); + (0,0) circle [radius=0.33]; } \fp_compare:nNnT {#5} > { \c_zero } { \__tikzsymbols_cChangey:nnn {#5} {#4} {#3} - (0,0) circle (0.33); + (0,0) circle [radius=0.33]; } \fp_compare:nNnT {#5} = { \c_zero } { - \filldraw [fill=#3] (0,0) circle (0.33); + \filldraw [fill=#3] (0,0) circle [radius=0.33]; } - \fill (-0.1,0.1) circle (0.05); - \fill (0.1,0.1) circle (0.05); + \fill (-0.1,0.1) circle [radius=0.05]; + \fill (0.1,0.1) circle [radius=0.05]; \pgfmathsetmacro \l_tmpa_tl { -0.125 + 0.025*#5 } \pgfmathsetmacro \l_tmpb_tl { \l_tmpa_tl - 0.1*#5 } \draw @@ -1057,9 +1140,9 @@ \shade [ball ~ color=#2!#1!#3] } \cs_generate_variant:Nn \__tikzsymbols_dcChangey_aux:nnn { x } -\__tikzsymbols_Declare_Document_Command:nnn { dcChangey } { O{1} O{red} O{yellow} O{green} m } +\__tikzsymbols_Declare_Document_Command:nnn { dcChangey } { S O{red} O{yellow} O{green} m } { - \__tikzsymbols_if_savebox_undefined_define_fi_and_use_it_afterwards:nT + \__tikzsymbols_provide_savebox_and_use:nT { dcChangey_#1_#2_#3_#4_#5 } { \fp_compare:nT { abs(#5) > 2 } @@ -1077,19 +1160,19 @@ \fp_compare:nNnT {#5} < { \c_zero } { \__tikzsymbols_dcChangey:nnn {#5} {#2} {#3} - (0,0) circle (0.33); + (0,0) circle [radius=0.33]; } \fp_compare:nNnT {#5} > { \c_zero } { \__tikzsymbols_dcChangey:nnn {#5} {#4} {#3} - (0,0) circle (0.33); + (0,0) circle [radius=0.33]; } \fp_compare:nNnT {#5} = { \c_zero } { - \shade[ball ~ color=#3] (0,0) circle (0.33); + \shade[ball ~ color=#3] (0,0) circle [radius=0.33]; } - \shade[ball ~ color=black] (-0.1,0.1) circle (0.05); - \shade[ball ~ color=black] (0.1,0.1) circle (0.05); + \shade[ball ~ color=black] (-0.1,0.1) circle [radius=0.05]; + \shade[ball ~ color=black] (0.1,0.1) circle [radius=0.05]; \pgfmathsetmacro \l_tmpa_tl { -0.125 + 0.025*#5 } \pgfmathsetmacro \l_tmpb_tl { \l_tmpa_tl - 0.1*#5 } \draw[black] @@ -1101,9 +1184,9 @@ } } } -\__tikzsymbols_Declare_Document_Command:nnn { Annoey } { O{1} O{none} } +\__tikzsymbols_Declare_Document_Command:nnn { Annoey } { S O{none} } { - \__tikzsymbols_if_savebox_undefined_define_fi_and_use_it_afterwards:nT { Annoey_#1_#2 } + \__tikzsymbols_provide_savebox_and_use:nT { Annoey_#1_#2 } { \__tikzsymbols_set_scale_abs_tl:n {#1} \bool_if:NTF \g__tikzsymbols_if_opt_draft_bool @@ -1115,7 +1198,7 @@ /__tikzsymbols , x=2.4ex, y=2.4ex, line ~ width=0.09ex * \l__tikzsymbols_scale_abs_tl ,scale=#1 ] - \filldraw[fill=#2, line ~ width=0.12ex* \l__tikzsymbols_scale_abs_tl ] (0,0) circle (0.33); + \filldraw[fill=#2, line ~ width=0.12ex* \l__tikzsymbols_scale_abs_tl ] (0,0) circle [radius=0.33]; \draw (0.08,0.1) -- (0.22,0.1); \draw (-0.08,0.1) -- (-0.22,0.1); \draw (-0.2,-0.1) -- (0.2,-0.1); @@ -1123,9 +1206,9 @@ } } } -\__tikzsymbols_Declare_Document_Command:nnn { dAnnoey } { O{1} O{yellow} } +\__tikzsymbols_Declare_Document_Command:nnn { dAnnoey } { S O{yellow} } { - \__tikzsymbols_if_savebox_undefined_define_fi_and_use_it_afterwards:nT { dAnnoey_#1_#2 } + \__tikzsymbols_provide_savebox_and_use:nT { dAnnoey_#1_#2 } { \__tikzsymbols_set_scale_abs_tl:n {#1} \bool_if:NTF \g__tikzsymbols_if_opt_draft_bool @@ -1137,7 +1220,7 @@ /__tikzsymbols , x=2.4ex, y=2.4ex, line ~ width=0.09ex* \l__tikzsymbols_scale_abs_tl ,scale=#1 ] - \shade[ball ~ color=#2] (0,0) circle (0.33); + \shade[ball ~ color=#2] (0,0) circle [radius=0.33]; \draw[black] (0.08,0.1) -- (0.22,0.1); \draw[black] (-0.08,0.1) -- (-0.22,0.1); \draw[black] (-0.2,-0.1) -- (0.2,-0.1); @@ -1147,9 +1230,9 @@ } \bool_if:NF \g__tikzsymbols_if_opt_marvosym_bool { - \__tikzsymbols_Declare_Document_Command:nnn { Smiley } { O{1} O{none} } + \__tikzsymbols_Declare_Document_Command:nnn { Smiley } { S O{none} } { - \__tikzsymbols_if_savebox_undefined_define_fi_and_use_it_afterwards:nT { Smiley_#1_#2 } + \__tikzsymbols_provide_savebox_and_use:nT { Smiley_#1_#2 } { \__tikzsymbols_set_scale_abs_tl:n {#1} \bool_if:NTF \g__tikzsymbols_if_opt_draft_bool @@ -1161,18 +1244,18 @@ /__tikzsymbols , x=2.4ex, y=2.4ex, line ~ width=0.12ex* \l__tikzsymbols_scale_abs_tl , scale=#1 ] - \filldraw[fill=#2] (0,0) circle (0.33); - \fill (-0.1,0.1) circle (0.05); - \fill (0.1,0.1) circle (0.05); + \filldraw[fill=#2] (0,0) circle [radius=0.33]; + \fill (-0.1,0.1) circle [radius=0.05]; + \fill (0.1,0.1) circle [radius=0.05]; \draw (-0.2,-0.1) .. controls (-0.1,-0.2) and (0.1,-0.2) .. (0.2,-0.1); \end{tikzpicture}% } } } } -\__tikzsymbols_Declare_Document_Command:nnn { dSmiley } { O{1} O{yellow} } +\__tikzsymbols_Declare_Document_Command:nnn { dSmiley } { S O{yellow} } { - \__tikzsymbols_if_savebox_undefined_define_fi_and_use_it_afterwards:nT { dSmiley_#1_#2 } + \__tikzsymbols_provide_savebox_and_use:nT { dSmiley_#1_#2 } { \__tikzsymbols_set_scale_abs_tl:n {#1} \bool_if:NTF \g__tikzsymbols_if_opt_draft_bool @@ -1184,17 +1267,17 @@ /__tikzsymbols , x=2.4ex, y=2.4ex, line ~ width=0.1ex* \l__tikzsymbols_scale_abs_tl ,scale=#1 ] - \shade[ball ~ color=#2] (0,0) circle (0.33); - \shade[ball ~ color=black] (-0.1,0.1) circle (0.05); - \shade[ball ~ color=black] (0.1,0.1) circle (0.05); + \shade[ball ~ color=#2] (0,0) circle [radius=0.33]; + \shade[ball ~ color=black] (-0.1,0.1) circle [radius=0.05]; + \shade[ball ~ color=black] (0.1,0.1) circle [radius=0.05]; \draw[black] (-0.2,-0.1) .. controls (-0.1,-0.2) and (0.1,-0.2) .. (0.2,-0.1); \end{tikzpicture}% } } } -\__tikzsymbols_Declare_Document_Command:nnn { Laughey } { O{1} O{none} O{none} } +\__tikzsymbols_Declare_Document_Command:nnn { Laughey } { S O{none} O{none} } { - \__tikzsymbols_if_savebox_undefined_define_fi_and_use_it_afterwards:nT { Laughey_#1_#2_#3 } + \__tikzsymbols_provide_savebox_and_use:nT { Laughey_#1_#2_#3 } { \__tikzsymbols_set_scale_abs_tl:n {#1} \bool_if:NTF \g__tikzsymbols_if_opt_draft_bool @@ -1206,7 +1289,7 @@ /__tikzsymbols , x=2.4ex, y=2.4ex, line ~ width=0.09ex* \l__tikzsymbols_scale_abs_tl ,scale=#1 ] - \filldraw[fill=#2,line ~ width=0.12ex* \l__tikzsymbols_scale_abs_tl ] (0,0) circle (0.33); + \filldraw[fill=#2,line ~ width=0.12ex* \l__tikzsymbols_scale_abs_tl ] (0,0) circle [radius=0.33]; \draw (-0.09,0.06) .. controls (-0.11,0.16) and (-0.17,0.16) .. +(-0.1,0); \draw (0.09,0.06) .. controls (0.11,0.16) and (0.17,0.16) .. +(0.1,0); \filldraw[fill=#3,rounded ~ corners=0.1ex* \l__tikzsymbols_scale_abs_tl , yshift=-0.5] @@ -1216,9 +1299,9 @@ } } } -\__tikzsymbols_Declare_Document_Command:nnn { dLaughey } { O{1} O{yellow} O{red} } +\__tikzsymbols_Declare_Document_Command:nnn { dLaughey } { S O{yellow} O{red} } { - \__tikzsymbols_if_savebox_undefined_define_fi_and_use_it_afterwards:nT { dLaughey_#1_#2_#3 } + \__tikzsymbols_provide_savebox_and_use:nT { dLaughey_#1_#2_#3 } { \__tikzsymbols_set_scale_abs_tl:n {#1} \bool_if:NTF \g__tikzsymbols_if_opt_draft_bool @@ -1231,7 +1314,7 @@ x=2.4ex, y=2.4ex, line ~ width=0.09ex* \l__tikzsymbols_scale_abs_tl ,scale=#1, black ] - \fill[ball ~ color=#2,line ~ width=0.12ex* \l__tikzsymbols_scale_abs_tl ] (0,0) circle (0.33); + \fill[ball ~ color=#2,line ~ width=0.12ex* \l__tikzsymbols_scale_abs_tl ] (0,0) circle [radius=0.33]; \draw (-0.09,0.06) .. controls (-0.11,0.16) and (-0.17,0.16) .. +(-0.1,0); \draw (0.09,0.06) .. controls (0.11,0.16) and (0.17,0.16) .. +(0.1,0); \shade @@ -1244,9 +1327,9 @@ } } } -\__tikzsymbols_Declare_Document_Command:nnn { Neutrey } { O{1} O{none} } +\__tikzsymbols_Declare_Document_Command:nnn { Neutrey } { S O{none} } { - \__tikzsymbols_if_savebox_undefined_define_fi_and_use_it_afterwards:nT { Neutrey_#1_#2 } + \__tikzsymbols_provide_savebox_and_use:nT { Neutrey_#1_#2 } { \__tikzsymbols_set_scale_abs_tl:n {#1} \bool_if:NTF \g__tikzsymbols_if_opt_draft_bool @@ -1258,17 +1341,17 @@ /__tikzsymbols , x=2.4ex, y=2.4ex, line ~ width=0.09ex* \l__tikzsymbols_scale_abs_tl ,scale=#1 ] - \filldraw[fill=#2,line ~ width=0.12ex* \l__tikzsymbols_scale_abs_tl ] (0,0) circle (0.33); - \fill (0.1,0.1) circle (0.05); - \fill (-0.1,0.1) circle (0.05); + \filldraw[fill=#2,line ~ width=0.12ex* \l__tikzsymbols_scale_abs_tl ] (0,0) circle [radius=0.33]; + \fill (0.1,0.1) circle [radius=0.05]; + \fill (-0.1,0.1) circle [radius=0.05]; \draw (-0.2,-0.1) -- (0.2,-0.1); \end{tikzpicture}% } } } -\__tikzsymbols_Declare_Document_Command:nnn { dNeutrey } { O{1} O{yellow} } +\__tikzsymbols_Declare_Document_Command:nnn { dNeutrey } { S O{yellow} } { - \__tikzsymbols_if_savebox_undefined_define_fi_and_use_it_afterwards:nT { Neutrey_#1_#2 } + \__tikzsymbols_provide_savebox_and_use:nT { Neutrey_#1_#2 } { \__tikzsymbols_set_scale_abs_tl:n {#1} \bool_if:NTF \g__tikzsymbols_if_opt_draft_bool @@ -1280,17 +1363,17 @@ /__tikzsymbols , x=2.4ex, y=2.4ex, line ~ width=0.09ex* \l__tikzsymbols_scale_abs_tl ,scale=#1 ] - \shade[ball ~ color=#2] (0,0) circle (0.33); - \shade[ball ~ color=black] (0.1,0.1) circle (0.05); - \shade[ball ~ color=black] (-0.1,0.1) circle (0.05); + \shade[ball ~ color=#2] (0,0) circle [radius=0.33]; + \shade[ball ~ color=black] (0.1,0.1) circle [radius=0.05]; + \shade[ball ~ color=black] (-0.1,0.1) circle [radius=0.05]; \draw[black] (-0.2,-0.1) -- (0.2,-0.1); \end{tikzpicture}% } } } -\__tikzsymbols_Declare_Document_Command:nnn { Winkey } { O{1} O{none} } +\__tikzsymbols_Declare_Document_Command:nnn { Winkey } { S O{none} } { - \__tikzsymbols_if_savebox_undefined_define_fi_and_use_it_afterwards:nT { Winkey_#1_#2 } + \__tikzsymbols_provide_savebox_and_use:nT { Winkey_#1_#2 } { \__tikzsymbols_set_scale_abs_tl:n {#1} \bool_if:NTF \g__tikzsymbols_if_opt_draft_bool @@ -1302,17 +1385,17 @@ /__tikzsymbols , x=2.4ex, y=2.4ex, line ~ width=0.12ex* \l__tikzsymbols_scale_abs_tl ,scale=#1 ] - \filldraw[fill=#2] (0,0) circle (0.33); + \filldraw[fill=#2] (0,0) circle [radius=0.33]; \draw(0.17,0.1) -- (0.05,0.1); - \fill (-0.1,0.1) circle (0.05); + \fill (-0.1,0.1) circle [radius=0.05]; \draw (-0.15,-0.15) .. controls (-0.05,-0.2) and (0.15,-0.2) .. (0.19,0); \end{tikzpicture}% } } } -\__tikzsymbols_Declare_Document_Command:nnn { oldWinkey } { O{1} O{none} } +\__tikzsymbols_Declare_Document_Command:nnn { oldWinkey } { S O{none} } { - \__tikzsymbols_if_savebox_undefined_define_fi_and_use_it_afterwards:nT { oldWinkey_#1_#2 } + \__tikzsymbols_provide_savebox_and_use:nT { oldWinkey_#1_#2 } { \__tikzsymbols_set_scale_abs_tl:n {#1} \bool_if:NTF \g__tikzsymbols_if_opt_draft_bool @@ -1324,17 +1407,17 @@ /__tikzsymbols , x=2.4ex, y=2.4ex, line ~ width=0.12ex* \l__tikzsymbols_scale_abs_tl ,scale=#1 ] - \filldraw[fill=#2] (0,0) circle (0.33); + \filldraw[fill=#2] (0,0) circle [radius=0.33]; \draw(0.17,0.1) -- (0.05,0.1); - \fill (-0.1,0.1) circle (0.05); + \fill (-0.1,0.1) circle [radius=0.05]; \draw (-0.2,-0.1) .. controls (-0.1,-0.2) and (0.15,-0.2) .. (0.2,0); \end{tikzpicture}% } } } -\__tikzsymbols_Declare_Document_Command:nnn { dWinkey } { O{1} O{yellow} } +\__tikzsymbols_Declare_Document_Command:nnn { dWinkey } { S O{yellow} } { - \__tikzsymbols_if_savebox_undefined_define_fi_and_use_it_afterwards:nT { dWinkey_#1_#2 } + \__tikzsymbols_provide_savebox_and_use:nT { dWinkey_#1_#2 } { \__tikzsymbols_set_scale_abs_tl:n {#1} \bool_if:NTF \g__tikzsymbols_if_opt_draft_bool @@ -1346,17 +1429,17 @@ /__tikzsymbols , x=2.4ex, y=2.4ex, line ~ width=0.12ex* \l__tikzsymbols_scale_abs_tl ,scale=#1 ] - \shade[ball ~ color=#2] (0,0) circle (0.33); + \shade[ball ~ color=#2] (0,0) circle [radius=0.33]; \draw[black] (0.17,0.1) -- (0.05,0.1); - \shade[ball ~ color=black] (-0.1,0.1) circle (0.05); + \shade[ball ~ color=black] (-0.1,0.1) circle [radius=0.05]; \draw[black] (-0.15,-0.15) .. controls (-0.05,-0.2) and (0.15,-0.2) .. (0.19,0); \end{tikzpicture}% } } } -\__tikzsymbols_Declare_Document_Command:nnn { olddWinkey } { O{1} O{yellow} } +\__tikzsymbols_Declare_Document_Command:nnn { olddWinkey } { S O{yellow} } { - \__tikzsymbols_if_savebox_undefined_define_fi_and_use_it_afterwards:nT { olddWinkey_#1_#2 } + \__tikzsymbols_provide_savebox_and_use:nT { olddWinkey_#1_#2 } { \__tikzsymbols_set_scale_abs_tl:n {#1} \bool_if:NTF \g__tikzsymbols_if_opt_draft_bool @@ -1368,17 +1451,17 @@ /__tikzsymbols , x=2.4ex, y=2.4ex, line ~ width=0.12ex* \l__tikzsymbols_scale_abs_tl ,scale=#1 ] - \shade[ball ~ color=#2] (0,0) circle (0.33); + \shade[ball ~ color=#2] (0,0) circle [radius=0.33]; \draw[black] (0.17,0.1) -- (0.05,0.1); - \shade[ball ~ color=black] (-0.1,0.1) circle (0.05); + \shade[ball ~ color=black] (-0.1,0.1) circle [radius=0.05]; \draw[black] (-0.2,-0.1) .. controls (-0.1,-0.2) and (0.15,-0.2) .. (0.2,0); \end{tikzpicture} } } } -\__tikzsymbols_Declare_Document_Command:nnn { Sey } { O{1} O{none} } +\__tikzsymbols_Declare_Document_Command:nnn { Sey } { S O{none} } { - \__tikzsymbols_if_savebox_undefined_define_fi_and_use_it_afterwards:nT { Sey_#1_#2 } + \__tikzsymbols_provide_savebox_and_use:nT { Sey_#1_#2 } { \__tikzsymbols_set_scale_abs_tl:n {#1} \bool_if:NTF \g__tikzsymbols_if_opt_draft_bool @@ -1390,17 +1473,17 @@ /__tikzsymbols , x=2.4ex, y=2.4ex, line ~ width=0.09ex* \l__tikzsymbols_scale_abs_tl ,scale=#1 ] - \filldraw[fill=#2, line ~ width=0.12ex* \l__tikzsymbols_scale_abs_tl ] (0,0) circle (0.33); - \fill (0.1,0.1) circle (0.05); - \fill (-0.1,0.1) circle (0.05); + \filldraw[fill=#2, line ~ width=0.12ex* \l__tikzsymbols_scale_abs_tl ] (0,0) circle [radius=0.33]; + \fill (0.1,0.1) circle [radius=0.05]; + \fill (-0.1,0.1) circle [radius=0.05]; \draw (-0.2,-0.08) .. controls (-0.0,-0.2) and (0.0,0) .. (0.2,-0.12); \end{tikzpicture}% } } } -\__tikzsymbols_Declare_Document_Command:nnn { dSey } { O{1} O{yellow} } +\__tikzsymbols_Declare_Document_Command:nnn { dSey } { S O{yellow} } { - \__tikzsymbols_if_savebox_undefined_define_fi_and_use_it_afterwards:nT { dSey_#1_#2 } + \__tikzsymbols_provide_savebox_and_use:nT { dSey_#1_#2 } { \__tikzsymbols_set_scale_abs_tl:n {#1} \bool_if:NTF \g__tikzsymbols_if_opt_draft_bool @@ -1412,17 +1495,17 @@ /__tikzsymbols , x=2.4ex, y=2.4ex, line ~ width=0.09ex* \l__tikzsymbols_scale_abs_tl ,scale=#1 ] - \shade[ball ~ color=#2] (0,0) circle (0.33); - \shade[ball ~ color=black] (0.1,0.1) circle (0.05); - \shade[ball ~ color=black] (-0.1,0.1) circle (0.05); + \shade[ball ~ color=#2] (0,0) circle [radius=0.33]; + \shade[ball ~ color=black] (0.1,0.1) circle [radius=0.05]; + \shade[ball ~ color=black] (-0.1,0.1) circle [radius=0.05]; \draw[black] (-0.2,-0.08) .. controls (-0.0,-0.2) and (0.0,0) .. (0.2,-0.12); \end{tikzpicture}% } } } -\__tikzsymbols_Declare_Document_Command:nnn { Xey } { O{1} O{none} } +\__tikzsymbols_Declare_Document_Command:nnn { Xey } { S O{none} } { - \__tikzsymbols_if_savebox_undefined_define_fi_and_use_it_afterwards:nT { Xey_#1_#2 } + \__tikzsymbols_provide_savebox_and_use:nT { Xey_#1_#2 } { \__tikzsymbols_set_scale_abs_tl:n {#1} \bool_if:NTF \g__tikzsymbols_if_opt_draft_bool @@ -1434,7 +1517,7 @@ /__tikzsymbols , x=2.4ex, y=2.4ex, line ~ width=0.09ex* \l__tikzsymbols_scale_abs_tl ,scale=#1 ] - \filldraw[fill=#2, line ~ width=0.12ex* \l__tikzsymbols_scale_abs_tl ] (0,0) circle (0.33); + \filldraw[fill=#2, line ~ width=0.12ex* \l__tikzsymbols_scale_abs_tl ] (0,0) circle [radius=0.33]; \foreach \xi in { 0.05 , -0.15 } \draw (\xi,0.05) -- ++ (0.1,0.1) (-\xi,0.05) -- ++ (-0.1,0.1); \draw (-0.2,-0.15) .. controls (-0.1,-0.06) and (0.1,-0.06) .. (0.2,-0.15); @@ -1442,9 +1525,9 @@ } } } -\__tikzsymbols_Declare_Document_Command:nnn { dXey } { O{1} O{yellow} } +\__tikzsymbols_Declare_Document_Command:nnn { dXey } { S O{yellow} } { - \__tikzsymbols_if_savebox_undefined_define_fi_and_use_it_afterwards:nT { dXey_#1_#2 } + \__tikzsymbols_provide_savebox_and_use:nT { dXey_#1_#2 } { \__tikzsymbols_set_scale_abs_tl:n {#1} \bool_if:NTF \g__tikzsymbols_if_opt_draft_bool @@ -1458,7 +1541,7 @@ black ] \fill[ball ~ color=#2, line ~ width=0.12ex* \l__tikzsymbols_scale_abs_tl ] - (0,0) circle (0.33); + (0,0) circle [radius=0.33]; \foreach \xi in { 0.05 , -0.15 } \draw (\xi,0.05) -- ++ (0.1,0.1) (-\xi,0.05) -- ++ (-0.1,0.1); \draw (-0.2,-0.15) .. controls (-0.1,-0.06) and (0.1,-0.06) .. (0.2,-0.15); @@ -1466,9 +1549,9 @@ } } } -\__tikzsymbols_Declare_Document_Command:nnn { Innocey } { O{1} O{none} O{yellow} } +\__tikzsymbols_Declare_Document_Command:nnn { Innocey } { S O{none} O{yellow} } { - \__tikzsymbols_if_savebox_undefined_define_fi_and_use_it_afterwards:nT { Innocey_#1_#2_#3 } + \__tikzsymbols_provide_savebox_and_use:nT { Innocey_#1_#2_#3 } { \__tikzsymbols_set_scale_abs_tl:n {#1} \bool_if:NTF \g__tikzsymbols_if_opt_draft_bool @@ -1482,9 +1565,9 @@ /__tikzsymbols , x=2.4ex, y=2.4ex, line ~ width=0.12ex* \l__tikzsymbols_scale_abs_tl ,scale=#1 ] - \filldraw[fill=#2] (0,0) circle (0.33); - \fill (-0.1,0.1) circle (0.05); - \fill (0.1,0.1) circle (0.05); + \filldraw[fill=#2] (0,0) circle [radius=0.33]; + \fill (-0.1,0.1) circle [radius=0.05]; + \fill (0.1,0.1) circle [radius=0.05]; \draw (-0.2,-0.1) .. controls (-0.1,-0.2) and (0.1,-0.2) .. (0.2,-0.1); \draw[#3, line ~ width=0.095ex* \l__tikzsymbols_scale_abs_tl ] (0.32,0.31) arc @@ -1499,16 +1582,16 @@ } } } -\__tikzsymbols_Declare_Document_Command:nnn { wInnocey } { O{1} } +\__tikzsymbols_Declare_Document_Command:nnn { wInnocey } { S } { \group_begin: \tl_clear:N \l__tikzsymbols_tikzsymbols_after_symbol_tl \tikzsymbolsuse { Innocey } [#1] [none] [white] \group_end: } -\__tikzsymbols_Declare_Document_Command:nnn { dInnocey } { O{1} O{yellow} O{yellow} } +\__tikzsymbols_Declare_Document_Command:nnn { dInnocey } { S O{yellow} O{yellow} } { - \__tikzsymbols_if_savebox_undefined_define_fi_and_use_it_afterwards:nT { dInnocey_#1_#2_#3 } + \__tikzsymbols_provide_savebox_and_use:nT { dInnocey_#1_#2_#3 } { \__tikzsymbols_set_scale_abs_tl:n {#1} \bool_if:NTF \g__tikzsymbols_if_opt_draft_bool @@ -1523,9 +1606,9 @@ x=2.4ex, y=2.4ex, line ~ width=0.12ex* \l__tikzsymbols_scale_abs_tl ,scale=#1, black ] - \shade[ball ~ color=#2] (0,0) circle (0.33); - \shade[ball ~ color=black] (-0.1,0.1) circle (0.05); - \shade[ball ~ color=black] (0.1,0.1) circle (0.05); + \shade[ball ~ color=#2] (0,0) circle [radius=0.33]; + \shade[ball ~ color=black] (-0.1,0.1) circle [radius=0.05]; + \shade[ball ~ color=black] (0.1,0.1) circle [radius=0.05]; \draw[black] (-0.2,-0.1) .. controls (-0.1,-0.2) and (0.1,-0.2) .. (0.2,-0.1); \draw[color=#3!97!black, line ~ width=0.1ex* \l__tikzsymbols_scale_abs_tl ] (0.32,0.31) arc [start ~ angle=0, end ~ angle=360, x ~ radius = 0.32 , y ~ radius=0.1]; @@ -1537,9 +1620,9 @@ } } } -\__tikzsymbols_Declare_Document_Command:nnn { Cooley } { O{1} O{none} } +\__tikzsymbols_Declare_Document_Command:nnn { Cooley } { S O{none} } { - \__tikzsymbols_if_savebox_undefined_define_fi_and_use_it_afterwards:nT { Cooley_#1_#2 } + \__tikzsymbols_provide_savebox_and_use:nT { Cooley_#1_#2 } { \__tikzsymbols_set_scale_abs_tl:n {#1} \bool_if:NTF \g__tikzsymbols_if_opt_draft_bool @@ -1551,7 +1634,7 @@ /__tikzsymbols , x=2.4ex, y=2.4ex, line ~ width=0.12ex* \l__tikzsymbols_scale_abs_tl ,scale=#1 ] - \filldraw[fill=#2] (0,0) circle (0.33); + \filldraw[fill=#2] (0,0) circle [radius=0.33]; \foreach \xi/\xii in { 0.24/0.01 , -0.24/-0.01 } \fill[rounded ~ corners=0.1ex* \l__tikzsymbols_scale_abs_tl ] (\xi,0.15) -- (\xii,0.15) -- (\xii,0) -- (\xi,0) -- cycle; @@ -1563,9 +1646,9 @@ } } } -\__tikzsymbols_Declare_Document_Command:nnn { dCooley } { O{1} O{yellow} } +\__tikzsymbols_Declare_Document_Command:nnn { dCooley } { S O{yellow} } { - \__tikzsymbols_if_savebox_undefined_define_fi_and_use_it_afterwards:nT { dCooley_#1_#2 } + \__tikzsymbols_provide_savebox_and_use:nT { dCooley_#1_#2 } { \__tikzsymbols_set_scale_abs_tl:n {#1} \bool_if:NTF \g__tikzsymbols_if_opt_draft_bool @@ -1577,7 +1660,7 @@ /__tikzsymbols , x=2.4ex, y=2.4ex, line ~ width=0.12ex* \l__tikzsymbols_scale_abs_tl ,scale=#1 ] - \shade[ball ~ color=#2] (0,0) circle (0.33); + \shade[ball ~ color=#2] (0,0) circle [radius=0.33]; \draw[black] (0.02,0.1) -- (-0.02,0.1); \draw[black] (-0.2,0.1) -- (-0.295,0.146); \draw[black] (0.2,0.1) -- (0.295,0.146); @@ -1589,9 +1672,9 @@ } } } -\__tikzsymbols_Declare_Document_Command:nnn { Tongey } { O{1} O{none} O{none} } +\__tikzsymbols_Declare_Document_Command:nnn { Tongey } { S O{none} O{none} } { - \__tikzsymbols_if_savebox_undefined_define_fi_and_use_it_afterwards:nT { Tongey_#1_#2_#3 } + \__tikzsymbols_provide_savebox_and_use:nT { Tongey_#1_#2_#3 } { \__tikzsymbols_set_scale_abs_tl:n {#1} \bool_if:NTF \g__tikzsymbols_if_opt_draft_bool @@ -1603,9 +1686,9 @@ /__tikzsymbols , x=2.4ex, y=2.4ex, line ~ width=0.12ex* \l__tikzsymbols_scale_abs_tl ,scale=#1 ] - \filldraw[fill=#2] (0,0) circle (0.33); - \fill (-0.1,0.1) circle (0.05); - \fill (0.1,0.1) circle (0.05); + \filldraw[fill=#2] (0,0) circle [radius=0.33]; + \fill (-0.1,0.1) circle [radius=0.05]; + \fill (0.1,0.1) circle [radius=0.05]; \filldraw [ fill=#3, line ~ width=0.058ex* \l__tikzsymbols_scale_abs_tl , @@ -1618,9 +1701,9 @@ } } } -\__tikzsymbols_Declare_Document_Command:nnn { dTongey } { O{1} O{yellow} O{red} } +\__tikzsymbols_Declare_Document_Command:nnn { dTongey } { S O{yellow} O{red} } { - \__tikzsymbols_if_savebox_undefined_define_fi_and_use_it_afterwards:nT { dTongey_#1_#2_#3 } + \__tikzsymbols_provide_savebox_and_use:nT { dTongey_#1_#2_#3 } { \__tikzsymbols_set_scale_abs_tl:n {#1} \bool_if:NTF \g__tikzsymbols_if_opt_draft_bool @@ -1632,9 +1715,9 @@ /__tikzsymbols , x=2.4ex, y=2.4ex, line ~ width=0.12ex* \l__tikzsymbols_scale_abs_tl ,scale=#1 ] - \shade[ball ~ color=#2] (0,0) circle (0.33); - \shade[ball ~ color=black] (-0.1,0.1) circle (0.05); - \shade[ball ~ color=black] (0.1,0.1) circle (0.05); + \shade[ball ~ color=#2] (0,0) circle [radius=0.33]; + \shade[ball ~ color=black] (-0.1,0.1) circle [radius=0.05]; + \shade[ball ~ color=black] (0.1,0.1) circle [radius=0.05]; \shadedraw [ ball ~ color=#3, draw=black,line ~ width=0.058ex* \l__tikzsymbols_scale_abs_tl , @@ -1647,9 +1730,9 @@ } } } -\__tikzsymbols_Declare_Document_Command:nnn { Nursey } { O{1} O{none} O{none} O{} } +\__tikzsymbols_Declare_Document_Command:nnn { Nursey } { S O{none} O{none} O{} } { - \__tikzsymbols_if_savebox_undefined_define_fi_and_use_it_afterwards:nT { Nursey_#1_#2_#3_#4 } + \__tikzsymbols_provide_savebox_and_use:nT { Nursey_#1_#2_#3_#4 } { \__tikzsymbols_set_scale_abs_tl:n {#1} \bool_if:NTF \g__tikzsymbols_if_opt_draft_bool @@ -1665,9 +1748,9 @@ ] \fill[fill=#3,rounded ~ corners=.023ex* \l__tikzsymbols_scale_abs_tl ] (-0.3,0) -- (-0.3,0.3) -- (0,0.6) -- (0.3,0.3) -- (0.3,0); - \filldraw[fill=#2] (0,0) circle (0.3); - \fill (-0.1,0.1) circle (0.05); - \fill (0.1,0.1) circle (0.05); + \filldraw[fill=#2] (0,0) circle [radius=0.3]; + \fill (-0.1,0.1) circle [radius=0.05]; + \fill (0.1,0.1) circle [radius=0.05]; \draw[line ~ width=0.09ex* \l__tikzsymbols_scale_abs_tl , yshift=0.07ex] (-0.2,-0.1) .. controls (-0.1,-0.2) and (0.1,-0.2) .. (0.2,-0.1); \draw[rounded ~ corners=.023ex* \l__tikzsymbols_scale_abs_tl ] @@ -1678,9 +1761,9 @@ } } } -\__tikzsymbols_Declare_Document_Command:nnn { dNursey } { O{1} O{yellow} O{white} O{red} } +\__tikzsymbols_Declare_Document_Command:nnn { dNursey } { S O{yellow} O{white} O{red} } { - \__tikzsymbols_if_savebox_undefined_define_fi_and_use_it_afterwards:nT { dNursey_#1_#2_#3_#4 } + \__tikzsymbols_provide_savebox_and_use:nT { dNursey_#1_#2_#3_#4 } { \__tikzsymbols_set_scale_abs_tl:n {#1} \bool_if:NTF \g__tikzsymbols_if_opt_draft_bool @@ -1694,9 +1777,9 @@ /__tikzsymbols , x=2.3ex, y=2.3ex, line ~ width=0.12ex* \l__tikzsymbols_scale_abs_tl ,scale=#1 ] - \shade[ball ~ color=#2] (0,0) circle (0.3); - \shade[ball ~ color=black] (-0.1,0.1) circle (0.05); - \shade[ball ~ color=black] (0.1,0.1) circle (0.05); + \shade[ball ~ color=#2] (0,0) circle [radius=0.3]; + \shade[ball ~ color=black] (-0.1,0.1) circle [radius=0.05]; + \shade[ball ~ color=black] (0.1,0.1) circle [radius=0.05]; \draw[black, line ~ width=0.09ex* \l__tikzsymbols_scale_abs_tl , yshift=0.07ex] (-0.2,-0.1) .. controls (-0.1,-0.2) and (0.1,-0.2) .. (0.2,-0.1); \shade @@ -1714,9 +1797,9 @@ } } } -\__tikzsymbols_Declare_Document_Command:nnn { Vomey } { O{1} O{none} O{opacity=0} } +\__tikzsymbols_Declare_Document_Command:nnn { Vomey } { S O{none} O{opacity=0} } { - \__tikzsymbols_if_savebox_undefined_define_fi_and_use_it_afterwards:nT { Vomey_#1_#2_#3 } + \__tikzsymbols_provide_savebox_and_use:nT { Vomey_#1_#2_#3 } { \__tikzsymbols_set_scale_abs_tl:n {#1} \bool_if:NTF \g__tikzsymbols_if_opt_draft_bool @@ -1751,9 +1834,9 @@ } } } -\__tikzsymbols_Declare_Document_Command:nnn { dVomey } { O{1} O{yellow} O{brown!10!olive} } +\__tikzsymbols_Declare_Document_Command:nnn { dVomey } { S O{yellow} O{brown!10!olive} } { - \__tikzsymbols_if_savebox_undefined_define_fi_and_use_it_afterwards:nT { dVomey_#1_#2_#3 } + \__tikzsymbols_provide_savebox_and_use:nT { dVomey_#1_#2_#3 } { \__tikzsymbols_set_scale_abs_tl:n {#1} \bool_if:NTF \g__tikzsymbols_if_opt_draft_bool @@ -1790,9 +1873,9 @@ } } } -\__tikzsymbols_Declare_Document_Command:nnn { Walley } { O{1} O{none} O{none} } +\__tikzsymbols_Declare_Document_Command:nnn { Walley } { S O{none} O{none} } { - \__tikzsymbols_if_savebox_undefined_define_fi_and_use_it_afterwards:nT { Walley_#1_#2_#3 } + \__tikzsymbols_provide_savebox_and_use:nT { Walley_#1_#2_#3 } { \__tikzsymbols_set_scale_abs_tl:n {#1} \bool_if:NTF \g__tikzsymbols_if_opt_draft_bool @@ -1811,7 +1894,7 @@ amplitude=0.1ex* \l__tikzsymbols_scale_abs_tl } ] - \filldraw[fill=#2, line ~ width=0.08ex* \l__tikzsymbols_scale_abs_tl ] (0,0) circle (0.28); + \filldraw[fill=#2, line ~ width=0.08ex* \l__tikzsymbols_scale_abs_tl ] (0,0) circle [radius=0.28]; \filldraw[fill=#3] (0.28,-0.33) rectangle (0.66,0.33); \draw[line ~ width=0.06ex* \l__tikzsymbols_scale_abs_tl ] (0.28,0) --++(0.05,0.07) --++(0.03,0.02) --+ @@ -1831,9 +1914,9 @@ } } } -\__tikzsymbols_Declare_Document_Command:nnn { rWalley } { O{1} O{none} O{none} } +\__tikzsymbols_Declare_Document_Command:nnn { rWalley } { S O{none} O{none} } { - \__tikzsymbols_if_savebox_undefined_define_fi_and_use_it_afterwards:nT { rWalley_#1_#2_#3 } + \__tikzsymbols_provide_savebox_and_use:nT { rWalley_#1_#2_#3 } { \__tikzsymbols_set_scale_abs_tl:n {#1} \bool_if:NTF \g__tikzsymbols_if_opt_draft_bool @@ -1852,7 +1935,7 @@ amplitude=0.1ex* \l__tikzsymbols_scale_abs_tl } ] - \filldraw[fill=#2, line ~ width=0.08ex* \l__tikzsymbols_scale_abs_tl ] (0,0) circle (0.28); + \filldraw[fill=#2, line ~ width=0.08ex* \l__tikzsymbols_scale_abs_tl ] (0,0) circle [radius=0.28]; \filldraw[fill=#3] (0.28,-0.33) rectangle (0.66,0.33); \foreach \x/\y in { 0.5/0.25 , 0.6/0 , 0.5/-0.25 } \draw[decorate, line ~ width=0.06ex* \l__tikzsymbols_scale_abs_tl ] @@ -1864,9 +1947,9 @@ } } } -\__tikzsymbols_Declare_Document_Command:nnn { dWalley } { O{1} O{yellow} } +\__tikzsymbols_Declare_Document_Command:nnn { dWalley } { S O{yellow} } { - \__tikzsymbols_if_savebox_undefined_define_fi_and_use_it_afterwards:nT { dWalley_#1_#2 } + \__tikzsymbols_provide_savebox_and_use:nT { dWalley_#1_#2 } { \__tikzsymbols_set_scale_abs_tl:n {#1} \bool_if:NTF \g__tikzsymbols_if_opt_draft_bool @@ -1893,7 +1976,7 @@ (0.28,0) --++(0.03,-0.02) --++(0.03,-0.07) --++ (0.03,-0.01) --++(0.01,-0.07) --++ (0.06,0.01) --++(0.03,-0.08) -- (0.5,0.-0.25); - \shade[ball ~ color=#2] (-0.01,0) circle (0.31); + \shade[ball ~ color=#2] (-0.01,0) circle [radius=0.31]; \draw[rotate=-20] (0.12,0.1) -- (0.2,0.05); \draw[rotate=-20] (0.283,-0.1) .. controls (0.2,-0.072) and (0.1,-0.06) .. (0,-0.1); @@ -1901,9 +1984,9 @@ } } } -\__tikzsymbols_Declare_Document_Command:nnn { drWalley } { O{1} O{yellow} } +\__tikzsymbols_Declare_Document_Command:nnn { drWalley } { S O{yellow} } { - \__tikzsymbols_if_savebox_undefined_define_fi_and_use_it_afterwards:nT { drWalley_#1_#2 } + \__tikzsymbols_provide_savebox_and_use:nT { drWalley_#1_#2 } { \__tikzsymbols_set_scale_abs_tl:n {#1} \bool_if:NTF \g__tikzsymbols_if_opt_draft_bool @@ -1926,7 +2009,7 @@ \foreach \x/\y in { 0.5/0.25 , 0.6/0 , 0.5/-0.25 } \draw[decorate, line ~ width=0.06ex* \l__tikzsymbols_scale_abs_tl ] (0.298,0) -- (\x,\y); - \shade[ball ~ color=#2] (-0.01,0) circle (0.31); + \shade[ball ~ color=#2] (-0.01,0) circle [radius=0.31]; \draw[rotate=-20] (0.12,0.1) -- (0.2,0.05); \draw[rotate=-20] (0.283,-0.1) .. controls (0.2,-0.072) and (0.1,-0.06) .. (0.,-0.1); @@ -1934,9 +2017,115 @@ } } } -\__tikzsymbols_Declare_Document_Command:nnn { Cat } { O{1} } +\cs_new:Npn \__tikzsymbols_Cat:n #1 + { + \draw (0,0) circle [radius=0.3]; + \foreach \xi/\xii in { 0.3/0.35 } + { + \draw[rounded ~ corners=0.163ex* \l__tikzsymbols_scale_abs_tl ] + (-\xi,0) -- (-\xii,0.5) -- (0,\xi) (0,\xi) -- (\xii,0.5) -- (\xi,0); + } + \fill (-0.15,.15) circle [radius=0.05]; + \fill (0.15,.15) circle [radius=0.05]; + \foreach \x in { 0.1 , -0.1 } + \draw[rounded ~ corners=0.175ex* \l__tikzsymbols_scale_abs_tl ,yshift=-0.12ex] + (0,0) -- (0,-0.1) -- (\x,-0.095); + \draw[rounded ~ corners=.12ex* \l__tikzsymbols_scale_abs_tl ,yshift=-.15ex, + line ~ width=0.03em*0.9* \l__tikzsymbols_scale_abs_tl ] + (-0.1,0.1) -- (0,0) -- (0.1,0.1) -- cycle ; + \foreach \a/\b/\c/\d in + { 0.1/0.25/0.35/0.4 , -0.1/-0.25/-0.35/-0.4 } + \foreach \yi/\yii/\yiii in + { 0/0/-0.05 , -0.01/-0.09/-0.14 , -0.045/-0.13/-0.23 } + { + \draw[line ~ width=0.035ex* \l__tikzsymbols_scale_abs_tl ] + (\a,-0.05)..controls(\b,\yi)and(\c,\yii).. (\d,\yiii); + } + } +\cs_new:Npn \__tikzsymbols_Cat_unknown:n #1 + { + \draw (0,0) circle [radius=0.3]; + \foreach \xi/\xii in { 0.3/0.35 } + { + \draw[rounded ~ corners=0.163ex* \l__tikzsymbols_scale_abs_tl ] + (-\xi,0) -- (-\xii,0.5) -- (0,\xi) + (0,\xi) -- (\xii,0.5) -- (\xi,0); + } + \fill (0,-0.18) circle [radius=0.04]; + \draw + (0,0.06) arc[start ~angle=-90, end ~angle=180, radius=0.075] + (0,0.06) arc[start ~angle=90, end ~angle=360, radius=0.075]; + \foreach \case in { 1,-1 } + \foreach \yi/\yii/\yiii in + { + -0.01/-0.05/-0.08 , + -0.02/-0.12/-0.16 , + -0.055/-0.15/-0.25 + }{ + \draw[line ~ width=0.035ex* \l__tikzsymbols_scale_abs_tl ] + ({0.1*\case},-0.05)..controls({\case*0.25},\yi) + and({0.35*\case},\yii).. ({0.4*\case},\yiii); + } + } +\cs_new:Npn \__tikzsymbols_Cat_dead:n #1 + { + \draw (0,0) circle [radius=0.3]; + \foreach \case in { 1,-1 } + { + \draw[rounded ~ corners=0.163ex* \l__tikzsymbols_scale_abs_tl ] + ({\case*0.3},0) -- ({\case*0.35},0.5) -- (0,0.3); + } + \draw + \foreach \angle in { 45,135,225,315 } + { + (0.13,0.13) -- ({0.13+0.07*cos(\angle)},{0.13+0.07*sin(\angle)}) + (-0.13,0.13) -- ({-0.13+0.07*cos(\angle)},{0.13+0.07*sin(\angle)}) + } + ; + \foreach \case in { 1,-1 } + \draw[rounded ~ corners=0.175ex* \l__tikzsymbols_scale_abs_tl ,yshift=-0.12ex] + (0,0) -- (0,-0.08) -- ({0.09*\case},-0.12); + \draw[rounded ~ corners=.12ex* \l__tikzsymbols_scale_abs_tl ,yshift=-.15ex, + line ~ width=0.03em*0.9* \l__tikzsymbols_scale_abs_tl ] + (0,0) -- (0.1,0.07) -- (0,0.1)-- (-0.1,0.07) -- cycle ; + \foreach \case in {-1,1} + \foreach \yi/\yii/\yiii in + { + -0.04/-0.09/-0.15 , + -0.05/-0.18/-0.23, + -0.085/-0.22/-0.31 + }{ + \draw[line ~ width=0.035ex* \l__tikzsymbols_scale_abs_tl ] + ({0.1*\case},-0.05) + .. controls ({0.18*\case},\yi) and ({0.28*\case},\yii) .. + ({0.33*\case},\yiii); + } + \draw [transparent,line ~ width=0.035ex*\l__tikzsymbols_scale_abs_tl] (-0.4,0) -- (0.4,0); + } +\__tikzsymbols_Declare_Document_Command:nnn { Cat } { S } + { + \__tikzsymbols_provide_savebox_and_use:nT { Cat_#1 } + { + \__tikzsymbols_set_scale_abs_tl:n {#1} + \bool_if:NTF \g__tikzsymbols_if_opt_draft_bool + { + \__tikzsymbols_create_draftbox:nn + { 1.899ex * \l__tikzsymbols_scale_abs_tl } + { 1.957ex * \l__tikzsymbols_scale_abs_tl } + }{ + \begin{tikzpicture} + [ + /__tikzsymbols , + x=2.33ex,y=2.33ex, line ~ width=0.093ex* \l__tikzsymbols_scale_abs_tl ,scale=#1 + ] + \__tikzsymbols_Cat:n {#1} + \end{tikzpicture}% + } + } + } +\__tikzsymbols_Declare_Document_Command:nnn { SchrodingersCat } { S m } { - \__tikzsymbols_if_savebox_undefined_define_fi_and_use_it_afterwards:nT { Cat_#1 } + \__tikzsymbols_provide_savebox_and_use:nT { SchrodingersCat_#1_#2 } { \__tikzsymbols_set_scale_abs_tl:n {#1} \bool_if:NTF \g__tikzsymbols_if_opt_draft_bool @@ -1950,35 +2139,20 @@ /__tikzsymbols , x=2.33ex,y=2.33ex, line ~ width=0.093ex* \l__tikzsymbols_scale_abs_tl ,scale=#1 ] - \draw (0,0) circle (0.3); - \foreach \xi/\xii in { 0.3/0.35 } + \int_case:nnF {#2} { - \draw[rounded ~ corners=0.163ex* \l__tikzsymbols_scale_abs_tl ] - (-\xi,0) -- (-\xii,0.5) -- (0,\xi) (0,\xi) -- (\xii,0.5) -- (\xi,0); + { 1 } { \__tikzsymbols_Cat:n {#1} } + { 0 } { \__tikzsymbols_Cat_unknown:n {#1} } + { -1 } { \__tikzsymbols_Cat_dead:n {#1} } } - \fill (-0.15,.15) circle (0.05); - \fill (0.15,.15) circle (0.05); - \foreach \x in { 0.1 , -0.1 } - \draw[rounded ~ corners=0.175ex* \l__tikzsymbols_scale_abs_tl ,yshift=-0.12ex] - (0,0) -- (0,-0.1) -- (\x,-0.095); - \draw[rounded ~ corners=.12ex* \l__tikzsymbols_scale_abs_tl ,yshift=-.15ex, - line ~ width=0.03em*0.9* \l__tikzsymbols_scale_abs_tl ] - (-0.1,0.1) -- (0,0) -- (0.1,0.1) -- cycle ; - \foreach \a/\b/\c/\d in - { 0.1/0.25/0.35/0.4 , -0.1/-0.25/-0.35/-0.4 } - \foreach \yi/\yii/\yiii in - { 0/0/-0.05 , -0.01/-0.09/-0.14 , -0.045/-0.13/-0.23 } - { - \draw[line ~ width=0.035ex* \l__tikzsymbols_scale_abs_tl ] - (\a,-0.05)..controls(\b,\yi)and(\c,\yii).. (\d,\yiii); - } + { \msg_error:nnn { tikzsymbols } { SchrodingersCat } {#2} } \end{tikzpicture}% } } } -\__tikzsymbols_Declare_Document_Command:nnn { Ninja } { O{1} O{black} O{red} O{white} } +\__tikzsymbols_Declare_Document_Command:nnn { Ninja } { S O{black} O{red} O{white} } { - \__tikzsymbols_if_savebox_undefined_define_fi_and_use_it_afterwards:nT { Ninja_#1_#2_#3_#4 } + \__tikzsymbols_provide_savebox_and_use:nT { Ninja_#1_#2_#3_#4 } { \__tikzsymbols_set_scale_abs_tl:n {#1} \bool_if:NTF \g__tikzsymbols_if_opt_draft_bool @@ -1998,13 +2172,13 @@ } ] \tl_set:Nn \l_tmpa_tl {#2} - \fill[#2] (0,0) circle (0.33); + \fill[#2] (0,0) circle [radius=0.33]; \fill[decoration={random ~ steps,segment ~ length=0.1ex* \l__tikzsymbols_scale_abs_tl , amplitude=0.01ex* \l__tikzsymbols_scale_abs_tl }, decorate,#3] (-0.33,0) -- (0.33,0) -- (0.23,0.23) -- (-0.23,0.23) -- cycle; \tl_if_eq:NNT \c__tikzsymbols_black_tl \l_tmpa_tl { - \draw[line ~ width=0.08ex* \l__tikzsymbols_scale_abs_tl ] (0,0) circle (0.33); + \draw[line ~ width=0.08ex* \l__tikzsymbols_scale_abs_tl ] (0,0) circle [radius=0.33]; } \fill[#3] (0,0.1) -- (-0.33,0) -- (-0.26,0.23); \fill[#3] (0.3465,0) arc [start ~ angle=0, end ~ angle=42, x ~ radius=0.34, y~ radius=0.345] -- @@ -2025,15 +2199,15 @@ (0.26,0.21) -- \x; \tl_if_eq:NNF \c__tikzsymbols_black_tl \l_tmpa_tl { - \draw[line ~ width=0.08ex* \l__tikzsymbols_scale_abs_tl ] (0,0) circle (0.33); + \draw[line ~ width=0.08ex* \l__tikzsymbols_scale_abs_tl ] (0,0) circle [radius=0.33]; } \end{tikzpicture}% } } } -\__tikzsymbols_Declare_Document_Command:nnn { dNinja } { O{1} O{black} O{red} O{white} } +\__tikzsymbols_Declare_Document_Command:nnn { dNinja } { S O{black} O{red} O{white} } { - \__tikzsymbols_if_savebox_undefined_define_fi_and_use_it_afterwards:nT { dNinja_#1_#2_#3_#4 } + \__tikzsymbols_provide_savebox_and_use:nT { dNinja_#1_#2_#3_#4 } { \__tikzsymbols_set_scale_abs_tl:n {#1} \bool_if:NTF \g__tikzsymbols_if_opt_draft_bool @@ -2062,7 +2236,7 @@ } , decorate, #3!50!black ] \coord -- (0.26,0.21); - \shade[ball ~ color=#2] (0,0) circle (0.347); + \shade[ball ~ color=#2] (0,0) circle [radius=0.347]; \fill [ decoration= @@ -2083,9 +2257,107 @@ } } } -\__tikzsymbols_Declare_Document_Command:nnn { NiceReapey } { O{1} O{black!20!white} } +\__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_set_scale_abs_tl:n {#1} + \bool_if:NTF \g__tikzsymbols_if_opt_draft_bool + { + \__tikzsymbols_create_draftbox:nn + { 2.084866ex * \l__tikzsymbols_scale_abs_tl } + { 1.5912ex * \l__tikzsymbols_scale_abs_tl } + }{ + \begin{tikzpicture} + [ + /__tikzsymbols , + x=2.04ex, y=2.04ex, line ~ width=0.102ex* \l__tikzsymbols_scale_abs_tl , + scale=#1 + ] + \filldraw [fill=#3] + (-0.33,0) arc[start~angle=180,end~angle=0,x~radius=0.45,y~radius=0.4] + -- ++(0,-0.2) + arc[start~angle=0,end~angle=130,x~radius=0.15,y~radius=0.24]; + \filldraw [fill=#2,rounded ~ corners=0.001ex * \l__tikzsymbols_scale_abs_tl] + (0.33,0) arc[start~angle=0, end~angle=-180, radius=0.33] -- cycle ; + \fill (0.55,-0.15) circle [radius=0.06]; + \foreach \l__tikzsymbols_angle_tl in {0,30,60,...,360} + { + \draw ({0.55+0.06*cos(\l__tikzsymbols_angle_tl)*1.2}, + {-0.15+0.06*sin(\l__tikzsymbols_angle_tl)*1.2}) + circle[radius=0.02]; + } + \foreach \l_tmpa_tl/\l_tmpb_tl in { -0.14/0.12 , 0.19/0.12 , 0.05/0.26 , 0.40/0.16 } + { + \draw [line~width=0.04ex*\l__tikzsymbols_scale_abs_tl ,#4] + \foreach \l__tikzsymbols_angle_tl in { 0,45,90,...,360 } + { + (\l_tmpa_tl,\l_tmpb_tl) -- ({\l_tmpa_tl+0.07*cos(\l__tikzsymbols_angle_tl)}, + {\l_tmpb_tl+0.07*sin(\l__tikzsymbols_angle_tl)}) + } + ; + } + \fill (0,-0.225) circle [radius=0.04]; + \draw (-0.1,-0.09) arc[start~angle=0, end~angle=-180, + x~radius=0.06,y~radius=0.08] ; + \draw (0.1,-0.09) arc[start~angle=180, + end~angle=360,x~radius=0.06,y~radius=0.08] ; + \end{tikzpicture}% + } + } + } +\__tikzsymbols_Declare_Document_Command:nnn { dSleepey } { S O{yellow} O{blue} O{black} } { - \__tikzsymbols_if_savebox_undefined_define_fi_and_use_it_afterwards:nT { NiceReapey_#1_#2 } + \__tikzsymbols_provide_savebox_and_use:nT { dSleepey_#1_#2_#3_#4 } + { + \__tikzsymbols_set_scale_abs_tl:n {#1} + \bool_if:NTF \g__tikzsymbols_if_opt_draft_bool + { + \__tikzsymbols_create_draftbox:nn + { 2.033865ex * \l__tikzsymbols_scale_abs_tl } + { 1.489181ex * \l__tikzsymbols_scale_abs_tl } + }{ + \begin{tikzpicture} + [ + /__tikzsymbols , + x=2.04ex, y=2.04ex, line ~ width=0.102ex* \l__tikzsymbols_scale_abs_tl , + scale=#1 + ] + \shade [ball ~ color=#3] + (-0.33,0) arc[start~angle=180,end~angle=0,x~radius=0.45,y~radius=0.4] + -- ++(0,-0.2) + arc[start~angle=0,end~angle=130,x~radius=0.15,y~radius=0.24]; + \shade [ball ~ color=#2,rounded ~ corners=0.001ex * \l__tikzsymbols_scale_abs_tl] + (0.33,0) arc[start~angle=0, end~angle=-180, radius=0.33] -- cycle ; + \fill (0.55,-0.15) circle [radius=0.06]; + \foreach \l__tikzsymbols_angle_tl in {0,30,60,...,360} + { + \draw ({0.55+0.06*cos(\l__tikzsymbols_angle_tl)*1.2}, + {-0.15+0.06*sin(\l__tikzsymbols_angle_tl)*1.2}) + circle[radius=0.02]; + } + \foreach \l_tmpa_tl/\l_tmpb_tl in { -0.14/0.12 , 0.19/0.12 , 0.05/0.26 , 0.40/0.16 } + { + \draw [line~width=0.04ex* \l__tikzsymbols_scale_abs_tl,#4] + \foreach \l__tikzsymbols_angle_tl in { 0,45,90,...,360 } + { + (\l_tmpa_tl,\l_tmpb_tl) -- ({\l_tmpa_tl+0.07*cos(\l__tikzsymbols_angle_tl)}, + {\l_tmpb_tl+0.07*sin(\l__tikzsymbols_angle_tl)}) + } + ; + } + \fill (0,-0.225) circle [radius=0.04]; + \draw (-0.1,-0.09) arc[start~angle=0, end~angle=-180, + x~radius=0.06,y~radius=0.08] ; + \draw (0.1,-0.09) arc[start~angle=180, + end~angle=360,x~radius=0.06,y~radius=0.08] ; + \end{tikzpicture}% + } + } + } +\__tikzsymbols_Declare_Document_Command:nnn { NiceReapey } { S O{black!20!white} } + { + \__tikzsymbols_provide_savebox_and_use:nT { NiceReapey_#1_#2 } { \__tikzsymbols_set_scale_abs_tl:n {#1} \bool_if:NTF \g__tikzsymbols_if_opt_draft_bool @@ -2105,19 +2377,18 @@ arc [start ~ angle=260, end ~ angle=100, x ~ radius=-1.3, y ~ radius=-2] -- cycle; \filldraw[fill=#2] (3,-3) -- (3,3) .. controls (5,3) and (6,2) .. (7,1.5) -- (3,1.5) -- cycle; - \draw (0,-1.5) circle (1 ~ and ~ 0.5); + \draw (0,-1.5) circle [ x~radius=1 , y~radius= 0.5]; + \draw (0,-1.5) circle [ x~radius=1 , y~radius= 0.5]; \foreach \x in { 0.2 , 0.6 } \draw[line ~ width=0.04ex* \l__tikzsymbols_scale_abs_tl ] (\x,-1) -- (\x,-2) (-\x,-1) -- (-\x,-2) ; \draw[line ~ width=0.04ex* \l__tikzsymbols_scale_abs_tl ] (-1,-1.5) -- (1,-1.5); - \fill (1.25,1.25) circle ( 0.5 ~ and ~ 0.75); - \fill (-1.25,1.25) circle ( 0.5 ~ and ~ 0.75); + \fill (1.25,1.25) circle [ x~radius=0.5 , y~radius= 0.75]; + \fill (-1.25,1.25) circle [ x~radius=0.5 , y~radius= 0.75]; \end{tikzpicture}% } } } -\clist_set_eq:NN \g_tikzsymbols_list_of_emoticons_commands_clist \l__tikzsymbols_tmpa_clist -\clist_clear:N \l__tikzsymbols_tmpa_clist \cs_new:Npn \__tikzsymbols_Strichmaxerl_x_check:N #1 { \fp_compare:nTF { #1 > 0 } @@ -2137,9 +2408,9 @@ \fp_compare:nT { #1 < 0 } { \fp_zero:N #1 } } \__tikzsymbols_Declare_Document_Command:nnn { Strichmaxerl } - { O{1} O{-22} O{22} O{27} O{-27} } + { S O{-22} O{22} O{27} O{-27} } { - \__tikzsymbols_if_savebox_undefined_define_fi_and_use_it_afterwards:nT + \__tikzsymbols_provide_savebox_and_use:nT { Strichmaxerl_#1_#2_#3_#4_#5 } { \__tikzsymbols_set_scale_abs_tl:n {#1} @@ -2209,12 +2480,12 @@ \draw[rotate \space around={ #3 \token_to_str:N : ( 0.15 , 0.4) } ] (0.15,0.4) -- (0.42,0.4); \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 (0.18); + \draw (.15,.8) circle [radius=0.18]; \end{tikzpicture}% } } } -\__tikzsymbols_Declare_Document_Command:nnn { Person } { O{1} O{-22} O{22} O{27} O{-27} } +\__tikzsymbols_Declare_Document_Command:nnn { Person } { S O{-22} O{22} O{27} O{-27} } { \msg_error:nnnn { tikzsymbols } @@ -2223,9 +2494,9 @@ { \Strichmaxerl } \tikzsymbolsuse { Strichmaxerl } [#1] [#2] [#3] [#4] [#5] } -\__tikzsymbols_Declare_Document_Command:nnn { Candle } { O{1} } +\__tikzsymbols_Declare_Document_Command:nnn { Candle } { S } { - \__tikzsymbols_if_savebox_undefined_define_fi_and_use_it_afterwards:nT { Candle_#1 } + \__tikzsymbols_provide_savebox_and_use:nT { Candle_#1 } { \__tikzsymbols_set_scale_abs_tl:n {#1} \bool_if:NTF \g__tikzsymbols_if_opt_draft_bool @@ -2249,9 +2520,9 @@ } } } -\__tikzsymbols_Declare_Document_Command:nnn { Fire } { O{1} } +\__tikzsymbols_Declare_Document_Command:nnn { Fire } { S } { - \__tikzsymbols_if_savebox_undefined_define_fi_and_use_it_afterwards:nT { Fire_#1 } + \__tikzsymbols_provide_savebox_and_use:nT { Fire_#1 } { \__tikzsymbols_set_scale_abs_tl:n {#1} \bool_if:NTF \g__tikzsymbols_if_opt_draft_bool @@ -2296,9 +2567,9 @@ } \bool_if:NF \g__tikzsymbols_if_opt_marvosym_bool { -\__tikzsymbols_Declare_Document_Command:nnn { Coffeecup } { O{1} } +\__tikzsymbols_Declare_Document_Command:nnn { Coffeecup } { S } { - \__tikzsymbols_if_savebox_undefined_define_fi_and_use_it_afterwards:nT { Coffeecup_#1 } + \__tikzsymbols_provide_savebox_and_use:nT { Coffeecup_#1 } { \__tikzsymbols_set_scale_abs_tl:n {#1} \bool_if:NTF \g__tikzsymbols_if_opt_draft_bool @@ -2329,9 +2600,9 @@ } } } -\__tikzsymbols_Declare_Document_Command:nnn { Chair } { O{1} } +\__tikzsymbols_Declare_Document_Command:nnn { Chair } { S } { - \__tikzsymbols_if_savebox_undefined_define_fi_and_use_it_afterwards:nT { Chair_#1 } + \__tikzsymbols_provide_savebox_and_use:nT { Chair_#1 } { \__tikzsymbols_set_scale_abs_tl:n {#1} \bool_if:NTF \g__tikzsymbols_if_opt_draft_bool @@ -2358,9 +2629,9 @@ \bool_set_false:N \l__tikzsymbols_if_scale_negative_bool } } -\__tikzsymbols_Declare_Document_Command:nnn { Bed } { O{1} } +\__tikzsymbols_Declare_Document_Command:nnn { Bed } { S } { - \__tikzsymbols_if_savebox_undefined_define_fi_and_use_it_afterwards:nT { Bed_#1 } + \__tikzsymbols_provide_savebox_and_use:nT { Bed_#1 } { \__tikzsymbols_set_scale_abs_tl:n {#1} \bool_if:NTF \g__tikzsymbols_if_opt_draft_bool @@ -2385,9 +2656,9 @@ } } \__tikzsymbols_Declare_Document_Command:nnn { Tribar } - { O{1} O{opacity=0} O{opacity=0} O{opacity=0} } + { S O{opacity=0} O{opacity=0} O{opacity=0} } { - \__tikzsymbols_if_savebox_undefined_define_fi_and_use_it_afterwards:nT { Tribar_#1_#2_#3_#4 } + \__tikzsymbols_provide_savebox_and_use:nT { Tribar_#1_#2_#3_#4 } { \__tikzsymbols_set_scale_abs_tl:n {#1} \bool_if:NTF \g__tikzsymbols_if_opt_draft_bool @@ -2419,9 +2690,9 @@ } } } -\__tikzsymbols_Declare_Document_Command:nnn { Moai } { O{1} } +\__tikzsymbols_Declare_Document_Command:nnn { Moai } { S } { - \__tikzsymbols_if_savebox_undefined_define_fi_and_use_it_afterwards:nT { Moai_#1 } + \__tikzsymbols_provide_savebox_and_use:nT { Moai_#1 } { \__tikzsymbols_set_scale_abs_tl:n {#1} \fp_compare:nTF { abs (#1) < 2 } @@ -2469,9 +2740,9 @@ } } } -\__tikzsymbols_Declare_Document_Command:nnn { Snowman } { O{1} } +\__tikzsymbols_Declare_Document_Command:nnn { Snowman } { S } { - \__tikzsymbols_if_savebox_undefined_define_fi_and_use_it_afterwards:nT { Snowman_#1 } + \__tikzsymbols_provide_savebox_and_use:nT { Snowman_#1 } { \__tikzsymbols_set_scale_abs_tl:n {#1} \bool_if:NTF \g__tikzsymbols_if_opt_draft_bool @@ -2503,13 +2774,13 @@ ] (-0.2,1.19) arc [start ~ angle=270, end ~ angle=90, radius=0.1]; \foreach \y in { 0.78 , 0.63 , 0.48 } - \fill (0,\y) circle (0.04); + \fill (0,\y) circle [radius=0.04]; \foreach \y in { 0.2 , 0 , -0.2 } - \fill (0,\y) circle (0.05); - \fill (-0.06,1.18) circle (0.045); - \fill (0.06,1.18) circle (0.045); + \fill (0,\y) circle [radius=0.05]; + \fill (-0.06,1.18) circle [radius=0.045]; + \fill (0.06,1.18) circle [radius=0.045]; \foreach \x/\y in { 0.1/1.08 , 0.06/1.055 , 0.02/1.039} - \fill (\x,\y) circle (0.015) (-\x,\y) circle (0.015) ; + \fill (\x,\y) circle [radius=0.015] (-\x,\y) circle [radius=0.015] ; \draw (-0.3,0.7) -- (-0.6,0.8); \draw (0.3,0.7) -- (0.6,0.8); \draw[line ~ width=0.06ex* \l__tikzsymbols_scale_abs_tl ] (-0.65,0) -- (-0.65,1); @@ -2521,11 +2792,9 @@ } } } -\clist_set_eq:NN \g_tikzsymbols_list_of_other_commands_clist \l__tikzsymbols_tmpa_clist -\clist_clear:N \l__tikzsymbols_tmpa_clist \cs_new:Npn \__tikzsymbols_Basic_Tree:nnnnn #1#2#3#4#5 { - \__tikzsymbols_if_savebox_undefined_define_fi_and_use_it_afterwards:nT + \__tikzsymbols_provide_savebox_and_use:nT { BasicTree_#1_#2_#3_#4_#5 } { \tl_set:Nn \l_tmpa_tl {#5} @@ -2540,13 +2809,13 @@ } } } -\__tikzsymbols_Declare_Document_Command:nnn { BasicTree } { O{1} m m m m } +\__tikzsymbols_Declare_Document_Command:nnn { BasicTree } { S m m m m } { \__tikzsymbols_Basic_Tree:nnnnn {#1} {#2} {#3} {#4} {#5} } -\__tikzsymbols_Declare_Document_Command:nnn { WorstTree } { O{1} } +\__tikzsymbols_Declare_Document_Command:nnn { WorstTree } { S } { - \__tikzsymbols_if_savebox_undefined_define_fi_and_use_it_afterwards:nT { WorstTree_#1 } + \__tikzsymbols_provide_savebox_and_use:nT { WorstTree_#1 } { \__tikzsymbols_set_scale_abs_tl:n {#1} \bool_if:NTF \g__tikzsymbols_if_opt_draft_bool @@ -2573,14 +2842,14 @@ controls (-0.3, 1.6) and (-0.1,1.6) .. (0.1,1.5) .. controls (0.3,1.8) and (0.6,1.6) .. (0.7,1.5) .. controls (1.1, 1.6) and (1,1.4) .. (1,1.2) .. controls (1.2,1) and (1.2,0.7) .. (0.8,0.8) -- (0.486,0.8); - \fill[red] (0,1) circle (0.1); - \fill[red] (0.4,1.2) circle (0.1); - \fill[red] (0.8,1.1) circle (0.1); + \fill[red] (0,1) circle [radius=0.1]; + \fill[red] (0.4,1.2) circle [radius=0.1]; + \fill[red] (0.8,1.1) circle [radius=0.1]; \end{tikzpicture}% } } } -\__tikzsymbols_Declare_Document_Command:nnn { Springtree } { O {1} } +\__tikzsymbols_Declare_Document_Command:nnn { Springtree } { S } { \__tikzsymbols_Basic_Tree:nnnnn {#1} @@ -2589,7 +2858,7 @@ { green!80!black } { leaf } } -\__tikzsymbols_Declare_Document_Command:nnn { Summertree } { O {1} } +\__tikzsymbols_Declare_Document_Command:nnn { Summertree } { S } { \__tikzsymbols_Basic_Tree:nnnnn {#1} @@ -2598,7 +2867,7 @@ { red!80!green } { leaf } } -\__tikzsymbols_Declare_Document_Command:nnn { Autumntree } { O {1} } +\__tikzsymbols_Declare_Document_Command:nnn { Autumntree } { S } { \__tikzsymbols_Basic_Tree:nnnnn {#1} @@ -2607,7 +2876,7 @@ { orange } { leaf } } -\__tikzsymbols_Declare_Document_Command:nnn { Wintertree } { O {1} } +\__tikzsymbols_Declare_Document_Command:nnn { Wintertree } { S } { \__tikzsymbols_Basic_Tree:nnnnn {#1} @@ -2639,8 +2908,25 @@ } \NewDocumentCommand \tikzsymbolsset { m } { - \keys_set_groups:nnn { tikzsymbols } { document } {#1} + \keys_set_filter:nnnN { tikzsymbols } { package } {#1} \l_tmpa_tl + \tl_if_empty:NF \l_tmpa_tl + { + \keyval_parse:NNV + \__tikzsymbols_tikzsymbolsset_msg_i:n + \__tikzsymbols_tikzsymbolsset_msg_ii:nn + \l_tmpa_tl + } + } +\cs_generate_variant:Nn \keyval_parse:NNn { NNV } +\cs_new:Npn \__tikzsymbols_tikzsymbolsset_msg_i:n #1 + { + \__tikzsymbols_tikzsymbolsset_msg_ii:nn {#1} { } + } +\cs_new:Npn \__tikzsymbols_tikzsymbolsset_msg_ii:nn #1#2 + { + \msg_error:nnn { tikzsymbols } { package-option } {#1} } +\exp_args:NV \tikzsymbolsset \l__tikzsymbols_used_only_once_because_no_better_idea_tl \endinput %% %% End of file `tikzsymbols.sty'. -- cgit v1.2.3