From 543354e66d53cfba243be523e74d8fabba12e15d Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Mon, 5 Jun 2017 23:12:59 +0000 Subject: hobby (1jun17) git-svn-id: svn://tug.org/texlive/trunk@44474 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/hobby/hobby.pdf | Bin 523029 -> 523036 bytes Master/texmf-dist/doc/latex/hobby/hobby_code.pdf | Bin 444451 -> 444339 bytes Master/texmf-dist/source/latex/hobby/hobby.dtx | 14 ++++++++------ Master/texmf-dist/tex/latex/hobby/hobby.code.tex | 4 ++-- .../tex/latex/hobby/tikzlibraryhobby.code.tex | 8 +++++--- 5 files changed, 15 insertions(+), 11 deletions(-) (limited to 'Master') diff --git a/Master/texmf-dist/doc/latex/hobby/hobby.pdf b/Master/texmf-dist/doc/latex/hobby/hobby.pdf index 0c9b734b35d..1235aa74c19 100644 Binary files a/Master/texmf-dist/doc/latex/hobby/hobby.pdf and b/Master/texmf-dist/doc/latex/hobby/hobby.pdf differ diff --git a/Master/texmf-dist/doc/latex/hobby/hobby_code.pdf b/Master/texmf-dist/doc/latex/hobby/hobby_code.pdf index 832c2eaa9e6..9b8f4973b9e 100644 Binary files a/Master/texmf-dist/doc/latex/hobby/hobby_code.pdf and b/Master/texmf-dist/doc/latex/hobby/hobby_code.pdf differ diff --git a/Master/texmf-dist/source/latex/hobby/hobby.dtx b/Master/texmf-dist/source/latex/hobby/hobby.dtx index e5937b7f202..d555a5b2f36 100644 --- a/Master/texmf-dist/source/latex/hobby/hobby.dtx +++ b/Master/texmf-dist/source/latex/hobby/hobby.dtx @@ -111,7 +111,7 @@ and the derived files hobby.code.tex % % \fi % -% \CheckSum{3373} +% \CheckSum{3382} % % \CharacterTable % {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z @@ -183,8 +183,8 @@ and the derived files hobby.code.tex \tl_new:N \g__hobby_version \tl_new:N \g__hobby_date -\tl_set:Nn \g__hobby_version {1.7} -\tl_set:Nn \g__hobby_date {2016-02-19} +\tl_set:Nn \g__hobby_version {1.8} +\tl_set:Nn \g__hobby_date {2017-06-01} \DeclareDocumentCommand \hobbyVersion {} { \tl_use:N \g__hobby_version @@ -2209,12 +2209,12 @@ sin ( (\array_get:Nn \l_hobby_angles_array {##1}) break/.default = true, invert blank/.default = true, in angle/.code = {% - \pgfmathparse{#1*pi/180}% + \pgfmathparse{(#1)*pi/180}% \edef\@temp{in angle=\pgfmathresult,}% \pgfkeysalso{add option to Hobby path/.expand once=\@temp}% }, out angle/.code = {% - \pgfmathparse{#1*pi/180}% + \pgfmathparse{(#1)*pi/180}% \edef\@temp{out angle=\pgfmathresult,}% \pgfkeysalso{add option to Hobby path/.expand once=\@temp}% }, @@ -2306,6 +2306,7 @@ sin ( (\array_get:Nn \l_hobby_angles_array {##1}) \def\pgf@temp{#1}% \ifx\pgf@temp\pgfutil@empty \let\tikz@timer=\tikz@timer@line + \expandafter\def\expandafter\hobby@collected@onpath\expandafter{\expandafter{\expandafter}\hobby@collected@onpath} \else \hobby@topgf{#1}% \edef\tikz@timer@cont@one{\noexpand\pgfqpoint{\the\pgf@x}{\the\pgf@y}}% @@ -2567,6 +2568,7 @@ sin ( (\array_get:Nn \l_hobby_angles_array {##1}) % \begin{macro}{\hobby@finish} % \begin{macrocode} \def\hobby@finish{% + \hobby@restore@tikz@commands \ifhobby@externalise \ifx\hobby@path@name\pgfutil@empty \hobbygenusepath @@ -2581,7 +2583,7 @@ sin ( (\array_get:Nn \l_hobby_angles_array {##1}) \hobbysavepath{\hobby@path@name}% \fi \global\let\hobby@path@name=\pgfutil@empty - \hobby@restore@tikz@commands + \tikzset{designated Hobby path=next}% } % \end{macrocode} % \end{macro} diff --git a/Master/texmf-dist/tex/latex/hobby/hobby.code.tex b/Master/texmf-dist/tex/latex/hobby/hobby.code.tex index 74da1f1e335..fc9655567eb 100644 --- a/Master/texmf-dist/tex/latex/hobby/hobby.code.tex +++ b/Master/texmf-dist/tex/latex/hobby/hobby.code.tex @@ -33,8 +33,8 @@ \tl_new:N \g__hobby_version \tl_new:N \g__hobby_date -\tl_set:Nn \g__hobby_version {1.7} -\tl_set:Nn \g__hobby_date {2016-02-19} +\tl_set:Nn \g__hobby_version {1.8} +\tl_set:Nn \g__hobby_date {2017-06-01} \DeclareDocumentCommand \hobbyVersion {} { \tl_use:N \g__hobby_version diff --git a/Master/texmf-dist/tex/latex/hobby/tikzlibraryhobby.code.tex b/Master/texmf-dist/tex/latex/hobby/tikzlibraryhobby.code.tex index 1a59b037cec..21b75c4958b 100644 --- a/Master/texmf-dist/tex/latex/hobby/tikzlibraryhobby.code.tex +++ b/Master/texmf-dist/tex/latex/hobby/tikzlibraryhobby.code.tex @@ -84,12 +84,12 @@ break/.default = true, invert blank/.default = true, in angle/.code = {% - \pgfmathparse{#1*pi/180}% + \pgfmathparse{(#1)*pi/180}% \edef\@temp{in angle=\pgfmathresult,}% \pgfkeysalso{add option to Hobby path/.expand once=\@temp}% }, out angle/.code = {% - \pgfmathparse{#1*pi/180}% + \pgfmathparse{(#1)*pi/180}% \edef\@temp{out angle=\pgfmathresult,}% \pgfkeysalso{add option to Hobby path/.expand once=\@temp}% }, @@ -170,6 +170,7 @@ \def\pgf@temp{#1}% \ifx\pgf@temp\pgfutil@empty \let\tikz@timer=\tikz@timer@line + \expandafter\def\expandafter\hobby@collected@onpath\expandafter{\expandafter{\expandafter}\hobby@collected@onpath} \else \hobby@topgf{#1}% \edef\tikz@timer@cont@one{\noexpand\pgfqpoint{\the\pgf@x}{\the\pgf@y}}% @@ -344,6 +345,7 @@ \tikz@scan@one@point\hobby@addfromtikz% } \def\hobby@finish{% + \hobby@restore@tikz@commands \ifhobby@externalise \ifx\hobby@path@name\pgfutil@empty \hobbygenusepath @@ -358,7 +360,7 @@ \hobbysavepath{\hobby@path@name}% \fi \global\let\hobby@path@name=\pgfutil@empty - \hobby@restore@tikz@commands + \tikzset{designated Hobby path=next}% } \tikzset{ quick curve through/.style={% -- cgit v1.2.3