summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/generic/pgf/basiclayer/pgfcorepathconstruct.code.tex
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/tex/generic/pgf/basiclayer/pgfcorepathconstruct.code.tex')
-rw-r--r--Master/texmf-dist/tex/generic/pgf/basiclayer/pgfcorepathconstruct.code.tex144
1 files changed, 72 insertions, 72 deletions
diff --git a/Master/texmf-dist/tex/generic/pgf/basiclayer/pgfcorepathconstruct.code.tex b/Master/texmf-dist/tex/generic/pgf/basiclayer/pgfcorepathconstruct.code.tex
index ad0a8fff031..2886ffa8a53 100644
--- a/Master/texmf-dist/tex/generic/pgf/basiclayer/pgfcorepathconstruct.code.tex
+++ b/Master/texmf-dist/tex/generic/pgf/basiclayer/pgfcorepathconstruct.code.tex
@@ -7,7 +7,7 @@
%
% See the file doc/generic/pgf/licenses/LICENSE for more details.
-\ProvidesFileRCS $Header: /cvsroot/pgf/pgf/generic/pgf/basiclayer/pgfcorepathconstruct.code.tex,v 1.6 2006/10/16 22:32:58 tantau Exp $
+\ProvidesFileRCS $Header: /cvsroot/pgf/pgf/generic/pgf/basiclayer/pgfcorepathconstruct.code.tex,v 1.9 2007/06/07 07:41:10 tantau Exp $
\newdimen\pgf@path@lastx
@@ -218,8 +218,8 @@
% \pgfstroke
\def\pgfpatharc#1#2#3{%
- \pgf@setcounter{pgf@countc}{#1}%
- \pgf@setcounter{pgf@countd}{#2}%
+ \pgfmathsetcounter{pgf@countc}{#1}%
+ \pgfmathsetcounter{pgf@countd}{#2}%
\ifnum\c@pgf@countc>360\relax%
\advance\c@pgf@countc by-360\relax%
\fi%
@@ -233,21 +233,21 @@
\advance\c@pgf@countd by360\relax%
\fi%
\loop%
- \@tempcnta=\c@pgf@countc\relax%
- \advance\@tempcnta by-\c@pgf@countd\relax%
- \ifnum\@tempcnta<0\relax%
- \@tempcnta=-\@tempcnta\relax%
+ \pgfutil@tempcnta=\c@pgf@countc\relax%
+ \advance\pgfutil@tempcnta by-\c@pgf@countd\relax%
+ \ifnum\pgfutil@tempcnta<0\relax%
+ \pgfutil@tempcnta=-\pgfutil@tempcnta\relax%
\fi%
- \ifnum\@tempcnta>90\relax%
+ \ifnum\pgfutil@tempcnta>90\relax%
\ifnum\c@pgf@countd>\c@pgf@countc\relax%
- \@tempcnta=\c@pgf@countc\relax%
- \advance\@tempcnta by 90\relax%
- \expandafter\pgf@arc\expandafter{\expandafter\c@pgf@countc\expandafter}\expandafter{\the\@tempcnta}{#3}%
+ \pgfutil@tempcnta=\c@pgf@countc\relax%
+ \advance\pgfutil@tempcnta by 90\relax%
+ \expandafter\pgf@arc\expandafter{\expandafter\c@pgf@countc\expandafter}\expandafter{\the\pgfutil@tempcnta}{#3}%
\advance\c@pgf@countc by 90\relax%
\else
- \@tempcnta=\c@pgf@countc\relax%
- \advance\@tempcnta by -90\relax%
- \expandafter\pgf@arc\expandafter{\expandafter\c@pgf@countc\expandafter}\expandafter{\the\@tempcnta}{#3}%
+ \pgfutil@tempcnta=\c@pgf@countc\relax%
+ \advance\pgfutil@tempcnta by -90\relax%
+ \expandafter\pgf@arc\expandafter{\expandafter\c@pgf@countc\expandafter}\expandafter{\the\pgfutil@tempcnta}{#3}%
\advance\c@pgf@countc by -90\relax%
\fi%
\repeat%
@@ -256,53 +256,53 @@
}
\def\pgf@arc#1#2#3{%
- \pgfutil@in@/{#3}%
+ \pgfutil@in@{and }{#3}%
\ifpgfutil@in@%
\pgf@@arc{#1}{#2}#3\@@%
\else
- \pgf@@arc{#1}{#2}#3/#3\@@%
+ \pgf@@arc{#1}{#2}#3and #3\@@%
\fi%
}
-\def\pgf@@arc#1#2#3/#4\@@{%
- \setlength{\@tempdima}{#3}%
- \setlength{\@tempdimb}{#4}%
- \@tempcnta=#1\relax%
- \@tempcntb=#2\relax%
- \advance\@tempcntb by-\@tempcnta\relax%
- \ifnum\@tempcntb<0\relax%
- \@tempcntb=-\@tempcntb\relax%
+\def\pgf@@arc#1#2#3and #4\@@{%
+ \pgfmathsetlength{\pgfutil@tempdima}{#3}%
+ \pgfmathsetlength{\pgfutil@tempdimb}{#4}%
+ \pgfutil@tempcnta=#1\relax%
+ \pgfutil@tempcntb=#2\relax%
+ \advance\pgfutil@tempcntb by-\pgfutil@tempcnta\relax%
+ \ifnum\pgfutil@tempcntb<0\relax%
+ \pgfutil@tempcntb=-\pgfutil@tempcntb\relax%
\fi%
- \ifnum\@tempcntb>85\relax% hackery to correct the control points
- \@tempdima=0.0555\@tempdima\relax%
- \@tempdimb=0.0555\@tempdimb\relax%
+ \ifnum\pgfutil@tempcntb>85\relax% hackery to correct the control points
+ \pgfutil@tempdima=0.0555\pgfutil@tempdima\relax%
+ \pgfutil@tempdimb=0.0555\pgfutil@tempdimb\relax%
\else%
- \ifnum\@tempcntb>75\relax%
- \@tempdima=0.055\@tempdima\relax%
- \@tempdimb=0.055\@tempdimb\relax%
+ \ifnum\pgfutil@tempcntb>75\relax%
+ \pgfutil@tempdima=0.055\pgfutil@tempdima\relax%
+ \pgfutil@tempdimb=0.055\pgfutil@tempdimb\relax%
\else%
- \ifnum\@tempcntb>60\relax%
- \@tempdima=0.0545\@tempdima\relax%
- \@tempdimb=0.0545\@tempdimb\relax%
+ \ifnum\pgfutil@tempcntb>60\relax%
+ \pgfutil@tempdima=0.0545\pgfutil@tempdima\relax%
+ \pgfutil@tempdimb=0.0545\pgfutil@tempdimb\relax%
\else%
- \@tempdima=0.054\@tempdima\relax%
- \@tempdimb=0.054\@tempdimb\relax%
+ \pgfutil@tempdima=0.054\pgfutil@tempdima\relax%
+ \pgfutil@tempdimb=0.054\pgfutil@tempdimb\relax%
\fi%
\fi%
\fi
- \@tempdima=\@tempcntb\@tempdima\relax%
- \divide\@tempdima by 9\relax%
- \@tempdimb=\@tempcntb\@tempdimb\relax%
- \divide\@tempdimb by 9\relax%
- %.. controls +(\@tempcnta+90:\@tempdima) and +(\@tempcntb-90:\@tempdima) .. +(-(#1:#3)+(#2:#3))%
+ \pgfutil@tempdima=\pgfutil@tempcntb\pgfutil@tempdima\relax%
+ \divide\pgfutil@tempdima by 9\relax%
+ \pgfutil@tempdimb=\pgfutil@tempcntb\pgfutil@tempdimb\relax%
+ \divide\pgfutil@tempdimb by 9\relax%
+ %.. controls +(\pgfutil@tempcnta+90:\pgfutil@tempdima) and +(\pgfutil@tempcntb-90:\pgfutil@tempdima) .. +(-(#1:#3)+(#2:#3))%
% store first support vector in xa/ya:
- \@tempcnta=#1\relax%
+ \pgfutil@tempcnta=#1\relax%
\ifnum#2>#1\relax%
- \advance\@tempcnta by 90\relax%
+ \advance\pgfutil@tempcnta by 90\relax%
\else%
- \advance\@tempcnta by -90\relax%
+ \advance\pgfutil@tempcnta by -90\relax%
\fi%
- \pgfpointtransformed{\pgfpointpolar{\@tempcnta}{\@tempdima/\@tempdimb}}%
+ \pgfpointtransformed{\pgfpointpolar{\pgfutil@tempcnta}{\pgfutil@tempdima and \pgfutil@tempdimb}}%
\advance\pgf@x by-\pgf@pt@x%
\advance\pgf@y by-\pgf@pt@y%
\pgf@xa=\pgf@path@lastx%
@@ -310,24 +310,24 @@
\advance\pgf@xa by \pgf@x%
\advance\pgf@ya by \pgf@y%
% store target in xb/yb:
- \@tempcnta=#1\relax%
- \pgfpointtransformed{\pgfpointpolar{\@tempcnta}{#3/#4}}%
+ \pgfutil@tempcnta=#1\relax%
+ \pgfpointtransformed{\pgfpointpolar{\pgfutil@tempcnta}{#3and #4}}%
\pgf@xb=\pgf@path@lastx%
\pgf@yb=\pgf@path@lasty%
\advance\pgf@xb by -\pgf@x%
\advance\pgf@yb by -\pgf@y%
- \@tempcnta=#2\relax%
- \pgfpointtransformed{\pgfpointpolar{\@tempcnta}{#3/#4}}%
+ \pgfutil@tempcnta=#2\relax%
+ \pgfpointtransformed{\pgfpointpolar{\pgfutil@tempcnta}{#3and #4}}%
\advance\pgf@xb by \pgf@x%
\advance\pgf@yb by \pgf@y%
% store second support xc/yc:
- \@tempcnta=#2\relax%
+ \pgfutil@tempcnta=#2\relax%
\ifnum#2>#1\relax%
- \advance\@tempcnta by -90\relax%
+ \advance\pgfutil@tempcnta by -90\relax%
\else%
- \advance\@tempcnta by 90\relax%
+ \advance\pgfutil@tempcnta by 90\relax%
\fi%
- \pgfpointtransformed{\pgfpointpolar{\@tempcnta}{\@tempdima/\@tempdimb}}%
+ \pgfpointtransformed{\pgfpointpolar{\pgfutil@tempcnta}{\pgfutil@tempdima and \pgfutil@tempdimb}}%
\advance\pgf@x by-\pgf@pt@x%
\advance\pgf@y by-\pgf@pt@y%
\pgf@xc=\pgf@xb\relax%
@@ -554,12 +554,12 @@
\pgf@yb=\pgf@y%
\advance\pgf@xa by\pgf@xb%
\advance\pgf@ya by\pgf@yb%
- \pgfpathmoveto{\pgfpoint{\pgf@xa}{\pgf@ya}}%
- \pgfpathlineto{\pgfpoint{\pgf@xb}{\pgf@ya}}%
- \pgfpathlineto{\pgfpoint{\pgf@xb}{\pgf@yb}}%
- \pgfpathlineto{\pgfpoint{\pgf@xa}{\pgf@yb}}%
+ \pgfpathmoveto{\pgfqpoint{\pgf@xa}{\pgf@ya}}%
+ \pgfpathlineto{\pgfqpoint{\pgf@xb}{\pgf@ya}}%
+ \pgfpathlineto{\pgfqpoint{\pgf@xb}{\pgf@yb}}%
+ \pgfpathlineto{\pgfqpoint{\pgf@xa}{\pgf@yb}}%
\pgfpathclose%
- \pgfpathmoveto{\pgfpoint{\pgf@xb}{\pgf@yb}}%
+ \pgfpathmoveto{\pgfqpoint{\pgf@xb}{\pgf@yb}}%
}
% Append a rectangle to the current path
@@ -579,7 +579,7 @@
\pgf@process{#1}%
\advance\pgf@xc by-\pgf@x%
\advance\pgf@yc by-\pgf@y%
- \pgfpathrectangle{#1}{\pgfpoint{\pgf@xc}{\pgf@yc}}%
+ \pgfpathrectangle{#1}{\pgfqpoint{\pgf@xc}{\pgf@yc}}%
}
@@ -601,8 +601,8 @@
% \pgfsetlinewidth{0.4pt}
% \pgfgrid[stepx=1cm,stepy=1cm]{\pgfxy(0,0)}{\pgfxy(3,2)}
-\define@key{pgfbase}{stepx}{\setlength{\pgf@x}{#1}\relax}
-\define@key{pgfbase}{stepy}{\setlength{\pgf@y}{#1}\relax}
+\define@key{pgfbase}{stepx}{\pgfmathsetlength{\pgf@x}{#1}\relax}
+\define@key{pgfbase}{stepy}{\pgfmathsetlength{\pgf@y}{#1}\relax}
\define@key{pgfbase}{step}{\pgf@process{#1}}
\def\pgfpathgrid{\pgfutil@ifnextchar[{\pgf@pathgrid}{\pgf@pathgrid[]}}
@@ -774,9 +774,9 @@
\pgf@pt@x=\pgf@path@lastx%
\pgf@pt@y=\pgf@path@lasty%
\pgfpathcurveto%
- {\pgfpoint{.1125\pgf@xc}{.225\pgf@yc}}% found by trial and error
- {\pgfpoint{.5\pgf@xc}{\pgf@yc}}% found by trial and error
- {\pgfpoint{\pgf@xc}{\pgf@yc}}%
+ {\pgfqpoint{.1125\pgf@xc}{.225\pgf@yc}}% found by trial and error
+ {\pgfqpoint{.5\pgf@xc}{\pgf@yc}}% found by trial and error
+ {\pgfqpoint{\pgf@xc}{\pgf@yc}}%
}%
\fi%
}%
@@ -787,9 +787,9 @@
\pgf@pt@x=\pgf@path@lastx%
\pgf@pt@y=\pgf@path@lasty%
\pgfpathcurveto%
- {\pgfpoint{.5\pgf@xc}{0\pgf@yc}}% found by trial and error
- {\pgfpoint{.8875\pgf@xc}{.775\pgf@yc}}% found by trial and error
- {\pgfpoint{\pgf@xc}{\pgf@yc}}%
+ {\pgfqpoint{.5\pgf@xc}{0\pgf@yc}}% found by trial and error
+ {\pgfqpoint{.8875\pgf@xc}{.775\pgf@yc}}% found by trial and error
+ {\pgfqpoint{\pgf@xc}{\pgf@yc}}%
}%
\fi%
}%
@@ -822,9 +822,9 @@
\pgf@pt@x=\pgf@path@lastx% evil trickery to transform to the last point
\pgf@pt@y=\pgf@path@lasty%
\pgfpathcurveto%
- {\pgfpoint{.31830988618\pgf@xc}{.5\pgf@yc}}% found by trial and error
- {\pgfpoint{.63502822294\pgf@xc}{\pgf@yc}}% found by trial and error
- {\pgfpoint{\pgf@xc}{\pgf@yc}}%
+ {\pgfqpoint{.31831\pgf@xc}{.5\pgf@yc}}% found by trial and error
+ {\pgfqpoint{.63503\pgf@xc}{\pgf@yc}}% found by trial and error
+ {\pgfqpoint{\pgf@xc}{\pgf@yc}}%
}%
}
@@ -847,9 +847,9 @@
\pgf@pt@x=\pgf@path@lastx% evil trickery to transform to the last point
\pgf@pt@y=\pgf@path@lasty%
\pgfpathcurveto%
- {\pgfpoint{.36497177706\pgf@xc}{0pt}}% found by trial and error
- {\pgfpoint{.68169011382\pgf@xc}{.5\pgf@yc}}% found by trial and error
- {\pgfpoint{\pgf@xc}{\pgf@yc}}%
+ {\pgfqpoint{.36497\pgf@xc}{0pt}}% found by trial and error
+ {\pgfqpoint{.68169\pgf@xc}{.5\pgf@yc}}% found by trial and error
+ {\pgfqpoint{\pgf@xc}{\pgf@yc}}%
}%
}