diff options
author | Karl Berry <karl@freefriends.org> | 2015-08-08 22:54:29 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2015-08-08 22:54:29 +0000 |
commit | 531d43fafa269c546d587eaca6cd14adcd11914f (patch) | |
tree | 1883933af984c60254e6d9d1bd955a76748cb827 /Master/texmf-dist/tex/generic/pgf/libraries/pgflibrarycurvilinear.code.tex | |
parent | 877e963d44f039783cb9227d90c911866c780961 (diff) |
pgf (8aug15)
git-svn-id: svn://tug.org/texlive/trunk@38079 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/generic/pgf/libraries/pgflibrarycurvilinear.code.tex')
-rw-r--r-- | Master/texmf-dist/tex/generic/pgf/libraries/pgflibrarycurvilinear.code.tex | 33 |
1 files changed, 17 insertions, 16 deletions
diff --git a/Master/texmf-dist/tex/generic/pgf/libraries/pgflibrarycurvilinear.code.tex b/Master/texmf-dist/tex/generic/pgf/libraries/pgflibrarycurvilinear.code.tex index 18fa1951b05..2ae9eb00e5a 100644 --- a/Master/texmf-dist/tex/generic/pgf/libraries/pgflibrarycurvilinear.code.tex +++ b/Master/texmf-dist/tex/generic/pgf/libraries/pgflibrarycurvilinear.code.tex @@ -7,7 +7,7 @@ % % See the file doc/generic/pgf/licenses/LICENSE for more details. -\ProvidesFileRCS[v\pgfversion] $Header: /cvsroot/pgf/pgf/generic/pgf/libraries/pgflibrarycurvilinear.code.tex,v 1.3 2013/10/07 15:51:46 tantau Exp $ +\ProvidesFileRCS[v\pgfversion] $Header: /cvsroot/pgf/pgf/generic/pgf/libraries/pgflibrarycurvilinear.code.tex,v 1.4 2015/05/14 14:43:05 cfeuersaenger Exp $ % % This file defines commands for computing points in curvilinear @@ -75,7 +75,7 @@ \pgf@yb=-\pgf@y% \advance\pgf@x by\pgf@xa% \advance\pgf@y by\pgf@ya% - \pgfmathveclen@{\pgf@x}{\pgf@y}% + \pgfmathveclen@{\pgf@sys@tonumber\pgf@x}{\pgf@sys@tonumber\pgf@y}% \let\pgf@curvilinear@lenab\pgfmathresult% \pgf@process{#3}% \edef\pgf@curvilinear@line@c{\noexpand\pgfqpoint{\the\pgf@x}{\the\pgf@y}}% @@ -83,26 +83,26 @@ \pgf@yc=-\pgf@y% \advance\pgf@x by\pgf@xb% \advance\pgf@y by\pgf@yb% - \pgfmathveclen@{\pgf@x}{\pgf@y}% + \pgfmathveclen@{\pgf@sys@tonumber\pgf@x}{\pgf@sys@tonumber\pgf@y}% \let\pgf@curvilinear@lenbc\pgfmathresult% \pgf@process{#4}% \edef\pgf@curvilinear@line@d{\noexpand\pgfqpoint{\the\pgf@x}{\the\pgf@y}}% \advance\pgf@x by\pgf@xc% \advance\pgf@y by\pgf@yc% - \pgfmathveclen@{\pgf@x}{\pgf@y}% + \pgfmathveclen@{\pgf@sys@tonumber\pgf@x}{\pgf@sys@tonumber\pgf@y}% \let\pgf@curvilinear@lencd\pgfmathresult % \pgf@x=\pgf@curvilinear@lenab pt% \advance\pgf@x by\pgf@curvilinear@lenbc pt% \advance\pgf@x by\pgf@curvilinear@lencd pt% - \pgfmathreciprocal@{\pgf@x}% + \pgfmathreciprocal@{\pgf@sys@tonumber\pgf@x}% \pgf@curvilinear@time@a\pgfmathresult pt% \pgf@process{\pgfpointcurveattime{\pgf@curvilinear@time@a}{\pgf@curvilinear@line@a}{\pgf@curvilinear@line@b}{\pgf@curvilinear@line@c}{\pgf@curvilinear@line@d}}% \pgf@xb=-\pgf@x% \pgf@yb=-\pgf@y% \advance\pgf@x by\pgf@xa% \advance\pgf@y by\pgf@ya% - \pgfmathveclen@{\pgf@x}{\pgf@y}% + \pgfmathveclen@{\pgf@sys@tonumber\pgf@x}{\pgf@sys@tonumber\pgf@y}% \pgf@curvilinear@length@a\pgfmathresult pt% \ifdim\pgf@curvilinear@length@a>1pt\relax% % Ok, too large, let us make this smaller @@ -113,7 +113,7 @@ \pgf@yb=-\pgf@y% \advance\pgf@x by\pgf@xa% \advance\pgf@y by\pgf@ya% - \pgfmathveclen@{\pgf@x}{\pgf@y}% + \pgfmathveclen@{\pgf@sys@tonumber\pgf@x}{\pgf@sys@tonumber\pgf@y}% \pgf@curvilinear@length@a\pgfmathresult pt% \fi% % Compute three positions: @@ -122,7 +122,7 @@ \pgf@ya=-\pgf@y% \advance\pgf@x by\pgf@xb% \advance\pgf@y by\pgf@yb% - \pgfmathveclen@{\pgf@x}{\pgf@y}% + \pgfmathveclen@{\pgf@sys@tonumber\pgf@x}{\pgf@sys@tonumber\pgf@y}% \pgf@curvilinear@length@b\pgfmathresult pt% \advance\pgf@curvilinear@length@b by\pgf@curvilinear@length@a% \pgf@process{\pgfpointcurveattime{4\pgf@curvilinear@time@a}{\pgf@curvilinear@line@a}{\pgf@curvilinear@line@b}{\pgf@curvilinear@line@c}{\pgf@curvilinear@line@d}} @@ -130,13 +130,13 @@ \pgf@yb=-\pgf@y% \advance\pgf@x by\pgf@xa% \advance\pgf@y by\pgf@ya% - \pgfmathveclen@{\pgf@x}{\pgf@y}% + \pgfmathveclen@{\pgf@sys@tonumber\pgf@x}{\pgf@sys@tonumber\pgf@y}% \pgf@curvilinear@length@c\pgfmathresult pt% \advance\pgf@curvilinear@length@c by\pgf@curvilinear@length@b% \pgf@process{\pgfpointcurveattime{8\pgf@curvilinear@time@a}{\pgf@curvilinear@line@a}{\pgf@curvilinear@line@b}{\pgf@curvilinear@line@c}{\pgf@curvilinear@line@d}} \advance\pgf@x by\pgf@xb% \advance\pgf@y by\pgf@yb% - \pgfmathveclen@{\pgf@x}{\pgf@y}% + \pgfmathveclen@{\pgf@sys@tonumber\pgf@x}{\pgf@sys@tonumber\pgf@y}% \pgf@curvilinear@length@d\pgfmathresult pt% \advance\pgf@curvilinear@length@d by\pgf@curvilinear@length@c% \let\pgf@curvilinear@comp@a\pgf@curvilinear@comp@a@initial% @@ -154,7 +154,7 @@ \def\pgf@curvilinear@comp@a@initial{% - \pgfmathdivide@\pgf@curvilinear@time@a\pgf@curvilinear@length@a% + \pgfmathdivide@{\pgf@sys@tonumber\pgf@curvilinear@time@a}{\pgf@sys@tonumber\pgf@curvilinear@length@a}% \let\pgf@curvilinear@quot@a\pgfmathresult% \let\pgf@curvilinear@comp@a\pgf@curvilinear@comp@a@cont% \pgf@curvilinear@comp@a@cont% @@ -166,7 +166,7 @@ \def\pgf@curvilinear@comp@b@initial{% \pgf@y=\pgf@curvilinear@length@b% \advance\pgf@y by-\pgf@curvilinear@length@a% - \pgfmathdivide@\pgf@curvilinear@time@a\pgf@y% + \pgfmathdivide@{\pgf@sys@tonumber\pgf@curvilinear@time@a}{\pgf@sys@tonumber\pgf@y}% \let\pgf@curvilinear@quot@b\pgfmathresult% \pgf@y\pgfmathresult\pgf@curvilinear@length@a% \pgf@y-\pgf@y% @@ -184,7 +184,7 @@ \pgf@y=\pgf@curvilinear@length@c% \advance\pgf@y by-\pgf@curvilinear@length@b% \pgf@y.5\pgf@y% - \pgfmathdivide@\pgf@curvilinear@time@a\pgf@y% + \pgfmathdivide@{\pgf@sys@tonumber\pgf@curvilinear@time@a}{\pgf@sys@tonumber\pgf@y}% \let\pgf@curvilinear@quot@c\pgfmathresult% \pgf@y\pgf@curvilinear@quot@c\pgf@curvilinear@length@b% \pgf@y-\pgf@y% @@ -202,7 +202,7 @@ \pgf@y=\pgf@curvilinear@length@d% \advance\pgf@y by-\pgf@curvilinear@length@c% \pgf@y.25\pgf@y% - \pgfmathdivide@\pgf@curvilinear@time@a\pgf@y% + \pgfmathdivide@{\pgf@sys@tonumber\pgf@curvilinear@time@a}{\pgf@sys@tonumber\pgf@y}% \let\pgf@curvilinear@quot@d\pgfmathresult% \pgf@y\pgf@curvilinear@quot@d\pgf@curvilinear@length@c% \pgf@y-\pgf@y% @@ -217,7 +217,8 @@ } \def\pgf@curvilinear@comp@e@initial{% - \pgfmathdivide@{8\pgf@curvilinear@time@a}{\pgf@curvilinear@length@d}% + \pgfmathmultiply@{8}{\pgf@sys@tonumber\pgf@curvilinear@time@a}% + \expandafter\pgfmathdivide@\expandafter{\pgfmathresult}{\pgf@sys@tonumber\pgf@curvilinear@length@d}% \let\pgf@curvilinear@quot@e\pgfmathresult% \let\pgf@curvilinear@comp@e\pgf@curvilinear@comp@e@cont% \pgf@curvilinear@comp@e@cont% @@ -353,7 +354,7 @@ {\pgf@sys@tonumber\pgf@x}{\pgf@sys@tonumber\pgf@y}% {\pgf@sys@tonumber\pgf@ya}{\pgf@sys@tonumber\pgf@x}{0pt}{0pt}% \pgftransformshift{\pgfpointscale{-1}{\pgf@curvilinear@line@a}}% - \pgfmathveclen@{\pgfutil@tempdima}{\pgfutil@tempdimb}% + \pgfmathveclen@{\pgf@sys@tonumber\pgfutil@tempdima}{\pgf@sys@tonumber\pgfutil@tempdimb}% \ifdim\pgfutil@tempdima<0pt% \edef\pgfmathresult{-\pgfmathresult}% \fi% |