From 4407d96af752e6e79a48c25c5189bd1a63fbd125 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sun, 14 May 2017 22:39:49 +0000 Subject: tikzsymbols (14may17) git-svn-id: svn://tug.org/texlive/trunk@44350 c570f23f-e606-0410-a88d-b1316a301751 --- .../source/latex/tikzsymbols/tikzsymbols.dtx | 320 ++++++++++++++++++--- 1 file changed, 286 insertions(+), 34 deletions(-) (limited to 'Master/texmf-dist/source/latex/tikzsymbols') diff --git a/Master/texmf-dist/source/latex/tikzsymbols/tikzsymbols.dtx b/Master/texmf-dist/source/latex/tikzsymbols/tikzsymbols.dtx index f9fa847d793..026a1303111 100644 --- a/Master/texmf-dist/source/latex/tikzsymbols/tikzsymbols.dtx +++ b/Master/texmf-dist/source/latex/tikzsymbols/tikzsymbols.dtx @@ -1,8 +1,6 @@ % \iffalse meta-comment % !TEX encoding = UTF-8 Unicode -%: CheckSum % \fi -%^^A \CheckSum{0} % % \iffalse meta-comment % @@ -180,7 +178,7 @@ % %\author{Ben Vitecek \\ \href{mailto:b.vitecek@gmx.at}{b.vitecek@gmx.at}} % -% \date{December 26, 2016} +% \date{May 14, 2017} % % \maketitle{} % @@ -260,7 +258,7 @@ % in combination with the new command \Makro{tikzsymbolsset}, % see \cref{sec:options} for more information. % -% And a new Emoticon: \Makro{Changey} (and \Makro{dChangey}). +%^^A And a new Emoticon: \Makro{Changey} (and \Makro{dChangey}). % % \section{Options} % \label{sec:options} @@ -279,7 +277,7 @@ % % \begin{function}{\tikzsymbolsset} % \begin{syntax} -% \Makro{tikzsymbolsset} \marg{keys \& values} +% \Makro{tikzsymbolsset} \marg{keys = values} % \end{syntax} % % Most keys, except @@ -492,7 +490,19 @@ % \end{function} % % -% +% \subsubsection{baseline (true/false)} +% \label{sec:baseline} +% +% \begin{function}{baseline} +% \begin{syntax} +% baseline = \marg{true/false} +% \end{syntax} +% This option mainly exists to let the commands of this package work inside +% \pkg{todonotes} \cs{todo} command. If \Option{true} adds to each symbol of this package +% the tikz option \Option{baseline=default}. If you do not want this, set this option +% to \Option{false}. It is set to \Option{true} by default. +% \end{function} +% % % % @@ -591,6 +601,7 @@ % \Sadey, % \Neutrey, % \Changey, +% \cChangey, % \Annoey, % \Laughey, % \Winkey, @@ -634,6 +645,7 @@ % \Makro{Sadey}& \oarg{scale}\oarg{color} & \Sadey \\ % \Makro{Neutrey}& \oarg{scale}\oarg{color} & \Neutrey \\ % \Makro{Changey}& \oarg{scale}\oarg{color}\marg{mood} & \Changey{2} \\ +% \Makro{cChangey}& \oarg{scale}\oarg{color1}\oarg{color2}\oarg{color3}\marg{mood} & \cChangey{2} \\ % \Makro{Annoey}& \oarg{scale}\oarg{color} & \Annoey \\ % \Makro{Laughey}& \oarg{scale}\oarg{color}\oarg{mouth color} & \Laughey \\ % \Makro{Winkey}& \oarg{scale}\oarg{color} & \Winkey \\ @@ -681,6 +693,20 @@ % \CreateExample{Changey} {{1.41}} % \CreateExample{Changey} {{2}} % +% \CreateExample{cChangey} {{2}} +% \CreateExample{cChangey} {{1}} +% \CreateExample{cChangey} {{0.5}} +% \CreateExample{cChangey} {{0.1}} +% \CreateExample{cChangey} {{0}} +% \CreateExample{cChangey} {{-0.5}} +% \CreateExample{cChangey} {{-1}} +% \CreateExample{cChangey} {{-2}} +% +% \CreateExample{cChangey} {[][][blue]{-1}} +% \CreateExample{cChangey} {[][][blue]{0.5}} +% +% If you intent to change the color of \cs{cChangey} you may define a new command +% so that you do not have to write those brackets each time. % % % \subsubsection{\enquote{3D} Emoticons \texorpdfstring{\dSmiley\dSadey[-1]}{dSmiley dSadey}} @@ -692,6 +718,7 @@ % \dSadey, % \dNeutrey, % \dChangey, +% \dcChangey, % \dAnnoey, % \dLaughey, % \dWinkey, @@ -735,6 +762,7 @@ % \Makro{dSadey}& \oarg{scale}\oarg{color} & \dSadey \\ % \Makro{dNeutrey}& \oarg{scale}\oarg{color} & \dNeutrey \\ % \Makro{dChangey}& \oarg{scale}\oarg{color}\marg{mood} & \dChangey{2} \\ +% \Makro{dcChangey}& \oarg{scale}\oarg{color1}\oarg{color2}\oarg{color3}\marg{mood} & \dcChangey{2} \\ % \Makro{dLaughey}& \oarg{scale}\oarg{color}\oarg{mouth color} & \dLaughey \\ % \Makro{dAnnoey}& \oarg{scale}\oarg{color} & \dAnnoey \\ % \Makro{dWinkey}& \oarg{scale}\oarg{color} & \dWinkey \\ @@ -775,15 +803,26 @@ % \CreateExample{dChangey} {{2}} % % +% \CreateExample{dcChangey} {{2}} +% \CreateExample{dcChangey} {{1}} +% \CreateExample{dcChangey} {{0.5}} +% \CreateExample{dcChangey} {{0.1}} +% \CreateExample{dcChangey} {{0}} +% \CreateExample{dcChangey} {{-0.5}} +% \CreateExample{dcChangey} {{-1}} +% \CreateExample{dcChangey} {{-2}} % +% \CreateExample{dcChangey} {[][][blue]{-1}} +% \CreateExample{dcChangey} {[][][blue]{0.5}} % +% If you intent to change the color of \cs{dcChangey} you may define a new command +% so that you do not have to write those brackets each time. % % \subsection{other Symbols \texorpdfstring{\Moai}{Moai}} % % \begin{function} % { % \Strichmaxerl, -%^^A \Person, % \Candle, % \Fire, % \Coffeecup, @@ -875,7 +914,7 @@ % \cref{sec:draft} and \cref{sec:tree}) to make \LaTeX{} faster. % % Furthermore this trees are pretty much stolen from the -% \Package{tikz} manual. I regret nothing. +% \Package{tikz} manual. % % \begin{center} % \begin{tabular}{@{}llc@{}} @@ -975,7 +1014,7 @@ % involving a \emph{minimal example} % showing the bug and a short description. Please mention % \enquote{\Package{tikzsymbols}} in the header, \enquote{gmx} has -% a habit of putting mails into the spam-folder +% a habit of putting mails into the spam-folder % and it helps me to recognize those mails faster. % This can also be the reason why I may need some time to answer % the mail. @@ -1085,14 +1124,18 @@ % \changes{v3.9}{2016/04/04}{Added \Makro{@ifackagelater}.} % \changes{v3.99}{2016/04/04}{As advised undid my version-resetting.} % \changes{v4.0}{2016/03/20}{Finished reworking the code.} -% \changes{v4.0}{2016/26/12}{Added \cs{Nudelholz} bzw. \cs{rollingpin).} +% \changes{v4.0}{2016/26/12}{Added \cs{Nudelholz} bzw. \cs{rollingpin}.} +% +% \changes{v4.02}{2017/05/14}{Added option 'baseline=true/false' to fix a some strange +% behaviors with \pkg{todonotes}.} +% \changes{v4.02}{2017/05/14}{Defined the tikz-style '/\_\_tikzsymbols' which is used to implement 'baseline'.} % % The first lines are always the same: What do I need, what is the % package named. % \begin{macrocode} \@ifpackageloaded{xparse}{}{\RequirePackage{xparse}} \@ifpackageloaded{expl3}{}{\RequirePackage{expl3}} -\@ifpackagelater{expl3}{2016/11/21} +\@ifpackagelater{expl3}{2017/04/01} {} {% \PackageError { tikzsymbols }{ Support~package~expl3~too~old } @@ -1105,8 +1148,8 @@ } \ProvidesExplPackage {tikzsymbols} - {2016/12/26} - {4.01} + {2017/05/14} + {4.02} {Some symbols created using tikz and LaTeX3.} \@ifpackageloaded { tikz } {} { \RequirePackage { tikz } } \@ifpackageloaded { xcolor } {} { \RequirePackage { xcolor } } @@ -1373,10 +1416,10 @@ % \end{macrocode} % \end{macro} % -% \begin{macro}{ Changey-number-to-large } +% \begin{macro}{ Changey-number-too-large } % \changes{v3.95}{2016/03/20}{New} % \begin{macrocode} -\msg_new:nnnn { tikzsymbols } { Changey-number-to-large } +\msg_new:nnnn { tikzsymbols } { Changey-number-too-large } { Changey's \ mood \ has \ to \ be \ between \ -2 \ and \ 2 \ (currently:\ '#1' ). @@ -1385,6 +1428,15 @@ \ use \ an \ number \ between \ -2 \ and \ 2. \msg_see_documentation_text:n { tikzsymbols } } +\msg_new:nnnn { tikzsymbols } { cChangey-number-too-large } + { + cChangey's \ mood \ has \ to \ be \ between \ + -2 \ and \ 2 \ (currently:\ '#1' ). + }{ + Given \ number \ is \ too \ large \ (small), \ please + \ use \ an \ number \ between \ -2 \ and \ 2. + \msg_see_documentation_text:n { tikzsymbols } + } % \end{macrocode} % \end{macro} % @@ -1541,6 +1593,14 @@ after-symbol .default:n= { \xspace } , after-symbol .groups:n = { document } , % \end{macrocode} +% +% \begin{macro}{ baseline } +% \begin{macrocode} + baseline .choice: , + baseline / true .code:n = { \pgfkeys{ /@@/.style={baseline=default} } } , + baseline / false .code:n = { \pgfkeys{ /@@/.style={ } } } , + baseline .default:n = { true } , +% \end{macrocode} % \end{macro} % % @@ -1549,6 +1609,11 @@ } % \end{macrocode} % +% To make this package \pkg{todonotes} safe: +% \begin{macrocode} +\pgfkeys{ /@@/.style={baseline=default} } +% \end{macrocode} +% % % We process all options. % \begin{macro}{ ProcessKeyOptions } @@ -1688,9 +1753,9 @@ % be able to write \Makro{Command}[] (note the empty brackets, you % don't need to insert a '1' inside, it is done automatically). % -% \begin{macro}{ \@@_if_empty:nn } +% \begin{macro}{ \@@_if_empty:Tn } % This command is used in \Makro{DeclareDocumentCommand} to help -% setting the options with \verb|>{ \@@_if_empty:nn } O{1}|. If the +% setting the options with \verb|>{ \@@_if_empty:Tn } O{1}|. If the % brackets are empty the value of the option is inserted. Example: % The option has been defined by 'O{none}', so the value inserted if % no brackets are given is 'none'. If empty brackets are given, @@ -1699,7 +1764,7 @@ % safes some error messages. \Makro{ProcessedArgument} is defined in % the manual of \Package{xparse}. % \begin{macrocode} -\cs_new:Npn \@@_if_empty:nn #1#2 +\cs_new:Npn \@@_if_empty:Tn #1#2 { \tl_if_empty:nTF {#2} { \tl_set:Nn \ProcessedArgument {#1} } @@ -1755,7 +1820,7 @@ % \begin{macrocode} \cs_new_protected:Npn \@@_parse_option_type_O:w #1#2 { - \clist_put_right:Nn \l_tmpa_clist { >{ \@@_if_empty:nn {#2} } O{#2} } + \clist_put_right:Nn \l_tmpa_clist { >{ \@@_if_empty:Tn {#2} } O{#2} } \@@_parse_command_options:N } % \end{macrocode} @@ -1766,7 +1831,7 @@ % Main Command to define the command of this package. It runs % through the second input (argument specifications), stores the % arguments in a \verb|\l_tmpa_clist| and adds -% \verb|>{ \@@_if_empty:nn {#2} }| if an optional argument is +% \verb|>{ \@@_if_empty:Tn {#2} }| if an optional argument is % found. Yeah. I think the rest is self-explaining. % \begin{macrocode} \cs_new:Npn \@@_Declare_Document_Command:nnn #1#2#3 @@ -1913,7 +1978,8 @@ { (1.28ex-0.2pt+0.4pt) * \l_tmpa_dim } } }{ - \begin{tikzpicture}[scale=#1+0.02ex,x=1ex,y=1ex, line ~ width=0.4pt * \l_tmpa_dim] + \begin{tikzpicture}[ /@@ , scale=#1+0.02ex,x=1ex,y=1ex, + line ~ width=0.4pt * \l_tmpa_dim] \tl_if_eq:NNTF \c_@@_leaf_tl \l_tmpa_tl { \draw[#2] (-0.8386,0+0.2pt) -- (-0.8386,1.42); @@ -1953,7 +2019,7 @@ \colorlet { @@_trunk } {#2} \colorlet { @@_leaf ~ a } {#3} \colorlet { @@_leaf ~ b } {#4} - \begin{tikzpicture}[ x=1ex , y=1ex , line ~ width=0.07ex] + \begin{tikzpicture}[ /@@ , x=1ex , y=1ex , line ~ width=0.07ex] \pgfarrowsdeclare{leaf}{leaf} { \pgfarrowsleftextend { -0.1ex } \pgfarrowsrightextend { -0.05ex } } { @@ -2030,7 +2096,7 @@ { 2.47ex * \l_@@_scale_abs_tl } { 1.577ex * \l_@@_scale_abs_tl } }{ - \begin{tikzpicture}[x=2ex,y=2.2ex, line ~ width=0.07ex * + \begin{tikzpicture}[ /@@ , x=2ex,y=2.2ex, line ~ width=0.07ex * \l_@@_scale_abs_tl , scale=#1 ] % \end{macrocode} % Let's draw the pot. @@ -2082,6 +2148,7 @@ }{ \begin{tikzpicture} [ + /@@ , x=0.7ex , y=1.4ex , line ~ width=0.07ex * \l_@@_scale_abs_tl, scale=#1 , decoration= { @@ -2129,6 +2196,7 @@ }{ \begin{tikzpicture} [ + /@@ , y=2.1ex,x=1.4ex, scale=#1, line ~ width = 0.01ex * \l_@@_scale_abs_tl * 0.97 ] @@ -2168,6 +2236,7 @@ }{ \begin{tikzpicture} [ + /@@ , x=2.8ex, y=2.8ex,line ~ width=0.02ex * \l_@@_scale_abs_tl , scale=#1 ] % \end{macrocode} @@ -2292,6 +2361,7 @@ }{ \begin{tikzpicture} [ + /@@ , x=2.3ex , y=2.2ex, line ~ width=0.07ex * \l_@@_scale_abs_tl ,scale = #1 ] \draw[rounded ~ corners=0.07ex* \l_@@_scale_abs_tl ] @@ -2325,6 +2395,7 @@ }{ \begin{tikzpicture} [ + /@@ , x=2.3ex , y=2.2ex , line ~ width=0.035ex * \l_@@_scale_abs_tl , scale = #1 ] \fill[ rounded ~ corners=0.07ex * \l_@@_scale_abs_tl * 0.99 ] @@ -2358,6 +2429,7 @@ }{ \begin{tikzpicture} [ + /@@ , x=6.53ex , y=5ex , line ~ width=0.07ex * \l_@@_scale_abs_tl , scale = #1 ] \filldraw[rounded ~ corners=0.09ex * \l_@@_scale_abs_tl ] (0,0) rectangle (0.3,0.3); @@ -2393,6 +2465,7 @@ }{ \begin{tikzpicture} [ + /@@ , x=0.50ex , y=0.5ex , line ~ width=0.07ex * \l_@@_scale_abs_tl , scale=#1 ] \draw (0,0) rectangle (4,3); @@ -2427,6 +2500,7 @@ }{ \begin{tikzpicture} [ + /@@ , x=2.3ex , y=2.3ex , line ~ width=0.09ex * \l_@@_scale_abs_tl , scale=#1 ] \draw [rounded ~ corners = 0.023ex * \l_@@_scale_abs_tl ] @@ -2470,6 +2544,7 @@ }{ \begin{tikzpicture} [ + /@@ , x=1ex , y=1ex , line ~ width= 0.04ex * \l_@@_scale_abs_tl , scale = #1 ] \draw[line ~ width=0.08ex* \l_@@_scale_abs_tl ] (0,0) rectangle (2,1.5); @@ -2504,6 +2579,7 @@ }{ \begin{tikzpicture} [ + /@@ , x=1.2ex , y=1ex, line ~ width=0.07ex * \l_@@_scale_abs_tl ,scale=#1 ] \draw[rounded ~ corners=0.1ex * \l_@@_scale_abs_tl ] @@ -2548,6 +2624,7 @@ }{ \begin{tikzpicture} [ + /@@ , x=1ex , y=1ex , line ~ width=0.07ex * \l_@@_scale_abs_tl , scale=#1 ] \draw[rounded ~ corners=0.5ex* \l_@@_scale_abs_tl ] @@ -2580,6 +2657,7 @@ }{ \begin{tikzpicture} [ + /@@ , x=2.7ex , y=2.3ex , line ~ width=0.07ex * \l_@@_scale_abs_tl , scale=#1 ] \draw[rounded ~ corners=0.07ex* \l_@@_scale_abs_tl ] @@ -2613,6 +2691,7 @@ }{ \begin{tikzpicture} [ + /@@ , x=1ex , y=1ex , line ~ width=0.08ex * \l_@@_scale_abs_tl , scale=#1 ] \draw (0,0) rectangle (1,1.2); @@ -2646,6 +2725,7 @@ }{ \begin{tikzpicture} [ + /@@ , x=1ex,y=1ex, line ~ width=0.08ex* \l_@@_scale_abs_tl , rounded ~ corners=0.08ex* \l_@@_scale_abs_tl , scale=#1 ] @@ -2682,9 +2762,10 @@ { 0.9ex * \l_@@_scale_abs_tl } }{ \begin{tikzpicture} - [ - x=0.8ex, y=0.8ex, scale=#1, line ~ width=0.1ex * \l_@@_scale_abs_tl , - ] + [ + /@@ , + x=0.8ex, y=0.8ex, scale=#1, line ~ width=0.1ex * \l_@@_scale_abs_tl , + ] \draw[rounded ~ corners=0.10ex*\l_@@_scale_abs_tl] (0,0) rectangle (3,1); \draw[rounded ~ corners=0.15ex*\l_@@_scale_abs_tl] (3,0.75) -- (3.25,0.6) -- (3.75,0.7) -- (4.25,0.6) @@ -2733,6 +2814,7 @@ }{ \begin{tikzpicture} [ + /@@ , x=2.4ex , y=2.4ex, line ~ width=0.09ex * \l_@@_scale_abs_tl , scale = #1 ] \filldraw[fill=#2, line ~ width=0.1ex* \l_@@_scale_abs_tl ] (0,0) circle (0.33); @@ -2761,6 +2843,7 @@ }{ \begin{tikzpicture} [ + /@@ , x=2.4ex, y=2.4ex, line ~ width=0.09ex * \l_@@_scale_abs_tl , scale = #1 ] \shade[ball ~ color=#2] (0,0) circle (0.33); @@ -2785,7 +2868,7 @@ \@@_if_savebox_undefined_define_fi_and_use_it_afterwards:nT { Changey_#1_#2_#3 } { \fp_compare:nT { abs(#3) > 2 } - { \msg_error:nnn { tikzsymbols } { Changey-number-to-large } {#3} } + { \msg_error:nnn { tikzsymbols } { Changey-number-too-large } {#3} } \@@_set_scale_abs_tl:n {#1} \bool_if:NTF \g_@@_if_opt_draft_bool { @@ -2793,6 +2876,7 @@ }{ \begin{tikzpicture} [ + /@@ , x=2.4ex, y=2.4ex, line ~ width=0.12ex* \l_@@_scale_abs_tl ,scale=#1 ] \filldraw[fill=#2] (0,0) circle (0.33); @@ -2821,7 +2905,7 @@ \@@_if_savebox_undefined_define_fi_and_use_it_afterwards:nT { dChangey_#1_#2_#3 } { \fp_compare:nT { abs(#3) > 2 } - { \msg_error:nnn { tikzsymbols } { Changey-number-to-large } {#3} } + { \msg_error:nnn { tikzsymbols } { Changey-number-too-large } {#3} } \@@_set_scale_abs_tl:n {#1} \bool_if:NTF \g_@@_if_opt_draft_bool { @@ -2829,6 +2913,7 @@ }{ \begin{tikzpicture} [ + /@@ , x=2.4ex, y=2.4ex, line ~ width=0.12ex* \l_@@_scale_abs_tl ,scale=#1 ] \shade[ball ~ color=#2] (0,0) circle (0.33); @@ -2850,6 +2935,130 @@ % % % +%\begin{macro}{ \cChangey } +% \changes{v4.02}{2016/2017/05/14}{New.} +% Why didn't I implement this earlier? +% \begin{macrocode} +\cs_new:Npn \@@_cChangey:nnn #1 #2#3 + { + \fp_set:Nn \l_tmpa_fp { abs (#1/2) * 100 } + \@@_cChangey_aux:xnn { \fp_use:N \l_tmpa_fp } {#2} {#3} + } +\cs_new:Npn \@@_cChangey_aux:nnn #1 #2#3 + { + \filldraw[fill=#2!#1!#3] + } +\cs_generate_variant:Nn \@@_cChangey_aux:nnn { x } +\@@_Declare_Document_Command:nnn { cChangey } { O{1} O{red} O{yellow} O{green} m } + { + \@@_if_savebox_undefined_define_fi_and_use_it_afterwards:nT + { cChangey_#1_#2_#3_#4_#5 } + { + \fp_compare:nT { abs(#5) > 2 } + { \msg_error:nnn { tikzsymbols } { cChangey-number-too-large } {#5} } + \@@_set_scale_abs_tl:n {#1} + \bool_if:NTF \g_@@_if_opt_draft_bool + { + \@@_create_squared_draftbox:n { 1.704ex * \l_@@_scale_abs_tl } + }{ + \begin{tikzpicture} + [ + /@@ , + x=2.4ex, y=2.4ex, line ~ width=0.12ex* \l_@@_scale_abs_tl ,scale=#1 + ] + \fp_compare:nNnT {#5} < { \c_zero } + { + \@@_cChangey:nnn {#5} {#2} {#3} + (0,0) circle (0.33); + } + \fp_compare:nNnT {#5} > { \c_zero } + { + \@@_cChangey:nnn {#5} {#4} {#3} + (0,0) circle (0.33); + } + \fp_compare:nNnT {#5} = { \c_zero } + { + \filldraw [fill=#3] (0,0) circle (0.33); + } + \fill (-0.1,0.1) circle (0.05); + \fill (0.1,0.1) circle (0.05); + \pgfmathsetmacro \l_tmpa_tl { -0.125 + 0.025*#5 } + \pgfmathsetmacro \l_tmpb_tl { \l_tmpa_tl - 0.1*#5 } + \draw + ( -0.2 , \l_tmpa_tl ) .. controls + ( -0.1 , \l_tmpb_tl ) and + ( 0.1 , \l_tmpb_tl ) .. + ( 0.2 , \l_tmpa_tl ) ; + \end{tikzpicture} + } + } + } +% \end{macrocode} +%\end{macro} +% +%\begin{macro}{ \dcChangey } +% \changes{v4.02}{2016/2017/05/14}{New.} +% Same as above +% \begin{macrocode} +\cs_new:Npn \@@_dcChangey:nnn #1 #2#3 + { + \fp_set:Nn \l_tmpa_fp { abs (#1/2) * 100 } + \@@_dcChangey_aux:xnn { \fp_use:N \l_tmpa_fp } {#2} {#3} + } +\cs_new:Npn \@@_dcChangey_aux:nnn #1 #2#3 + { + \shade [ball ~ color=#2!#1!#3] + } +\cs_generate_variant:Nn \@@_dcChangey_aux:nnn { x } +\@@_Declare_Document_Command:nnn { dcChangey } { O{1} O{red} O{yellow} O{green} m } + { + \@@_if_savebox_undefined_define_fi_and_use_it_afterwards:nT + { dcChangey_#1_#2_#3_#4_#5 } + { + \fp_compare:nT { abs(#5) > 2 } + { \msg_error:nnn { tikzsymbols } { cChangey-number-too-large } {#5} } + \@@_set_scale_abs_tl:n {#1} + \bool_if:NTF \g_@@_if_opt_draft_bool + { + \@@_create_squared_draftbox:n { 1.584ex * \l_@@_scale_abs_tl } + }{ + \begin{tikzpicture} + [ + /@@ , + x=2.4ex, y=2.4ex, line ~ width=0.12ex* \l_@@_scale_abs_tl ,scale=#1 + ] + \fp_compare:nNnT {#5} < { \c_zero } + { + \@@_dcChangey:nnn {#5} {#2} {#3} + (0,0) circle (0.33); + } + \fp_compare:nNnT {#5} > { \c_zero } + { + \@@_dcChangey:nnn {#5} {#4} {#3} + (0,0) circle (0.33); + } + \fp_compare:nNnT {#5} = { \c_zero } + { + \shade[ball ~ color=#3] (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); + \pgfmathsetmacro \l_tmpa_tl { -0.125 + 0.025*#5 } + \pgfmathsetmacro \l_tmpb_tl { \l_tmpa_tl - 0.1*#5 } + \draw[black] + ( -0.2 , \l_tmpa_tl ) .. controls + ( -0.1 , \l_tmpb_tl ) and + ( 0.1 , \l_tmpb_tl ) .. + ( 0.2 , \l_tmpa_tl ) ; + \end{tikzpicture} + } + } + } +% \end{macrocode} +%\end{macro} +% +% +% % % %\begin{macro}{ \Annoey } @@ -2866,6 +3075,7 @@ }{ \begin{tikzpicture} [ + /@@ , x=2.4ex, y=2.4ex, line ~ width=0.09ex * \l_@@_scale_abs_tl ,scale=#1 ] \filldraw[fill=#2, line ~ width=0.12ex* \l_@@_scale_abs_tl ] (0,0) circle (0.33); @@ -2895,6 +3105,7 @@ }{ \begin{tikzpicture} [ + /@@ , x=2.4ex, y=2.4ex, line ~ width=0.09ex* \l_@@_scale_abs_tl ,scale=#1 ] \shade[ball ~ color=#2] (0,0) circle (0.33); @@ -2930,6 +3141,7 @@ }{ \begin{tikzpicture} [ + /@@ , x=2.4ex, y=2.4ex, line ~ width=0.12ex* \l_@@_scale_abs_tl , scale=#1 ] \filldraw[fill=#2] (0,0) circle (0.33); @@ -2959,6 +3171,7 @@ }{ \begin{tikzpicture} [ + /@@ , x=2.4ex, y=2.4ex, line ~ width=0.1ex* \l_@@_scale_abs_tl ,scale=#1 ] \shade[ball ~ color=#2] (0,0) circle (0.33); @@ -2991,6 +3204,7 @@ }{ \begin{tikzpicture} [ + /@@ , x=2.4ex, y=2.4ex, line ~ width=0.09ex* \l_@@_scale_abs_tl ,scale=#1 ] \filldraw[fill=#2,line ~ width=0.12ex* \l_@@_scale_abs_tl ] (0,0) circle (0.33); @@ -3021,6 +3235,7 @@ }{ \begin{tikzpicture} [ + /@@ , x=2.4ex, y=2.4ex, line ~ width=0.09ex* \l_@@_scale_abs_tl ,scale=#1, black ] @@ -3058,6 +3273,7 @@ }{ \begin{tikzpicture} [ + /@@ , x=2.4ex, y=2.4ex, line ~ width=0.09ex* \l_@@_scale_abs_tl ,scale=#1 ] \filldraw[fill=#2,line ~ width=0.12ex* \l_@@_scale_abs_tl ] (0,0) circle (0.33); @@ -3085,6 +3301,7 @@ }{ \begin{tikzpicture} [ + /@@ , x=2.4ex, y=2.4ex, line ~ width=0.09ex* \l_@@_scale_abs_tl ,scale=#1 ] \shade[ball ~ color=#2] (0,0) circle (0.33); @@ -3116,6 +3333,7 @@ }{ \begin{tikzpicture} [ + /@@ , x=2.4ex, y=2.4ex, line ~ width=0.12ex* \l_@@_scale_abs_tl ,scale=#1 ] \filldraw[fill=#2] (0,0) circle (0.33); @@ -3143,6 +3361,7 @@ }{ \begin{tikzpicture} [ + /@@ , x=2.4ex, y=2.4ex, line ~ width=0.12ex* \l_@@_scale_abs_tl ,scale=#1 ] \filldraw[fill=#2] (0,0) circle (0.33); @@ -3170,6 +3389,7 @@ }{ \begin{tikzpicture} [ + /@@ , x=2.4ex, y=2.4ex, line ~ width=0.12ex* \l_@@_scale_abs_tl ,scale=#1 ] \shade[ball ~ color=#2] (0,0) circle (0.33); @@ -3196,6 +3416,7 @@ }{ \begin{tikzpicture} [ + /@@ , x=2.4ex, y=2.4ex, line ~ width=0.12ex* \l_@@_scale_abs_tl ,scale=#1 ] \shade[ball ~ color=#2] (0,0) circle (0.33); @@ -3227,6 +3448,7 @@ }{ \begin{tikzpicture} [ + /@@ , x=2.4ex, y=2.4ex, line ~ width=0.09ex* \l_@@_scale_abs_tl ,scale=#1 ] \filldraw[fill=#2, line ~ width=0.12ex* \l_@@_scale_abs_tl ] (0,0) circle (0.33); @@ -3255,6 +3477,7 @@ }{ \begin{tikzpicture} [ + /@@ , x=2.4ex, y=2.4ex, line ~ width=0.09ex* \l_@@_scale_abs_tl ,scale=#1 ] \shade[ball ~ color=#2] (0,0) circle (0.33); @@ -3286,6 +3509,7 @@ }{ \begin{tikzpicture} [ + /@@ , x=2.4ex, y=2.4ex, line ~ width=0.09ex* \l_@@_scale_abs_tl ,scale=#1 ] \filldraw[fill=#2, line ~ width=0.12ex* \l_@@_scale_abs_tl ] (0,0) circle (0.33); @@ -3313,6 +3537,7 @@ }{ \begin{tikzpicture} [ + /@@ , x=2.4ex, y=2.4ex, line ~ width=0.09ex* \l_@@_scale_abs_tl ,scale=#1, black ] @@ -3348,6 +3573,7 @@ }{ \begin{tikzpicture} [ + /@@ , x=2.4ex, y=2.4ex, line ~ width=0.12ex* \l_@@_scale_abs_tl ,scale=#1 ] \filldraw[fill=#2] (0,0) circle (0.33); @@ -3405,6 +3631,7 @@ }{ \begin{tikzpicture} [ + /@@ , x=2.4ex, y=2.4ex, line ~ width=0.12ex* \l_@@_scale_abs_tl ,scale=#1, black ] @@ -3447,6 +3674,7 @@ }{ \begin{tikzpicture} [ + /@@ , x=2.4ex, y=2.4ex, line ~ width=0.12ex* \l_@@_scale_abs_tl ,scale=#1 ] \filldraw[fill=#2] (0,0) circle (0.33); @@ -3478,6 +3706,7 @@ }{ \begin{tikzpicture} [ + /@@ , x=2.4ex, y=2.4ex, line ~ width=0.12ex* \l_@@_scale_abs_tl ,scale=#1 ] \shade[ball ~ color=#2] (0,0) circle (0.33); @@ -3515,6 +3744,7 @@ }{ \begin{tikzpicture} [ + /@@ , x=2.4ex, y=2.4ex, line ~ width=0.12ex* \l_@@_scale_abs_tl ,scale=#1 ] \filldraw[fill=#2] (0,0) circle (0.33); @@ -3549,6 +3779,7 @@ }{ \begin{tikzpicture} [ + /@@ , x=2.4ex, y=2.4ex, line ~ width=0.12ex* \l_@@_scale_abs_tl ,scale=#1 ] \shade[ball ~ color=#2] (0,0) circle (0.33); @@ -3589,6 +3820,7 @@ }{ \begin{tikzpicture} [ + /@@ , x=2.3ex, y=2.3ex, line ~ width=0.12ex* \l_@@_scale_abs_tl ,scale=#1 ] \fill[fill=#3,rounded ~ corners=.023ex* \l_@@_scale_abs_tl ] @@ -3625,6 +3857,7 @@ }{ \begin{tikzpicture} [ + /@@ , x=2.3ex, y=2.3ex, line ~ width=0.12ex* \l_@@_scale_abs_tl ,scale=#1 ] \shade[ball ~ color=#2] (0,0) circle (0.3); @@ -3670,6 +3903,7 @@ }{ \begin{tikzpicture} [ + /@@ , x=0.58ex,y=0.58ex, line ~ width=0.09ex* \l_@@_scale_abs_tl ,scale=#1 ] \filldraw[fill=#2,rounded ~ corners=0.05ex* \l_@@_scale_abs_tl ] @@ -3713,6 +3947,7 @@ }{ \begin{tikzpicture} [ + /@@ , x=0.58ex,y=0.58ex, line ~ width=0.09ex* \l_@@_scale_abs_tl ,scale=#1 ] \shade @@ -3761,6 +3996,7 @@ }{ \begin{tikzpicture} [ + /@@ , x=2.4ex, y=2.4ex, line ~ width=0.09ex* \l_@@_scale_abs_tl ,scale=#1, decoration= { @@ -3807,6 +4043,7 @@ }{ \begin{tikzpicture} [ + /@@ , x=2.4ex, y=2.4ex, line ~ width=0.09ex* \l_@@_scale_abs_tl ,scale=#1, decoration= { @@ -3844,6 +4081,7 @@ }{ \begin{tikzpicture} [ + /@@ , x=2.4ex, y=2.4ex, line ~ width=0.09ex* \l_@@_scale_abs_tl ,scale=#1, black ] @@ -3885,6 +4123,7 @@ }{ \begin{tikzpicture} [ + /@@ , x=2.4ex, y=2.4ex, line ~ width=0.09ex* \l_@@_scale_abs_tl , scale=#1, black, decoration= { @@ -3928,6 +4167,7 @@ }{ \begin{tikzpicture} [ + /@@ , x=2.33ex,y=2.33ex, line ~ width=0.093ex* \l_@@_scale_abs_tl ,scale=#1 ] \draw (0,0) circle (0.3); @@ -3980,6 +4220,7 @@ }{ \begin{tikzpicture} [ + /@@ , x=2.4ex, y=2.4ex, line ~ width=0.09ex* \l_@@_scale_abs_tl , scale=#1, decoration= { @@ -4040,6 +4281,7 @@ }{ \begin{tikzpicture} [ + /@@ , x=2.4ex, y=2.4ex, line ~ width=0.09ex* \l_@@_scale_abs_tl , scale=#1, decoration= { @@ -4105,6 +4347,7 @@ }{ \begin{tikzpicture} [ + /@@ , x=0.11em,y=0.11em, line ~ width=0.07ex* \l_@@_scale_abs_tl ,scale=#1 ] \draw[] (1.7,-1) arc [start ~ angle=360, end ~ angle=180, x ~ radius=1.7, y ~ radius=2] @@ -4292,14 +4535,14 @@ 0.606ex+1.35ex * \@@_Strichmaxerl_x_max_fp -1.35ex * \@@_Strichmaxerl_x_min_fp ) * \l_@@_scale_abs_tl - } - { + }{ ( 1.173ex + 1.35ex * \@@_Strichmaxerl_y_max) * \l_@@_scale_abs_tl } }{ - { +% { \begin{tikzpicture} [ + /@@ , line ~ width=0.12ex* \l_@@_scale_abs_tl , scale=#1, x=1.35ex, y=1.35ex ] \char_set_catcode_other:N : @@ -4311,7 +4554,7 @@ \draw (.15, .4) -- (.15, .53); \draw (.15,.8) circle (0.18); \end{tikzpicture}% - } +% } } } } @@ -4354,6 +4597,7 @@ }{ \begin{tikzpicture} [ + /@@ , x=1ex, y=1ex, scale=#1, line ~ width=0.07ex* \l_@@_scale_abs_tl ] \draw[rounded ~ corners=0.04ex* \l_@@_scale_abs_tl ] @@ -4389,6 +4633,7 @@ }{ \begin{tikzpicture} [ + /@@ , x=1ex, y=1ex, scale=#1, line ~ width=0.07ex* \l_@@_scale_abs_tl , rotate=45, ] @@ -4445,6 +4690,7 @@ }{ \begin{tikzpicture} [ + /@@ , x=0.7ex,y=0.7ex, scale=#1, line ~ width=0.07ex* \l_@@_scale_abs_tl , decoration= { @@ -4488,6 +4734,7 @@ \fp_compare:nT { #1 < 0 } { \bool_set_true:N \l_@@_if_scale_negative_bool } \begin{tikzpicture} [ + /@@ , x=0.9ex,y=0.9ex, scale=#1, line ~ width=0.07ex* \l_@@_scale_abs_tl ] \draw (0,-0.5) -- (0,0.7) -- (0.5,1) -- (0.5,0.25); @@ -4525,6 +4772,7 @@ }{ \begin{tikzpicture} [ + /@@ , x=1ex , y=1ex , scale=#1 , line ~ width=0.08ex*\l_@@_scale_abs_tl ] \draw (0,0) -- (0,1.6); @@ -4561,6 +4809,7 @@ }{ \begin{tikzpicture} [ + /@@ , x=0.65ex,y=0.65ex,scale=#1, rounded ~ corners=0.03ex* \l_@@_scale_abs_tl , line ~ width=0.06ex* \l_@@_scale_abs_tl @@ -4612,6 +4861,7 @@ }{ \begin{tikzpicture} [ + /@@ , x=.13ex, y=.13ex, rounded ~ corners=0.01ex* \l_@@_scale_abs_tl , scale=#1, line ~ width= \dim_use:N \l_@@_Moai_thickness_dim * \l_@@_scale_abs_tl @@ -4664,6 +4914,7 @@ }{ \begin{tikzpicture} [ + /@@ , x=0.9ex,y=0.9ex,line ~ width=0.07ex* \l_@@_scale_abs_tl , scale=#1 ] \draw (0,0) circle [x ~ radius = 0.4 , y~radius=0.35]; @@ -4774,6 +5025,7 @@ }{ \begin{tikzpicture} [ + /@@ , x=1ex,y=1ex, line ~ width=0.04ex* \l_@@_scale_abs_tl ,scale=#1 ] \fill[brown] (-0.3,0) .. controls (0.2,0.3) and (0.2,0.7) .. (0.2,1) -- (0.5,1) .. @@ -4936,7 +5188,7 @@ %\iffalse %<*ignore> \tkzsymbls@Declare@Robust@Command{@@@@@@@@Keep@Cool@@@@I}{% -\begin{tikzpicture}[x=1em, y=1em, line ~ width=0.03em] +\begin{tikzpicture}[ /@@ ,x=1em, y=1em, line ~ width=0.03em] \fill[decorate,decoration={snake,amplitude=.02em,segment ~ length=0.4em},cyan!20!] (0,0) -- (0,1) -- (1,1) -- (1,0) -- cycle; \draw (0.3,0.3) -- (0.55,0.7);% Körper @@ -4948,7 +5200,7 @@ \tikzsymbolsaftersymbolinput% } \tkzsymbls@Declare@Robust@Command{@@@@@@@@@@@Keep@Cool@@@@@II}{% -\begin{tikzpicture}[x=1em,y=1em] +\begin{tikzpicture}[ /@@ ,x=1em,y=1em] \fill[decorate,decoration={snake,amplitude=.02em,segment ~ length=0.6em},cyan!20!] (-0.3,-0.3) rectangle (0.5,1); \draw (0,-0.1) -- (0.15,0.2) -- (0.3,-0.1);% Beine \draw (.15,.2) -- (.15,.4);% Körper -- cgit v1.2.3