From c505027958efb9577fdffa8a872829364100e8b6 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Mon, 2 Jan 2017 23:51:39 +0000 Subject: tikzsymbols (27dec16) git-svn-id: svn://tug.org/texlive/trunk@42844 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/tikzsymbols/README | 75 ------------- Master/texmf-dist/doc/latex/tikzsymbols/README.md | 77 +++++++++++++ .../doc/latex/tikzsymbols/tikzsymbols.pdf | Bin 490181 -> 493604 bytes .../source/latex/tikzsymbols/tikzsymbols.dtx | 121 ++++++++++++++++----- .../tex/latex/tikzsymbols/tikzsymbols.sty | 34 +++++- 5 files changed, 202 insertions(+), 105 deletions(-) delete mode 100644 Master/texmf-dist/doc/latex/tikzsymbols/README create mode 100644 Master/texmf-dist/doc/latex/tikzsymbols/README.md diff --git a/Master/texmf-dist/doc/latex/tikzsymbols/README b/Master/texmf-dist/doc/latex/tikzsymbols/README deleted file mode 100644 index 42e403bbddf..00000000000 --- a/Master/texmf-dist/doc/latex/tikzsymbols/README +++ /dev/null @@ -1,75 +0,0 @@ -tikzsymbols -=========== - -Overview --------- - -The `tiksymbols` package v4.0 contains symbols created using tikz. - -This package provides: - * various emoticons - * cooking symbols - * trees - * other symbols (e.g. Penrose-Triangle(Triban), chair, coffeecup, etc.) - -Changes -------- -* v1.6 Several bugs fixed and some options added. -* v1.7 New symbols and some "bugs" fixed -* v2.0 Bug fixed, now option "tree=on/off" is working again, - new symbols: "Triban", improved BasicTree code. - New option: "marvsoym" (see documentation for more details). -* v2.2 Included \@ifpackageloaded, now symbols can have negative scale, - Did something else, I can`t remember. -* v2.25 Changed some code -* v2.5 New option: draftabsolute (symbols are replaced by text and LateX - becomes faster again). Changed manual a bit. -* v3.0 Symbols are stored inside a save-box and are used via \usebox{}, - New option: "draft=absolute" (old option is still useable but obsolete), - Changed output of "draft=absolute", - New option: "prefix=", adds a to all commands, - New option: "usebox=true/false" If false the symbols aren`t stored inside a box, - See manual for more changes. -* v3.0a New cookingsymbols: \grater, \bottle -* v3.0b Deleted some non-ASCII characters. -* v3.0g Removed a bug caused by me messing up with commands. - Removed package `calc` and replaced \setlength with \pgfmathsetlength - Reworked some code of the symbols. - Did not change the manual. -* v3.0h Created a bug in the process of fixing the last bug, - added the forgotten \fi. -* v3.01alpha Copied the 2e code and started rewriting the code - in LaTeX3. -* v3.38 Nearly finished rewriting. -* v3.40 Now everything is coded in LaTeX3. -* v3.40-v0.95 Various fixes and changes. -* v3.95 New emoticon \(d)Changey. -* v4.0 Finished reworking the code. - - -Requirements ------------- - - * expl3 & xparse - * tikz - * xcolor - * xspace - * l3keys2e - - -This file contains ------------------- - - * README - * tikzsymbols.pdf - * tikzsymbols.dtx - * tikzsymbols.ins - -License -------- -This material is subject to the LaTeX Project Public License. See - - http://www.ctan.org/tex-archive/help/Catalogue/licenses.lppl.html - -for the details of that license. - diff --git a/Master/texmf-dist/doc/latex/tikzsymbols/README.md b/Master/texmf-dist/doc/latex/tikzsymbols/README.md new file mode 100644 index 00000000000..24dfb399bbb --- /dev/null +++ b/Master/texmf-dist/doc/latex/tikzsymbols/README.md @@ -0,0 +1,77 @@ +tikzsymbols +=========== + +Overview +-------- + +The `tiksymbols` package v4.01 contains symbols created using tikz. + +This package provides: + * various emoticons + * cooking symbols + * trees + * other symbols (e.g. Penrose-Triangle(Triban), chair, coffeecup, etc.) + +Changes +------- +* v1.6 Several bugs fixed and some options added. +* v1.7 New symbols and some "bugs" fixed +* v2.0 Bug fixed, now option "tree=on/off" is working again, + new symbols: "Triban", improved BasicTree code. + New option: "marvsoym" (see documentation for more details). +* v2.2 Included \@ifpackageloaded, now symbols can have negative scale, + Did something else, I can`t remember. +* v2.25 Changed some code +* v2.5 New option: draftabsolute (symbols are replaced by text and LateX + becomes faster again). Changed manual a bit. +* v3.0 Symbols are stored inside a save-box and are used via \usebox{}, + New option: "draft=absolute" (old option is still useable but obsolete), + Changed output of "draft=absolute", + New option: "prefix=", adds a to all commands, + New option: "usebox=true/false" If false the symbols aren`t stored inside a box, + See manual for more changes. +* v3.0a New cookingsymbols: \grater, \bottle +* v3.0b Deleted some non-ASCII characters. +* v3.0g Removed a bug caused by me messing up with commands. + Removed package `calc` and replaced \setlength with \pgfmathsetlength + Reworked some code of the symbols. + Did not change the manual. +* v3.0h Created a bug in the process of fixing the last bug, + added the forgotten \fi. +* v3.01alpha Copied the 2e code and started rewriting the code + in LaTeX3. +* v3.38 Nearly finished rewriting. +* v3.40 Now everything is coded in LaTeX3. +* v3.40-v0.95 Various fixes and changes. +* v3.95 New emoticon \(d)Changey. +* v4.0 Finished reworking the code. +* v4.01 Added a known problem to the documentation. + New Symbol: \rollingpin (and of course the german equivalent \Nudelholz) + + +Requirements +------------ + + * expl3 & xparse + * tikz + * xcolor + * xspace + * l3keys2e + + +This file contains +------------------ + + * README + * tikzsymbols.pdf + * tikzsymbols.dtx + * tikzsymbols.ins + +License +------- +This material is subject to the LaTeX Project Public License. See + + http://www.ctan.org/tex-archive/help/Catalogue/licenses.lppl.html + +for the details of that license. + diff --git a/Master/texmf-dist/doc/latex/tikzsymbols/tikzsymbols.pdf b/Master/texmf-dist/doc/latex/tikzsymbols/tikzsymbols.pdf index faec0043c37..5cc2ec8d02d 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 145ef708177..f9fa847d793 100644 --- a/Master/texmf-dist/source/latex/tikzsymbols/tikzsymbols.dtx +++ b/Master/texmf-dist/source/latex/tikzsymbols/tikzsymbols.dtx @@ -27,7 +27,7 @@ % % \iffalse %<*driver> -\documentclass[onlydoc,12pt]{l3doc} +\documentclass[onlydoc,11pt]{l3doc} \usepackage[utf8]{inputenc} \usepackage[T1]{fontenc} @@ -38,7 +38,6 @@ \usepackage{longtable} \usepackage{booktabs} \usepackage{mathtools} -\newcommand\Packageload{tikzsymbols} \usepackage{tikzsymbols} \usepackage{xparse} \usepackage{marginnote} @@ -52,8 +51,8 @@ \AtEndDocument { \PrintChanges \PrintIndex } %: Ganz oben -\ExplSyntaxOn \makeatletter +\ExplSyntaxOn \newcommand\tikzsymbols{\Package{tikzsymbols}} @@ -61,25 +60,9 @@ \NewDocumentCommand{\definedBasicTree} { O{1} m m m m } { \group_begin: -% \str_if_eq:VnTF \Packageload { tikzsymbols } \__tikzsymbols_Basic_Tree_off:nnnnn {#1} {#2} {#3} {#4} {#5} -% { \tikzsymbols@Basic@Tree@off {#1} {#2} {#3} {#4} {#5} } \group_end: } -\NewDocumentCommand \PlainVanilla { m } - {{{ -% \str_if_eq:VnTF \Packageload { tikzsymbols } - \bool_set_true:N \g__tikzsymbols_if_opt_draft_bool -% { \@tikzsymbols@opt@drafttrue } - #1[1.00001] - }}} -\NewDocumentCommand \PlainVanillaII { m } - {{{ -% \str_if_eq:VnTF \Packageload { tikzsymbols } - \bool_set_true:N \g__tikzsymbols_if_opt_draft_bool -% { \@tikzsymbols@opt@drafttrue } - #1 - }}} \newcommand{\Package}{\pkg} @@ -197,7 +180,7 @@ % %\author{Ben Vitecek \\ \href{mailto:b.vitecek@gmx.at}{b.vitecek@gmx.at}} % -% \date{April 4, 2016} ^^A 2016/03/20 +% \date{December 26, 2016} % % \maketitle{} % @@ -560,7 +543,9 @@ % \Reibe, % \grater, % \Flasche, -% \bottle +% \bottle, +% \Nudelholz, +% \rollingpin % } % % The following table shows all available cooking-symbols and their @@ -924,7 +909,8 @@ % \verb|\colorbox{black}{\BasicTree[3.75]{gray!80}{gray!50}{gray!40}{leaf}}| % \colorbox{black}{\BasicTree[3.75]{gray!80}{gray!50}{gray!40}{leaf}} % -% \paragraph{draftbox \Makro{BasicTree} examples} Some \enquote{draftbox} trees: +% \paragraph{draftbox \Makro{BasicTree} examples} Some \enquote{draftbox} trees +% (using \Option{tree=false}): % % \dots and using the same trees with \Option{tree=off/false} or \Option{draft}(\Option{=true}): % @@ -952,7 +938,9 @@ % % % -% \section{Known errors} +% \section{Known errors \& Problems} +% +% \subsection*{marvosym} % Make sure you load \Package{marvosym} \emph{before} % \Package{tikzsymbols} because both packages define \verb|\Smiley|, % \Package{marvosym} via \verb|\newcommand| \tikzsymbols\ via @@ -968,6 +956,18 @@ % marvosym more, use the \tikzsymbols{} option \verb|marvosym| % or \Option{prefix}). % +% \subsection*{babel} +% +% If you encounter an error message like +% \begin{verbatim} +% Argument of \pgffor@next has an extra } +% \end{verbatim} +% while using \pkg{babel} with e.g. language \enquote{francais} +% and for example \cs{Cooley} you may add +% \begin{verbatim} +% \usetikzlibrary{babel} +% \end{verbatim} +% to your preamble. This should (hopefully) fix the problem. % % \section{Nobody is perfect} % @@ -1029,6 +1029,32 @@ %<@@=tikzsymbols> % \end{macrocode} % +%\changes {v1.0} {2013/01/19} {Initial version} +%\changes {v1.05} {2013/02/13} {Deleted a \enquote{t} in the BasicTree-code, shortened the trunk from the tree a bit, renamed some codes, made an index} +%\changes {v1.6} {2013/02/14} {Now \enquote{Person} can be used in sections, etc.} +%\changes {v1.6} {2013/02/14} {Now an error message is generated if the last parameter of \enquote{BasicTree} is neither \enquote{leaf} nor empty.} +%\changes {v1.6} {2013/02/14} { New options: draft and final. If in documentclass the option \enquote{draft} is defined, the package recognizes it. Plus some warnings if you use class option draft/final with package option tree=on/off.} +%\changes {v1.6} {2013/02/14} { Renamed \enquote{tikzsymbolsaftersymbolinput} to \enquote{tikzsymbolsaftersymbolinput}} +%\changes {v1.61} {2013/02/17} {Made an invisible box in BasicTree.} +%\changes {v1.65} {2013/02/17} {Improved BasicTree; New symbols \enquote{Schaler/peeler}, Laughey, Walley, Ninja; but didn't improve the source-description} +%\changes {v1.7} {2013/02/28} {New symbols, etc.} +%\changes {v2.0} {2013/03/07} {Fixed Bugs, improved BasicTree, new option \enquote{marvosym}, new symbol} +%\changes {v2.2} {2013/03/23} {Now you can use negative scaling. Include \Makro{@ifpackageloaded}. Did something else, I can't remember} +%\changes {v2.5} {2013/04/18} {New option: draftabsolute, changed the documentation a bit} +%\changes {v3.0} {2013/07/21} {Changed the documentation} +%\changes {v3.0} {2013/07/21} {Replaced \cs{let} by \cs{tikzsymbols@let}} +% \changes{v3.0}{2013/07/21}{Changed symbol code} +% \changes{v3.0}{2013/07/26}{Using \cs{changes{}{}{}} correctly (hopefully)} +% \changes{v3.0}{2013/07/21}{Changed output of \enquote{absolute} option} +% \changes{v3.0b}{2014/10/19}{Deleted non ASCII characters in der .sty file.} +% \changes{v3.0d}{2014/10/29}{\cs{tikzsymbolsscl} to \cs{tikzsymbols@scl}} +% \changes{v3.0e}{2014/10/29}{\cs{tikzsymbolsDeclareRobustCommand} to \cs{tikzsymbols@Declare@Robust@Command}} +% \changes{v3.0f}{2014/10/29}{\cs{tikzsymbolsbxPrmtrstore} to \cs{tikzsymbols@bx@Prmtrstore}} +% +% \changes{v3.0g}{2015/10/01}{Deleted package \Package{calc}, using now \cs{pgfmathsetlength} instead of \cs{setlength}.} +% +% \changes{v3.0h}{2015/10/13}{Added a missing \cs{fi} into the code. } +% % \changes{v3.01alpha}{2015/10/03}{Started from new using \LaTeX3} % % \changes{v3.38}{2015/10/03}{Nearly finished translating the code to @@ -1059,13 +1085,14 @@ % \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).} % % 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/03/28} +\@ifpackagelater{expl3}{2016/11/21} {} {% \PackageError { tikzsymbols }{ Support~package~expl3~too~old } @@ -1078,8 +1105,8 @@ } \ProvidesExplPackage {tikzsymbols} - {2016/04/04} - {4.0} + {2016/12/26} + {4.01} {Some symbols created using tikz and LaTeX3.} \@ifpackageloaded { tikz } {} { \RequirePackage { tikz } } \@ifpackageloaded { xcolor } {} { \RequirePackage { xcolor } } @@ -1862,7 +1889,7 @@ % % % \begin{macro}{ \@@_Basic_Tree_off:nnnnn } -% This command creates not inly the plain vanilla draftbox, but also a box +% This command creates not only the plain vanilla draftbox, but also a box % drawn by \Package{tikz} using the colors of the tree to color the % lines. If the last argument is 'leaf', the box has a bottom line, if % it is empty the bottom line disappears. @@ -2634,6 +2661,46 @@ % \end{macrocode} % \end{macro} % +% +% +% +% +% \begin{macro}{ \Nudelholz , \rollingpin } +% You know what that is\dots +% +% For the draftbox the calculation of the length is \verb|(1.26ex + 4.25ex)*0.8 + 0.1ex|. +% \begin{macrocode} +\@@_Declare_Document_Commands:nnnn { Nudelholz } { rollingpin } { O{1} } + { + \@@_if_savebox_undefined_define_fi_and_use_it_afterwards:nT { Nudelholz_#1 } + { + \@@_set_scale_abs_tl:n {#1} + \bool_if:NTF \g_@@_if_opt_draft_bool + { + \@@_create_draftbox:nn + { 4.508ex * \l_@@_scale_abs_tl }%% + { 0.9ex * \l_@@_scale_abs_tl } + }{ + \begin{tikzpicture} + [ + 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) + (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) + -- (-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]; + \end{tikzpicture} + } + } + } +% \end{macrocode} +% \end{macro} +% % I may will remove this, but for testing a list of commands is useful. % \begin{macrocode} \clist_set_eq:NN \g_tikzsymbols_list_of_cooking_commands_clist \l_@@_tmpa_clist diff --git a/Master/texmf-dist/tex/latex/tikzsymbols/tikzsymbols.sty b/Master/texmf-dist/tex/latex/tikzsymbols/tikzsymbols.sty index b4f071b9bce..f038974a904 100644 --- a/Master/texmf-dist/tex/latex/tikzsymbols/tikzsymbols.sty +++ b/Master/texmf-dist/tex/latex/tikzsymbols/tikzsymbols.sty @@ -25,7 +25,7 @@ %% and the derived file tikzsymbols.sty. \@ifpackageloaded{xparse}{}{\RequirePackage{xparse}} \@ifpackageloaded{expl3}{}{\RequirePackage{expl3}} -\@ifpackagelater{expl3}{2016/03/28} +\@ifpackagelater{expl3}{2016/11/21} {} {% \PackageError { tikzsymbols }{ Support~package~expl3~too~old } @@ -38,8 +38,8 @@ } \ProvidesExplPackage {tikzsymbols} - {2016/04/04} - {4.0} + {2016/12/26} + {4.01} {Some symbols created using tikz and LaTeX3.} \@ifpackageloaded { tikz } {} { \RequirePackage { tikz } } \@ifpackageloaded { xcolor } {} { \RequirePackage { xcolor } } @@ -829,6 +829,34 @@ } } } +\__tikzsymbols_Declare_Document_Commands:nnnn { Nudelholz } { rollingpin } { O{1} } + { + \__tikzsymbols_if_savebox_undefined_define_fi_and_use_it_afterwards:nT { Nudelholz_#1 } + { + \__tikzsymbols_set_scale_abs_tl:n {#1} + \bool_if:NTF \g__tikzsymbols_if_opt_draft_bool + { + \__tikzsymbols_create_draftbox:nn + { 4.508ex * \l__tikzsymbols_scale_abs_tl }%% + { 0.9ex * \l__tikzsymbols_scale_abs_tl } + }{ + \begin{tikzpicture} + [ + x=0.8ex, y=0.8ex, scale=#1, line ~ width=0.1ex * \l__tikzsymbols_scale_abs_tl , + ] + \draw[rounded ~ corners=0.10ex*\l__tikzsymbols_scale_abs_tl] (0,0) rectangle (3,1); + \draw[rounded ~ corners=0.15ex*\l__tikzsymbols_scale_abs_tl] + (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) + -- (-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]; + \end{tikzpicture} + } + } + } \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} } -- cgit v1.2.3