From 3031cbd848546746dd3545c69b200dd0756c87ff Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Fri, 8 Feb 2019 22:55:22 +0000 Subject: tikzsymbols (8feb19) git-svn-id: svn://tug.org/texlive/trunk@49975 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/tikzsymbols/README.md | 4 +- .../doc/latex/tikzsymbols/tikzsymbols.pdf | Bin 543939 -> 543601 bytes .../source/latex/tikzsymbols/tikzsymbols.dtx | 65 +++++++++++---------- .../source/latex/tikzsymbols/tikzsymbols.ins | 4 +- .../tex/latex/tikzsymbols/tikzsymbols.sty | 55 +++++++++-------- 5 files changed, 67 insertions(+), 61 deletions(-) (limited to 'Master') diff --git a/Master/texmf-dist/doc/latex/tikzsymbols/README.md b/Master/texmf-dist/doc/latex/tikzsymbols/README.md index 0704ef8fedd..ad77b09f66b 100644 --- a/Master/texmf-dist/doc/latex/tikzsymbols/README.md +++ b/Master/texmf-dist/doc/latex/tikzsymbols/README.md @@ -5,7 +5,7 @@ tikzsymbols Overview -------- -The *tikzsymbols* package v4.10a (2018/05/16) contains symbols created using tikz. +The *tikzsymbols* package v4.10c (2019/02/08) contains symbols created using tikz. This package provides: * various emoticons @@ -77,6 +77,8 @@ Changes - Option `draft` and `final` now set the internal draft boolean locally. - Reworked sizes of the plain vanilla draft boxes. * v4.10a Bugfix: Forgot to remove colors from `\Strichmaxerl` +* v4.10b Bugfix: Replace deprecated `\c_zero` by `0` +* v4.10c Bugfix: Added dimension to `xshift` and `yshift` for `\Fire`, `\Candle` and `\(d)Laughey` Requirements ------------ diff --git a/Master/texmf-dist/doc/latex/tikzsymbols/tikzsymbols.pdf b/Master/texmf-dist/doc/latex/tikzsymbols/tikzsymbols.pdf index a10d20af57a..f075506ba37 100644 Binary files a/Master/texmf-dist/doc/latex/tikzsymbols/tikzsymbols.pdf and b/Master/texmf-dist/doc/latex/tikzsymbols/tikzsymbols.pdf differ diff --git a/Master/texmf-dist/source/latex/tikzsymbols/tikzsymbols.dtx b/Master/texmf-dist/source/latex/tikzsymbols/tikzsymbols.dtx index 4f7c99a17f0..e845b8342fc 100644 --- a/Master/texmf-dist/source/latex/tikzsymbols/tikzsymbols.dtx +++ b/Master/texmf-dist/source/latex/tikzsymbols/tikzsymbols.dtx @@ -14,7 +14,7 @@ tikzsymbols Overview -------- -The *tikzsymbols* package v4.10a (2018/05/16) contains symbols created using tikz. +The *tikzsymbols* package v4.10c (2019/02/08) contains symbols created using tikz. This package provides: * various emoticons @@ -87,6 +87,8 @@ Changes - Option `draft` and `final` now set the internal draft boolean locally. - Reworked sizes of the plain vanilla draft boxes. * v4.10a Bugfix: Forgot to remove colors from `\Strichmaxerl` +* v4.10b Bugfix: Replace deprecated `\c_zero` by `0` +* v4.10c Bugfix: Added dimension to `xshift` and `yshift` for `\Fire`, `\Candle` and `\(d)Laughey` Requirements ------------ @@ -128,7 +130,7 @@ for the details of that license. \askforoverwritefalse \preamble - Copyright (C) 2013--2018 by Ben Vitecek (current Maintainer) + Copyright (C) 2013--2019 by Ben Vitecek (current Maintainer) This work may be distributed and/or modified under the conditions of the LaTeX Project Public License, either version 1.3c @@ -245,7 +247,7 @@ for the details of that license. \clist_use:Nn \printclist { } } -\clist_set_eq:NN \printclist \g_tikzsymbols_list_of_printing_cooking_with_argument_commands_clist +\clist_gset_eq:NN \printclist \g_tikzsymbols_list_of_printing_cooking_with_argument_commands_clist \clist_if_exist:NF \printclist { \ERROR } @@ -1514,6 +1516,8 @@ for the details of that license. % \changes{v4.10}{2018/04/11}{Option \opt{draft} and \opt{final} are local now.} % % \changes{v4.10a}{2018/05/16}{Removed colors from \cs{Strichmaxerl}.} +% \changes{v4.10b}{2019/02/07}{Replaced \cs{c_zero} by \texttt{0}.} +% \changes{v4.10c}{2019/02/08}{Fixed \texttt{xshift} and \texttt{yshift} by adding dimensions. Fixes \cs{Fire}, \cs{Candle} and \cs{(d)Laughey}.} % % The first lines are always the same: What do I need, what is the % package named. @@ -1533,8 +1537,8 @@ for the details of that license. } \ProvidesExplPackage {tikzsymbols} - {2018/05/16} - {4.10a} + {2019/02/08} + {4.10c} {Some symbols created using tikz and LaTeX3.} \@ifpackageloaded { tikz } {} { \RequirePackage { tikz } } \@ifpackageloaded { xcolor } {} { \RequirePackage { xcolor } } @@ -1618,7 +1622,7 @@ for the details of that license. % Setting the default value and yes, I know that you maybe should not % use \Makro{xspace}, but I do it anyway: % \begin{macrocode} -\tl_gset:Nn \l_@@_tikzsymbols_after_symbol_tl { \xspace } +\tl_set:Nn \l_@@_tikzsymbols_after_symbol_tl { \xspace } % \end{macrocode} % % \begin{macrocode} @@ -2410,7 +2414,7 @@ for the details of that license. % \begin{macrocode} \cs_new:Npn \@@_Declare_Document_Commands:nnnn #1#2#3#4 { - \clist_put_right:Nn + \clist_gput_right:Nn \g_tikzsymbols_list_of_printing_cooking_with_argument_commands_clist { \cs{#1} & \cs{#2} & \oarg{scale} & \tikzsymbolsuse{#1} \\ @@ -3540,17 +3544,17 @@ for the details of that license. /@@ , x=2.4ex, y=2.4ex, line ~ width=0.12ex* \l_@@_scale_abs_tl ,scale=#1 ] - \fp_compare:nNnT {#5} < { \c_zero } + \fp_compare:nNnT {#5} < { 0 } { \@@_cChangey:nnn {#5} {#2} {#3} (0,0) circle [radius=0.33]; } - \fp_compare:nNnT {#5} > { \c_zero } + \fp_compare:nNnT {#5} > { 0 } { \@@_cChangey:nnn {#5} {#4} {#3} (0,0) circle [radius=0.33]; } - \fp_compare:nNnT {#5} = { \c_zero } + \fp_compare:nNnT {#5} = { 0 } { \filldraw [fill=#3] (0,0) circle [radius=0.33]; } @@ -3601,17 +3605,17 @@ for the details of that license. /@@ , x=2.4ex, y=2.4ex, line ~ width=0.12ex* \l_@@_scale_abs_tl ,scale=#1 ] - \fp_compare:nNnT {#5} < { \c_zero } + \fp_compare:nNnT {#5} < { 0 } { \@@_dcChangey:nnn {#5} {#2} {#3} (0,0) circle [radius=0.33]; } - \fp_compare:nNnT {#5} > { \c_zero } + \fp_compare:nNnT {#5} > { 0 } { \@@_dcChangey:nnn {#5} {#4} {#3} (0,0) circle [radius=0.33]; } - \fp_compare:nNnT {#5} = { \c_zero } + \fp_compare:nNnT {#5} = { 0 } { \shade[ball ~ color=#3] (0,0) circle [radius=0.33]; } @@ -3784,9 +3788,8 @@ for the details of that license. \filldraw[fill=#2,line ~ width=0.12ex* \l_@@_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_@@_scale_abs_tl , yshift=-0.5] + \filldraw[fill=#3,rounded ~ corners=0.1ex* \l_@@_scale_abs_tl , yshift=-0.06ex] (-0.22,-0.0) .. controls (-0.13,-0.23) and (0.13,-0.23) .. (0.22,-0.0) -- cycle; - \end{tikzpicture}% } } @@ -3819,7 +3822,7 @@ for the details of that license. \shade [ ball ~ color=#3, rounded ~ corners=0.1ex* \l_@@_scale_abs_tl , - yshift=-0.3 + yshift=-0.028ex ] (-0.25,-0.0) .. controls (-0.13,-0.26) and (0.13,-0.26) .. (0.25,-0.0) -- cycle; \end{tikzpicture}% @@ -5388,8 +5391,8 @@ for the details of that license. \bool_if:NTF \l_@@_if_opt_draft_bool { \@@_create_draftbox:nn - { 0.639976ex * \l_@@_scale_abs_tl } - { (1.255ex+2.2pt) * \l_@@_scale_abs_tl } + { 0.63998ex * \l_@@_scale_abs_tl } + { 1.754993ex * \l_@@_scale_abs_tl } }{ \begin{tikzpicture} [ @@ -5399,9 +5402,9 @@ for the details of that license. \draw[rounded ~ corners=0.04ex* \l_@@_scale_abs_tl ] (0,0) -- (0.2,0) -- +(0,1) -- (0,1) -- cycle; \draw[line ~ width=0.05ex* \l_@@_scale_abs_tl ] (0.1,1) -- (0.1,1.2); - \foreach \x in { -0.4 , 0.2 } - \draw[xshift=0.95, yshift=2.2, line ~ width=0.04ex* \l_@@_scale_abs_tl ] - (-0.1,0.6) .. controls (\x,0.8) and (-0.1,1) .. (-0.1,1.2); + \foreach \x in { -0.2 , 0.4 } + \draw[line ~ width=0.04ex* \l_@@_scale_abs_tl ] + (0.1,1.1) .. controls (\x,1.3) and (0.1,1.5) .. (0.1,1.7); \end{tikzpicture}% } } @@ -5415,6 +5418,8 @@ for the details of that license. % % %\begin{macro}{ \Fire } +% Not quite happy with the |xshift| and |yshift| and |rotate|, +% but it works. % \begin{macrocode} \@@_Declare_Document_Command:nnn { Fire } { S } { @@ -5424,8 +5429,8 @@ for the details of that license. \bool_if:NTF \l_@@_if_opt_draft_bool { \@@_create_draftbox:nn - { 1.58612ex * \l_@@_scale_abs_tl } - { 1.652901ex * \l_@@_scale_abs_tl } + { 1.576ex * \l_@@_scale_abs_tl } + { 1.640942ex * \l_@@_scale_abs_tl } }{ \begin{tikzpicture} [ @@ -5435,27 +5440,27 @@ for the details of that license. ] \fill (-0.05,0) -- (0.05,0) -- (0.05,0.95) -- (-0.05,0.95) -- cycle; \fill (-0.74,0.7) -- (0.19,0.7) -- (0.19,0.8) -- (-0.74,0.8) -- cycle; - \fill[rotate=-20, xshift=-1.3, yshift=-0.1] + \fill[rotate=-20, xshift=-0.275ex, yshift=-0.02ex] (-0.05,0.07) -- (0.05,0.07) -- (0.05,0.9) -- (-0.05,0.9) -- cycle; - \fill[rotate=-70, xshift=-3.3, yshift=-2.3] + \fill[rotate=-70, xshift=-0.7ex, yshift=-0.49ex] (-0.05,0.07) -- (0.05,0.07) -- (0.05,0.9) -- (-0.05,0.9) -- cycle; - \fill[rotate=135, xshift=2.5, yshift=-3.8] + \fill[rotate=135, xshift=0.53ex, yshift=-0.805ex] (-0.05,0.07) -- (0.05,0.07) -- (0.05,0.9) -- (-0.05,0.9) -- cycle; \draw [ - rotate=-45, xshift=-2.6, yshift=1.5, + rotate=-45, xshift=-0.56ex, yshift=0.32ex, line ~ width=0.04ex* \l_@@_scale_abs_tl , x=0.5ex, y=0.5ex ] (-0.1,0.29) .. controls (-0.7,0.6) and (0,1.2) .. (0.05,1.7); \draw [ - rotate=-45, xshift=-2.1,yshift=1.5, + rotate=-45, xshift=-0.455ex,yshift=0.32ex, line ~ width=0.04ex* \l_@@_scale_abs_tl , x=0.5ex, y=0.5ex ] (-0.1,0.29) .. controls (0.7,0.6) and (-0.1,1.2) .. (-0.15,1.7); - \draw[rotate=-45, xshift=-2.5] (-0.1,0.29) .. controls + \draw[rotate=-45, xshift=-0.53ex] (-0.1,0.29) .. controls (-0.7,0.6) and (0,1.2) .. (0,1.5); - \draw[rotate=-45, xshift=-2] (-0.1,0.29) .. controls + \draw[rotate=-45, xshift=-0.424ex] (-0.1,0.29) .. controls (0.7,0.6) and (-0.1,1.2) .. (-0.1,1.5); \end{tikzpicture}% } diff --git a/Master/texmf-dist/source/latex/tikzsymbols/tikzsymbols.ins b/Master/texmf-dist/source/latex/tikzsymbols/tikzsymbols.ins index 484527a3688..9b22e1b434a 100644 --- a/Master/texmf-dist/source/latex/tikzsymbols/tikzsymbols.ins +++ b/Master/texmf-dist/source/latex/tikzsymbols/tikzsymbols.ins @@ -6,7 +6,7 @@ %% %% tikzsymbols.dtx (with options: `install') %% -%% Copyright (C) 2013--2018 by Ben Vitecek (current Maintainer) +%% Copyright (C) 2013--2019 by Ben Vitecek (current Maintainer) %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3c @@ -25,7 +25,7 @@ \askforoverwritefalse \preamble - Copyright (C) 2013--2018 by Ben Vitecek (current Maintainer) + Copyright (C) 2013--2019 by Ben Vitecek (current Maintainer) This work may be distributed and/or modified under the conditions of the LaTeX Project Public License, either version 1.3c diff --git a/Master/texmf-dist/tex/latex/tikzsymbols/tikzsymbols.sty b/Master/texmf-dist/tex/latex/tikzsymbols/tikzsymbols.sty index fbd5b2d4705..5cb16aa01ef 100644 --- a/Master/texmf-dist/tex/latex/tikzsymbols/tikzsymbols.sty +++ b/Master/texmf-dist/tex/latex/tikzsymbols/tikzsymbols.sty @@ -6,7 +6,7 @@ %% %% tikzsymbols.dtx (with options: `package') %% -%% Copyright (C) 2013--2018 by Ben Vitecek (current Maintainer) +%% Copyright (C) 2013--2019 by Ben Vitecek (current Maintainer) %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3c @@ -36,8 +36,8 @@ } \ProvidesExplPackage {tikzsymbols} - {2018/05/16} - {4.10a} + {2019/02/08} + {4.10c} {Some symbols created using tikz and LaTeX3.} \@ifpackageloaded { tikz } {} { \RequirePackage { tikz } } \@ifpackageloaded { xcolor } {} { \RequirePackage { xcolor } } @@ -57,7 +57,7 @@ \tl_new:N \l__tikzsymbols_scale_abs_tl \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_set:Nn \l__tikzsymbols_tikzsymbols_after_symbol_tl { \xspace } \tl_new:N \l__tikzsymbols_save_global_scale_for_later_because_no_better_idea_tl \tl_new:N \l__tikzsymbols_symbol_name_tl \tl_new:N \l__tikzsymbols_symbol_options_clist @@ -409,7 +409,7 @@ } \cs_new:Npn \__tikzsymbols_Declare_Document_Commands:nnnn #1#2#3#4 { - \clist_put_right:Nn + \clist_gput_right:Nn \g_tikzsymbols_list_of_printing_cooking_with_argument_commands_clist { \cs{#1} & \cs{#2} & \oarg{scale} & \tikzsymbolsuse{#1} \\ @@ -1147,17 +1147,17 @@ /__tikzsymbols , x=2.4ex, y=2.4ex, line ~ width=0.12ex* \l__tikzsymbols_scale_abs_tl ,scale=#1 ] - \fp_compare:nNnT {#5} < { \c_zero } + \fp_compare:nNnT {#5} < { 0 } { \__tikzsymbols_cChangey:nnn {#5} {#2} {#3} (0,0) circle [radius=0.33]; } - \fp_compare:nNnT {#5} > { \c_zero } + \fp_compare:nNnT {#5} > { 0 } { \__tikzsymbols_cChangey:nnn {#5} {#4} {#3} (0,0) circle [radius=0.33]; } - \fp_compare:nNnT {#5} = { \c_zero } + \fp_compare:nNnT {#5} = { 0 } { \filldraw [fill=#3] (0,0) circle [radius=0.33]; } @@ -1201,17 +1201,17 @@ /__tikzsymbols , x=2.4ex, y=2.4ex, line ~ width=0.12ex* \l__tikzsymbols_scale_abs_tl ,scale=#1 ] - \fp_compare:nNnT {#5} < { \c_zero } + \fp_compare:nNnT {#5} < { 0 } { \__tikzsymbols_dcChangey:nnn {#5} {#2} {#3} (0,0) circle [radius=0.33]; } - \fp_compare:nNnT {#5} > { \c_zero } + \fp_compare:nNnT {#5} > { 0 } { \__tikzsymbols_dcChangey:nnn {#5} {#4} {#3} (0,0) circle [radius=0.33]; } - \fp_compare:nNnT {#5} = { \c_zero } + \fp_compare:nNnT {#5} = { 0 } { \shade[ball ~ color=#3] (0,0) circle [radius=0.33]; } @@ -1336,9 +1336,8 @@ \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] + \filldraw[fill=#3,rounded ~ corners=0.1ex* \l__tikzsymbols_scale_abs_tl , yshift=-0.06ex] (-0.22,-0.0) .. controls (-0.13,-0.23) and (0.13,-0.23) .. (0.22,-0.0) -- cycle; - \end{tikzpicture}% } } @@ -1364,7 +1363,7 @@ \shade [ ball ~ color=#3, rounded ~ corners=0.1ex* \l__tikzsymbols_scale_abs_tl , - yshift=-0.3 + yshift=-0.028ex ] (-0.25,-0.0) .. controls (-0.13,-0.26) and (0.13,-0.26) .. (0.25,-0.0) -- cycle; \end{tikzpicture}% @@ -2551,8 +2550,8 @@ \bool_if:NTF \l__tikzsymbols_if_opt_draft_bool { \__tikzsymbols_create_draftbox:nn - { 0.639976ex * \l__tikzsymbols_scale_abs_tl } - { (1.255ex+2.2pt) * \l__tikzsymbols_scale_abs_tl } + { 0.63998ex * \l__tikzsymbols_scale_abs_tl } + { 1.754993ex * \l__tikzsymbols_scale_abs_tl } }{ \begin{tikzpicture} [ @@ -2562,9 +2561,9 @@ \draw[rounded ~ corners=0.04ex* \l__tikzsymbols_scale_abs_tl ] (0,0) -- (0.2,0) -- +(0,1) -- (0,1) -- cycle; \draw[line ~ width=0.05ex* \l__tikzsymbols_scale_abs_tl ] (0.1,1) -- (0.1,1.2); - \foreach \x in { -0.4 , 0.2 } - \draw[xshift=0.95, yshift=2.2, line ~ width=0.04ex* \l__tikzsymbols_scale_abs_tl ] - (-0.1,0.6) .. controls (\x,0.8) and (-0.1,1) .. (-0.1,1.2); + \foreach \x in { -0.2 , 0.4 } + \draw[line ~ width=0.04ex* \l__tikzsymbols_scale_abs_tl ] + (0.1,1.1) .. controls (\x,1.3) and (0.1,1.5) .. (0.1,1.7); \end{tikzpicture}% } } @@ -2577,8 +2576,8 @@ \bool_if:NTF \l__tikzsymbols_if_opt_draft_bool { \__tikzsymbols_create_draftbox:nn - { 1.58612ex * \l__tikzsymbols_scale_abs_tl } - { 1.652901ex * \l__tikzsymbols_scale_abs_tl } + { 1.576ex * \l__tikzsymbols_scale_abs_tl } + { 1.640942ex * \l__tikzsymbols_scale_abs_tl } }{ \begin{tikzpicture} [ @@ -2588,27 +2587,27 @@ ] \fill (-0.05,0) -- (0.05,0) -- (0.05,0.95) -- (-0.05,0.95) -- cycle; \fill (-0.74,0.7) -- (0.19,0.7) -- (0.19,0.8) -- (-0.74,0.8) -- cycle; - \fill[rotate=-20, xshift=-1.3, yshift=-0.1] + \fill[rotate=-20, xshift=-0.275ex, yshift=-0.02ex] (-0.05,0.07) -- (0.05,0.07) -- (0.05,0.9) -- (-0.05,0.9) -- cycle; - \fill[rotate=-70, xshift=-3.3, yshift=-2.3] + \fill[rotate=-70, xshift=-0.7ex, yshift=-0.49ex] (-0.05,0.07) -- (0.05,0.07) -- (0.05,0.9) -- (-0.05,0.9) -- cycle; - \fill[rotate=135, xshift=2.5, yshift=-3.8] + \fill[rotate=135, xshift=0.53ex, yshift=-0.805ex] (-0.05,0.07) -- (0.05,0.07) -- (0.05,0.9) -- (-0.05,0.9) -- cycle; \draw [ - rotate=-45, xshift=-2.6, yshift=1.5, + rotate=-45, xshift=-0.56ex, yshift=0.32ex, line ~ width=0.04ex* \l__tikzsymbols_scale_abs_tl , x=0.5ex, y=0.5ex ] (-0.1,0.29) .. controls (-0.7,0.6) and (0,1.2) .. (0.05,1.7); \draw [ - rotate=-45, xshift=-2.1,yshift=1.5, + rotate=-45, xshift=-0.455ex,yshift=0.32ex, line ~ width=0.04ex* \l__tikzsymbols_scale_abs_tl , x=0.5ex, y=0.5ex ] (-0.1,0.29) .. controls (0.7,0.6) and (-0.1,1.2) .. (-0.15,1.7); - \draw[rotate=-45, xshift=-2.5] (-0.1,0.29) .. controls + \draw[rotate=-45, xshift=-0.53ex] (-0.1,0.29) .. controls (-0.7,0.6) and (0,1.2) .. (0,1.5); - \draw[rotate=-45, xshift=-2] (-0.1,0.29) .. controls + \draw[rotate=-45, xshift=-0.424ex] (-0.1,0.29) .. controls (0.7,0.6) and (-0.1,1.2) .. (-0.1,1.5); \end{tikzpicture}% } -- cgit v1.2.3