summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/generic/pgf/libraries
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2007-06-17 23:22:38 +0000
committerKarl Berry <karl@freefriends.org>2007-06-17 23:22:38 +0000
commit5c5c7843fbd37c6960799b6e1a32d5948966316c (patch)
treeea73f6b5ba799656992ebe2f34beccd2555f1342 /Master/texmf-dist/tex/generic/pgf/libraries
parentf0c1f4cdb9fad83f293fd91d194538425f9f7633 (diff)
pgf 1.18 (15jun07)
git-svn-id: svn://tug.org/texlive/trunk@4459 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/generic/pgf/libraries')
-rw-r--r--Master/texmf-dist/tex/generic/pgf/libraries/pgflibraryarrows.code.tex808
-rw-r--r--Master/texmf-dist/tex/generic/pgf/libraries/pgflibrarypatterns.code.tex108
-rw-r--r--Master/texmf-dist/tex/generic/pgf/libraries/pgflibraryplothandlers.code.tex66
-rw-r--r--Master/texmf-dist/tex/generic/pgf/libraries/pgflibraryplotmarks.code.tex116
-rw-r--r--Master/texmf-dist/tex/generic/pgf/libraries/pgflibraryshapes.arrows.code.tex12
-rw-r--r--Master/texmf-dist/tex/generic/pgf/libraries/pgflibraryshapes.code.tex573
-rw-r--r--Master/texmf-dist/tex/generic/pgf/libraries/pgflibraryshapes.geometric.code.tex1229
-rw-r--r--Master/texmf-dist/tex/generic/pgf/libraries/pgflibraryshapes.misc.code.tex70
-rw-r--r--Master/texmf-dist/tex/generic/pgf/libraries/pgflibraryshapes.multipart.code.tex165
-rw-r--r--Master/texmf-dist/tex/generic/pgf/libraries/pgflibraryshapes.symbols.code.tex50
-rw-r--r--Master/texmf-dist/tex/generic/pgf/libraries/pgflibrarysnakes.code.tex232
-rw-r--r--Master/texmf-dist/tex/generic/pgf/libraries/pgflibrarytikzbackgrounds.code.tex12
-rw-r--r--Master/texmf-dist/tex/generic/pgf/libraries/pgflibrarytikzcalendar.code.tex458
-rw-r--r--Master/texmf-dist/tex/generic/pgf/libraries/pgflibrarytikzcoordinatesystems.code.tex24
-rw-r--r--Master/texmf-dist/tex/generic/pgf/libraries/pgflibrarytikzfolding.code.tex143
-rw-r--r--Master/texmf-dist/tex/generic/pgf/libraries/pgflibrarytikzmatrix.code.tex129
-rw-r--r--Master/texmf-dist/tex/generic/pgf/libraries/pgflibrarytikzmindmap.code.tex91
-rw-r--r--Master/texmf-dist/tex/generic/pgf/libraries/pgflibrarytikzpetri.code.tex6
-rw-r--r--Master/texmf-dist/tex/generic/pgf/libraries/pgflibrarytikzshapes.arrows.code.tex14
-rw-r--r--Master/texmf-dist/tex/generic/pgf/libraries/pgflibrarytikzshapes.code.tex8
-rw-r--r--Master/texmf-dist/tex/generic/pgf/libraries/pgflibrarytikzshapes.geometric.code.tex23
-rw-r--r--Master/texmf-dist/tex/generic/pgf/libraries/pgflibrarytikzshapes.misc.code.tex14
-rw-r--r--Master/texmf-dist/tex/generic/pgf/libraries/pgflibrarytikzshapes.multipart.code.tex14
-rw-r--r--Master/texmf-dist/tex/generic/pgf/libraries/pgflibrarytikzshapes.symbols.code.tex14
-rw-r--r--Master/texmf-dist/tex/generic/pgf/libraries/pgflibrarytikztopaths.code.tex16
-rw-r--r--Master/texmf-dist/tex/generic/pgf/libraries/pgflibrarytikztrees.code.tex4
26 files changed, 3116 insertions, 1283 deletions
diff --git a/Master/texmf-dist/tex/generic/pgf/libraries/pgflibraryarrows.code.tex b/Master/texmf-dist/tex/generic/pgf/libraries/pgflibraryarrows.code.tex
index a0b9a108d60..9de07884dd5 100644
--- a/Master/texmf-dist/tex/generic/pgf/libraries/pgflibraryarrows.code.tex
+++ b/Master/texmf-dist/tex/generic/pgf/libraries/pgflibraryarrows.code.tex
@@ -7,30 +7,30 @@
%
% See the file doc/generic/pgf/licenses/LICENSE for more details.
-\ProvidesFileRCS[v\pgfversion] $Header: /cvsroot/pgf/pgf/generic/pgf/libraries/pgflibraryarrows.code.tex,v 1.5 2006/10/11 15:22:26 tantau Exp $
+\ProvidesFileRCS[v\pgfversion] $Header: /cvsroot/pgf/pgf/generic/pgf/libraries/pgflibraryarrows.code.tex,v 1.7 2007/06/07 07:41:11 tantau Exp $
% A square bracket shaped arrow
\pgfarrowsdeclare{[}{]}
{
- \@tempdima=1pt%
- \advance\@tempdima by1.25\pgflinewidth%
- \pgfarrowsleftextend{-\@tempdima}
- \pgfarrowsrightextend{.5\pgflinewidth}
+ \pgfutil@tempdima=1pt%
+ \advance\pgfutil@tempdima by1.25\pgflinewidth%
+ \pgfarrowsleftextend{+-\pgfutil@tempdima}
+ \pgfarrowsrightextend{+.5\pgflinewidth}
}
{
- \@tempdima=2pt%
- \advance\@tempdima by1.5\pgflinewidth%
- \@tempdimb=\@tempdima%
- \advance\@tempdimb by\pgflinewidth%
- \pgfsetdash{}{0pt}
+ \pgfutil@tempdima=2pt%
+ \advance\pgfutil@tempdima by1.5\pgflinewidth%
+ \pgfutil@tempdimb=\pgfutil@tempdima%
+ \advance\pgfutil@tempdimb by\pgflinewidth%
+ \pgfsetdash{}{+0pt}
\pgfsetmiterjoin
\pgfsetbuttcap
- \pgfpathmoveto{\pgfpoint{-.5\@tempdimb}{-\@tempdima}}
- \pgfpathlineto{\pgfpoint{0pt}{-\@tempdima}}
- \pgfpathlineto{\pgfpoint{0pt}{\@tempdima}}
- \pgfpathlineto{\pgfpoint{-.5\@tempdimb}{\@tempdima}}
+ \pgfpathmoveto{\pgfqpoint{-.5\pgfutil@tempdimb}{-1\pgfutil@tempdima}}
+ \pgfpathlineto{\pgfqpoint{0pt}{-1\pgfutil@tempdima}}
+ \pgfpathlineto{\pgfqpoint{0pt}{\pgfutil@tempdima}}
+ \pgfpathlineto{\pgfqpoint{-.5\pgfutil@tempdimb}{\pgfutil@tempdima}}
\pgfusepathqstroke
}
@@ -41,23 +41,23 @@
\pgfarrowsdeclare{(}{)}
{
- \@tempdima=2pt%
- \advance\@tempdima by1.5\pgflinewidth%
- \@tempdimb=0.0625\@tempdima\advance\@tempdimb by.5\pgflinewidth%
- \pgfarrowsrightextend{\@tempdimb}
- \@tempdimb=0.5\@tempdima\advance\@tempdimb by.5\pgflinewidth%
- \pgfarrowsleftextend{-\@tempdimb}
+ \pgfutil@tempdima=2pt%
+ \advance\pgfutil@tempdima by1.5\pgflinewidth%
+ \pgfutil@tempdimb=0.0625\pgfutil@tempdima\advance\pgfutil@tempdimb by.5\pgflinewidth%
+ \pgfarrowsrightextend{+\pgfutil@tempdimb}
+ \pgfutil@tempdimb=0.5\pgfutil@tempdima\advance\pgfutil@tempdimb by.5\pgflinewidth%
+ \pgfarrowsleftextend{+-\pgfutil@tempdimb}
}
{
- \@tempdima=2pt%
- \advance\@tempdima by1.5\pgflinewidth%
- \pgfsetdash{}{0pt}
+ \pgfutil@tempdima=2pt%
+ \advance\pgfutil@tempdima by1.5\pgflinewidth%
+ \pgfsetdash{}{+0pt}
\pgfsetroundcap
- \pgfpathmoveto{\pgfpoint{-.5\@tempdima}{-\@tempdima}}
+ \pgfpathmoveto{\pgfqpoint{-.5\pgfutil@tempdima}{-1\pgfutil@tempdima}}
\pgfpathcurveto
- {\pgfpoint{.25\@tempdima}{-.5\@tempdima}}
- {\pgfpoint{.25\@tempdima}{.5\@tempdima}}
- {\pgfpoint{-.5\@tempdima}{\@tempdima}}
+ {\pgfqpoint{.25\pgfutil@tempdima}{-.5\pgfutil@tempdima}}
+ {\pgfqpoint{.25\pgfutil@tempdima}{.5\pgfutil@tempdima}}
+ {\pgfqpoint{-.5\pgfutil@tempdima}{\pgfutil@tempdima}}
\pgfusepathqstroke
}
@@ -70,22 +70,22 @@
\pgfarrowsdeclare{angle 90}{angle 90}
{
- \@tempdima=0.3pt%
- \advance\@tempdima by.25\pgflinewidth%
- \@tempdimb=5.5\@tempdima\advance\@tempdimb by.5\pgflinewidth%
- \pgfarrowsleftextend{-\@tempdimb}
- \@tempdimb=.5\@tempdima\advance\@tempdimb by0.707\pgflinewidth%
- \pgfarrowsrightextend{\@tempdimb}
+ \pgfutil@tempdima=0.3pt%
+ \advance\pgfutil@tempdima by.25\pgflinewidth%
+ \pgfutil@tempdimb=5.5\pgfutil@tempdima\advance\pgfutil@tempdimb by.5\pgflinewidth%
+ \pgfarrowsleftextend{+-\pgfutil@tempdimb}
+ \pgfutil@tempdimb=.5\pgfutil@tempdima\advance\pgfutil@tempdimb by0.707\pgflinewidth%
+ \pgfarrowsrightextend{+\pgfutil@tempdimb}
}
{
- \@tempdima=0.3pt%
- \advance\@tempdima by.25\pgflinewidth%
- \pgfsetdash{}{0pt}
+ \pgfutil@tempdima=0.3pt%
+ \advance\pgfutil@tempdima by.25\pgflinewidth%
+ \pgfsetdash{}{+0pt}
\pgfsetroundcap
\pgfsetmiterjoin
- \pgfpathmoveto{\pgfpoint{-5.5\@tempdima}{-6\@tempdima}}
- \pgfpathlineto{\pgfpoint{0.5\@tempdima}{0\@tempdima}}
- \pgfpathlineto{\pgfpoint{-5.5\@tempdima}{6\@tempdima}}
+ \pgfpathmoveto{\pgfqpoint{-5.5\pgfutil@tempdima}{-6\pgfutil@tempdima}}
+ \pgfpathlineto{\pgfqpoint{0.5\pgfutil@tempdima}{0\pgfutil@tempdima}}
+ \pgfpathlineto{\pgfqpoint{-5.5\pgfutil@tempdima}{6\pgfutil@tempdima}}
\pgfusepathqstroke
}
@@ -94,22 +94,22 @@
\pgfarrowsdeclare{angle 60}{angle 60}
{
- \@tempdima=0.3pt%
- \advance\@tempdima by.25\pgflinewidth%
- \@tempdimb=7.29\@tempdima\advance\@tempdimb by.5\pgflinewidth%
- \pgfarrowsleftextend{-\@tempdimb}
- \@tempdimb=.5\@tempdima\advance\@tempdimb by\pgflinewidth%
- \pgfarrowsrightextend{\@tempdimb}
+ \pgfutil@tempdima=0.3pt%
+ \advance\pgfutil@tempdima by.25\pgflinewidth%
+ \pgfutil@tempdimb=7.29\pgfutil@tempdima\advance\pgfutil@tempdimb by.5\pgflinewidth%
+ \pgfarrowsleftextend{+-\pgfutil@tempdimb}
+ \pgfutil@tempdimb=.5\pgfutil@tempdima\advance\pgfutil@tempdimb by\pgflinewidth%
+ \pgfarrowsrightextend{+\pgfutil@tempdimb}
}
{
- \@tempdima=0.3pt%
- \advance\@tempdima by.25\pgflinewidth%
- \pgfsetdash{}{0pt}
+ \pgfutil@tempdima=0.3pt%
+ \advance\pgfutil@tempdima by.25\pgflinewidth%
+ \pgfsetdash{}{+0pt}
\pgfsetroundcap
\pgfsetmiterjoin
- \pgfpathmoveto{\pgfpointadd{\pgfpoint{0.5\@tempdima}{0pt}}{\pgfpointpolar{150}{9\@tempdima}}}
- \pgfpathlineto{\pgfpoint{0.5\@tempdima}{0\@tempdima}}
- \pgfpathlineto{\pgfpointadd{\pgfpoint{0.5\@tempdima}{0pt}}{\pgfpointpolar{-150}{9\@tempdima}}}
+ \pgfpathmoveto{\pgfpointadd{\pgfqpoint{0.5\pgfutil@tempdima}{0pt}}{\pgfqpointpolar{150}{9\pgfutil@tempdima}}}
+ \pgfpathlineto{\pgfqpoint{0.5\pgfutil@tempdima}{0pt}}
+ \pgfpathlineto{\pgfpointadd{\pgfqpoint{0.5\pgfutil@tempdima}{0pt}}{\pgfqpointpolar{-150}{9\pgfutil@tempdima}}}
\pgfusepathqstroke
}
@@ -119,22 +119,22 @@
\pgfarrowsdeclare{angle 45}{angle 45}
{
- \@tempdima=0.3pt%
- \advance\@tempdima by.25\pgflinewidth%
- \@tempdimb=8.705\@tempdima\advance\@tempdimb by.5\pgflinewidth%
- \pgfarrowsleftextend{-\@tempdimb}
- \@tempdimb=.5\@tempdima\advance\@tempdimb by1.28\pgflinewidth%
- \pgfarrowsrightextend{\@tempdimb}
+ \pgfutil@tempdima=0.3pt%
+ \advance\pgfutil@tempdima by.25\pgflinewidth%
+ \pgfutil@tempdimb=8.705\pgfutil@tempdima\advance\pgfutil@tempdimb by.5\pgflinewidth%
+ \pgfarrowsleftextend{+-\pgfutil@tempdimb}
+ \pgfutil@tempdimb=.5\pgfutil@tempdima\advance\pgfutil@tempdimb by1.28\pgflinewidth%
+ \pgfarrowsrightextend{+\pgfutil@tempdimb}
}
{
- \@tempdima=0.3pt%
- \advance\@tempdima by.25\pgflinewidth%
- \pgfsetdash{}{0pt}
+ \pgfutil@tempdima=0.3pt%
+ \advance\pgfutil@tempdima by.25\pgflinewidth%
+ \pgfsetdash{}{+0pt}
\pgfsetroundcap
\pgfsetmiterjoin
- \pgfpathmoveto{\pgfpointadd{\pgfpoint{0.5\@tempdima}{0pt}}{\pgfpointpolar{157}{10\@tempdima}}}
- \pgfpathlineto{\pgfpoint{0.5\@tempdima}{0\@tempdima}}
- \pgfpathlineto{\pgfpointadd{\pgfpoint{0.5\@tempdima}{0pt}}{\pgfpointpolar{-157}{10\@tempdima}}}
+ \pgfpathmoveto{\pgfpointadd{\pgfqpoint{0.5\pgfutil@tempdima}{0pt}}{\pgfqpointpolar{157}{10\pgfutil@tempdima}}}
+ \pgfpathlineto{\pgfqpoint{0.5\pgfutil@tempdima}{0\pgfutil@tempdima}}
+ \pgfpathlineto{\pgfpointadd{\pgfqpoint{0.5\pgfutil@tempdima}{0pt}}{\pgfqpointpolar{-157}{10\pgfutil@tempdima}}}
\pgfusepathqstroke
}
@@ -146,18 +146,18 @@
\pgfarrowsdeclare{*}{*}
{
- \@tempdima=0.4pt%
- \advance\@tempdima by.2\pgflinewidth%
- \@tempdimb=5.5\@tempdima\advance\@tempdimb by\pgflinewidth
- \pgfarrowsleftextend{-\@tempdimb}
- \@tempdimb=1.5\@tempdima\advance\@tempdimb by.5\pgflinewidth
- \pgfarrowsrightextend{\@tempdimb}
+ \pgfutil@tempdima=0.4pt%
+ \advance\pgfutil@tempdima by.2\pgflinewidth%
+ \pgfutil@tempdimb=5.5\pgfutil@tempdima\advance\pgfutil@tempdimb by\pgflinewidth
+ \pgfarrowsleftextend{+-\pgfutil@tempdimb}
+ \pgfutil@tempdimb=1.5\pgfutil@tempdima\advance\pgfutil@tempdimb by.5\pgflinewidth
+ \pgfarrowsrightextend{+\pgfutil@tempdimb}
}
{
- \@tempdima=0.4pt%
- \advance\@tempdima by.2\pgflinewidth%
- \pgfsetdash{}{0pt}
- \pgfpathcircle{\pgfpoint{-3\@tempdima}{0pt}}{4.5\@tempdima}
+ \pgfutil@tempdima=0.4pt%
+ \advance\pgfutil@tempdima by.2\pgflinewidth%
+ \pgfsetdash{}{+0pt}
+ \pgfpathcircle{\pgfqpoint{-3\pgfutil@tempdima}{0pt}}{+4.5\pgfutil@tempdima}
\pgfusepathqfillstroke
}
@@ -166,17 +166,17 @@
\pgfarrowsdeclare{o}{o}
{
- \pgfarrowsleftextend{-.5\pgflinewidth}
- \@tempdima=0.4pt%
- \advance\@tempdima by.2\pgflinewidth%
- \@tempdimb=9\@tempdima\advance\@tempdimb by.5\pgflinewidth
- \pgfarrowsrightextend{\@tempdimb}
+ \pgfarrowsleftextend{+-.5\pgflinewidth}
+ \pgfutil@tempdima=0.4pt%
+ \advance\pgfutil@tempdima by.2\pgflinewidth%
+ \pgfutil@tempdimb=9\pgfutil@tempdima\advance\pgfutil@tempdimb by.5\pgflinewidth
+ \pgfarrowsrightextend{+\pgfutil@tempdimb}
}
{
- \@tempdima=0.4pt%
- \advance\@tempdima by.2\pgflinewidth%
- \pgfsetdash{}{0pt}
- \pgfpathcircle{\pgfpoint{4.5\@tempdima}{0bp}}{4.5\@tempdima}
+ \pgfutil@tempdima=0.4pt%
+ \advance\pgfutil@tempdima by.2\pgflinewidth%
+ \pgfsetdash{}{+0pt}
+ \pgfpathcircle{\pgfqpoint{4.5\pgfutil@tempdima}{0bp}}{4.5\pgfutil@tempdima}
\pgfusepathqstroke
}
@@ -186,43 +186,43 @@
\pgfarrowsdeclare{diamond}{diamond}
{
- \@tempdima=0.4pt%
- \advance\@tempdima by.275\pgflinewidth%
- \@tempdimb=13\@tempdima\advance\@tempdimb by.5\pgflinewidth
- \pgfarrowsleftextend{-\@tempdimb}
- \@tempdimb=1\@tempdima\advance\@tempdimb by.5\pgflinewidth
- \pgfarrowsrightextend{\@tempdimb}
+ \pgfutil@tempdima=0.4pt%
+ \advance\pgfutil@tempdima by.275\pgflinewidth%
+ \pgfutil@tempdimb=13\pgfutil@tempdima\advance\pgfutil@tempdimb by.5\pgflinewidth
+ \pgfarrowsleftextend{+-\pgfutil@tempdimb}
+ \pgfutil@tempdimb=1\pgfutil@tempdima\advance\pgfutil@tempdimb by.5\pgflinewidth
+ \pgfarrowsrightextend{+\pgfutil@tempdimb}
}
{
- \@tempdima=0.4pt%
- \advance\@tempdima by.275\pgflinewidth%
- \pgfsetdash{}{0pt}
+ \pgfutil@tempdima=0.4pt%
+ \advance\pgfutil@tempdima by.275\pgflinewidth%
+ \pgfsetdash{}{+0pt}
\pgfsetroundjoin
- \pgfpathmoveto{\pgfpoint{1\@tempdima}{0\@tempdima}}
- \pgfpathlineto{\pgfpoint{-6\@tempdima}{4\@tempdima}}
- \pgfpathlineto{\pgfpoint{-13\@tempdima}{0\@tempdima}}
- \pgfpathlineto{\pgfpoint{-6\@tempdima}{-4\@tempdima}}
+ \pgfpathmoveto{\pgfqpoint{1\pgfutil@tempdima}{0\pgfutil@tempdima}}
+ \pgfpathlineto{\pgfqpoint{-6\pgfutil@tempdima}{4\pgfutil@tempdima}}
+ \pgfpathlineto{\pgfqpoint{-13\pgfutil@tempdima}{0\pgfutil@tempdima}}
+ \pgfpathlineto{\pgfqpoint{-6\pgfutil@tempdima}{-4\pgfutil@tempdima}}
\pgfpathclose
\pgfusepathqfillstroke
}
\pgfarrowsdeclare{open diamond}{open diamond}%{{-.5bp}{14.5bp}}
{
- \@tempdima=0.4pt%
- \advance\@tempdima by.275\pgflinewidth%
- \pgfarrowsleftextend{-.5\pgflinewidth}
- \@tempdimb=14\@tempdima\advance\@tempdimb by.5\pgflinewidth
- \pgfarrowsrightextend{\@tempdimb}
+ \pgfutil@tempdima=0.4pt%
+ \advance\pgfutil@tempdima by.275\pgflinewidth%
+ \pgfarrowsleftextend{+-.5\pgflinewidth}
+ \pgfutil@tempdimb=14\pgfutil@tempdima\advance\pgfutil@tempdimb by.5\pgflinewidth
+ \pgfarrowsrightextend{+\pgfutil@tempdimb}
}
{
- \@tempdima=0.4pt%
- \advance\@tempdima by.275\pgflinewidth%
- \pgfsetdash{}{0pt}
+ \pgfutil@tempdima=0.4pt%
+ \advance\pgfutil@tempdima by.275\pgflinewidth%
+ \pgfsetdash{}{+0pt}
\pgfsetroundjoin
- \pgfpathmoveto{\pgfpoint{14\@tempdima}{0\@tempdima}}
- \pgfpathlineto{\pgfpoint{7\@tempdima}{4\@tempdima}}
- \pgfpathlineto{\pgfpoint{0\@tempdima}{0\@tempdima}}
- \pgfpathlineto{\pgfpoint{7\@tempdima}{-4\@tempdima}}
+ \pgfpathmoveto{\pgfqpoint{14\pgfutil@tempdima}{0\pgfutil@tempdima}}
+ \pgfpathlineto{\pgfqpoint{7\pgfutil@tempdima}{4\pgfutil@tempdima}}
+ \pgfpathlineto{\pgfqpoint{0\pgfutil@tempdima}{0\pgfutil@tempdima}}
+ \pgfpathlineto{\pgfqpoint{7\pgfutil@tempdima}{-4\pgfutil@tempdima}}
\pgfpathclose
\pgfusepathqstroke
}
@@ -233,21 +233,21 @@
\pgfarrowsdeclare{triangle 90}{triangle 90}
{
- \@tempdima=0.5pt%
- \advance\@tempdima by.25\pgflinewidth%
- \@tempdimb=5.5\@tempdima\advance\@tempdimb by.5\pgflinewidth%
- \pgfarrowsleftextend{-\@tempdimb}
- \@tempdimb=.5\@tempdima\advance\@tempdimb by0.707\pgflinewidth%
- \pgfarrowsrightextend{\@tempdimb}
+ \pgfutil@tempdima=0.5pt%
+ \advance\pgfutil@tempdima by.25\pgflinewidth%
+ \pgfutil@tempdimb=5.5\pgfutil@tempdima\advance\pgfutil@tempdimb by.5\pgflinewidth%
+ \pgfarrowsleftextend{+-\pgfutil@tempdimb}
+ \pgfutil@tempdimb=.5\pgfutil@tempdima\advance\pgfutil@tempdimb by0.707\pgflinewidth%
+ \pgfarrowsrightextend{+\pgfutil@tempdimb}
}
{
- \@tempdima=0.5pt%
- \advance\@tempdima by.25\pgflinewidth%
- \pgfsetdash{}{0pt}
+ \pgfutil@tempdima=0.5pt%
+ \advance\pgfutil@tempdima by.25\pgflinewidth%
+ \pgfsetdash{}{+0pt}
\pgfsetmiterjoin
- \pgfpathmoveto{\pgfpoint{-5.5\@tempdima}{-6\@tempdima}}
- \pgfpathlineto{\pgfpoint{0.5\@tempdima}{0\@tempdima}}
- \pgfpathlineto{\pgfpoint{-5.5\@tempdima}{6\@tempdima}}
+ \pgfpathmoveto{\pgfqpoint{-5.5\pgfutil@tempdima}{-6\pgfutil@tempdima}}
+ \pgfpathlineto{\pgfqpoint{0.5\pgfutil@tempdima}{0\pgfutil@tempdima}}
+ \pgfpathlineto{\pgfqpoint{-5.5\pgfutil@tempdima}{6\pgfutil@tempdima}}
\pgfpathclose
\pgfusepathqfillstroke
}
@@ -257,21 +257,21 @@
\pgfarrowsdeclare{triangle 60}{triangle 60}
{
- \@tempdima=0.5pt%
- \advance\@tempdima by.25\pgflinewidth%
- \@tempdimb=7.29\@tempdima\advance\@tempdimb by.5\pgflinewidth%
- \pgfarrowsleftextend{-\@tempdimb}
- \@tempdimb=.5\@tempdima\advance\@tempdimb by\pgflinewidth%
- \pgfarrowsrightextend{\@tempdimb}
+ \pgfutil@tempdima=0.5pt%
+ \advance\pgfutil@tempdima by.25\pgflinewidth%
+ \pgfutil@tempdimb=7.29\pgfutil@tempdima\advance\pgfutil@tempdimb by.5\pgflinewidth%
+ \pgfarrowsleftextend{+-\pgfutil@tempdimb}
+ \pgfutil@tempdimb=.5\pgfutil@tempdima\advance\pgfutil@tempdimb by\pgflinewidth%
+ \pgfarrowsrightextend{+\pgfutil@tempdimb}
}
{
- \@tempdima=0.5pt%
- \advance\@tempdima by.25\pgflinewidth%
- \pgfsetdash{}{0pt}
+ \pgfutil@tempdima=0.5pt%
+ \advance\pgfutil@tempdima by.25\pgflinewidth%
+ \pgfsetdash{}{+0pt}
\pgfsetmiterjoin
- \pgfpathmoveto{\pgfpointadd{\pgfpoint{0.5\@tempdima}{0pt}}{\pgfpointpolar{150}{9\@tempdima}}}
- \pgfpathlineto{\pgfpoint{0.5\@tempdima}{0\@tempdima}}
- \pgfpathlineto{\pgfpointadd{\pgfpoint{0.5\@tempdima}{0pt}}{\pgfpointpolar{-150}{9\@tempdima}}}
+ \pgfpathmoveto{\pgfpointadd{\pgfqpoint{0.5\pgfutil@tempdima}{0pt}}{\pgfqpointpolar{150}{9\pgfutil@tempdima}}}
+ \pgfpathlineto{\pgfqpoint{0.5\pgfutil@tempdima}{0\pgfutil@tempdima}}
+ \pgfpathlineto{\pgfpointadd{\pgfqpoint{0.5\pgfutil@tempdima}{0pt}}{\pgfqpointpolar{-150}{9\pgfutil@tempdima}}}
\pgfpathclose
\pgfusepathqfillstroke
}
@@ -283,21 +283,21 @@
\pgfarrowsdeclare{triangle 45}{triangle 45}
{
- \@tempdima=0.5pt%
- \advance\@tempdima by.25\pgflinewidth%
- \@tempdimb=8.705\@tempdima\advance\@tempdimb by.5\pgflinewidth%
- \pgfarrowsleftextend{-\@tempdimb}
- \@tempdimb=.5\@tempdima\advance\@tempdimb by1.28\pgflinewidth%
- \pgfarrowsrightextend{\@tempdimb}
+ \pgfutil@tempdima=0.5pt%
+ \advance\pgfutil@tempdima by.25\pgflinewidth%
+ \pgfutil@tempdimb=8.705\pgfutil@tempdima\advance\pgfutil@tempdimb by.5\pgflinewidth%
+ \pgfarrowsleftextend{+-\pgfutil@tempdimb}
+ \pgfutil@tempdimb=.5\pgfutil@tempdima\advance\pgfutil@tempdimb by1.28\pgflinewidth%
+ \pgfarrowsrightextend{+\pgfutil@tempdimb}
}
{
- \@tempdima=0.5pt%
- \advance\@tempdima by.25\pgflinewidth%
- \pgfsetdash{}{0pt}
+ \pgfutil@tempdima=0.5pt%
+ \advance\pgfutil@tempdima by.25\pgflinewidth%
+ \pgfsetdash{}{+0pt}
\pgfsetmiterjoin
- \pgfpathmoveto{\pgfpointadd{\pgfpoint{0.5\@tempdima}{0pt}}{\pgfpointpolar{157}{10\@tempdima}}}
- \pgfpathlineto{\pgfpoint{0.5\@tempdima}{0\@tempdima}}
- \pgfpathlineto{\pgfpointadd{\pgfpoint{0.5\@tempdima}{0pt}}{\pgfpointpolar{-157}{10\@tempdima}}}
+ \pgfpathmoveto{\pgfpointadd{\pgfqpoint{0.5\pgfutil@tempdima}{0pt}}{\pgfqpointpolar{157}{10\pgfutil@tempdima}}}
+ \pgfpathlineto{\pgfqpoint{0.5\pgfutil@tempdima}{0\pgfutil@tempdima}}
+ \pgfpathlineto{\pgfpointadd{\pgfqpoint{0.5\pgfutil@tempdima}{0pt}}{\pgfqpointpolar{-157}{10\pgfutil@tempdima}}}
\pgfpathclose
\pgfusepathqfillstroke
}
@@ -309,40 +309,40 @@
\pgfarrowsdeclare{open triangle 90}{open triangle 90}
{
- \@tempdima=0.5pt%
- \advance\@tempdima by.25\pgflinewidth%
- \pgfarrowsleftextend{-.5\pgflinewidth}
- \@tempdimb=6\@tempdima\advance\@tempdimb by0.707\pgflinewidth%
- \pgfarrowsrightextend{\@tempdimb}
+ \pgfutil@tempdima=0.5pt%
+ \advance\pgfutil@tempdima by.25\pgflinewidth%
+ \pgfarrowsleftextend{+-.5\pgflinewidth}
+ \pgfutil@tempdimb=6\pgfutil@tempdima\advance\pgfutil@tempdimb by0.707\pgflinewidth%
+ \pgfarrowsrightextend{+\pgfutil@tempdimb}
}
{
- \@tempdima=0.5pt%
- \advance\@tempdima by.25\pgflinewidth%
- \pgfsetdash{}{0pt}
+ \pgfutil@tempdima=0.5pt%
+ \advance\pgfutil@tempdima by.25\pgflinewidth%
+ \pgfsetdash{}{+0pt}
\pgfsetmiterjoin
- \pgfpathmoveto{\pgfpoint{0\@tempdima}{-6\@tempdima}}
- \pgfpathlineto{\pgfpoint{6\@tempdima}{0\@tempdima}}
- \pgfpathlineto{\pgfpoint{0\@tempdima}{6\@tempdima}}
+ \pgfpathmoveto{\pgfqpoint{0\pgfutil@tempdima}{-6\pgfutil@tempdima}}
+ \pgfpathlineto{\pgfqpoint{6\pgfutil@tempdima}{0\pgfutil@tempdima}}
+ \pgfpathlineto{\pgfqpoint{0\pgfutil@tempdima}{6\pgfutil@tempdima}}
\pgfpathclose
\pgfusepathqstroke
}
\pgfarrowsdeclare{open triangle 90 reversed}{open triangle 90 reversed}
{
- \@tempdima=0.5pt%
- \advance\@tempdima by.25\pgflinewidth%
- \pgfarrowsleftextend{-.707\pgflinewidth}
- \@tempdimb=6\@tempdima\advance\@tempdimb by0.5\pgflinewidth%
- \pgfarrowsrightextend{\@tempdimb}
+ \pgfutil@tempdima=0.5pt%
+ \advance\pgfutil@tempdima by.25\pgflinewidth%
+ \pgfarrowsleftextend{+-.707\pgflinewidth}
+ \pgfutil@tempdimb=6\pgfutil@tempdima\advance\pgfutil@tempdimb by0.5\pgflinewidth%
+ \pgfarrowsrightextend{+\pgfutil@tempdimb}
}
{
- \@tempdima=0.5pt%
- \advance\@tempdima by.25\pgflinewidth%
- \pgfsetdash{}{0pt}
+ \pgfutil@tempdima=0.5pt%
+ \advance\pgfutil@tempdima by.25\pgflinewidth%
+ \pgfsetdash{}{+0pt}
\pgfsetmiterjoin
- \pgfpathmoveto{\pgfpoint{6\@tempdima}{-6\@tempdima}}
- \pgfpathlineto{\pgfpoint{0\@tempdima}{0\@tempdima}}
- \pgfpathlineto{\pgfpoint{6\@tempdima}{6\@tempdima}}
+ \pgfpathmoveto{\pgfqpoint{6\pgfutil@tempdima}{-6\pgfutil@tempdima}}
+ \pgfpathlineto{\pgfqpoint{0\pgfutil@tempdima}{0\pgfutil@tempdima}}
+ \pgfpathlineto{\pgfqpoint{6\pgfutil@tempdima}{6\pgfutil@tempdima}}
\pgfpathclose
\pgfusepathqstroke
}
@@ -351,20 +351,20 @@
\pgfarrowsdeclare{open triangle 60}{open triangle 60}
{
- \@tempdima=0.5pt%
- \advance\@tempdima by.25\pgflinewidth%
- \pgfarrowsleftextend{-.5\pgflinewidth}
- \@tempdimb=7.794\@tempdima\advance\@tempdimb by\pgflinewidth%
- \pgfarrowsrightextend{\@tempdimb}
+ \pgfutil@tempdima=0.5pt%
+ \advance\pgfutil@tempdima by.25\pgflinewidth%
+ \pgfarrowsleftextend{+-.5\pgflinewidth}
+ \pgfutil@tempdimb=7.794\pgfutil@tempdima\advance\pgfutil@tempdimb by\pgflinewidth%
+ \pgfarrowsrightextend{+\pgfutil@tempdimb}
}
{
- \@tempdima=0.5pt%
- \advance\@tempdima by.25\pgflinewidth%
- \pgfsetdash{}{0pt}
+ \pgfutil@tempdima=0.5pt%
+ \advance\pgfutil@tempdima by.25\pgflinewidth%
+ \pgfsetdash{}{+0pt}
\pgfsetmiterjoin
- \pgfpathmoveto{\pgfpointadd{\pgfpoint{7.794\@tempdima}{0pt}}{\pgfpointpolar{150}{9\@tempdima}}}
- \pgfpathlineto{\pgfpoint{7.794\@tempdima}{0pt}}
- \pgfpathlineto{\pgfpointadd{\pgfpoint{7.794\@tempdima}{0pt}}{\pgfpointpolar{-150}{9\@tempdima}}}
+ \pgfpathmoveto{\pgfpointadd{\pgfqpoint{7.794\pgfutil@tempdima}{0pt}}{\pgfqpointpolar{150}{9\pgfutil@tempdima}}}
+ \pgfpathlineto{\pgfqpoint{7.794\pgfutil@tempdima}{0pt}}
+ \pgfpathlineto{\pgfpointadd{\pgfqpoint{7.794\pgfutil@tempdima}{0pt}}{\pgfqpointpolar{-150}{9\pgfutil@tempdima}}}
\pgfpathclose
\pgfusepathqstroke
}
@@ -373,20 +373,20 @@
\pgfarrowsdeclare{open triangle 60 reversed}{open triangle 60 reversed}
{
- \@tempdima=0.5pt%
- \advance\@tempdima by.25\pgflinewidth%
- \pgfarrowsleftextend{-\pgflinewidth}
- \@tempdimb=7.794\@tempdima\advance\@tempdimb by0.5\pgflinewidth%
- \pgfarrowsrightextend{\@tempdimb}
+ \pgfutil@tempdima=0.5pt%
+ \advance\pgfutil@tempdima by.25\pgflinewidth%
+ \pgfarrowsleftextend{+-\pgflinewidth}
+ \pgfutil@tempdimb=7.794\pgfutil@tempdima\advance\pgfutil@tempdimb by0.5\pgflinewidth%
+ \pgfarrowsrightextend{+\pgfutil@tempdimb}
}
{
- \@tempdima=0.5pt%
- \advance\@tempdima by.25\pgflinewidth%
- \pgfsetdash{}{0pt}
+ \pgfutil@tempdima=0.5pt%
+ \advance\pgfutil@tempdima by.25\pgflinewidth%
+ \pgfsetdash{}{+0pt}
\pgfsetmiterjoin
- \pgfpathmoveto{\pgfpointpolar{30}{9\@tempdima}}
+ \pgfpathmoveto{\pgfqpointpolar{30}{9\pgfutil@tempdima}}
\pgfpathlineto{\pgfpointorigin}
- \pgfpathlineto{\pgfpointpolar{-30}{9\@tempdima}}
+ \pgfpathlineto{\pgfqpointpolar{-30}{9\pgfutil@tempdima}}
\pgfpathclose
\pgfusepathqstroke
}
@@ -395,20 +395,20 @@
\pgfarrowsdeclare{open triangle 45}{open triangle 45}
{
- \@tempdima=0.5pt%
- \advance\@tempdima by.25\pgflinewidth%
- \pgfarrowsleftextend{-.5\pgflinewidth}
- \@tempdimb=9.205\@tempdima\advance\@tempdimb by1.28\pgflinewidth%
- \pgfarrowsrightextend{\@tempdimb}
+ \pgfutil@tempdima=0.5pt%
+ \advance\pgfutil@tempdima by.25\pgflinewidth%
+ \pgfarrowsleftextend{+-.5\pgflinewidth}
+ \pgfutil@tempdimb=9.205\pgfutil@tempdima\advance\pgfutil@tempdimb by1.28\pgflinewidth%
+ \pgfarrowsrightextend{+\pgfutil@tempdimb}
}
{
- \@tempdima=0.5pt%
- \advance\@tempdima by.25\pgflinewidth%
- \pgfsetdash{}{0pt}
+ \pgfutil@tempdima=0.5pt%
+ \advance\pgfutil@tempdima by.25\pgflinewidth%
+ \pgfsetdash{}{+0pt}
\pgfsetmiterjoin
- \pgfpathmoveto{\pgfpointadd{\pgfpoint{9.205\@tempdima}{0pt}}{\pgfpointpolar{157}{10\@tempdima}}}
- \pgfpathlineto{\pgfpoint{9.205\@tempdima}{0pt}}
- \pgfpathlineto{\pgfpointadd{\pgfpoint{9.205\@tempdima}{0pt}}{\pgfpointpolar{-157}{10\@tempdima}}}
+ \pgfpathmoveto{\pgfpointadd{\pgfqpoint{9.205\pgfutil@tempdima}{0pt}}{\pgfqpointpolar{157}{10\pgfutil@tempdima}}}
+ \pgfpathlineto{\pgfqpoint{9.205\pgfutil@tempdima}{0pt}}
+ \pgfpathlineto{\pgfpointadd{\pgfqpoint{9.205\pgfutil@tempdima}{0pt}}{\pgfqpointpolar{-157}{10\pgfutil@tempdima}}}
\pgfpathclose
\pgfusepathqstroke
}
@@ -417,20 +417,20 @@
\pgfarrowsdeclare{open triangle 45 reversed}{open triangle 45 reversed}
{
- \@tempdima=0.5pt%
- \advance\@tempdima by.25\pgflinewidth%
- \pgfarrowsleftextend{-1.28\pgflinewidth}
- \@tempdimb=9.205\@tempdima\advance\@tempdimb by0.5\pgflinewidth%
- \pgfarrowsrightextend{\@tempdimb}
+ \pgfutil@tempdima=0.5pt%
+ \advance\pgfutil@tempdima by.25\pgflinewidth%
+ \pgfarrowsleftextend{+-1.28\pgflinewidth}
+ \pgfutil@tempdimb=9.205\pgfutil@tempdima\advance\pgfutil@tempdimb by0.5\pgflinewidth%
+ \pgfarrowsrightextend{+\pgfutil@tempdimb}
}
{
- \@tempdima=0.5pt%
- \advance\@tempdima by.25\pgflinewidth%
- \pgfsetdash{}{0pt}
+ \pgfutil@tempdima=0.5pt%
+ \advance\pgfutil@tempdima by.25\pgflinewidth%
+ \pgfsetdash{}{+0pt}
\pgfsetmiterjoin
- \pgfpathmoveto{\pgfpointpolar{23}{10\@tempdima}}
+ \pgfpathmoveto{\pgfqpointpolar{23}{10\pgfutil@tempdima}}
\pgfpathlineto{\pgfpointorigin}
- \pgfpathlineto{\pgfpointpolar{-23}{10\@tempdima}}
+ \pgfpathlineto{\pgfqpointpolar{-23}{10\pgfutil@tempdima}}
\pgfpathclose
\pgfusepathqstroke
}
@@ -441,27 +441,27 @@
\pgfarrowsdeclare{latex'}{latex'}
{
- \@tempdima=0.28pt%
- \advance\@tempdima by.3\pgflinewidth%
- \pgfarrowsleftextend{-4\@tempdima}
- \pgfarrowsrightextend{6\@tempdima}
+ \pgfutil@tempdima=0.28pt%
+ \advance\pgfutil@tempdima by.3\pgflinewidth%
+ \pgfarrowsleftextend{+-4\pgfutil@tempdima}
+ \pgfarrowsrightextend{+6\pgfutil@tempdima}
}
{
- \@tempdima=0.28pt%
- \advance\@tempdima by.3\pgflinewidth%
- \pgfpathmoveto{\pgfpoint{6\@tempdima}{0\@tempdima}}
+ \pgfutil@tempdima=0.28pt%
+ \advance\pgfutil@tempdima by.3\pgflinewidth%
+ \pgfpathmoveto{\pgfqpoint{6\pgfutil@tempdima}{0\pgfutil@tempdima}}
\pgfpathcurveto
- {\pgfpoint{3.5\@tempdima}{.5\@tempdima}}
- {\pgfpoint{-1\@tempdima}{1.5\@tempdima}}
- {\pgfpoint{-4\@tempdima}{3.75\@tempdima}}
+ {\pgfqpoint{3.5\pgfutil@tempdima}{.5\pgfutil@tempdima}}
+ {\pgfqpoint{-1\pgfutil@tempdima}{1.5\pgfutil@tempdima}}
+ {\pgfqpoint{-4\pgfutil@tempdima}{3.75\pgfutil@tempdima}}
\pgfpathcurveto
- {\pgfpoint{-1.5\@tempdima}{1\@tempdima}}
- {\pgfpoint{-1.5\@tempdima}{-1\@tempdima}}
- {\pgfpoint{-4\@tempdima}{-3.75\@tempdima}}
+ {\pgfqpoint{-1.5\pgfutil@tempdima}{1\pgfutil@tempdima}}
+ {\pgfqpoint{-1.5\pgfutil@tempdima}{-1\pgfutil@tempdima}}
+ {\pgfqpoint{-4\pgfutil@tempdima}{-3.75\pgfutil@tempdima}}
\pgfpathcurveto
- {\pgfpoint{-1\@tempdima}{-1.5\@tempdima}}
- {\pgfpoint{3.5\@tempdima}{-.5\@tempdima}}
- {\pgfpoint{6\@tempdima}{0\@tempdima}}
+ {\pgfqpoint{-1\pgfutil@tempdima}{-1.5\pgfutil@tempdima}}
+ {\pgfqpoint{3.5\pgfutil@tempdima}{-.5\pgfutil@tempdima}}
+ {\pgfqpoint{6\pgfutil@tempdima}{0\pgfutil@tempdima}}
\pgfusepathqfill
}
@@ -472,31 +472,31 @@
\pgfarrowsdeclare{stealth'}{stealth'}
{
- \@tempdima=0.28pt%
- \advance\@tempdima by.3\pgflinewidth%
- \@tempdimb=6\@tempdima\advance\@tempdimb by.5\pgflinewidth%
- \pgfarrowsleftextend{-\@tempdimb}
- \@tempdimb=2\@tempdima\advance\@tempdimb by0.5\pgflinewidth%
- \pgfarrowsrightextend{\@tempdimb}
+ \pgfutil@tempdima=0.28pt%
+ \advance\pgfutil@tempdima by.3\pgflinewidth%
+ \pgfutil@tempdimb=6\pgfutil@tempdima\advance\pgfutil@tempdimb by.5\pgflinewidth%
+ \pgfarrowsleftextend{+-\pgfutil@tempdimb}
+ \pgfutil@tempdimb=2\pgfutil@tempdima\advance\pgfutil@tempdimb by0.5\pgflinewidth%
+ \pgfarrowsrightextend{+\pgfutil@tempdimb}
}
{
- \@tempdima=0.28pt%
- \advance\@tempdima by.3\pgflinewidth%
- \pgfsetdash{}{0pt}
+ \pgfutil@tempdima=0.28pt%
+ \advance\pgfutil@tempdima by.3\pgflinewidth%
+ \pgfsetdash{}{+0pt}
\pgfsetroundjoin
- \pgfpathmoveto{\pgfpoint{2\@tempdima}{0\@tempdima}}
+ \pgfpathmoveto{\pgfqpoint{2\pgfutil@tempdima}{0\pgfutil@tempdima}}
\pgfpathcurveto
- {\pgfpoint{-.5\@tempdima}{.5\@tempdima}}
- {\pgfpoint{-3\@tempdima}{1.5\@tempdima}}
- {\pgfpoint{-6\@tempdima}{3.25\@tempdima}}
+ {\pgfqpoint{-.5\pgfutil@tempdima}{.5\pgfutil@tempdima}}
+ {\pgfqpoint{-3\pgfutil@tempdima}{1.5\pgfutil@tempdima}}
+ {\pgfqpoint{-6\pgfutil@tempdima}{3.25\pgfutil@tempdima}}
\pgfpathcurveto
- {\pgfpoint{-3\@tempdima}{1\@tempdima}}
- {\pgfpoint{-3\@tempdima}{-1\@tempdima}}
- {\pgfpoint{-6\@tempdima}{-3.25\@tempdima}}
+ {\pgfqpoint{-3\pgfutil@tempdima}{1\pgfutil@tempdima}}
+ {\pgfqpoint{-3\pgfutil@tempdima}{-1\pgfutil@tempdima}}
+ {\pgfqpoint{-6\pgfutil@tempdima}{-3.25\pgfutil@tempdima}}
\pgfpathcurveto
- {\pgfpoint{-3\@tempdima}{-1.5\@tempdima}}
- {\pgfpoint{-.5\@tempdima}{-.5\@tempdima}}
- {\pgfpoint{2\@tempdima}{0\@tempdima}}
+ {\pgfqpoint{-3\pgfutil@tempdima}{-1.5\pgfutil@tempdima}}
+ {\pgfqpoint{-.5\pgfutil@tempdima}{-.5\pgfutil@tempdima}}
+ {\pgfqpoint{2\pgfutil@tempdima}{0\pgfutil@tempdima}}
\pgfpathclose
\pgfusepathqfillstroke
}
@@ -509,60 +509,60 @@
\pgfarrowsdeclare{left to}{left to}
{
- \@tempdima=-0.84pt%
- \advance\@tempdima by-1.3\pgflinewidth%
- \@tempdimb=0.21pt%
- \advance\@tempdimb by.625\pgflinewidth%
- \pgfarrowsleftextend{\@tempdima}
- \pgfarrowsrightextend{\@tempdimb}
+ \pgfutil@tempdima=-0.84pt%
+ \advance\pgfutil@tempdima by-1.3\pgflinewidth%
+ \pgfutil@tempdimb=0.21pt%
+ \advance\pgfutil@tempdimb by.625\pgflinewidth%
+ \pgfarrowsleftextend{+\pgfutil@tempdima}
+ \pgfarrowsrightextend{+\pgfutil@tempdimb}
}
{
- \@tempdima=0.28pt%
- \advance\@tempdima by.3\pgflinewidth%
+ \pgfutil@tempdima=0.28pt%
+ \advance\pgfutil@tempdima by.3\pgflinewidth%
\pgfsetlinewidth{0.8\pgflinewidth}
- \pgfsetdash{}{0pt}
+ \pgfsetdash{}{+0pt}
\pgfsetroundcap
\pgfsetroundjoin
- \pgfpathmoveto{\pgfpoint{-3\@tempdima}{4\@tempdima}}
+ \pgfpathmoveto{\pgfqpoint{-3\pgfutil@tempdima}{4\pgfutil@tempdima}}
\pgfpathcurveto
- {\pgfpoint{-2.75\@tempdima}{2.5\@tempdima}}
- {\pgfpoint{0pt}{0.25\@tempdima}}
- {\pgfpoint{0.75\@tempdima}{0pt}}
+ {\pgfqpoint{-2.75\pgfutil@tempdima}{2.5\pgfutil@tempdima}}
+ {\pgfqpoint{0pt}{0.25\pgfutil@tempdima}}
+ {\pgfqpoint{0.75\pgfutil@tempdima}{0pt}}
\pgfpathcurveto
- {\pgfpoint{0.55\@tempdima}{-0.125\pgflinewidth}}
- {\pgfpoint{0.5\@tempdima}{-0.125\pgflinewidth}}
- {\pgfpoint{0.5\@tempdima}{-0.125\pgflinewidth}}
- \pgfpathlineto{\pgfpoint{0pt}{-0.125\pgflinewidth}}
+ {\pgfqpoint{0.55\pgfutil@tempdima}{-0.125\pgflinewidth}}
+ {\pgfqpoint{0.5\pgfutil@tempdima}{-0.125\pgflinewidth}}
+ {\pgfqpoint{0.5\pgfutil@tempdima}{-0.125\pgflinewidth}}
+ \pgfpathlineto{\pgfqpoint{0pt}{-0.125\pgflinewidth}}
\pgfusepathqstroke
}
\pgfarrowsdeclare{right to}{right to}
{
- \@tempdima=-0.84pt%
- \advance\@tempdima by-1.3\pgflinewidth%
- \@tempdimb=0.21pt%
- \advance\@tempdimb by.625\pgflinewidth%
- \pgfarrowsleftextend{\@tempdima}
- \pgfarrowsrightextend{\@tempdimb}
+ \pgfutil@tempdima=-0.84pt%
+ \advance\pgfutil@tempdima by-1.3\pgflinewidth%
+ \pgfutil@tempdimb=0.21pt%
+ \advance\pgfutil@tempdimb by.625\pgflinewidth%
+ \pgfarrowsleftextend{+\pgfutil@tempdima}
+ \pgfarrowsrightextend{+\pgfutil@tempdimb}
}
{
- \@tempdima=0.28pt%
- \advance\@tempdima by.3\pgflinewidth%
+ \pgfutil@tempdima=0.28pt%
+ \advance\pgfutil@tempdima by.3\pgflinewidth%
\pgfsetlinewidth{0.8\pgflinewidth}
- \pgfsetdash{}{0pt}
+ \pgfsetdash{}{+0pt}
\pgfsetroundcap
\pgfsetroundjoin
- \pgfpathmoveto{\pgfpoint{-3\@tempdima}{-4\@tempdima}}
+ \pgfpathmoveto{\pgfqpoint{-3\pgfutil@tempdima}{-4\pgfutil@tempdima}}
\pgfpathcurveto
- {\pgfpoint{-2.75\@tempdima}{-2.5\@tempdima}}
- {\pgfpoint{0pt}{-0.25\@tempdima}}
- {\pgfpoint{0.75\@tempdima}{0pt}}
+ {\pgfqpoint{-2.75\pgfutil@tempdima}{-2.5\pgfutil@tempdima}}
+ {\pgfqpoint{0pt}{-0.25\pgfutil@tempdima}}
+ {\pgfqpoint{0.75\pgfutil@tempdima}{0pt}}
\pgfpathcurveto
- {\pgfpoint{0.55\@tempdima}{0.125\pgflinewidth}}
- {\pgfpoint{0.5\@tempdima}{0.125\pgflinewidth}}
- {\pgfpoint{0.5\@tempdima}{0.125\pgflinewidth}}
- \pgfpathlineto{\pgfpoint{0pt}{0.125\pgflinewidth}}
+ {\pgfqpoint{0.55\pgfutil@tempdima}{0.125\pgflinewidth}}
+ {\pgfqpoint{0.5\pgfutil@tempdima}{0.125\pgflinewidth}}
+ {\pgfqpoint{0.5\pgfutil@tempdima}{0.125\pgflinewidth}}
+ \pgfpathlineto{\pgfqpoint{0pt}{0.125\pgflinewidth}}
\pgfusepathqstroke
}
@@ -572,56 +572,56 @@
\pgfarrowsdeclare{left to reversed}{left to reversed}
{
- \@tempdima=0.28pt%
- \advance\@tempdima by.3\pgflinewidth%
- \pgfarrowsleftextend{-.1\pgflinewidth}
- \@tempdimb=3.75\@tempdima\advance\@tempdimb by0.9\pgflinewidth%
- \pgfarrowsrightextend{\@tempdimb}
+ \pgfutil@tempdima=0.28pt%
+ \advance\pgfutil@tempdima by.3\pgflinewidth%
+ \pgfarrowsleftextend{+-.1\pgflinewidth}
+ \pgfutil@tempdimb=3.75\pgfutil@tempdima\advance\pgfutil@tempdimb by0.9\pgflinewidth%
+ \pgfarrowsrightextend{+\pgfutil@tempdimb}
}
{
- \@tempdima=0.28pt%
- \advance\@tempdima by.3\pgflinewidth%
- \pgfsetdash{}{0pt}
+ \pgfutil@tempdima=0.28pt%
+ \advance\pgfutil@tempdima by.3\pgflinewidth%
+ \pgfsetdash{}{+0pt}
\pgfsetroundjoin
\pgfsetbuttcap
- \pgfpathmoveto{\pgfpoint{0.5\pgflinewidth}{0pt}}
- \pgfpathlineto{\pgfpoint{-0.1\pgflinewidth}{0pt}}
+ \pgfpathmoveto{\pgfqpoint{0.5\pgflinewidth}{0pt}}
+ \pgfpathlineto{\pgfqpoint{-0.1\pgflinewidth}{0pt}}
\pgfusepathqstroke
\pgfsetroundcap
\pgfsetlinewidth{.8\pgflinewidth}
{\pgftransformxshift{0.625\pgflinewidth}
- \pgfpathmoveto{\pgfpoint{3.75\@tempdima}{4\@tempdima}}
- \pgfpathcurveto{\pgfpoint{3.5\@tempdima}{2.5\@tempdima}}{\pgfpoint{0.75\@tempdima}{0.25\@tempdima}}{\pgfpoint{0pt}{0.125\pgflinewidth}}
- \pgfpathmoveto{\pgfpoint{3.75\@tempdima}{4\@tempdima}}
- \pgfpathcurveto{\pgfpoint{3.5\@tempdima}{2.5\@tempdima}}{\pgfpoint{0.75\@tempdima}{0.25\@tempdima}}{\pgfpoint{0pt}{-0.125\pgflinewidth}}
+ \pgfpathmoveto{\pgfqpoint{3.75\pgfutil@tempdima}{4\pgfutil@tempdima}}
+ \pgfpathcurveto{\pgfqpoint{3.5\pgfutil@tempdima}{2.5\pgfutil@tempdima}}{\pgfqpoint{0.75\pgfutil@tempdima}{0.25\pgfutil@tempdima}}{\pgfqpoint{0pt}{0.125\pgflinewidth}}
+ \pgfpathmoveto{\pgfqpoint{3.75\pgfutil@tempdima}{4\pgfutil@tempdima}}
+ \pgfpathcurveto{\pgfqpoint{3.5\pgfutil@tempdima}{2.5\pgfutil@tempdima}}{\pgfqpoint{0.75\pgfutil@tempdima}{0.25\pgfutil@tempdima}}{\pgfqpoint{0pt}{-0.125\pgflinewidth}}
}
\pgfusepathqstroke%
}
\pgfarrowsdeclare{right to reversed}{right to reversed}
{
- \@tempdima=0.28pt%
- \advance\@tempdima by.3\pgflinewidth%
- \pgfarrowsleftextend{-.1\pgflinewidth}
- \@tempdimb=3.75\@tempdima\advance\@tempdimb by0.9\pgflinewidth%
- \pgfarrowsrightextend{\@tempdimb}
+ \pgfutil@tempdima=0.28pt%
+ \advance\pgfutil@tempdima by.3\pgflinewidth%
+ \pgfarrowsleftextend{+-.1\pgflinewidth}
+ \pgfutil@tempdimb=3.75\pgfutil@tempdima\advance\pgfutil@tempdimb by0.9\pgflinewidth%
+ \pgfarrowsrightextend{+\pgfutil@tempdimb}
}
{
- \@tempdima=0.28pt%
- \advance\@tempdima by.3\pgflinewidth%
- \pgfsetdash{}{0pt}
+ \pgfutil@tempdima=0.28pt%
+ \advance\pgfutil@tempdima by.3\pgflinewidth%
+ \pgfsetdash{}{+0pt}
\pgfsetroundjoin
\pgfsetbuttcap
- \pgfpathmoveto{\pgfpoint{0.5\pgflinewidth}{0pt}}
- \pgfpathlineto{\pgfpoint{-0.1\pgflinewidth}{0pt}}
+ \pgfpathmoveto{\pgfqpoint{0.5\pgflinewidth}{0pt}}
+ \pgfpathlineto{\pgfqpoint{-0.1\pgflinewidth}{0pt}}
\pgfusepathqstroke
\pgfsetroundcap
\pgfsetlinewidth{.8\pgflinewidth}
{\pgftransformxshift{0.625\pgflinewidth}
- \pgfpathmoveto{\pgfpoint{3.75\@tempdima}{-4\@tempdima}}
- \pgfpathcurveto{\pgfpoint{3.5\@tempdima}{-2.5\@tempdima}}{\pgfpoint{0.75\@tempdima}{-0.25\@tempdima}}{\pgfpoint{0pt}{-0.125\pgflinewidth}}
- \pgfpathmoveto{\pgfpoint{3.75\@tempdima}{-4\@tempdima}}
- \pgfpathcurveto{\pgfpoint{3.5\@tempdima}{-2.5\@tempdima}}{\pgfpoint{0.75\@tempdima}{-0.25\@tempdima}}{\pgfpoint{0pt}{0.125\pgflinewidth}}
+ \pgfpathmoveto{\pgfqpoint{3.75\pgfutil@tempdima}{-4\pgfutil@tempdima}}
+ \pgfpathcurveto{\pgfqpoint{3.5\pgfutil@tempdima}{-2.5\pgfutil@tempdima}}{\pgfqpoint{0.75\pgfutil@tempdima}{-0.25\pgfutil@tempdima}}{\pgfqpoint{0pt}{-0.125\pgflinewidth}}
+ \pgfpathmoveto{\pgfqpoint{3.75\pgfutil@tempdima}{-4\pgfutil@tempdima}}
+ \pgfpathcurveto{\pgfqpoint{3.5\pgfutil@tempdima}{-2.5\pgfutil@tempdima}}{\pgfqpoint{0.75\pgfutil@tempdima}{-0.25\pgfutil@tempdima}}{\pgfqpoint{0pt}{0.125\pgflinewidth}}
}
\pgfusepathqstroke%
}
@@ -632,21 +632,21 @@
\pgfarrowsdeclare{left hook}{left hook}
{
- \@tempdima=0.4pt%
- \advance\@tempdima by.2\pgflinewidth%
- \pgfarrowsleftextend{-.5\pgflinewidth}
- \@tempdimb=3.75\@tempdima\advance\@tempdimb by0.5\pgflinewidth%
- \pgfarrowsrightextend{\@tempdimb}
+ \pgfutil@tempdima=0.4pt%
+ \advance\pgfutil@tempdima by.2\pgflinewidth%
+ \pgfarrowsleftextend{+-.5\pgflinewidth}
+ \pgfutil@tempdimb=3.75\pgfutil@tempdima\advance\pgfutil@tempdimb by0.5\pgflinewidth%
+ \pgfarrowsrightextend{+\pgfutil@tempdimb}
}
{
- \@tempdima=0.4pt%
- \advance\@tempdima by.2\pgflinewidth%
- \pgfsetdash{}{0pt}
+ \pgfutil@tempdima=0.4pt%
+ \advance\pgfutil@tempdima by.2\pgflinewidth%
+ \pgfsetdash{}{+0pt}
\pgfsetroundcap
- \pgfpathmoveto{\pgfpoint{0\@tempdima}{0\@tempdima}}
- \pgfpathlineto{\pgfpoint{0.75\@tempdima}{0\@tempdima}}
- \pgfpathcurveto{\pgfpoint{2.415\@tempdima}{0\@tempdima}}{\pgfpoint{3.75\@tempdima}{1.665\@tempdima}}{\pgfpoint{3.75\@tempdima}{3\@tempdima}}
- \pgfpathcurveto{\pgfpoint{3.75\@tempdima}{4.665\@tempdima}}{\pgfpoint{2.415\@tempdima}{6\@tempdima}}{\pgfpoint{0.75\@tempdima}{6\@tempdima}}
+ \pgfpathmoveto{\pgfqpoint{0\pgfutil@tempdima}{0\pgfutil@tempdima}}
+ \pgfpathlineto{\pgfqpoint{0.75\pgfutil@tempdima}{0\pgfutil@tempdima}}
+ \pgfpathcurveto{\pgfqpoint{2.415\pgfutil@tempdima}{0\pgfutil@tempdima}}{\pgfqpoint{3.75\pgfutil@tempdima}{1.665\pgfutil@tempdima}}{\pgfqpoint{3.75\pgfutil@tempdima}{3\pgfutil@tempdima}}
+ \pgfpathcurveto{\pgfqpoint{3.75\pgfutil@tempdima}{4.665\pgfutil@tempdima}}{\pgfqpoint{2.415\pgfutil@tempdima}{6\pgfutil@tempdima}}{\pgfqpoint{0.75\pgfutil@tempdima}{6\pgfutil@tempdima}}
\pgfusepathqstroke%
}
@@ -658,21 +658,21 @@
\pgfarrowsdeclare{right hook}{right hook}
{
- \@tempdima=0.4pt%
- \advance\@tempdima by.2\pgflinewidth%
- \pgfarrowsleftextend{-.5\pgflinewidth}
- \@tempdimb=3.75\@tempdima\advance\@tempdimb by0.5\pgflinewidth%
- \pgfarrowsrightextend{\@tempdimb}
+ \pgfutil@tempdima=0.4pt%
+ \advance\pgfutil@tempdima by.2\pgflinewidth%
+ \pgfarrowsleftextend{+-.5\pgflinewidth}
+ \pgfutil@tempdimb=3.75\pgfutil@tempdima\advance\pgfutil@tempdimb by0.5\pgflinewidth%
+ \pgfarrowsrightextend{+\pgfutil@tempdimb}
}
{
- \@tempdima=0.4pt%
- \advance\@tempdima by.2\pgflinewidth%
- \pgfsetdash{}{0pt}
+ \pgfutil@tempdima=0.4pt%
+ \advance\pgfutil@tempdima by.2\pgflinewidth%
+ \pgfsetdash{}{+0pt}
\pgfsetroundcap
- \pgfpathmoveto{\pgfpoint{0\@tempdima}{0\@tempdima}}
- \pgfpathlineto{\pgfpoint{0.75\@tempdima}{0\@tempdima}}
- \pgfpathcurveto{\pgfpoint{2.415\@tempdima}{0\@tempdima}}{\pgfpoint{3.75\@tempdima}{-1.665\@tempdima}}{\pgfpoint{3.75\@tempdima}{-3\@tempdima}}
- \pgfpathcurveto{\pgfpoint{3.75\@tempdima}{-4.665\@tempdima}}{\pgfpoint{2.415\@tempdima}{-6\@tempdima}}{\pgfpoint{0.75\@tempdima}{-6\@tempdima}}
+ \pgfpathmoveto{\pgfqpoint{0\pgfutil@tempdima}{0\pgfutil@tempdima}}
+ \pgfpathlineto{\pgfqpoint{0.75\pgfutil@tempdima}{0\pgfutil@tempdima}}
+ \pgfpathcurveto{\pgfqpoint{2.415\pgfutil@tempdima}{0\pgfutil@tempdima}}{\pgfqpoint{3.75\pgfutil@tempdima}{-1.665\pgfutil@tempdima}}{\pgfqpoint{3.75\pgfutil@tempdima}{-3\pgfutil@tempdima}}
+ \pgfpathcurveto{\pgfqpoint{3.75\pgfutil@tempdima}{-4.665\pgfutil@tempdima}}{\pgfqpoint{2.415\pgfutil@tempdima}{-6\pgfutil@tempdima}}{\pgfqpoint{0.75\pgfutil@tempdima}{-6\pgfutil@tempdima}}
\pgfusepathqstroke%
}
@@ -683,24 +683,24 @@
\pgfarrowsdeclare{hooks}{hooks}
{
- \@tempdima=0.4pt%
- \advance\@tempdima by.2\pgflinewidth%
- \pgfarrowsleftextend{-.5\pgflinewidth}
- \@tempdimb=3.75\@tempdima\advance\@tempdimb by0.5\pgflinewidth%
- \pgfarrowsrightextend{\@tempdimb}
+ \pgfutil@tempdima=0.4pt%
+ \advance\pgfutil@tempdima by.2\pgflinewidth%
+ \pgfarrowsleftextend{+-.5\pgflinewidth}
+ \pgfutil@tempdimb=3.75\pgfutil@tempdima\advance\pgfutil@tempdimb by0.5\pgflinewidth%
+ \pgfarrowsrightextend{+\pgfutil@tempdimb}
}
{
- \@tempdima=0.4pt%
- \advance\@tempdima by.2\pgflinewidth%
- \pgfsetdash{}{0pt}
+ \pgfutil@tempdima=0.4pt%
+ \advance\pgfutil@tempdima by.2\pgflinewidth%
+ \pgfsetdash{}{+0pt}
\pgfsetroundcap
- \pgfpathmoveto{\pgfpoint{0\@tempdima}{0\@tempdima}}
- \pgfpathlineto{\pgfpoint{0.75\@tempdima}{0\@tempdima}}
- \pgfpathcurveto{\pgfpoint{2.415\@tempdima}{0\@tempdima}}{\pgfpoint{3.75\@tempdima}{1.665\@tempdima}}{\pgfpoint{3.75\@tempdima}{3\@tempdima}}
- \pgfpathcurveto{\pgfpoint{3.75\@tempdima}{4.665\@tempdima}}{\pgfpoint{2.415\@tempdima}{6\@tempdima}}{\pgfpoint{0.75\@tempdima}{6\@tempdima}}
- \pgfpathmoveto{\pgfpoint{0.75\@tempdima}{0\@tempdima}}
- \pgfpathcurveto{\pgfpoint{2.415\@tempdima}{0\@tempdima}}{\pgfpoint{3.75\@tempdima}{-1.665\@tempdima}}{\pgfpoint{3.75\@tempdima}{-3\@tempdima}}
- \pgfpathcurveto{\pgfpoint{3.75\@tempdima}{-4.665\@tempdima}}{\pgfpoint{2.415\@tempdima}{-6\@tempdima}}{\pgfpoint{0.75\@tempdima}{-6\@tempdima}}
+ \pgfpathmoveto{\pgfqpoint{0\pgfutil@tempdima}{0\pgfutil@tempdima}}
+ \pgfpathlineto{\pgfqpoint{0.75\pgfutil@tempdima}{0\pgfutil@tempdima}}
+ \pgfpathcurveto{\pgfqpoint{2.415\pgfutil@tempdima}{0\pgfutil@tempdima}}{\pgfqpoint{3.75\pgfutil@tempdima}{1.665\pgfutil@tempdima}}{\pgfqpoint{3.75\pgfutil@tempdima}{3\pgfutil@tempdima}}
+ \pgfpathcurveto{\pgfqpoint{3.75\pgfutil@tempdima}{4.665\pgfutil@tempdima}}{\pgfqpoint{2.415\pgfutil@tempdima}{6\pgfutil@tempdima}}{\pgfqpoint{0.75\pgfutil@tempdima}{6\pgfutil@tempdima}}
+ \pgfpathmoveto{\pgfqpoint{0.75\pgfutil@tempdima}{0\pgfutil@tempdima}}
+ \pgfpathcurveto{\pgfqpoint{2.415\pgfutil@tempdima}{0\pgfutil@tempdima}}{\pgfqpoint{3.75\pgfutil@tempdima}{-1.665\pgfutil@tempdima}}{\pgfqpoint{3.75\pgfutil@tempdima}{-3\pgfutil@tempdima}}
+ \pgfpathcurveto{\pgfqpoint{3.75\pgfutil@tempdima}{-4.665\pgfutil@tempdima}}{\pgfqpoint{2.415\pgfutil@tempdima}{-6\pgfutil@tempdima}}{\pgfqpoint{0.75\pgfutil@tempdima}{-6\pgfutil@tempdima}}
\pgfusepathqstroke%
}
@@ -711,30 +711,30 @@
\pgfarrowsdeclare{serif cm}{serif cm}
{
- \@tempdima=0.4pt%
- \advance\@tempdima by.45\pgflinewidth%
- \pgfarrowsleftextend{-.75\@tempdima}
- \pgfarrowsrightextend{.04\pgflinewidth}
+ \pgfutil@tempdima=0.4pt%
+ \advance\pgfutil@tempdima by.45\pgflinewidth%
+ \pgfarrowsleftextend{+-.75\pgfutil@tempdima}
+ \pgfarrowsrightextend{+.04\pgflinewidth}
}
{
- \@tempdima=0.4pt%
- \advance\@tempdima by.45\pgflinewidth%
+ \pgfutil@tempdima=0.4pt%
+ \advance\pgfutil@tempdima by.45\pgflinewidth%
\pgftransformxshift{.04\pgflinewidth}
- \pgfpathmoveto{\pgfpoint{-.75\@tempdima}{.5\pgflinewidth}}
+ \pgfpathmoveto{\pgfqpoint{-.75\pgfutil@tempdima}{.5\pgflinewidth}}
\pgfpathcurveto
- {\pgfpoint{-.375\@tempdima}{.5\pgflinewidth}}
- {\pgfpoint{-.375\@tempdima}{.7\pgflinewidth}}
- {\pgfpoint{-.375\@tempdima}{1.95\@tempdima}}
- \pgfpathlineto{\pgfpoint{0pt}{1.95\@tempdima}}
+ {\pgfqpoint{-.375\pgfutil@tempdima}{.5\pgflinewidth}}
+ {\pgfqpoint{-.375\pgfutil@tempdima}{.7\pgflinewidth}}
+ {\pgfqpoint{-.375\pgfutil@tempdima}{1.95\pgfutil@tempdima}}
+ \pgfpathlineto{\pgfqpoint{0pt}{1.95\pgfutil@tempdima}}
\pgfpathcurveto
- {\pgfpoint{-.04\pgflinewidth}{.5\@tempdima}}
- {\pgfpoint{-.04\pgflinewidth}{-.5\@tempdima}}
- {\pgfpoint{0pt}{-1.95\@tempdima}}
- \pgfpathlineto{\pgfpoint{-.375\@tempdima}{-1.95\@tempdima}}
+ {\pgfqpoint{-.04\pgflinewidth}{.5\pgfutil@tempdima}}
+ {\pgfqpoint{-.04\pgflinewidth}{-.5\pgfutil@tempdima}}
+ {\pgfqpoint{0pt}{-1.95\pgfutil@tempdima}}
+ \pgfpathlineto{\pgfqpoint{-.375\pgfutil@tempdima}{-1.95\pgfutil@tempdima}}
\pgfpathcurveto
- {\pgfpoint{-.375\@tempdima}{-.7\pgflinewidth}}
- {\pgfpoint{-.375\@tempdima}{-.5\pgflinewidth}}
- {\pgfpoint{-.75\@tempdima}{-.5\pgflinewidth}}
+ {\pgfqpoint{-.375\pgfutil@tempdima}{-.7\pgflinewidth}}
+ {\pgfqpoint{-.375\pgfutil@tempdima}{-.5\pgflinewidth}}
+ {\pgfqpoint{-.75\pgfutil@tempdima}{-.5\pgflinewidth}}
\pgfpathclose
\pgfusepathqfill
}
@@ -744,12 +744,12 @@
% Round cap
\pgfarrowsdeclare{round cap}{round cap}
-{\pgfarrowsleftextend{0pt}\pgfarrowsrightextend{\pgflinewidth}}
+{\pgfarrowsleftextend{+0pt}\pgfarrowsrightextend{+\pgflinewidth}}
{
- \pgfsetdash{}{0pt}
+ \pgfsetdash{}{+0pt}
\pgfsetroundcap
\pgfpathmoveto{\pgfpointorigin}
- \pgfpathlineto{\pgfpoint{0.5\pgflinewidth}{0pt}}
+ \pgfpathlineto{\pgfqpoint{0.5\pgflinewidth}{0pt}}
\pgfusepathqstroke
}
@@ -757,12 +757,12 @@
% Butt cap
\pgfarrowsdeclare{butt cap}{butt cap}
-{\pgfarrowsleftextend{-.1\pgflinewidth}\pgfarrowsrightextend{.5\pgflinewidth}}
+{\pgfarrowsleftextend{+-.1\pgflinewidth}\pgfarrowsrightextend{+.5\pgflinewidth}}
{
- \pgfsetdash{}{0pt}
+ \pgfsetdash{}{+0pt}
\pgfsetbuttcap
- \pgfpathmoveto{\pgfpoint{-.1\pgflinewidth}{0pt}}
- \pgfpathlineto{\pgfpoint{0.5\pgflinewidth}{0pt}}
+ \pgfpathmoveto{\pgfqpoint{-.1\pgflinewidth}{0pt}}
+ \pgfpathlineto{\pgfqpoint{0.5\pgflinewidth}{0pt}}
\pgfusepathqstroke
}
@@ -771,13 +771,13 @@
% 90 degrees cap
\pgfarrowsdeclare{triangle 90 cap}{triangle 90 cap}
-{\pgfarrowsleftextend{-.1\pgflinewidth}\pgfarrowsrightextend{1\pgflinewidth}}
+{\pgfarrowsleftextend{+-.1\pgflinewidth}\pgfarrowsrightextend{+\pgflinewidth}}
{
- \pgfpathmoveto{\pgfpoint{-.1\pgflinewidth}{0.5\pgflinewidth}}
- \pgfpathlineto{\pgfpoint{.5\pgflinewidth}{.5\pgflinewidth}}
- \pgfpathlineto{\pgfpoint{\pgflinewidth}{0pt}}
- \pgfpathlineto{\pgfpoint{.5\pgflinewidth}{-.5\pgflinewidth}}
- \pgfpathlineto{\pgfpoint{-.1\pgflinewidth}{-0.5\pgflinewidth}}
+ \pgfpathmoveto{\pgfqpoint{-.1\pgflinewidth}{0.5\pgflinewidth}}
+ \pgfpathlineto{\pgfqpoint{.5\pgflinewidth}{.5\pgflinewidth}}
+ \pgfpathlineto{\pgfqpoint{\pgflinewidth}{0pt}}
+ \pgfpathlineto{\pgfqpoint{.5\pgflinewidth}{-.5\pgflinewidth}}
+ \pgfpathlineto{\pgfqpoint{-.1\pgflinewidth}{-0.5\pgflinewidth}}
\pgfusepathqfill
}
@@ -785,13 +785,13 @@
% reversed 90 degrees cap
\pgfarrowsdeclare{triangle 90 cap reversed}{triangle 90 cap reversed}
-{\pgfarrowsleftextend{-.1\pgflinewidth}\pgfarrowsrightextend{1\pgflinewidth}}
+{\pgfarrowsleftextend{+-.1\pgflinewidth}\pgfarrowsrightextend{+\pgflinewidth}}
{
- \pgfpathmoveto{\pgfpoint{1\pgflinewidth}{0.5\pgflinewidth}}
- \pgfpathlineto{\pgfpoint{-.1\pgflinewidth}{.5\pgflinewidth}}
- \pgfpathlineto{\pgfpoint{-.1\pgflinewidth}{-.5\pgflinewidth}}
- \pgfpathlineto{\pgfpoint{1\pgflinewidth}{-.5\pgflinewidth}}
- \pgfpathlineto{\pgfpoint{0.5\pgflinewidth}{0\pgflinewidth}}
+ \pgfpathmoveto{\pgfqpoint{1\pgflinewidth}{0.5\pgflinewidth}}
+ \pgfpathlineto{\pgfqpoint{-.1\pgflinewidth}{.5\pgflinewidth}}
+ \pgfpathlineto{\pgfqpoint{-.1\pgflinewidth}{-.5\pgflinewidth}}
+ \pgfpathlineto{\pgfqpoint{1\pgflinewidth}{-.5\pgflinewidth}}
+ \pgfpathlineto{\pgfqpoint{0.5\pgflinewidth}{0\pgflinewidth}}
\pgfusepathqfill
}
@@ -800,40 +800,40 @@
% fast
\pgfarrowsdeclare{fast cap}{fast cap}
-{\pgfarrowsleftextend{-.1\pgflinewidth}\pgfarrowsrightextend{2\pgflinewidth}}
+{\pgfarrowsleftextend{+-.1\pgflinewidth}\pgfarrowsrightextend{+2\pgflinewidth}}
{
- \pgfpathmoveto{\pgfpoint{-.1\pgflinewidth}{0.5\pgflinewidth}}
- \pgfpathlineto{\pgfpoint{.5\pgflinewidth}{.5\pgflinewidth}}
- \pgfpathlineto{\pgfpoint{1\pgflinewidth}{0\pgflinewidth}}
- \pgfpathlineto{\pgfpoint{.5\pgflinewidth}{-.5\pgflinewidth}}
- \pgfpathlineto{\pgfpoint{-.1\pgflinewidth}{-0.5\pgflinewidth}}
+ \pgfpathmoveto{\pgfqpoint{-.1\pgflinewidth}{0.5\pgflinewidth}}
+ \pgfpathlineto{\pgfqpoint{.5\pgflinewidth}{.5\pgflinewidth}}
+ \pgfpathlineto{\pgfqpoint{1\pgflinewidth}{0\pgflinewidth}}
+ \pgfpathlineto{\pgfqpoint{.5\pgflinewidth}{-.5\pgflinewidth}}
+ \pgfpathlineto{\pgfqpoint{-.1\pgflinewidth}{-0.5\pgflinewidth}}
\pgfpathclose
- \pgfpathmoveto{\pgfpoint{1\pgflinewidth}{0.5\pgflinewidth}}
- \pgfpathlineto{\pgfpoint{1.5\pgflinewidth}{0.5\pgflinewidth}}
- \pgfpathlineto{\pgfpoint{2\pgflinewidth}{0\pgflinewidth}}
- \pgfpathlineto{\pgfpoint{1.5\pgflinewidth}{-.5\pgflinewidth}}
- \pgfpathlineto{\pgfpoint{1\pgflinewidth}{-0.5\pgflinewidth}}
- \pgfpathlineto{\pgfpoint{1.5\pgflinewidth}{0\pgflinewidth}}
+ \pgfpathmoveto{\pgfqpoint{1\pgflinewidth}{0.5\pgflinewidth}}
+ \pgfpathlineto{\pgfqpoint{1.5\pgflinewidth}{0.5\pgflinewidth}}
+ \pgfpathlineto{\pgfqpoint{2\pgflinewidth}{0\pgflinewidth}}
+ \pgfpathlineto{\pgfqpoint{1.5\pgflinewidth}{-.5\pgflinewidth}}
+ \pgfpathlineto{\pgfqpoint{1\pgflinewidth}{-0.5\pgflinewidth}}
+ \pgfpathlineto{\pgfqpoint{1.5\pgflinewidth}{0\pgflinewidth}}
\pgfpathclose
\pgfusepathqfill
}
\pgfarrowsdeclare{fast cap reversed}{fast cap reversed}
-{\pgfarrowsleftextend{-.1\pgflinewidth}\pgfarrowsrightextend{2\pgflinewidth}}
+{\pgfarrowsleftextend{+-.1\pgflinewidth}\pgfarrowsrightextend{+2\pgflinewidth}}
{
- \pgfpathmoveto{\pgfpoint{-.1\pgflinewidth}{0.5\pgflinewidth}}
- \pgfpathlineto{\pgfpoint{1\pgflinewidth}{.5\pgflinewidth}}
- \pgfpathlineto{\pgfpoint{.5\pgflinewidth}{0\pgflinewidth}}
- \pgfpathlineto{\pgfpoint{1\pgflinewidth}{-.5\pgflinewidth}}
- \pgfpathlineto{\pgfpoint{-.1\pgflinewidth}{-0.5\pgflinewidth}}
+ \pgfpathmoveto{\pgfqpoint{-.1\pgflinewidth}{0.5\pgflinewidth}}
+ \pgfpathlineto{\pgfqpoint{1\pgflinewidth}{.5\pgflinewidth}}
+ \pgfpathlineto{\pgfqpoint{.5\pgflinewidth}{0\pgflinewidth}}
+ \pgfpathlineto{\pgfqpoint{1\pgflinewidth}{-.5\pgflinewidth}}
+ \pgfpathlineto{\pgfqpoint{-.1\pgflinewidth}{-0.5\pgflinewidth}}
\pgfpathclose
- \pgfpathmoveto{\pgfpoint{1.5\pgflinewidth}{0.5\pgflinewidth}}
- \pgfpathlineto{\pgfpoint{2\pgflinewidth}{0.5\pgflinewidth}}
- \pgfpathlineto{\pgfpoint{1.5\pgflinewidth}{0\pgflinewidth}}
- \pgfpathlineto{\pgfpoint{2\pgflinewidth}{-.5\pgflinewidth}}
- \pgfpathlineto{\pgfpoint{1.5\pgflinewidth}{-0.5\pgflinewidth}}
- \pgfpathlineto{\pgfpoint{1\pgflinewidth}{0\pgflinewidth}}
+ \pgfpathmoveto{\pgfqpoint{1.5\pgflinewidth}{0.5\pgflinewidth}}
+ \pgfpathlineto{\pgfqpoint{2\pgflinewidth}{0.5\pgflinewidth}}
+ \pgfpathlineto{\pgfqpoint{1.5\pgflinewidth}{0\pgflinewidth}}
+ \pgfpathlineto{\pgfqpoint{2\pgflinewidth}{-.5\pgflinewidth}}
+ \pgfpathlineto{\pgfqpoint{1.5\pgflinewidth}{-0.5\pgflinewidth}}
+ \pgfpathlineto{\pgfqpoint{1\pgflinewidth}{0\pgflinewidth}}
\pgfpathclose
\pgfusepathqfill
}
diff --git a/Master/texmf-dist/tex/generic/pgf/libraries/pgflibrarypatterns.code.tex b/Master/texmf-dist/tex/generic/pgf/libraries/pgflibrarypatterns.code.tex
index aebb9fb5ce6..92352856dbe 100644
--- a/Master/texmf-dist/tex/generic/pgf/libraries/pgflibrarypatterns.code.tex
+++ b/Master/texmf-dist/tex/generic/pgf/libraries/pgflibrarypatterns.code.tex
@@ -7,78 +7,78 @@
%
% See the file doc/generic/pgf/licenses/LICENSE for more details.
-\ProvidesFileRCS[v\pgfversion] $Header: /cvsroot/pgf/pgf/generic/pgf/libraries/pgflibrarypatterns.code.tex,v 1.7 2006/10/11 15:22:26 tantau Exp $
+\ProvidesFileRCS[v\pgfversion] $Header: /cvsroot/pgf/pgf/generic/pgf/libraries/pgflibrarypatterns.code.tex,v 1.8 2007/03/09 17:49:32 tantau Exp $
% Lines in different directions
-\pgfdeclarepatternformonly{horizontal lines}{\pgfpointorigin}{\pgfpoint{100pt}{1pt}}{\pgfpoint{100pt}{3pt}}%
+\pgfdeclarepatternformonly{horizontal lines}{\pgfpointorigin}{\pgfqpoint{100pt}{1pt}}{\pgfqpoint{100pt}{3pt}}%
{
\pgfsetlinewidth{0.4pt}
- \pgfpathmoveto{\pgfpoint{0pt}{0.5pt}}
- \pgfpathlineto{\pgfpoint{100pt}{0.5pt}}
+ \pgfpathmoveto{\pgfqpoint{0pt}{0.5pt}}
+ \pgfpathlineto{\pgfqpoint{100pt}{0.5pt}}
\pgfusepath{stroke}
}
-\pgfdeclarepatternformonly{vertical lines}{\pgfpointorigin}{\pgfpoint{1pt}{100pt}}{\pgfpoint{3pt}{100pt}}%
+\pgfdeclarepatternformonly{vertical lines}{\pgfpointorigin}{\pgfqpoint{1pt}{100pt}}{\pgfqpoint{3pt}{100pt}}%
{
\pgfsetlinewidth{0.4pt}
- \pgfpathmoveto{\pgfpoint{0.5pt}{0pt}}
- \pgfpathlineto{\pgfpoint{0.5pt}{100pt}}
+ \pgfpathmoveto{\pgfqpoint{0.5pt}{0pt}}
+ \pgfpathlineto{\pgfqpoint{0.5pt}{100pt}}
\pgfusepath{stroke}
}
-\pgfdeclarepatternformonly{north east lines}{\pgfpoint{-1pt}{-1pt}}{\pgfpoint{4pt}{4pt}}{\pgfpoint{3pt}{3pt}}%
+\pgfdeclarepatternformonly{north east lines}{\pgfqpoint{-1pt}{-1pt}}{\pgfqpoint{4pt}{4pt}}{\pgfqpoint{3pt}{3pt}}%
{
\pgfsetlinewidth{0.4pt}
- \pgfpathmoveto{\pgfpoint{0pt}{0pt}}
- \pgfpathlineto{\pgfpoint{3.1pt}{3.1pt}}
+ \pgfpathmoveto{\pgfqpoint{0pt}{0pt}}
+ \pgfpathlineto{\pgfqpoint{3.1pt}{3.1pt}}
\pgfusepath{stroke}
}
-\pgfdeclarepatternformonly{north west lines}{\pgfpoint{-1pt}{-1pt}}{\pgfpoint{4pt}{4pt}}{\pgfpoint{3pt}{3pt}}%
+\pgfdeclarepatternformonly{north west lines}{\pgfqpoint{-1pt}{-1pt}}{\pgfqpoint{4pt}{4pt}}{\pgfqpoint{3pt}{3pt}}%
{
\pgfsetlinewidth{0.4pt}
- \pgfpathmoveto{\pgfpoint{0pt}{3pt}}
- \pgfpathlineto{\pgfpoint{3.1pt}{-0.1pt}}
+ \pgfpathmoveto{\pgfqpoint{0pt}{3pt}}
+ \pgfpathlineto{\pgfqpoint{3.1pt}{-0.1pt}}
\pgfusepath{stroke}
}
% Crossed lines in different directions
-\pgfdeclarepatternformonly{grid}{\pgfpoint{-1pt}{-1pt}}{\pgfpoint{4pt}{4pt}}{\pgfpoint{3pt}{3pt}}%
+\pgfdeclarepatternformonly{grid}{\pgfqpoint{-1pt}{-1pt}}{\pgfqpoint{4pt}{4pt}}{\pgfqpoint{3pt}{3pt}}%
{
\pgfsetlinewidth{0.4pt}
- \pgfpathmoveto{\pgfpoint{0pt}{0pt}}
- \pgfpathlineto{\pgfpoint{0pt}{3.1pt}}
- \pgfpathmoveto{\pgfpoint{0pt}{0pt}}
- \pgfpathlineto{\pgfpoint{3.1pt}{0pt}}
+ \pgfpathmoveto{\pgfqpoint{0pt}{0pt}}
+ \pgfpathlineto{\pgfqpoint{0pt}{3.1pt}}
+ \pgfpathmoveto{\pgfqpoint{0pt}{0pt}}
+ \pgfpathlineto{\pgfqpoint{3.1pt}{0pt}}
\pgfusepath{stroke}
}
-\pgfdeclarepatternformonly{crosshatch}{\pgfpoint{-1pt}{-1pt}}{\pgfpoint{4pt}{4pt}}{\pgfpoint{3pt}{3pt}}%
+\pgfdeclarepatternformonly{crosshatch}{\pgfqpoint{-1pt}{-1pt}}{\pgfqpoint{4pt}{4pt}}{\pgfqpoint{3pt}{3pt}}%
{
\pgfsetlinewidth{0.4pt}
- \pgfpathmoveto{\pgfpoint{3.1pt}{0pt}}
- \pgfpathlineto{\pgfpoint{0pt}{3.1pt}}
- \pgfpathmoveto{\pgfpoint{0pt}{0pt}}
- \pgfpathlineto{\pgfpoint{3.1pt}{3.1pt}}
+ \pgfpathmoveto{\pgfqpoint{3.1pt}{0pt}}
+ \pgfpathlineto{\pgfqpoint{0pt}{3.1pt}}
+ \pgfpathmoveto{\pgfqpoint{0pt}{0pt}}
+ \pgfpathlineto{\pgfqpoint{3.1pt}{3.1pt}}
\pgfusepath{stroke}
}
% Dotted regions
-\pgfdeclarepatternformonly{dots}{\pgfpoint{-1pt}{-1pt}}{\pgfpoint{1pt}{1pt}}{\pgfpoint{3pt}{3pt}}%
+\pgfdeclarepatternformonly{dots}{\pgfqpoint{-1pt}{-1pt}}{\pgfqpoint{1pt}{1pt}}{\pgfqpoint{3pt}{3pt}}%
{
- \pgfpathcircle{\pgfpoint{0pt}{0pt}}{.5pt}
+ \pgfpathcircle{\pgfqpoint{0pt}{0pt}}{.5pt}
\pgfusepath{fill}
}
-\pgfdeclarepatternformonly{crosshatch dots}{\pgfpoint{-1pt}{-1pt}}{\pgfpoint{2.5pt}{2.5pt}}{\pgfpoint{3pt}{3pt}}%
+\pgfdeclarepatternformonly{crosshatch dots}{\pgfqpoint{-1pt}{-1pt}}{\pgfqpoint{2.5pt}{2.5pt}}{\pgfqpoint{3pt}{3pt}}%
{
- \pgfpathcircle{\pgfpoint{0pt}{0pt}}{.5pt}
- \pgfpathcircle{\pgfpoint{1.5pt}{1.5pt}}{.5pt}
+ \pgfpathcircle{\pgfqpoint{0pt}{0pt}}{.5pt}
+ \pgfpathcircle{\pgfqpoint{1.5pt}{1.5pt}}{.5pt}
\pgfusepath{fill}
}
@@ -87,28 +87,28 @@
% Star shaped patterns
-\pgfdeclarepatternformonly{fivepointed stars}{\pgfpointorigin}{\pgfpoint{3mm}{3mm}}{\pgfpoint{3mm}{3mm}}%
+\pgfdeclarepatternformonly{fivepointed stars}{\pgfpointorigin}{\pgfqpoint{3mm}{3mm}}{\pgfqpoint{3mm}{3mm}}%
{
- \pgftransformshift{\pgfpoint{1mm}{1mm}}
- \pgfpathmoveto{\pgfpointpolar{18}{1mm}}
- \pgfpathlineto{\pgfpointpolar{162}{1mm}}
- \pgfpathlineto{\pgfpointpolar{306}{1mm}}
- \pgfpathlineto{\pgfpointpolar{90}{1mm}}
- \pgfpathlineto{\pgfpointpolar{234}{1mm}}
+ \pgftransformshift{\pgfqpoint{1mm}{1mm}}
+ \pgfpathmoveto{\pgfqpointpolar{18}{1mm}}
+ \pgfpathlineto{\pgfqpointpolar{162}{1mm}}
+ \pgfpathlineto{\pgfqpointpolar{306}{1mm}}
+ \pgfpathlineto{\pgfqpointpolar{90}{1mm}}
+ \pgfpathlineto{\pgfqpointpolar{234}{1mm}}
\pgfpathclose%
\pgfusepath{fill}
}
-\pgfdeclarepatternformonly{sixpointed stars}{\pgfpointorigin}{\pgfpoint{3mm}{3mm}}{\pgfpoint{3mm}{3mm}}%
+\pgfdeclarepatternformonly{sixpointed stars}{\pgfpointorigin}{\pgfqpoint{3mm}{3mm}}{\pgfqpoint{3mm}{3mm}}%
{
- \pgftransformshift{\pgfpoint{1mm}{1mm}}
- \pgfpathmoveto{\pgfpointpolar{30}{1mm}}
- \pgfpathlineto{\pgfpointpolar{150}{1mm}}
- \pgfpathlineto{\pgfpointpolar{270}{1mm}}
+ \pgftransformshift{\pgfqpoint{1mm}{1mm}}
+ \pgfpathmoveto{\pgfqpointpolar{30}{1mm}}
+ \pgfpathlineto{\pgfqpointpolar{150}{1mm}}
+ \pgfpathlineto{\pgfqpointpolar{270}{1mm}}
\pgfpathclose%
- \pgfpathmoveto{\pgfpointpolar{-30}{1mm}}
- \pgfpathlineto{\pgfpointpolar{-270}{1mm}}
- \pgfpathlineto{\pgfpointpolar{-150}{1mm}}
+ \pgfpathmoveto{\pgfqpointpolar{-30}{1mm}}
+ \pgfpathlineto{\pgfqpointpolar{-270}{1mm}}
+ \pgfpathlineto{\pgfqpointpolar{-150}{1mm}}
\pgfpathclose%
\pgfsetnonzerorule
\pgfusepath{fill}
@@ -118,19 +118,19 @@
% Bricks
-\pgfdeclarepatternformonly{bricks}{\pgfpoint{-1pt}{-1pt}}{\pgfpoint{5mm}{5mm}}{\pgfpoint{4mm}{4mm}}%
+\pgfdeclarepatternformonly{bricks}{\pgfqpoint{-1pt}{-1pt}}{\pgfqpoint{5mm}{5mm}}{\pgfqpoint{4mm}{4mm}}%
{
\pgfsetlinewidth{0.8pt}
- \pgfpathmoveto{\pgfpoint{0mm}{1mm}}
- \pgfpathlineto{\pgfpoint{4mm}{1mm}}
- \pgfpathmoveto{\pgfpoint{0mm}{3mm}}
- \pgfpathlineto{\pgfpoint{4mm}{3mm}}
- \pgfpathmoveto{\pgfpoint{1mm}{0mm}}
- \pgfpathlineto{\pgfpoint{1mm}{1mm}}
- \pgfpathmoveto{\pgfpoint{3mm}{1mm}}
- \pgfpathlineto{\pgfpoint{3mm}{3mm}}
- \pgfpathmoveto{\pgfpoint{1mm}{3mm}}
- \pgfpathlineto{\pgfpoint{1mm}{4mm}}
+ \pgfpathmoveto{\pgfqpoint{0mm}{1mm}}
+ \pgfpathlineto{\pgfqpoint{4mm}{1mm}}
+ \pgfpathmoveto{\pgfqpoint{0mm}{3mm}}
+ \pgfpathlineto{\pgfqpoint{4mm}{3mm}}
+ \pgfpathmoveto{\pgfqpoint{1mm}{0mm}}
+ \pgfpathlineto{\pgfqpoint{1mm}{1mm}}
+ \pgfpathmoveto{\pgfqpoint{3mm}{1mm}}
+ \pgfpathlineto{\pgfqpoint{3mm}{3mm}}
+ \pgfpathmoveto{\pgfqpoint{1mm}{3mm}}
+ \pgfpathlineto{\pgfqpoint{1mm}{4mm}}
\pgfusepath{stroke}
}
diff --git a/Master/texmf-dist/tex/generic/pgf/libraries/pgflibraryplothandlers.code.tex b/Master/texmf-dist/tex/generic/pgf/libraries/pgflibraryplothandlers.code.tex
index 0a1572cd894..a0f504431eb 100644
--- a/Master/texmf-dist/tex/generic/pgf/libraries/pgflibraryplothandlers.code.tex
+++ b/Master/texmf-dist/tex/generic/pgf/libraries/pgflibraryplothandlers.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/pgflibraryplothandlers.code.tex,v 1.8 2006/10/16 22:32:59 tantau Exp $
+\ProvidesFileRCS[v\pgfversion] $Header: /cvsroot/pgf/pgf/generic/pgf/libraries/pgflibraryplothandlers.code.tex,v 1.9 2007/03/09 17:49:32 tantau Exp $
\newif\ifpgf@plot@started
@@ -36,22 +36,22 @@
\pgf@process{#1}%
\pgf@xa=\pgf@x%
\pgf@ya=\pgf@y%
- \pgf@plot@first@action{\pgfpoint{\pgf@xa}{\pgf@ya}}%
- \xdef\pgf@plot@curveto@first{\noexpand\pgfpoint{\the\pgf@xa}{\the\pgf@ya}}%
+ \pgf@plot@first@action{\pgfqpoint{\pgf@xa}{\pgf@ya}}%
+ \xdef\pgf@plot@curveto@first{\noexpand\pgfqpoint{\the\pgf@xa}{\the\pgf@ya}}%
\global\let\pgf@plot@curveto@first@support=\pgf@plot@curveto@first%
\global\let\pgf@plotstreampoint=\pgf@plot@curveto@handler@second%
}
\def\pgf@plot@curveto@handler@second#1{%
\pgf@process{#1}%
- \xdef\pgf@plot@curveto@second{\noexpand\pgfpoint{\the\pgf@x}{\the\pgf@y}}%
+ \xdef\pgf@plot@curveto@second{\noexpand\pgfqpoint{\the\pgf@x}{\the\pgf@y}}%
\global\let\pgf@plotstreampoint=\pgf@plot@curveto@handler@third%
\global\pgf@plot@startedtrue%
}
\def\pgf@plot@curveto@handler@third#1{%
\pgf@process{#1}%
- \xdef\pgf@plot@curveto@current{\noexpand\pgfpoint{\the\pgf@x}{\the\pgf@y}}%
+ \xdef\pgf@plot@curveto@current{\noexpand\pgfqpoint{\the\pgf@x}{\the\pgf@y}}%
% compute difference vector:
\pgf@xa=\pgf@x%
\pgf@ya=\pgf@y%
@@ -72,12 +72,12 @@
\advance\pgf@xc by\pgf@xa%
\advance\pgf@yc by\pgf@ya%
\edef\pgf@marshal{\noexpand\pgfpathcurveto{\noexpand\pgf@plot@curveto@first@support}%
- {\noexpand\pgfpoint{\the\pgf@xb}{\the\pgf@yb}}{\noexpand\pgf@plot@curveto@second}}%
+ {\noexpand\pgfqpoint{\the\pgf@xb}{\the\pgf@yb}}{\noexpand\pgf@plot@curveto@second}}%
{\pgf@marshal}%
% Prepare next:
\global\let\pgf@plot@curveto@first=\pgf@plot@curveto@second%
\global\let\pgf@plot@curveto@second=\pgf@plot@curveto@current%
- \xdef\pgf@plot@curveto@first@support{\noexpand\pgfpoint{\the\pgf@xc}{\the\pgf@yc}}%
+ \xdef\pgf@plot@curveto@first@support{\noexpand\pgfqpoint{\the\pgf@xc}{\the\pgf@yc}}%
}
\def\pgf@plot@curveto@handler@finish{%
@@ -125,14 +125,14 @@
\pgf@process{#1}%
\pgf@xa=\pgf@x%
\pgf@ya=\pgf@y%
- \xdef\pgf@plot@closedcurve@initial{\noexpand\pgfpoint{\the\pgf@xa}{\the\pgf@ya}}%
+ \xdef\pgf@plot@closedcurve@initial{\noexpand\pgfqpoint{\the\pgf@xa}{\the\pgf@ya}}%
\global\let\pgf@plotstreampoint=\pgf@plot@closedcurve@handler@second%
\global\pgf@plot@startedfalse%
}
\def\pgf@plot@closedcurve@handler@second#1{%
\pgf@process{#1}%
- \xdef\pgf@plot@closedcurve@after@initial{\noexpand\pgfpoint{\the\pgf@x}{\the\pgf@y}}%
+ \xdef\pgf@plot@closedcurve@after@initial{\noexpand\pgfqpoint{\the\pgf@x}{\the\pgf@y}}%
{\pgfpathmoveto{}}%
\global\let\pgf@plotstreampoint=\pgf@plot@closedcurve@handler@third%
}
@@ -140,7 +140,7 @@
\def\pgf@plot@closedcurve@handler@third#1{%
\global\pgf@plot@startedtrue%
\pgf@process{#1}%
- \xdef\pgf@plot@closedcurve@current{\noexpand\pgfpoint{\the\pgf@x}{\the\pgf@y}}%
+ \xdef\pgf@plot@closedcurve@current{\noexpand\pgfqpoint{\the\pgf@x}{\the\pgf@y}}%
% compute difference vector:
\pgf@xa=\pgf@x%
\pgf@ya=\pgf@y%
@@ -162,14 +162,14 @@
\advance\pgf@yc by\pgf@ya%
\global\let\pgf@plot@closedcurve@first=\pgf@plot@closedcurve@after@initial%
\global\let\pgf@plot@closedcurve@second=\pgf@plot@closedcurve@current%
- \xdef\pgf@plot@closedcurve@after@initial@presupport{\noexpand\pgfpoint{\the\pgf@xb}{\the\pgf@yb}}%
- \xdef\pgf@plot@closedcurve@first@support{\noexpand\pgfpoint{\the\pgf@xc}{\the\pgf@yc}}%
+ \xdef\pgf@plot@closedcurve@after@initial@presupport{\noexpand\pgfqpoint{\the\pgf@xb}{\the\pgf@yb}}%
+ \xdef\pgf@plot@closedcurve@first@support{\noexpand\pgfqpoint{\the\pgf@xc}{\the\pgf@yc}}%
\global\let\pgf@plotstreampoint=\pgf@plot@closedcurve@handler@fourth%
}
\def\pgf@plot@closedcurve@handler@fourth#1{%
\pgf@process{#1}%
- \xdef\pgf@plot@closedcurve@current{\noexpand\pgfpoint{\the\pgf@x}{\the\pgf@y}}%
+ \xdef\pgf@plot@closedcurve@current{\noexpand\pgfqpoint{\the\pgf@x}{\the\pgf@y}}%
% compute difference vector:
\pgf@xa=\pgf@x%
\pgf@ya=\pgf@y%
@@ -190,12 +190,12 @@
\advance\pgf@xc by\pgf@xa%
\advance\pgf@yc by\pgf@ya%
\edef\pgf@marshal{\noexpand\pgfpathcurveto{\noexpand\pgf@plot@closedcurve@first@support}%
- {\noexpand\pgfpoint{\the\pgf@xb}{\the\pgf@yb}}{\noexpand\pgf@plot@closedcurve@second}}%
+ {\noexpand\pgfqpoint{\the\pgf@xb}{\the\pgf@yb}}{\noexpand\pgf@plot@closedcurve@second}}%
{\pgf@marshal}%
% Prepare next:
\global\let\pgf@plot@closedcurve@first=\pgf@plot@closedcurve@second%
\global\let\pgf@plot@closedcurve@second=\pgf@plot@closedcurve@current%
- \xdef\pgf@plot@closedcurve@first@support{\noexpand\pgfpoint{\the\pgf@xc}{\the\pgf@yc}}%
+ \xdef\pgf@plot@closedcurve@first@support{\noexpand\pgfqpoint{\the\pgf@xc}{\the\pgf@yc}}%
}
\def\pgf@plot@closedcurve@handler@finish{%
@@ -224,9 +224,9 @@
\advance\pgf@xc by\pgf@xa%
\advance\pgf@yc by\pgf@ya%
\edef\pgf@marshal{\noexpand\pgfpathcurveto{\noexpand\pgf@plot@closedcurve@first@support}%
- {\noexpand\pgfpoint{\the\pgf@xb}{\the\pgf@yb}}{\noexpand\pgf@plot@closedcurve@second}}%
+ {\noexpand\pgfqpoint{\the\pgf@xb}{\the\pgf@yb}}{\noexpand\pgf@plot@closedcurve@second}}%
{\pgf@marshal}%
- \xdef\pgf@plot@closedcurve@first@support{\noexpand\pgfpoint{\the\pgf@xc}{\the\pgf@yc}}%
+ \xdef\pgf@plot@closedcurve@first@support{\noexpand\pgfqpoint{\the\pgf@xc}{\the\pgf@yc}}%
%
% second, draw line from last point to start:
%
@@ -251,12 +251,12 @@
\advance\pgf@xc by\pgf@xa%
\advance\pgf@yc by\pgf@ya%
\edef\pgf@marshal{\noexpand\pgfpathcurveto{\noexpand\pgf@plot@closedcurve@first@support}%
- {\noexpand\pgfpoint{\the\pgf@xb}{\the\pgf@yb}}{\noexpand\pgf@plot@closedcurve@initial}}%
+ {\noexpand\pgfqpoint{\the\pgf@xb}{\the\pgf@yb}}{\noexpand\pgf@plot@closedcurve@initial}}%
{\pgf@marshal}%
%
% third, draw line from first to second point:
%
- \edef\pgf@marshal{\noexpand\pgfpathcurveto{\noexpand\pgfpoint{\the\pgf@xc}{\the\pgf@yc}}%
+ \edef\pgf@marshal{\noexpand\pgfpathcurveto{\noexpand\pgfqpoint{\the\pgf@xc}{\the\pgf@yc}}%
{\noexpand\pgf@plot@closedcurve@after@initial@presupport}{\noexpand\pgf@plot@closedcurve@after@initial}}%
{\pgf@marshal}%
\pgfpathclose%
@@ -288,8 +288,8 @@
\pgf@process{#1}%
\pgf@xa=\pgf@x%
\pgf@ya=\pgf@y%
- \pgfpathmoveto{\pgfpoint{0pt}{\pgf@ya}}%
- \pgfpathlineto{\pgfpoint{\pgf@xa}{\pgf@ya}}%
+ \pgfpathmoveto{\pgfqpoint{0pt}{\pgf@ya}}%
+ \pgfpathlineto{\pgfqpoint{\pgf@xa}{\pgf@ya}}%
}
@@ -314,8 +314,8 @@
\pgf@process{#1}%
\pgf@xa=\pgf@x%
\pgf@ya=\pgf@y%
- \pgfpathmoveto{\pgfpoint{\pgf@xa}{0pt}}%
- \pgfpathlineto{\pgfpoint{\pgf@xa}{\pgf@ya}}%
+ \pgfpathmoveto{\pgfqpoint{\pgf@xa}{0pt}}%
+ \pgfpathlineto{\pgfqpoint{\pgf@xa}{\pgf@ya}}%
}
@@ -344,7 +344,7 @@
\pgf@xa=\pgf@x%
\pgf@ya=\pgf@y%
\pgfpathmoveto{\pgfpointorigin}%
- \pgfpathlineto{\pgfpoint{\pgf@xa}{\pgf@ya}}%
+ \pgfpathlineto{\pgfqpoint{\pgf@xa}{\pgf@ya}}%
}
@@ -461,7 +461,7 @@
%
% \pgfsetplotmarksize{1pt}
-\def\pgfsetplotmarksize#1{\setlength\pgfplotmarksize{#1}}
+\def\pgfsetplotmarksize#1{\pgfmathsetlength\pgfplotmarksize{#1}}
\newdimen\pgfplotmarksize
\pgfplotmarksize=2pt
@@ -491,10 +491,10 @@
\pgfdeclareplotmark{+}
{%
- \pgfpathmoveto{\pgfpoint{-\pgfplotmarksize}{0pt}}
- \pgfpathlineto{\pgfpoint{\pgfplotmarksize}{0pt}}
- \pgfpathmoveto{\pgfpoint{0pt}{\pgfplotmarksize}}
- \pgfpathlineto{\pgfpoint{0pt}{-\pgfplotmarksize}}
+ \pgfpathmoveto{\pgfqpoint{-\pgfplotmarksize}{0pt}}
+ \pgfpathlineto{\pgfqpoint{\pgfplotmarksize}{0pt}}
+ \pgfpathmoveto{\pgfqpoint{0pt}{\pgfplotmarksize}}
+ \pgfpathlineto{\pgfqpoint{0pt}{-\pgfplotmarksize}}
\pgfusepathqstroke
}
@@ -503,10 +503,10 @@
\pgfdeclareplotmark{x}
{%
- \pgfpathmoveto{\pgfpoint{-.70710678\pgfplotmarksize}{-.70710678\pgfplotmarksize}}
- \pgfpathlineto{\pgfpoint{.70710678\pgfplotmarksize}{.70710678\pgfplotmarksize}}
- \pgfpathmoveto{\pgfpoint{-.70710678\pgfplotmarksize}{.70710678\pgfplotmarksize}}
- \pgfpathlineto{\pgfpoint{.70710678\pgfplotmarksize}{-.70710678\pgfplotmarksize}}
+ \pgfpathmoveto{\pgfqpoint{-.70710678\pgfplotmarksize}{-.70710678\pgfplotmarksize}}
+ \pgfpathlineto{\pgfqpoint{.70710678\pgfplotmarksize}{.70710678\pgfplotmarksize}}
+ \pgfpathmoveto{\pgfqpoint{-.70710678\pgfplotmarksize}{.70710678\pgfplotmarksize}}
+ \pgfpathlineto{\pgfqpoint{.70710678\pgfplotmarksize}{-.70710678\pgfplotmarksize}}
\pgfusepathqstroke
}
diff --git a/Master/texmf-dist/tex/generic/pgf/libraries/pgflibraryplotmarks.code.tex b/Master/texmf-dist/tex/generic/pgf/libraries/pgflibraryplotmarks.code.tex
index a821e6f65cf..e20805d50a1 100644
--- a/Master/texmf-dist/tex/generic/pgf/libraries/pgflibraryplotmarks.code.tex
+++ b/Master/texmf-dist/tex/generic/pgf/libraries/pgflibraryplotmarks.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/pgflibraryplotmarks.code.tex,v 1.4 2006/10/11 15:22:26 tantau Exp $
+\ProvidesFileRCS[v\pgfversion] $Header: /cvsroot/pgf/pgf/generic/pgf/libraries/pgflibraryplotmarks.code.tex,v 1.5 2007/03/09 17:49:32 tantau Exp $
% A stroked circle mark
@@ -24,12 +24,12 @@
\pgfdeclareplotmark{asterisk}
{%
- \pgfpathmoveto{\pgfpoint{0pt}{-\pgfplotmarksize}}
- \pgfpathlineto{\pgfpoint{0pt}{\pgfplotmarksize}}
- \pgfpathmoveto{\pgfpointpolar{30}{\pgfplotmarksize}}
- \pgfpathlineto{\pgfpointpolar{210}{\pgfplotmarksize}}
- \pgfpathmoveto{\pgfpointpolar{-30}{\pgfplotmarksize}}
- \pgfpathlineto{\pgfpointpolar{-210}{\pgfplotmarksize}}
+ \pgfpathmoveto{\pgfqpoint{0pt}{-\pgfplotmarksize}}
+ \pgfpathlineto{\pgfqpoint{0pt}{\pgfplotmarksize}}
+ \pgfpathmoveto{\pgfqpointpolar{30}{\pgfplotmarksize}}
+ \pgfpathlineto{\pgfqpointpolar{210}{\pgfplotmarksize}}
+ \pgfpathmoveto{\pgfqpointpolar{-30}{\pgfplotmarksize}}
+ \pgfpathlineto{\pgfqpointpolar{-210}{\pgfplotmarksize}}
\pgfusepathqstroke
}
@@ -38,11 +38,11 @@
\pgfdeclareplotmark{star}
{%
- \pgfpathmoveto{\pgfpointorigin}\pgfpathlineto{\pgfpoint{0pt}{\pgfplotmarksize}}
- \pgfpathmoveto{\pgfpointorigin}\pgfpathlineto{\pgfpointpolar{18}{\pgfplotmarksize}}
- \pgfpathmoveto{\pgfpointorigin}\pgfpathlineto{\pgfpointpolar{-54}{\pgfplotmarksize}}
- \pgfpathmoveto{\pgfpointorigin}\pgfpathlineto{\pgfpointpolar{234}{\pgfplotmarksize}}
- \pgfpathmoveto{\pgfpointorigin}\pgfpathlineto{\pgfpointpolar{162}{\pgfplotmarksize}}
+ \pgfpathmoveto{\pgfpointorigin}\pgfpathlineto{\pgfqpoint{0pt}{\pgfplotmarksize}}
+ \pgfpathmoveto{\pgfpointorigin}\pgfpathlineto{\pgfqpointpolar{18}{\pgfplotmarksize}}
+ \pgfpathmoveto{\pgfpointorigin}\pgfpathlineto{\pgfqpointpolar{-54}{\pgfplotmarksize}}
+ \pgfpathmoveto{\pgfpointorigin}\pgfpathlineto{\pgfqpointpolar{234}{\pgfplotmarksize}}
+ \pgfpathmoveto{\pgfpointorigin}\pgfpathlineto{\pgfqpointpolar{162}{\pgfplotmarksize}}
\pgfusepathqstroke
}
@@ -52,20 +52,20 @@
\pgfdeclareplotmark{oplus}
{%
\pgfpathcircle{\pgfpointorigin}{\pgfplotmarksize}
- \pgfpathmoveto{\pgfpoint{-\pgfplotmarksize}{0pt}}
- \pgfpathlineto{\pgfpoint{\pgfplotmarksize}{0pt}}
- \pgfpathmoveto{\pgfpoint{0pt}{\pgfplotmarksize}}
- \pgfpathlineto{\pgfpoint{0pt}{-\pgfplotmarksize}}
+ \pgfpathmoveto{\pgfqpoint{-\pgfplotmarksize}{0pt}}
+ \pgfpathlineto{\pgfqpoint{\pgfplotmarksize}{0pt}}
+ \pgfpathmoveto{\pgfqpoint{0pt}{\pgfplotmarksize}}
+ \pgfpathlineto{\pgfqpoint{0pt}{-\pgfplotmarksize}}
\pgfusepathqstroke
}
\pgfdeclareplotmark{oplus*}
{%
\pgfpathcircle{\pgfpointorigin}{\pgfplotmarksize}
- \pgfpathmoveto{\pgfpoint{-\pgfplotmarksize}{0pt}}
- \pgfpathlineto{\pgfpoint{\pgfplotmarksize}{0pt}}
- \pgfpathmoveto{\pgfpoint{0pt}{\pgfplotmarksize}}
- \pgfpathlineto{\pgfpoint{0pt}{-\pgfplotmarksize}}
+ \pgfpathmoveto{\pgfqpoint{-\pgfplotmarksize}{0pt}}
+ \pgfpathlineto{\pgfqpoint{\pgfplotmarksize}{0pt}}
+ \pgfpathmoveto{\pgfqpoint{0pt}{\pgfplotmarksize}}
+ \pgfpathlineto{\pgfqpoint{0pt}{-\pgfplotmarksize}}
\pgfusepathqfillstroke
}
@@ -75,20 +75,20 @@
\pgfdeclareplotmark{otimes}
{%
\pgfpathcircle{\pgfpointorigin}{\pgfplotmarksize}
- \pgfpathmoveto{\pgfpoint{-.70710678\pgfplotmarksize}{-.70710678\pgfplotmarksize}}
- \pgfpathlineto{\pgfpoint{.70710678\pgfplotmarksize}{.70710678\pgfplotmarksize}}
- \pgfpathmoveto{\pgfpoint{-.70710678\pgfplotmarksize}{.70710678\pgfplotmarksize}}
- \pgfpathlineto{\pgfpoint{.70710678\pgfplotmarksize}{-.70710678\pgfplotmarksize}}
+ \pgfpathmoveto{\pgfqpoint{-.70710678\pgfplotmarksize}{-.70710678\pgfplotmarksize}}
+ \pgfpathlineto{\pgfqpoint{.70710678\pgfplotmarksize}{.70710678\pgfplotmarksize}}
+ \pgfpathmoveto{\pgfqpoint{-.70710678\pgfplotmarksize}{.70710678\pgfplotmarksize}}
+ \pgfpathlineto{\pgfqpoint{.70710678\pgfplotmarksize}{-.70710678\pgfplotmarksize}}
\pgfusepathqstroke
}
\pgfdeclareplotmark{otimes*}
{%
\pgfpathcircle{\pgfpointorigin}{\pgfplotmarksize}
- \pgfpathmoveto{\pgfpoint{-.70710678\pgfplotmarksize}{-.70710678\pgfplotmarksize}}
- \pgfpathlineto{\pgfpoint{.70710678\pgfplotmarksize}{.70710678\pgfplotmarksize}}
- \pgfpathmoveto{\pgfpoint{-.70710678\pgfplotmarksize}{.70710678\pgfplotmarksize}}
- \pgfpathlineto{\pgfpoint{.70710678\pgfplotmarksize}{-.70710678\pgfplotmarksize}}
+ \pgfpathmoveto{\pgfqpoint{-.70710678\pgfplotmarksize}{-.70710678\pgfplotmarksize}}
+ \pgfpathlineto{\pgfqpoint{.70710678\pgfplotmarksize}{.70710678\pgfplotmarksize}}
+ \pgfpathmoveto{\pgfqpoint{-.70710678\pgfplotmarksize}{.70710678\pgfplotmarksize}}
+ \pgfpathlineto{\pgfqpoint{.70710678\pgfplotmarksize}{-.70710678\pgfplotmarksize}}
\pgfusepathqfillstroke
}
@@ -97,8 +97,8 @@
\pgfdeclareplotmark{|}
{%
- \pgfpathmoveto{\pgfpoint{0pt}{\pgfplotmarksize}}
- \pgfpathlineto{\pgfpoint{0pt}{-\pgfplotmarksize}}
+ \pgfpathmoveto{\pgfqpoint{0pt}{\pgfplotmarksize}}
+ \pgfpathlineto{\pgfqpoint{0pt}{-\pgfplotmarksize}}
\pgfusepathqstroke
}
@@ -108,8 +108,8 @@
\pgfdeclareplotmark{-}
{%
- \pgfpathmoveto{\pgfpoint{\pgfplotmarksize}{0pt}}
- \pgfpathlineto{\pgfpoint{-\pgfplotmarksize}{0pt}}
+ \pgfpathmoveto{\pgfqpoint{\pgfplotmarksize}{0pt}}
+ \pgfpathlineto{\pgfqpoint{-\pgfplotmarksize}{0pt}}
\pgfusepathqstroke
}
@@ -118,7 +118,7 @@
\pgfdeclareplotmark{square}
{%
- \pgfpathrectangle{\pgfpoint{-\pgfplotmarksize}{-\pgfplotmarksize}}{\pgfpoint{2\pgfplotmarksize}{2\pgfplotmarksize}}%
+ \pgfpathrectangle{\pgfqpoint{-\pgfplotmarksize}{-\pgfplotmarksize}}{\pgfqpoint{2\pgfplotmarksize}{2\pgfplotmarksize}}%
\pgfusepathqstroke
}
@@ -126,7 +126,7 @@
\pgfdeclareplotmark{square*}
{%
- \pgfpathrectangle{\pgfpoint{-\pgfplotmarksize}{-\pgfplotmarksize}}{\pgfpoint{2\pgfplotmarksize}{2\pgfplotmarksize}}%
+ \pgfpathrectangle{\pgfqpoint{-\pgfplotmarksize}{-\pgfplotmarksize}}{\pgfqpoint{2\pgfplotmarksize}{2\pgfplotmarksize}}%
\pgfusepathqfillstroke
}
@@ -135,9 +135,9 @@
\pgfdeclareplotmark{triangle}
{%
- \pgfpathmoveto{\pgfpoint{0pt}{\pgfplotmarksize}}
- \pgfpathlineto{\pgfpointpolar{-30}{\pgfplotmarksize}}
- \pgfpathlineto{\pgfpointpolar{-150}{\pgfplotmarksize}}
+ \pgfpathmoveto{\pgfqpoint{0pt}{\pgfplotmarksize}}
+ \pgfpathlineto{\pgfqpointpolar{-30}{\pgfplotmarksize}}
+ \pgfpathlineto{\pgfqpointpolar{-150}{\pgfplotmarksize}}
\pgfpathclose
\pgfusepathqstroke
}
@@ -147,9 +147,9 @@
\pgfdeclareplotmark{triangle*}
{%
- \pgfpathmoveto{\pgfpoint{0pt}{\pgfplotmarksize}}
- \pgfpathlineto{\pgfpointpolar{-30}{\pgfplotmarksize}}
- \pgfpathlineto{\pgfpointpolar{-150}{\pgfplotmarksize}}
+ \pgfpathmoveto{\pgfqpoint{0pt}{\pgfplotmarksize}}
+ \pgfpathlineto{\pgfqpointpolar{-30}{\pgfplotmarksize}}
+ \pgfpathlineto{\pgfqpointpolar{-150}{\pgfplotmarksize}}
\pgfpathclose
\pgfusepathqfillstroke
}
@@ -160,10 +160,10 @@
\pgfdeclareplotmark{diamond}
{%
- \pgfpathmoveto{\pgfpoint{0pt}{\pgfplotmarksize}}
- \pgfpathlineto{\pgfpoint{.75\pgfplotmarksize}{0pt}}
- \pgfpathlineto{\pgfpoint{0pt}{-\pgfplotmarksize}}
- \pgfpathlineto{\pgfpoint{-.75\pgfplotmarksize}{0pt}}
+ \pgfpathmoveto{\pgfqpoint{0pt}{\pgfplotmarksize}}
+ \pgfpathlineto{\pgfqpoint{.75\pgfplotmarksize}{0pt}}
+ \pgfpathlineto{\pgfqpoint{0pt}{-\pgfplotmarksize}}
+ \pgfpathlineto{\pgfqpoint{-.75\pgfplotmarksize}{0pt}}
\pgfpathclose
\pgfusepathqstroke
}
@@ -173,10 +173,10 @@
\pgfdeclareplotmark{diamond*}
{%
- \pgfpathmoveto{\pgfpoint{0pt}{\pgfplotmarksize}}
- \pgfpathlineto{\pgfpoint{.75\pgfplotmarksize}{0pt}}
- \pgfpathlineto{\pgfpoint{0pt}{-\pgfplotmarksize}}
- \pgfpathlineto{\pgfpoint{-.75\pgfplotmarksize}{0pt}}
+ \pgfpathmoveto{\pgfqpoint{0pt}{\pgfplotmarksize}}
+ \pgfpathlineto{\pgfqpoint{.75\pgfplotmarksize}{0pt}}
+ \pgfpathlineto{\pgfqpoint{0pt}{-\pgfplotmarksize}}
+ \pgfpathlineto{\pgfqpoint{-.75\pgfplotmarksize}{0pt}}
\pgfpathclose
\pgfusepathqfillstroke
}
@@ -187,11 +187,11 @@
\pgfdeclareplotmark{pentagon}
{%
- \pgfpathmoveto{\pgfpoint{0pt}{\pgfplotmarksize}}
- \pgfpathlineto{\pgfpointpolar{18}{\pgfplotmarksize}}
- \pgfpathlineto{\pgfpointpolar{-54}{\pgfplotmarksize}}
- \pgfpathlineto{\pgfpointpolar{234}{\pgfplotmarksize}}
- \pgfpathlineto{\pgfpointpolar{162}{\pgfplotmarksize}}
+ \pgfpathmoveto{\pgfqpoint{0pt}{\pgfplotmarksize}}
+ \pgfpathlineto{\pgfqpointpolar{18}{\pgfplotmarksize}}
+ \pgfpathlineto{\pgfqpointpolar{-54}{\pgfplotmarksize}}
+ \pgfpathlineto{\pgfqpointpolar{234}{\pgfplotmarksize}}
+ \pgfpathlineto{\pgfqpointpolar{162}{\pgfplotmarksize}}
\pgfpathclose
\pgfusepathqstroke
}
@@ -200,11 +200,11 @@
\pgfdeclareplotmark{pentagon*}
{%
- \pgfpathmoveto{\pgfpoint{0pt}{\pgfplotmarksize}}
- \pgfpathlineto{\pgfpointpolar{18}{\pgfplotmarksize}}
- \pgfpathlineto{\pgfpointpolar{-54}{\pgfplotmarksize}}
- \pgfpathlineto{\pgfpointpolar{234}{\pgfplotmarksize}}
- \pgfpathlineto{\pgfpointpolar{162}{\pgfplotmarksize}}
+ \pgfpathmoveto{\pgfqpoint{0pt}{\pgfplotmarksize}}
+ \pgfpathlineto{\pgfqpointpolar{18}{\pgfplotmarksize}}
+ \pgfpathlineto{\pgfqpointpolar{-54}{\pgfplotmarksize}}
+ \pgfpathlineto{\pgfqpointpolar{234}{\pgfplotmarksize}}
+ \pgfpathlineto{\pgfqpointpolar{162}{\pgfplotmarksize}}
\pgfpathclose
\pgfusepathqfillstroke
}
diff --git a/Master/texmf-dist/tex/generic/pgf/libraries/pgflibraryshapes.arrows.code.tex b/Master/texmf-dist/tex/generic/pgf/libraries/pgflibraryshapes.arrows.code.tex
new file mode 100644
index 00000000000..2f81d04742f
--- /dev/null
+++ b/Master/texmf-dist/tex/generic/pgf/libraries/pgflibraryshapes.arrows.code.tex
@@ -0,0 +1,12 @@
+% Copyright 2006 by Till Tantau
+%
+% This file may be distributed and/or modified
+%
+% 1. under the LaTeX Project Public License and/or
+% 2. under the GNU Public License.
+%
+% See the file doc/generic/pgf/licenses/LICENSE for more details.
+
+\ProvidesFileRCS[v\pgfversion] $Header: /cvsroot/pgf/pgf/generic/pgf/libraries/pgflibraryshapes.arrows.code.tex,v 1.1 2007/06/08 11:24:59 tantau Exp $
+
+\endinput
diff --git a/Master/texmf-dist/tex/generic/pgf/libraries/pgflibraryshapes.code.tex b/Master/texmf-dist/tex/generic/pgf/libraries/pgflibraryshapes.code.tex
index a6965b60e3b..fecbb7df710 100644
--- a/Master/texmf-dist/tex/generic/pgf/libraries/pgflibraryshapes.code.tex
+++ b/Master/texmf-dist/tex/generic/pgf/libraries/pgflibraryshapes.code.tex
@@ -7,573 +7,12 @@
%
% See the file doc/generic/pgf/licenses/LICENSE for more details.
-\ProvidesFileRCS[v\pgfversion] $Header: /cvsroot/pgf/pgf/generic/pgf/libraries/pgflibraryshapes.code.tex,v 1.9 2006/10/11 15:22:26 tantau Exp $
-
-\pgfdeclareshape{ellipse}
-%
-% Draws a circle around the text
-%
-{
- \savedanchor\centerpoint{%
- \pgf@x=.5\wd\pgfnodeparttextbox%
- \pgf@y=.5\ht\pgfnodeparttextbox%
- \advance\pgf@y by-.5\dp\pgfnodeparttextbox%
- }
- \savedanchor\radius{%
- %
- % Caculate ``height radius''
- %
- \pgf@y=.5\ht\pgfnodeparttextbox%
- \advance\pgf@y by.5\dp\pgfnodeparttextbox%
- \setlength\pgf@yb{\pgfshapeinnerysep}%
- \advance\pgf@y by\pgf@yb%
- %
- % Caculate ``width radius''
- %
- \pgf@x=.5\wd\pgfnodeparttextbox%
- \setlength\pgf@xb{\pgfshapeinnerxsep}%
- \advance\pgf@x by\pgf@xb%
- %
- % Adjust
- %
- \pgf@x=1.4142136\pgf@x%
- \pgf@y=1.4142136\pgf@y%
- %
- % Adjust hieght, if necessary
- %
- \setlength\pgf@yc{\pgfshapeminheight}%
- \ifdim\pgf@y<.5\pgf@yc%
- \pgf@y=.5\pgf@yc%
- \fi%
- %
- % Adjust width, if necessary
- %
- \setlength\pgf@xc{\pgfshapeminwidth}%
- \ifdim\pgf@x<.5\pgf@xc%
- \pgf@x=.5\pgf@xc%
- \fi%
- %
- % Add outer sep
- %
- \setlength{\pgf@xb}{\pgfshapeouterxsep}%
- \setlength{\pgf@yb}{\pgfshapeouterysep}%
- \advance\pgf@x by\pgf@xb%
- \advance\pgf@y by\pgf@yb%
- }
-
- %
- % Anchors
- %
- \anchor{center}{\centerpoint}
- \anchor{mid}{\centerpoint\setlength\pgf@y{.5ex}}
- \anchor{base}{\centerpoint\pgf@y=0pt}
- \anchor{north}
- {
- \pgf@process{\radius}
- \pgf@ya=\pgf@y%
- \pgf@process{\centerpoint}
- \advance\pgf@y by\pgf@ya
- }
- \anchor{south}
- {
- \pgf@process{\radius}
- \pgf@ya=\pgf@y%
- \pgf@process{\centerpoint}
- \advance\pgf@y by-\pgf@ya
- }
- \anchor{west}
- {
- \pgf@process{\radius}
- \pgf@xa=\pgf@x%
- \pgf@process{\centerpoint}
- \advance\pgf@x by-\pgf@xa
- }
- \anchor{mid west}
- {%
- \pgf@process{\radius}
- \pgf@xa=\pgf@x%
- \pgf@process{\centerpoint}
- \advance\pgf@x by-\pgf@xa%
- \setlength\pgf@y{.5ex}
- }
- \anchor{base west}
- {%
- \pgf@process{\radius}
- \pgf@xa=\pgf@x%
- \pgf@process{\centerpoint}
- \advance\pgf@x by-\pgf@xa%
- \pgf@y=0pt
- }
- \anchor{north west}
- {
- \pgf@process{\radius}
- \pgf@xa=\pgf@x%
- \pgf@ya=\pgf@y%
- \pgf@process{\centerpoint}
- \advance\pgf@x by-0.707107\pgf@xa
- \advance\pgf@y by0.707107\pgf@ya
- }
- \anchor{south west}
- {
- \pgf@process{\radius}
- \pgf@xa=\pgf@x%
- \pgf@ya=\pgf@y%
- \pgf@process{\centerpoint}
- \advance\pgf@x by-0.707107\pgf@xa
- \advance\pgf@y by-0.707107\pgf@ya
- }
- \anchor{east}
- {%
- \pgf@process{\radius}
- \pgf@xa=\pgf@x%
- \pgf@process{\centerpoint}
- \advance\pgf@x by\pgf@xa
- }
- \anchor{mid east}
- {%
- \pgf@process{\radius}
- \pgf@xa=\pgf@x%
- \pgf@process{\centerpoint}
- \advance\pgf@x by\pgf@xa%
- \setlength\pgf@y{.5ex}
- }
- \anchor{base east}
- {%
- \pgf@process{\radius}
- \pgf@xa=\pgf@x%
- \pgf@process{\centerpoint}
- \advance\pgf@x by\pgf@xa%
- \pgf@y=0pt
- }
- \anchor{north east}
- {
- \pgf@process{\radius}
- \pgf@xa=\pgf@x%
- \pgf@ya=\pgf@y%
- \pgf@process{\centerpoint}
- \advance\pgf@x by0.707107\pgf@xa
- \advance\pgf@y by0.707107\pgf@ya
- }
- \anchor{south east}
- {
- \pgf@process{\radius}
- \pgf@xa=\pgf@x%
- \pgf@ya=\pgf@y%
- \pgf@process{\centerpoint}
- \advance\pgf@x by0.707107\pgf@xa
- \advance\pgf@y by-0.707107\pgf@ya
- }
- \anchorborder{
- \edef\pgf@marshal{%
- \noexpand\pgfpointborderellipse
- {\noexpand\pgfpoint{\the\pgf@x}{\the\pgf@y}}
- {\noexpand\radius}%
- }%
- \pgf@marshal%
- \pgf@xa=\pgf@x%
- \pgf@ya=\pgf@y%
- \centerpoint%
- \advance\pgf@x by\pgf@xa%
- \advance\pgf@y by\pgf@ya%
- }
-
- %
- % Background path
- %
- \backgroundpath
- {
- \pgf@process{\radius}%
- \@tempdima=\pgf@x%
- \@tempdimb=\pgf@y%
- \setlength{\pgf@xb}{\pgfshapeouterxsep}%
- \setlength{\pgf@yb}{\pgfshapeouterysep}%
- \advance\@tempdima by-\pgf@xb%
- \advance\@tempdimb by-\pgf@yb%
- \pgfpathellipse{\centerpoint}{\pgfpoint{\@tempdima}{0pt}}{\pgfpoint{0pt}{\@tempdimb}}%
- }
-}
-
-
-
-
-% Set the recommended shape aspect ratio
-%
-% #1 = aspect ratio
-%
-% Example:
-%
-% \pgfsetshapeminwidth{1.5}
-
-\def\pgfsetshapeaspect#1{%
- \def\pgfshapeaspect{#1}%
- % Invert
- \@tempdima=#1pt%
- \@tempdima=.125\@tempdima%
- \c@pgf@counta=\@tempdima\relax% 8192*determinant
- \@tempdima=8192pt%
- \divide\@tempdima by\c@pgf@counta%
- \edef\pgfshapeaspectinverse{\pgf@sys@tonumber{\@tempdima}}
-}
-\pgfsetshapeaspect{1}
-
-
-
-\pgfdeclareshape{diamond}
-{
- \savedanchor\outernortheast{%
- %
- % Calculate width and height of the inner rectangle
- %
- \pgf@xa=.5\wd\pgfnodeparttextbox%
- \setlength\pgf@xc{\pgfshapeinnerxsep}%
- \advance\pgf@xa by\pgf@xc%
- \pgf@ya=.5\ht\pgfnodeparttextbox%
- \advance\pgf@ya by.5\dp\pgfnodeparttextbox%
- \setlength\pgf@yc{\pgfshapeinnerysep}%
- \advance\pgf@ya by\pgf@yc%
- %
- % Calculate width and height of diamond
- %
- \pgf@x=\pgf@xa%
- \advance\pgf@x by\pgfshapeaspect\pgf@ya%
- \pgf@y=\pgfshapeaspectinverse\pgf@xa%
- \advance\pgf@y by\pgf@ya%
- %
- % Check against minimum height/width
- %
- \setlength\pgf@xb{\pgfshapeminwidth}%
- \ifdim\pgf@x<\pgf@xb%
- % yes, too small. Enlarge...
- \pgf@x=\pgf@xb%
- \fi%
- \setlength\pgf@yb{\pgfshapeminheight}%
- \ifdim\pgf@y<\pgf@yb%
- % yes, too small. Enlarge...
- \pgf@y=\pgf@yb%
- \fi%
- %
- % Add outer border
- %
- \setlength\pgf@xa{\pgfshapeouterxsep}%
- \advance\pgf@x by\pgf@xa%
- \setlength\pgf@ya{\pgfshapeouterysep}%
- \advance\pgf@y by\pgf@ya%
- }
- \savedanchor\text{%
- \pgf@x=-.5\wd\pgfnodeparttextbox%
- \pgf@y=-.5\ht\pgfnodeparttextbox%
- \advance\pgf@y by.5\dp\pgfnodeparttextbox%
- }
-
- %
- % Anchors
- %
- \anchor{text}{\text}%
- \anchor{center}{\pgfpointorigin}%
- \anchor{mid}{%
- \pgf@process{\text}%
- \pgf@x=0pt%
- \setlength\pgf@ya{.5ex}
- \advance\pgf@y by\pgf@ya%
- }
- \anchor{base}{\pgf@process{\text}\pgf@x=0pt }
- \anchor{north}{\pgf@process{\outernortheast}\pgf@x=0pt}
- \anchor{south}{\pgf@process{\outernortheast}\pgf@x=0pt\pgf@y=-\pgf@y}
- \anchor{west}{\pgf@process{\outernortheast}\pgf@x=-\pgf@x\pgf@y=0pt}
- \anchor{north west}{\pgf@process{\outernortheast}\pgf@x=-.5\pgf@x\pgf@y=.5\pgf@y}
- \anchor{south west}{\pgf@process{\outernortheast}\pgf@x=-.5\pgf@x\pgf@y=-.5\pgf@y}
- \anchor{east}{\pgf@process{\outernortheast}\pgf@y=0pt}
- \anchor{north east}{\pgf@process{\outernortheast}\pgf@x=.5\pgf@x\pgf@y=.5\pgf@y}
- \anchor{south east}{\pgf@process{\outernortheast}\pgf@x=.5\pgf@x\pgf@y=-.5\pgf@y}
- \anchorborder{%
- \pgf@xa=\pgf@x%
- \pgf@ya=\pgf@y%
- \pgf@process{\outernortheast}%
- \ifdim\pgf@xa>0pt%
- \else%
- \pgf@x=-\pgf@x%
- \fi%
- \ifdim\pgf@ya>0pt%
- \else%
- \pgf@y=-\pgf@y%
- \fi%
- \edef\pgf@marshal{%
- \noexpand\pgfpointintersectionoflines
- {\noexpand\pgfpointorigin}
- {\noexpand\pgfpoint{\the\pgf@xa}{\the\pgf@ya}}
- {\noexpand\pgfpoint{\the\pgf@x}{0pt}}
- {\noexpand\pgfpoint{0pt}{\the\pgf@y}}%
- }%
- \pgf@process{\pgf@marshal}%
- }
-
- %
- % Background path
- %
- \backgroundpath{
- \pgf@process{\outernortheast}%
- \pgf@xc=\pgf@x%
- \pgf@yc=\pgf@y%
- \setlength{\pgf@xa}{\pgfshapeouterxsep}%
- \setlength{\pgf@ya}{\pgfshapeouterysep}%
- \advance\pgf@xc by-1.414213\pgf@xa%
- \advance\pgf@yc by-1.414213\pgf@ya%
- \pgfpathmoveto{\pgfpoint{\pgf@xc}{0pt}}%
- \pgfpathlineto{\pgfpoint{0pt}{\pgf@yc}}%
- \pgfpathlineto{\pgfpoint{-\pgf@xc}{0pt}}%
- \pgfpathlineto{\pgfpoint{0pt}{-\pgf@yc}}%
- \pgfpathclose%
- }
-}
-
-
-
-\newbox\pgfnodepartlowerbox
-
-%
-% A circle that is split in the middle into an upper and a lower part.
-%
-% This node consists of two parts: The upper (main) part is shown in
-% the upper half of the circle. The second part is the (optional)
-% lower part.
-%
-% Parts: text, lower
-
-\pgfdeclareshape{circle split}
-{
- %
- % Node parts
- %
- \nodeparts{text,lower}
-
- %
- % Anchors
- %
- \savedanchor\centerpoint{%
- \pgf@x=.5\wd\pgfnodeparttextbox%
- \setlength{\pgf@y}{\pgfshapeinnerysep}%
- \pgf@y=-\pgf@y%
- \advance\pgf@y by-\dp\pgfnodeparttextbox%
- \advance\pgf@y by-.5\pgflinewidth%
- }%
- \savedanchor\loweranchor{%
- \pgf@x=-.5\wd\pgfnodepartlowerbox%
- \advance\pgf@x by.5\wd\pgfnodeparttextbox%
- \setlength{\pgf@y}{\pgfshapeinnerysep}%
- \pgf@y=-2\pgf@y%
- \advance\pgf@y by-\ht\pgfnodepartlowerbox%
- \advance\pgf@y by-.5\pgflinewidth%
- \advance\pgf@y by-\dp\pgfnodeparttextbox%
- \advance\pgf@y by-.5\pgflinewidth%
- }
-
- \saveddimen\radius{%
- %
- % Caculate ``height radius''
- %
- \pgf@ya=.5\ht\pgfnodeparttextbox%
- \advance\pgf@ya by.5\dp\pgfnodeparttextbox%
- \advance\pgf@ya by.5\ht\pgfnodepartlowerbox%
- \advance\pgf@ya by.5\dp\pgfnodepartlowerbox%
- \advance\pgf@ya by.5\pgflinewidth%
- \setlength\pgf@yb{\pgfshapeinnerysep}%
- \advance\pgf@ya by2\pgf@yb%
- %
- % Caculate ``width radius''
- %
- \pgf@xa=.5\wd\pgfnodeparttextbox%
- \ifdim\pgf@xa<.5\wd\pgfnodepartlowerbox%
- \pgf@xa=.5\wd\pgfnodepartlowerbox%
- \fi%
- \setlength\pgf@xb{\pgfshapeinnerxsep}%
- \advance\pgf@xa by\pgf@xb%
- %
- % Calculate length of radius vector:
- %
- \pgf@process{\pgfpointnormalised{\pgfpoint{\pgf@xa}{\pgf@ya}}}%
- \ifdim\pgf@x>\pgf@y%
- \c@pgf@counta=\pgf@x%
- \ifnum\c@pgf@counta=0\relax%
- \else%
- \divide\c@pgf@counta by 255\relax%
- \pgf@xa=16\pgf@xa\relax%
- \divide\pgf@xa by\c@pgf@counta%
- \pgf@xa=16\pgf@xa\relax%
- \fi%
- \else%
- \c@pgf@counta=\pgf@y%
- \ifnum\c@pgf@counta=0\relax%
- \else%
- \divide\c@pgf@counta by 255\relax%
- \pgf@ya=16\pgf@ya\relax%
- \divide\pgf@ya by\c@pgf@counta%
- \pgf@xa=16\pgf@ya\relax%
- \fi%
- \fi%
- \pgf@x=\pgf@xa%
- %
- % If necessary, adjust radius so that the size requirements are
- % met:
- %
- \setlength{\pgf@xb}{\pgfshapeminwidth}%
- \setlength{\pgf@yb}{\pgfshapeminheight}%
- \ifdim\pgf@x<.5\pgf@xb%
- \pgf@x=.5\pgf@xb%
- \fi%
- \ifdim\pgf@x<.5\pgf@yb%
- \pgf@x=.5\pgf@yb%
- \fi%
- %
- % Now, add larger of outer sepearations.
- %
- \setlength{\pgf@xb}{\pgfshapeouterxsep}%
- \setlength{\pgf@yb}{\pgfshapeouterysep}%
- \ifdim\pgf@xb<\pgf@yb%
- \advance\pgf@x by\pgf@yb%
- \else%
- \advance\pgf@x by\pgf@xb%
- \fi%
- }
-
- %
- % Anchors
- %
- \inheritanchorborder[from=circle]
- \inheritanchor[from=circle]{north}
- \inheritanchor[from=circle]{north west}
- \inheritanchor[from=circle]{north east}
- \inheritanchor[from=circle]{center}
- \inheritanchor[from=circle]{west}
- \inheritanchor[from=circle]{east}
- \inheritanchor[from=circle]{mid}
- \inheritanchor[from=circle]{mid west}
- \inheritanchor[from=circle]{mid east}
- \inheritanchor[from=circle]{base}
- \inheritanchor[from=circle]{base west}
- \inheritanchor[from=circle]{base east}
- \inheritanchor[from=circle]{south}
- \inheritanchor[from=circle]{south west}
- \inheritanchor[from=circle]{south east}
- \anchor{lower}{\loweranchor}
-
- %
- % Background path
- %
- \inheritbackgroundpath[from=circle]
- \beforebackgroundpath{
- \@tempdima=\radius%
- \setlength{\pgf@xb}{\pgfshapeouterxsep}%
- \setlength{\pgf@yb}{\pgfshapeouterysep}%
- \ifdim\pgf@xb<\pgf@yb%
- \advance\@tempdima by-\pgf@yb%
- \else%
- \advance\@tempdima by-\pgf@xb%
- \fi%
- \advance\@tempdima by-.5\pgflinewidth%
- \pgfsetshortenstart{0pt}%
- \pgfsetshortenend{0pt}%
- \pgfsetarrows{-}%
- \pgfpathmoveto{\pgfpointadd{\centerpoint}{\pgfpoint{-\@tempdima}{0pt}}}%
- \pgfpathlineto{\pgfpointadd{\centerpoint}{\pgfpoint{\@tempdima}{0pt}}}%
- \pgfusepath{stroke}%
- }
-}
-
-
-
-\pgfdeclareshape{cross out}
-{
- \inheritsavedanchors[from=rectangle] % this is nearly a rectangle
- \inheritanchorborder[from=rectangle]
- \inheritanchor[from=rectangle]{north}
- \inheritanchor[from=rectangle]{north west}
- \inheritanchor[from=rectangle]{north east}
- \inheritanchor[from=rectangle]{center}
- \inheritanchor[from=rectangle]{west}
- \inheritanchor[from=rectangle]{east}
- \inheritanchor[from=rectangle]{mid}
- \inheritanchor[from=rectangle]{mid west}
- \inheritanchor[from=rectangle]{mid east}
- \inheritanchor[from=rectangle]{base}
- \inheritanchor[from=rectangle]{base west}
- \inheritanchor[from=rectangle]{base east}
- \inheritanchor[from=rectangle]{south}
- \inheritanchor[from=rectangle]{south west}
- \inheritanchor[from=rectangle]{south east}
- \foregroundpath{
- % store lower right in xa/ya and upper right in xb/yb
- \southwest \pgf@xa=\pgf@x \pgf@ya=\pgf@y
- \northeast \pgf@xb=\pgf@x \pgf@yb=\pgf@y
- \pgfpathmoveto{\pgfpoint{\pgf@xa}{\pgf@ya}}
- \pgfpathlineto{\pgfpoint{\pgf@xb}{\pgf@yb}}
- \pgfpathmoveto{\pgfpoint{\pgf@xa}{\pgf@yb}}
- \pgfpathlineto{\pgfpoint{\pgf@xb}{\pgf@ya}}
- }
-}
-
-
-\pgfdeclareshape{strike out}
-{
- \inheritsavedanchors[from=rectangle] % this is nearly a rectangle
- \inheritanchorborder[from=rectangle]
- \inheritanchor[from=rectangle]{north}
- \inheritanchor[from=rectangle]{north west}
- \inheritanchor[from=rectangle]{north east}
- \inheritanchor[from=rectangle]{center}
- \inheritanchor[from=rectangle]{west}
- \inheritanchor[from=rectangle]{east}
- \inheritanchor[from=rectangle]{mid}
- \inheritanchor[from=rectangle]{mid west}
- \inheritanchor[from=rectangle]{mid east}
- \inheritanchor[from=rectangle]{base}
- \inheritanchor[from=rectangle]{base west}
- \inheritanchor[from=rectangle]{base east}
- \inheritanchor[from=rectangle]{south}
- \inheritanchor[from=rectangle]{south west}
- \inheritanchor[from=rectangle]{south east}
- \foregroundpath{
- \pgfpathmoveto{\southwest}
- \pgfpathlineto{\northeast}
- }
-}
-
-
-\pgfdeclareshape{forbidden sign}
-{
- \inheritsavedanchors[from=circle] % this is nearly a circle
- \inheritanchorborder[from=circle]
- \inheritanchor[from=circle]{north}
- \inheritanchor[from=circle]{north west}
- \inheritanchor[from=circle]{north east}
- \inheritanchor[from=circle]{center}
- \inheritanchor[from=circle]{west}
- \inheritanchor[from=circle]{east}
- \inheritanchor[from=circle]{mid}
- \inheritanchor[from=circle]{mid west}
- \inheritanchor[from=circle]{mid east}
- \inheritanchor[from=circle]{base}
- \inheritanchor[from=circle]{base west}
- \inheritanchor[from=circle]{base east}
- \inheritanchor[from=circle]{south}
- \inheritanchor[from=circle]{south west}
- \inheritanchor[from=circle]{south east}
- \inheritbackgroundpath[from=circle]
- \foregroundpath{
- \centerpoint%
- \pgf@xc=\pgf@x%
- \pgf@yc=\pgf@y%
- \@tempdima=\radius%
- \setlength{\pgf@xb}{\pgfshapeouterxsep}%
- \setlength{\pgf@yb}{\pgfshapeouterysep}%
- \ifdim\pgf@xb<\pgf@yb%
- \advance\@tempdima by-\pgf@yb%
- \else%
- \advance\@tempdima by-\pgf@xb%
- \fi%
- \pgfpathmoveto{\pgfpointadd{\pgfpoint{\pgf@xc}{\pgf@yc}}{\pgfpoint{-0.707107\@tempdima}{-0.707107\@tempdima}}}
- \pgfpathlineto{\pgfpointadd{\pgfpoint{\pgf@xc}{\pgf@yc}}{\pgfpoint{0.707107\@tempdima}{0.707107\@tempdima}}}
- }
-}
+\ProvidesFileRCS[v\pgfversion] $Header: /cvsroot/pgf/pgf/generic/pgf/libraries/pgflibraryshapes.code.tex,v 1.12 2007/06/08 11:24:59 tantau Exp $
+\usepgflibrary{shapes.geometric}
+\usepgflibrary{shapes.misc}
+\usepgflibrary{shapes.symbols}
+\usepgflibrary{shapes.arrows}
+\usepgflibrary{shapes.multipart}
\endinput
diff --git a/Master/texmf-dist/tex/generic/pgf/libraries/pgflibraryshapes.geometric.code.tex b/Master/texmf-dist/tex/generic/pgf/libraries/pgflibraryshapes.geometric.code.tex
new file mode 100644
index 00000000000..802c85a41b9
--- /dev/null
+++ b/Master/texmf-dist/tex/generic/pgf/libraries/pgflibraryshapes.geometric.code.tex
@@ -0,0 +1,1229 @@
+% Copyright 2006 by Till Tantau and Mark Wibrow
+%
+% This file may be distributed and/or modified
+%
+% 1. under the LaTeX Project Public License and/or
+% 2. under the GNU Public License.
+%
+% See the file doc/generic/pgf/licenses/LICENSE for more details.
+
+\ProvidesFileRCS[v\pgfversion] $Header: /cvsroot/pgf/pgf/generic/pgf/libraries/pgflibraryshapes.geometric.code.tex,v 1.1 2007/06/08 11:24:59 tantau Exp $
+
+\pgfdeclareshape{ellipse}
+%
+% Draws a circle around the text
+%
+{
+ \savedanchor\centerpoint{%
+ \pgf@x=.5\wd\pgfnodeparttextbox%
+ \pgf@y=.5\ht\pgfnodeparttextbox%
+ \advance\pgf@y by-.5\dp\pgfnodeparttextbox%
+ }
+ \savedanchor\radius{%
+ %
+ % Caculate ``height radius''
+ %
+ \pgf@y=.5\ht\pgfnodeparttextbox%
+ \advance\pgf@y by.5\dp\pgfnodeparttextbox%
+ \pgfmathsetlength\pgf@yb{\pgfshapeinnerysep}%
+ \advance\pgf@y by\pgf@yb%
+ %
+ % Caculate ``width radius''
+ %
+ \pgf@x=.5\wd\pgfnodeparttextbox%
+ \pgfmathsetlength\pgf@xb{\pgfshapeinnerxsep}%
+ \advance\pgf@x by\pgf@xb%
+ %
+ % Adjust
+ %
+ \pgf@x=1.4142136\pgf@x%
+ \pgf@y=1.4142136\pgf@y%
+ %
+ % Adjust hieght, if necessary
+ %
+ \pgfmathsetlength\pgf@yc{\pgfshapeminheight}%
+ \ifdim\pgf@y<.5\pgf@yc%
+ \pgf@y=.5\pgf@yc%
+ \fi%
+ %
+ % Adjust width, if necessary
+ %
+ \pgfmathsetlength\pgf@xc{\pgfshapeminwidth}%
+ \ifdim\pgf@x<.5\pgf@xc%
+ \pgf@x=.5\pgf@xc%
+ \fi%
+ %
+ % Add outer sep
+ %
+ \pgfmathsetlength{\pgf@xb}{\pgfshapeouterxsep}%
+ \pgfmathsetlength{\pgf@yb}{\pgfshapeouterysep}%
+ \advance\pgf@x by\pgf@xb%
+ \advance\pgf@y by\pgf@yb%
+ }
+
+ %
+ % Anchors
+ %
+ \anchor{center}{\centerpoint}
+ \anchor{mid}{\centerpoint\pgfmathsetlength\pgf@y{.5ex}}
+ \anchor{base}{\centerpoint\pgf@y=0pt}
+ \anchor{north}
+ {
+ \pgf@process{\radius}
+ \pgf@ya=\pgf@y%
+ \pgf@process{\centerpoint}
+ \advance\pgf@y by\pgf@ya
+ }
+ \anchor{south}
+ {
+ \pgf@process{\radius}
+ \pgf@ya=\pgf@y%
+ \pgf@process{\centerpoint}
+ \advance\pgf@y by-\pgf@ya
+ }
+ \anchor{west}
+ {
+ \pgf@process{\radius}
+ \pgf@xa=\pgf@x%
+ \pgf@process{\centerpoint}
+ \advance\pgf@x by-\pgf@xa
+ }
+ \anchor{mid west}
+ {%
+ \pgf@process{\radius}
+ \pgf@xa=\pgf@x%
+ \pgf@process{\centerpoint}
+ \advance\pgf@x by-\pgf@xa%
+ \pgfmathsetlength\pgf@y{.5ex}
+ }
+ \anchor{base west}
+ {%
+ \pgf@process{\radius}
+ \pgf@xa=\pgf@x%
+ \pgf@process{\centerpoint}
+ \advance\pgf@x by-\pgf@xa%
+ \pgf@y=0pt
+ }
+ \anchor{north west}
+ {
+ \pgf@process{\radius}
+ \pgf@xa=\pgf@x%
+ \pgf@ya=\pgf@y%
+ \pgf@process{\centerpoint}
+ \advance\pgf@x by-0.707107\pgf@xa
+ \advance\pgf@y by0.707107\pgf@ya
+ }
+ \anchor{south west}
+ {
+ \pgf@process{\radius}
+ \pgf@xa=\pgf@x%
+ \pgf@ya=\pgf@y%
+ \pgf@process{\centerpoint}
+ \advance\pgf@x by-0.707107\pgf@xa
+ \advance\pgf@y by-0.707107\pgf@ya
+ }
+ \anchor{east}
+ {%
+ \pgf@process{\radius}
+ \pgf@xa=\pgf@x%
+ \pgf@process{\centerpoint}
+ \advance\pgf@x by\pgf@xa
+ }
+ \anchor{mid east}
+ {%
+ \pgf@process{\radius}
+ \pgf@xa=\pgf@x%
+ \pgf@process{\centerpoint}
+ \advance\pgf@x by\pgf@xa%
+ \pgfmathsetlength\pgf@y{.5ex}
+ }
+ \anchor{base east}
+ {%
+ \pgf@process{\radius}
+ \pgf@xa=\pgf@x%
+ \pgf@process{\centerpoint}
+ \advance\pgf@x by\pgf@xa%
+ \pgf@y=0pt
+ }
+ \anchor{north east}
+ {
+ \pgf@process{\radius}
+ \pgf@xa=\pgf@x%
+ \pgf@ya=\pgf@y%
+ \pgf@process{\centerpoint}
+ \advance\pgf@x by0.707107\pgf@xa
+ \advance\pgf@y by0.707107\pgf@ya
+ }
+ \anchor{south east}
+ {
+ \pgf@process{\radius}
+ \pgf@xa=\pgf@x%
+ \pgf@ya=\pgf@y%
+ \pgf@process{\centerpoint}
+ \advance\pgf@x by0.707107\pgf@xa
+ \advance\pgf@y by-0.707107\pgf@ya
+ }
+ \anchorborder{
+ \edef\pgf@marshal{%
+ \noexpand\pgfpointborderellipse
+ {\noexpand\pgfqpoint{\the\pgf@x}{\the\pgf@y}}
+ {\noexpand\radius}%
+ }%
+ \pgf@marshal%
+ \pgf@xa=\pgf@x%
+ \pgf@ya=\pgf@y%
+ \centerpoint%
+ \advance\pgf@x by\pgf@xa%
+ \advance\pgf@y by\pgf@ya%
+ }
+
+ %
+ % Background path
+ %
+ \backgroundpath
+ {
+ \pgf@process{\radius}%
+ \pgfutil@tempdima=\pgf@x%
+ \pgfutil@tempdimb=\pgf@y%
+ \pgfmathsetlength{\pgf@xb}{\pgfshapeouterxsep}%
+ \pgfmathsetlength{\pgf@yb}{\pgfshapeouterysep}%
+ \advance\pgfutil@tempdima by-\pgf@xb%
+ \advance\pgfutil@tempdimb by-\pgf@yb%
+ \pgfpathellipse{\centerpoint}{\pgfqpoint{\pgfutil@tempdima}{0pt}}{\pgfqpoint{0pt}{\pgfutil@tempdimb}}%
+ }
+}
+
+
+
+
+% Set the recommended shape aspect ratio
+%
+% #1 = aspect ratio
+%
+% Example:
+%
+% \pgfsetshapeminwidth{1.5}
+
+\def\pgfsetshapeaspect#1{%
+ \def\pgfshapeaspect{#1}%
+ % Invert
+ \pgfutil@tempdima=#1pt%
+ \pgfutil@tempdima=.125\pgfutil@tempdima%
+ \c@pgf@counta=\pgfutil@tempdima\relax% 8192*determinant
+ \pgfutil@tempdima=8192pt%
+ \divide\pgfutil@tempdima by\c@pgf@counta%
+ \edef\pgfshapeaspectinverse{\pgf@sys@tonumber{\pgfutil@tempdima}}
+}
+\pgfsetshapeaspect{1}
+
+
+
+\pgfdeclareshape{diamond}
+{
+ \savedanchor\outernortheast{%
+ %
+ % Calculate width and height of the inner rectangle
+ %
+ \pgf@xa=.5\wd\pgfnodeparttextbox%
+ \pgfmathsetlength\pgf@xc{\pgfshapeinnerxsep}%
+ \advance\pgf@xa by\pgf@xc%
+ \pgf@ya=.5\ht\pgfnodeparttextbox%
+ \advance\pgf@ya by.5\dp\pgfnodeparttextbox%
+ \pgfmathsetlength\pgf@yc{\pgfshapeinnerysep}%
+ \advance\pgf@ya by\pgf@yc%
+ %
+ % Calculate width and height of diamond
+ %
+ \pgf@x=\pgf@xa%
+ \advance\pgf@x by\pgfshapeaspect\pgf@ya%
+ \pgf@y=\pgfshapeaspectinverse\pgf@xa%
+ \advance\pgf@y by\pgf@ya%
+ %
+ % Check against minimum height/width
+ %
+ \pgfmathsetlength\pgf@xb{\pgfshapeminwidth}%
+ \ifdim\pgf@x<\pgf@xb%
+ % yes, too small. Enlarge...
+ \pgf@x=\pgf@xb%
+ \fi%
+ \pgfmathsetlength\pgf@yb{\pgfshapeminheight}%
+ \ifdim\pgf@y<\pgf@yb%
+ % yes, too small. Enlarge...
+ \pgf@y=\pgf@yb%
+ \fi%
+ %
+ % Add outer border
+ %
+ \pgfmathsetlength\pgf@xa{\pgfshapeouterxsep}%
+ \advance\pgf@x by\pgf@xa%
+ \pgfmathsetlength\pgf@ya{\pgfshapeouterysep}%
+ \advance\pgf@y by\pgf@ya%
+ }
+ \savedanchor\text{%
+ \pgf@x=-.5\wd\pgfnodeparttextbox%
+ \pgf@y=-.5\ht\pgfnodeparttextbox%
+ \advance\pgf@y by.5\dp\pgfnodeparttextbox%
+ }
+
+ %
+ % Anchors
+ %
+ \anchor{text}{\text}%
+ \anchor{center}{\pgfpointorigin}%
+ \anchor{mid}{%
+ \pgf@process{\text}%
+ \pgf@x=0pt%
+ \pgfmathsetlength\pgf@ya{.5ex}
+ \advance\pgf@y by\pgf@ya%
+ }
+ \anchor{base}{\pgf@process{\text}\pgf@x=0pt }
+ \anchor{north}{\pgf@process{\outernortheast}\pgf@x=0pt}
+ \anchor{south}{\pgf@process{\outernortheast}\pgf@x=0pt\pgf@y=-\pgf@y}
+ \anchor{west}{\pgf@process{\outernortheast}\pgf@x=-\pgf@x\pgf@y=0pt}
+ \anchor{north west}{\pgf@process{\outernortheast}\pgf@x=-.5\pgf@x\pgf@y=.5\pgf@y}
+ \anchor{south west}{\pgf@process{\outernortheast}\pgf@x=-.5\pgf@x\pgf@y=-.5\pgf@y}
+ \anchor{east}{\pgf@process{\outernortheast}\pgf@y=0pt}
+ \anchor{north east}{\pgf@process{\outernortheast}\pgf@x=.5\pgf@x\pgf@y=.5\pgf@y}
+ \anchor{south east}{\pgf@process{\outernortheast}\pgf@x=.5\pgf@x\pgf@y=-.5\pgf@y}
+ \anchorborder{%
+ \pgf@xa=\pgf@x%
+ \pgf@ya=\pgf@y%
+ \pgf@process{\outernortheast}%
+ \ifdim\pgf@xa>0pt%
+ \else%
+ \pgf@x=-\pgf@x%
+ \fi%
+ \ifdim\pgf@ya>0pt%
+ \else%
+ \pgf@y=-\pgf@y%
+ \fi%
+ \edef\pgf@marshal{%
+ \noexpand\pgfpointintersectionoflines
+ {\noexpand\pgfpointorigin}
+ {\noexpand\pgfqpoint{\the\pgf@xa}{\the\pgf@ya}}
+ {\noexpand\pgfqpoint{\the\pgf@x}{0pt}}
+ {\noexpand\pgfqpoint{0pt}{\the\pgf@y}}%
+ }%
+ \pgf@process{\pgf@marshal}%
+ }
+
+ %
+ % Background path
+ %
+ \backgroundpath{
+ \pgf@process{\outernortheast}%
+ \pgf@xc=\pgf@x%
+ \pgf@yc=\pgf@y%
+ \pgfmathsetlength{\pgf@xa}{\pgfshapeouterxsep}%
+ \pgfmathsetlength{\pgf@ya}{\pgfshapeouterysep}%
+ \advance\pgf@xc by-1.414213\pgf@xa%
+ \advance\pgf@yc by-1.414213\pgf@ya%
+ \pgfpathmoveto{\pgfqpoint{\pgf@xc}{0pt}}%
+ \pgfpathlineto{\pgfqpoint{0pt}{\pgf@yc}}%
+ \pgfpathlineto{\pgfqpoint{-\pgf@xc}{0pt}}%
+ \pgfpathlineto{\pgfqpoint{0pt}{-\pgf@yc}}%
+ \pgfpathclose%
+ }
+}
+
+
+
+
+% \pgfsetstarpoints
+%
+% Set the number of points on a star.
+%
+\def\pgfsetstarpoints#1{%
+ \pgfmathsetcounter{pgf@counta}{#1}%
+ \edef\pgfstarpoints{\the\c@pgfmath@counta}}
+\pgfsetstarpoints{5}
+
+% \pgfsetstarpointheight
+%
+% Set the height of the points (this is the
+% distance between the outer and inner point
+% radii).
+%
+\def\pgfsetstarpointheight#1{%
+ \pgfmathparse{#1}%
+ \edef\pgfstarpointheight{\pgfmathresult pt}}
+\pgfsetstarpointheight{12pt}
+
+% \pgfsetstarpointratio
+%
+% Set the ratio between the outer and
+% inner point radii.
+%
+\def\pgfsetstarpointratio#1{%
+ \pgfmathparse{#1}%
+ \edef\pgfstarpointratio{\pgfmathresult}%
+ \def\pgfstarpointheight{-16383pt}% If negative, the ratio is used.
+}
+\pgfsetstarpointratio{1.75}
+
+% \pgfsetstarrrotate
+%
+% Set the angle of rotation of the star
+% border. This can be decimal.
+%
+\def\pgfsetstarrotate#1{%
+ \pgfmathparse{#1}%
+ \edef\pgfstarrotate{\pgfmathresult}}%
+\pgfsetstarrotate{0}
+
+% Shape star.
+%
+\pgfdeclareshape{star}{%
+ \saveddimen{\points}{\pgf@x\pgfstarpoints pt}%
+ \saveddimen{\pointratio}{\pgf@x\pgfstarpointratio pt}%
+ \saveddimen{\rotate}{\pgf@x\pgfstarrotate pt}%
+ \saveddimen{\pointheight}{\pgf@x\pgfstarpointheight}%
+ \saveddimen{\minimumsize}{%
+ \pgfmathsetlength\pgf@x{\pgfshapeminwidth}%
+ \pgfmathsetlength\pgf@y{\pgfshapeminheight}%
+ \ifdim\pgf@y>\pgf@x%
+ \pgf@x\pgf@y%
+ \fi}%
+ \saveddimen{\outersep}{%
+ \pgfmathsetlength\pgf@x{\pgfshapeouterxsep}%
+ \pgfmathsetlength\pgf@y{\pgfshapeouterysep}%
+ \ifdim\pgf@y>\pgf@x%
+ \pgf@x\pgf@y%
+ \fi}%
+ \savedanchor{\centerpoint}{%
+ \pgf@x.5\wd\pgfnodeparttextbox%
+ \pgf@y.5\ht\pgfnodeparttextbox%
+ \advance\pgf@y-.5\dp\pgfnodeparttextbox%
+ }%
+ \saveddimen{\innerpointradius}{%
+ %
+ % The innerpoint radius is the radius of the circle which
+ % can safely encompass the node textbox.
+ %
+ \pgfmathsetlength\pgf@x{\pgfshapeinnerxsep}%
+ \advance\pgf@x.5\wd\pgfnodeparttextbox%
+ \pgfmathsetlength\pgf@y{\pgfshapeinnerysep}%
+ \advance\pgf@y.5\ht\pgfnodeparttextbox%
+ \ifdim\pgf@y>\pgf@x%
+ \pgf@x\pgf@y%
+ \fi%
+ \pgfmathveclen@{\pgf@sys@tonumber{\pgf@x}}{\pgf@sys@tonumber{\pgf@x}}%
+ \pgf@x\pgfmathresult pt\relax%
+ }%
+ %
+ \anchor{center}{\centerpoint}%
+ \anchor{mid}{\centerpoint\pgfmathsetlength\pgf@y{.5ex}}%
+ \anchor{base}{\centerpoint\pgf@y=0pt}%
+ \anchor{north}{\pgf@anchor@star@border{\pgfpoint{+0pt}{+\outerpointradius}}}%
+ \anchor{south}{\pgf@anchor@star@border{\pgfpoint{+0pt}{+-\outerpointradius}}}%
+ \anchor{east}{\pgf@anchor@star@border{\pgfpoint{+\outerpointradius}{+0pt}}}%
+ \anchor{west}{\pgf@anchor@star@border{\pgfpoint{+-\outerpointradius}{+0pt}}}%
+ \anchor{north east}{\pgf@anchor@star@border{\pgfpoint{+\outerpointradius}{+\outerpointradius}}}%
+ \anchor{north west}{\pgf@anchor@star@border{\pgfpoint{+-\outerpointradius}{+\outerpointradius}}}%
+ \anchor{south east}{\pgf@anchor@star@border{\pgfpoint{+\outerpointradius}{+-\outerpointradius}}}%
+ \anchor{south west}{\pgf@anchor@star@border{\pgfpoint{+-\outerpointradius}{+-\outerpointradius}}}%
+ %
+ \backgroundpath{%
+ %
+ % Redefine stuff for ease of use.
+ %
+ \pgf@x\points%
+ \c@pgf@counta\pgf@x%
+ \divide\c@pgf@counta65536\relax%
+ \edef\points{\the\c@pgf@counta}%
+ \pgf@x\rotate%
+ \edef\rotate{\pgf@sys@tonumber{\pgf@x}}%
+ \pgf@x\pointratio%
+ \edef\pointratio{\pgf@sys@tonumber{\pgf@x}}%
+ %
+ % Calculate radii.
+ %
+ \pgf@x\innerpointradius\relax%
+ \edef\innerradius{\the\pgf@x}%
+ \pgf@xa\pointheight\relax%
+ \ifdim\pgf@xa<0pt\relax%
+ \pgf@x\pointratio\pgf@x%
+ \else%
+ \advance\pgf@x\pgf@xa%
+ \fi%
+ \pgf@xb\pgf@x%
+ \pgf@xc\minimumsize\relax%
+ \ifdim\pgf@x<.5\pgf@xc%
+ \pgf@x.5\pgf@xc%
+ \fi%
+ \edef\outerradius{\the\pgf@x}%
+ \ifdim\pgf@x>\pgf@xb%
+ \ifdim\pgf@xa<0pt\relax%
+ \pgfmathreciprocal{\pointratio}%
+ \pgf@xc\pgfmathresult\pgf@x\relax%
+ \edef\innerradius{\the\pgf@xc}%
+ \else%
+ \pgf@xc\pgf@x\relax%
+ \advance\pgf@xc-\pointheight%
+ \edef\innerradius{\the\pgf@xc}%
+ \fi%
+ \fi%
+ %
+ % Get the total number of points (inner + outer)...
+ %
+ \c@pgf@counta\points%
+ \advance\c@pgf@counta\c@pgf@counta%
+ \edef\numpoints{\the\c@pgf@counta}%
+ %
+ % ...and hence the angle between points.
+ %
+ \pgf@x360pt\relax%
+ \divide\pgf@x\c@pgf@counta%
+ \edef\staranglestep{\the\pgf@x}%
+ %
+ % Start at 90 degrees (star always points up)...
+ %
+ \pgf@x90pt\relax%
+ %
+ % ...unless rotation is applied.
+ %
+ \pgf@xa\rotate pt\relax%
+ \advance\pgf@x\pgf@xa%
+ \edef\starangle{\the\pgf@x}%
+ \let\starradius=\outerradius%
+ %
+ % Move to first point.
+ %
+ \pgfpathmoveto{%
+ \pgfpointadd{\centerpoint}%
+ {\pgfpointpolar{+\starangle}{+\starradius}}%
+ }%
+ \def\staranchorname{pgf@anchor@star@outer point}%
+ \pgfmathloop%
+ %
+ % Create anchors. Manually \xdef as \gdef is normally used by \anchor.
+ %
+ \c@pgf@counta\pgfmathcounter\relax%
+ \advance\c@pgf@counta1\relax%
+ \divide\c@pgf@counta2\relax%
+ \expandafter\xdef\csname\staranchorname\space\the\c@pgf@counta\endcsname{%
+ \noexpand\pgf@lib@shapesstaranchor{\pgfmathcounter}%
+ }%
+ \ifnum\pgfmathcounter=\numpoints\relax% Stop.
+ \else%
+ \ifodd\pgfmathcounter%
+ \let\starradius\innerradius%
+ \def\staranchorname{pgf@anchor@star@inner point}%
+ \else%
+ \let\starradius\outerradius%
+ \def\staranchorname{pgf@anchor@star@outer point}%
+ \fi%
+ \pgf@x\starangle\relax%
+ \advance\pgf@x\staranglestep\relax%
+ \edef\starangle{\the\pgf@x}%
+ \pgfpathlineto{%
+ \pgfpointadd{\centerpoint}%
+ {\pgfpointpolar{+\starangle}{+\starradius}}%
+ }%
+ \repeatpgfmathloop%
+ \pgfpathclose%
+ }%
+ %
+ \anchorborder{%
+ %
+ % Save x and y.
+ %
+ \pgf@xa\pgf@x%
+ \pgf@ya\pgf@y%
+ %
+ % Redefine stuff for ease of use.
+ %
+ \pgf@x\points%
+ \c@pgf@counta\pgf@x%
+ \divide\c@pgf@counta65536\relax%
+ \edef\points{\the\c@pgf@counta}%
+ \pgf@x\rotate%
+ \edef\rotate{\pgf@sys@tonumber{\pgf@x}}%
+ \pgf@x\pointratio%
+ \edef\pointratio{\pgf@sys@tonumber{\pgf@x}}%
+ %
+ % Calculate the location of the external
+ % point relative to the node center.
+ %
+ \centerpoint%
+ \advance\pgf@xa\pgf@x%
+ \advance\pgf@ya\pgf@y%
+ \edef\externalx{\the\pgf@xa}%
+ \edef\externaly{\the\pgf@ya}%
+ \pgf@process{\pgfpointdiff{\centerpoint}{\pgfpoint{+\externalx}{+\externaly}}}%
+ %
+ % First approximate the angle of the external point...
+ %
+ \pgf@xa\pgf@x%
+ \pgf@ya\pgf@y%
+ \pgf@xb\pgf@x%
+ \pgf@yb\pgf@y%
+ \ifdim\pgf@xa<0pt\relax%
+ \pgf@xa-\pgf@xa%
+ \fi%
+ \ifdim\pgf@ya<0pt\relax%
+ \pgf@ya-\pgf@ya%
+ \fi%
+ \ifdim\pgf@ya>\pgf@xa%
+ \pgf@x\pgf@xa%
+ \pgf@y\pgf@ya%
+ \else%
+ \pgf@x\pgf@ya%
+ \pgf@y\pgf@xa%
+ \fi%
+ \ifdim\pgf@y=0pt\relax%
+ \pgf@x0pt%
+ \else%
+ \pgfmathreciprocal@{\pgf@sys@tonumber{\pgf@y}}%
+ \pgf@x\pgfmathresult\pgf@x%
+ \fi%
+ \multiply\pgf@x1000\relax%
+ \afterassignment\pgfmath@gobbletilpgfmath@%
+ \expandafter\c@pgf@counta\the\pgf@x\relax\pgfmath@%
+ \expandafter\pgf@x\csname pgfmath@atan@\the\c@pgf@counta\endcsname pt\relax%
+ \ifdim\pgfmath@ya>\pgfmath@xa\relax%
+ \pgf@x-\pgf@x%
+ \advance\pgf@x90pt%
+ \fi%
+ \ifdim\pgf@xb<0pt%
+ \ifdim\pgf@yb>0pt%
+ \pgf@x-\pgf@x%
+ \fi%
+ \advance\pgf@x180pt\relax%
+ \else%
+ \ifdim\pgf@yb<0pt%
+ \pgf@x-\pgf@x%
+ \advance\pgf@x360pt\relax%
+ \fi\fi%
+ %
+ % ...then adjust, as star points start at 90 degrees...
+ %
+ \advance\pgf@x-90pt\relax%
+ \ifdim\pgf@x<0pt\relax%
+ \advance\pgf@x360pt\relax%
+ \fi%
+ %
+ % ...and also for rotation.
+ %
+ \advance\pgf@x-\rotate pt\relax%
+ \ifdim\pgf@x<0pt\relax%
+ \advance\pgf@x360pt\relax%
+ \fi%
+ %
+ % Now, locate the start and end points on the star border segment...
+ %
+ \c@pgf@counta\points\relax%
+ \pgf@y180pt\relax%
+ \divide\pgf@y\c@pgf@counta\relax%
+ \pgfmathreciprocal@{\pgf@sys@tonumber{\pgf@y}}%
+ \pgf@x\pgfmathresult\pgf@x%
+ \afterassignment\pgfmath@gobbletilpgfmath@%
+ \expandafter\c@pgf@counta\the\pgf@x\relax\pgfmath@%
+ %
+ % ...and hence, the start and end angles of the star border segment.
+ %
+ \pgf@x\pgf@y%
+ \multiply\pgf@x\c@pgf@counta%
+ \advance\pgf@x90pt%
+ \advance\pgf@x\rotate pt\relax%
+ \edef\firstangle{\the\pgf@x}%
+ \advance\c@pgf@counta1\relax%
+ \pgf@x\pgf@y%
+ \multiply\pgf@x\c@pgf@counta%
+ \advance\pgf@x\rotate pt\relax%
+ \advance\pgf@x90pt%
+ \edef\secondangle{\the\pgf@x}%
+ %
+ % Get the radii and add the outer sep...
+ %
+ \pgf@x\innerpointradius\relax%
+ \edef\innerradius{\the\pgf@x}%
+ \pgf@xa\pointheight\relax%
+ \ifdim\pgf@xa<0pt\relax%
+ \pgf@x\pointratio\pgf@x%
+ \else%
+ \advance\pgf@x\pgf@xa%
+ \fi%
+ \pgf@xb\pgf@x%
+ \pgf@xc\minimumsize\relax%
+ \ifdim\pgf@x<.5\pgf@xc%
+ \pgf@x.5\pgf@xc%
+ \fi%
+ \edef\outerradius{\the\pgf@x}%
+ \ifdim\pgf@x>\pgf@xb%
+ \ifdim\pgf@xa<0pt\relax%
+ \pgfmathreciprocal{\pointratio}%
+ \pgf@xc\pgfmathresult\pgf@x\relax%
+ \edef\innerradius{\the\pgf@xc}%
+ \else%
+ \pgf@xc\pgf@x\relax%
+ \advance\pgf@xc-\pgf@xb%
+ \edef\innerradius{\the\pgf@xc}%
+ \fi%
+ \fi%
+ \pgf@xa\outersep\relax%
+ \pgf@x\outerradius\relax%
+ \advance\pgf@x\pgf@xa%
+ \edef\outerradius{\the\pgf@x}%
+ \pgf@x\innerradius\relax%
+ \advance\pgf@x\pgf@xa%
+ \edef\innerradius{\the\pgf@x}%
+ \ifodd\c@pgf@counta%
+ \let\firstradii\outerradius%
+ \let\secondradii\innerradius%
+ \else%
+ \let\firstradii\innerradius%
+ \let\secondradii\outerradius%
+ \fi%
+ %
+ % ...and calculate the point on the intersection of
+ % the line from the external point to \centerpoint and
+ % the relevant segment of the star border.
+ %
+ \pgfpointintersectionoflines{\centerpoint}{\pgfpoint{+\externalx}{+\externaly}}%
+ {%
+ \pgfpointadd{\centerpoint}%
+ {\pgfpointpolar{+\firstangle}{+\firstradii}}%
+ }%
+ {%
+ \pgfpointadd{\centerpoint}%
+ {\pgfpointpolar{+\secondangle}{+\secondradii}}%
+ }%
+ }%
+}%
+
+
+% \pgf@lib@shapesstaranchor
+%
+% Used internally to calculate inner point and
+% outer point anchor positions 'on line'.
+%
+\def\pgf@lib@shapesstaranchor#1{%
+ %
+ % Redefine stuff for ease of use.
+ %
+ \pgf@x\points%
+ \c@pgf@counta\pgf@x%
+ \divide\c@pgf@counta65536\relax%
+ \edef\points{\the\c@pgf@counta}%
+ \pgf@x\rotate%
+ \edef\rotate{\pgf@sys@tonumber{\pgf@x}}%
+ \pgf@x\pointratio%
+ \edef\pointratio{\pgf@sys@tonumber{\pgf@x}}%
+ %
+ % Caculate radii.
+ %
+ \pgf@x\innerpointradius%
+ \edef\innerradius{\the\pgf@x}%
+ \pgf@xa\pointheight\relax%
+ \ifdim\pgf@xa<0pt\relax%
+ \pgf@x\pointratio\pgf@x%
+ \else%
+ \advance\pgf@x\pgf@xa%
+ \fi%
+ \pgf@xb\pgf@x%
+ \pgf@xc\minimumsize\relax%
+ \ifdim\pgf@x<.5\pgf@xc%
+ \pgf@x.5\pgf@xc%
+ \fi%
+ \edef\outerradius{\the\pgf@x}%
+ \ifdim\pgf@x>\pgf@xb%
+ \ifdim\pgf@xa<0pt\relax%
+ \pgfmathreciprocal{\pointratio}%
+ \pgf@xc\pgfmathresult\pgf@x\relax%
+ \edef\innerradius{\the\pgf@xc}%
+ \else%
+ \pgf@xc\pgf@x\relax%
+ \advance\pgf@xc-\pgf@xb%
+ \edef\innerradius{\the\pgf@xc}%
+ \fi%
+ \fi%
+ %
+ % Add the outer sep.
+ %
+ \pgf@xa\outersep%
+ \pgf@x\outerradius\relax%
+ \advance\pgf@x\pgf@xa%
+ \edef\outerradius{\the\pgf@x}%
+ \pgf@x\innerradius\relax%
+ \advance\pgf@x\pgf@xa%
+ \edef\innerradius{\the\pgf@x}%
+ %
+ % Calculate the angle.
+ %
+ \c@pgf@counta\points%
+ \pgf@x180pt\relax%
+ \divide\pgf@x\c@pgf@counta%
+ \c@pgf@counta#1\relax%
+ \advance\c@pgf@counta-1\relax%
+ \multiply\pgf@x\c@pgf@counta%
+ \pgf@xa\rotate pt\relax%
+ \advance\pgf@x\pgf@xa%
+ \advance\pgf@x90pt\relax%
+ \edef\starangle{\the\pgf@x}%
+ \ifodd\c@pgf@counta%
+ \let\starradius\innerradius%
+ \else%
+ \let\starradius\outerradius%
+ \fi%
+ \pgfpointadd{\centerpoint}%
+ {\pgfpointpolar{\starangle}{\starradius}}%
+}%
+
+
+% \pgfsetpolygonsides
+%
+% Set the number of sides on a polygon.
+%
+\def\pgfsetpolygonsides#1{%
+ \pgfmathsetcounter{pgf@counta}{#1}%
+ \edef\pgfpolygonsides{\the\c@pgfmath@counta}}
+\pgfsetpolygonsides{6}
+
+% \pgfsetpolygonrotate
+%
+% Set the angle of rotation of the polygon
+% border. This can be decimal.
+%
+\def\pgfsetpolygonrotate#1{%
+ \pgfmathparse{#1}%
+ \edef\pgfpolygonrotate{\pgfmathresult}}%
+\pgfsetpolygonrotate{0}
+
+
+% Regular polygon shape.
+%
+%
+\pgfdeclareshape{regular polygon}{%
+ %
+ % Saved dimensions.
+ %
+ \saveddimen{\sides}{\pgf@x\pgfpolygonsides pt}%
+ \saveddimen{\rotate}{\pgf@x\pgfpolygonrotate pt}%
+ \saveddimen{\minimumsize}{%
+ \pgfmathsetlength\pgf@x{\pgfshapeminwidth}%
+ \pgfmathsetlength\pgf@y{\pgfshapeminheight}%
+ \ifdim\pgf@y>\pgf@x%
+ \pgf@x\pgf@y%
+ \fi}%
+ \saveddimen{\outersep}{%
+ \pgfmathsetlength\pgf@x{\pgfshapeouterxsep}%
+ \pgfmathsetlength\pgf@y{\pgfshapeouterysep}%
+ \ifdim\pgf@y>\pgf@x%
+ \pgf@x\pgf@y%
+ \fi}%
+ \saveddimen{\radius}{%
+ %
+ % The radius calculated here is the radius of the circle which
+ % can safely encompass the node textbox. This corresponds to the
+ % distance from the centre of the polygon to the mid-point of the
+ % of the sides of the polygon. The desired radius for the corners
+ % of the polygon has to calculated `on-line' as the saved dimen
+ % \sides is not available here.
+ %
+ \pgfmathsetlength\pgf@x{\pgfshapeinnerxsep}%
+ \advance\pgf@x.5\wd\pgfnodeparttextbox%
+ \pgfmathsetlength\pgf@y{\pgfshapeinnerysep}%
+ \advance\pgf@y.5\ht\pgfnodeparttextbox%
+ \ifdim\pgf@y>\pgf@x%
+ \pgf@x\pgf@y%
+ \fi%
+ \pgfmathveclen@{\pgf@sys@tonumber{\pgf@x}}{\pgf@sys@tonumber{\pgf@x}}%
+ \pgf@x\pgfmathresult pt\relax%
+ }%
+
+ %
+ % Saved anchors.
+ %
+ \savedanchor{\centerpoint}{%
+ \pgf@x.5\wd\pgfnodeparttextbox%
+ \pgf@y.5\ht\pgfnodeparttextbox%
+ \advance\pgf@y-.5\dp\pgfnodeparttextbox%
+ }%
+
+ %
+ % Other anchors.
+ %
+ \anchor{center}{\centerpoint}%
+ \anchor{mid}{\centerpoint\pgfmathsetlength\pgf@y{.5ex}}%
+ \anchor{base}{\centerpoint\pgf@y=0pt}%
+ \anchor{north}{\csname pgf@anchor@regular polygon@border\endcsname{\pgfpoint{+0pt}{+\radius}}}%
+ \anchor{south}{\csname pgf@anchor@regular polygon@border\endcsname{\pgfpoint{+0pt}{+-\radius}}}%
+ \anchor{east}{\csname pgf@anchor@regular polygon@border\endcsname{\pgfpoint{+\radius}{+0pt}}}%
+ \anchor{west}{\csname pgf@anchor@regular polygon@border\endcsname{\pgfpoint{+-\radius}{+0pt}}}%
+ \anchor{north east}{\csname pgf@anchor@regular polygon@border\endcsname{\pgfpoint{+\radius}{+\radius}}}%
+ \anchor{north west}{\csname pgf@anchor@regular polygon@border\endcsname{\pgfpoint{+-\radius}{+\radius}}}%
+ \anchor{south east}{\csname pgf@anchor@regular polygon@border\endcsname{\pgfpoint{+\radius}{+-\radius}}}%
+ \anchor{south west}{\csname pgf@anchor@regular polygon@border\endcsname{\pgfpoint{+-\radius}{+-\radius}}}%
+
+ %
+ % Background path.
+ %
+ \backgroundpath{%
+ %
+ % Redefine some stuff for ease of use.
+ %
+ \pgf@x\sides%
+ \c@pgf@counta\pgf@x%
+ \divide\c@pgf@counta65536\relax%
+ \edef\sides{\the\c@pgf@counta}%
+ \pgf@x\rotate%
+ \edef\rotate{\pgf@sys@tonumber{\pgf@x}}%
+ %
+ % Get the inner angle.
+ %
+ \pgf@y360pt\relax%
+ \divide\pgf@y\sides%
+ \edef\polygonanglestep{\the\pgf@y}%
+ %
+ % Now recalculate the polygon *corner* radius.
+ %
+ \pgf@y.5\pgf@y%
+ \pgfmathcos@{\pgf@sys@tonumber{\pgf@y}}%
+ \pgfmathreciprocal@{\pgfmathresult}%
+ \pgf@x\radius\relax%
+ \pgf@x\pgfmathresult\pgf@x%
+ \pgf@xa\minimumsize\relax%
+ \ifdim\pgf@x<.5\pgf@xa%
+ \pgf@x.5\pgf@xa%
+ \fi%
+ \edef\polygonradius{\the\pgf@x}%
+ %
+ % Every polygon is drawn so that a side is at the bottom...
+ %
+ \pgf@x90pt\relax%
+ \ifodd\sides%
+ \else%
+ \advance\pgf@x-\pgf@y%
+ \fi%
+ %
+ % ...unless rotation is applied.
+ %
+ \pgf@xa\rotate pt\relax%
+ \advance\pgf@x\pgf@xa%
+ \edef\polygonangle{\the\pgf@x}%
+ %
+ % Move to first point.
+ %
+ \pgfpathmoveto{%
+ \pgfpointadd{\centerpoint}%
+ {\pgfpointpolar{+\polygonangle}{+\polygonradius}}%
+ }%
+ \pgfmathloop%
+ %
+ % Create anchors. Manually \xdef as \gdef is normally used by \anchor.
+ %
+ \expandafter\xdef\csname pgf@anchor@regular polygon@corner\space\pgfmathcounter\endcsname{%
+ \noexpand\pgf@lib@shapescorneranchor{\pgfmathcounter}%
+ }%
+ \expandafter\xdef\csname pgf@anchor@regular polygon@side\space\pgfmathcounter\endcsname{%
+ \noexpand\pgf@lib@shapessideanchor{\pgfmathcounter}%
+ }%
+ \ifnum\pgfmathcounter=\sides\relax% Stop.
+ \else%
+ \pgf@x\polygonangle\relax%
+ \advance\pgf@x\polygonanglestep\relax%
+ \edef\polygonangle{\the\pgf@x}%
+ \pgfpathlineto{%
+ \pgfpointadd{\centerpoint}%
+ {\pgfpointpolar{+\polygonangle}{+\polygonradius}}%
+ }%
+ \repeatpgfmathloop%
+ \pgfpathclose%
+ }%
+
+ %
+ % Anchor border.
+ %
+ \anchorborder{%
+ %
+ % Save the external point.
+ %
+ \pgf@xa\pgf@x%
+ \pgf@ya\pgf@y%
+ \centerpoint%
+ \advance\pgf@xa\pgf@x%
+ \advance\pgf@ya\pgf@y%
+ \edef\externalx{\the\pgf@xa}%
+ \edef\externaly{\the\pgf@ya}%
+ \pgf@process{\pgfpointdiff{\centerpoint}{\pgfpoint{+\externalx}{+\externaly}}}%
+ %
+ % Approximate the angle of the external point...
+ %
+ \pgf@xa\pgf@x%
+ \pgf@ya\pgf@y%
+ \pgf@xb\pgf@x%
+ \pgf@yb\pgf@y%
+ \ifdim\pgf@xa<0pt\relax%
+ \pgf@xa-\pgf@xa%
+ \fi%
+ \ifdim\pgf@ya<0pt\relax%
+ \pgf@ya-\pgf@ya%
+ \fi%
+ \ifdim\pgf@ya>\pgf@xa%
+ \pgf@x\pgf@xa%
+ \pgf@y\pgf@ya%
+ \else%
+ \pgf@x\pgf@ya%
+ \pgf@y\pgf@xa%
+ \fi%
+ \ifdim\pgf@y=0pt\relax%
+ \pgf@x0pt%
+ \else%
+ \pgfmathreciprocal@{\pgf@sys@tonumber{\pgf@y}}%
+ \pgf@x\pgfmathresult\pgf@x%
+ \fi%
+ \multiply\pgf@x1000\relax%
+ \afterassignment\pgfmath@gobbletilpgfmath@%
+ \expandafter\c@pgf@counta\the\pgf@x\relax\pgfmath@%
+ \expandafter\pgf@x\csname pgfmath@atan@\the\c@pgf@counta\endcsname pt\relax%
+ \ifdim\pgfmath@ya>\pgfmath@xa\relax%
+ \pgf@x-\pgf@x%
+ \advance\pgf@x90pt%
+ \fi%
+ \ifdim\pgf@xb<0pt%
+ \ifdim\pgf@yb>0pt%
+ \pgf@x-\pgf@x%
+ \fi%
+ \advance\pgf@x180pt\relax%
+ \else%
+ \ifdim\pgf@yb<0pt%
+ \pgf@x-\pgf@x%
+ \advance\pgf@x360pt\relax%
+ \fi\fi%
+ %
+ % ...(redefine stuff for ease of use)...
+ %
+ \pgf@y\sides%
+ \c@pgf@counta\pgf@y%
+ \divide\c@pgf@counta65536\relax%
+ \edef\sides{\the\c@pgf@counta}%
+ \pgf@y\rotate%
+ \edef\rotate{\pgf@sys@tonumber{\pgf@y}}%
+ %
+ % ...now adjust angle, for the number of polygon sides...
+ %
+ \advance\pgf@x-90pt\relax%
+ \pgf@xa180pt\relax%
+ \divide\pgf@xa\sides%
+ %
+ % ...and for if the there is an even number of sides...
+ %
+ \ifodd\sides%
+ \else%
+ \advance\pgf@x\pgf@xa%
+ \fi%
+ \ifdim\pgf@x<0pt\relax%
+ \advance\pgf@x360pt\relax%
+ \fi%
+ %
+ % ...and also for rotation.
+ %
+ \advance\pgf@x-\rotate pt\relax%
+ \ifdim\pgf@x<0pt\relax%
+ \advance\pgf@x360pt\relax%
+ \fi%
+ %
+ % Now, locate the start and end points on the polygon border segment...
+ %
+ \c@pgf@counta\sides\relax%
+ \pgf@y360pt\relax%
+ \divide\pgf@y\c@pgf@counta\relax%
+ \pgfmathreciprocal@{\pgf@sys@tonumber{\pgf@y}}%
+ \pgf@x\pgfmathresult\pgf@x%
+ \afterassignment\pgfmath@gobbletilpgfmath@%
+ \expandafter\c@pgf@counta\the\pgf@x\relax\pgfmath@%
+ %
+ % ...and hence, the start and end angles of the polygon border segment.
+ %
+ \pgf@x\pgf@y%
+ \multiply\pgf@x\c@pgf@counta%
+ \advance\pgf@x90pt%
+ \ifodd\sides%
+ \else%
+ \advance\pgf@x-\pgf@xa%
+ \fi%
+ \advance\pgf@x\rotate pt\relax%
+ \edef\firstangle{\the\pgf@x}%
+ \advance\c@pgf@counta1\relax%
+ \pgf@x\pgf@y%
+ \multiply\pgf@x\c@pgf@counta%
+ \advance\pgf@x\rotate pt\relax%
+ \advance\pgf@x90pt%
+ \ifodd\sides%
+ \else%
+ \advance\pgf@x-\pgf@xa%
+ \fi%
+ \edef\secondangle{\the\pgf@x}%
+ %
+ % Get the inner angle.
+ %
+ \pgf@y360pt\relax%
+ \divide\pgf@y\sides%
+ %
+ % Now recalculate the polygon *corner* radius...
+ %
+ \pgf@y.5\pgf@y%
+ \pgfmathcos@{\pgf@sys@tonumber{\pgf@y}}%
+ \pgfmathreciprocal@{\pgfmathresult}%
+ \pgf@x\radius\relax%
+ \pgf@x\pgfmathresult\pgf@x%
+ \edef\polygonradius{\the\pgf@x}%
+ %
+ % ...and add the outer sep to the corner radius...
+ %
+ \pgf@xa\minimumsize\relax%
+ \ifdim\pgf@x<.5\pgf@xa%
+ \pgf@x.5\pgf@xa%
+ \fi%
+ \pgf@xa\outersep\relax%
+ \advance\pgf@x\pgf@xa%
+ \edef\radius{\the\pgf@x}%
+ %
+ % ...and calculate the point on the intersection of
+ % the line from the external point to \centerpoint and
+ % the segment of the star border.
+ %
+ \pgfpointintersectionoflines{\centerpoint}{\pgfpoint{+\externalx}{+\externaly}}%
+ {%
+ \pgfpointadd{\centerpoint}%
+ {\pgfpointpolar{+\firstangle}{+\radius}}%
+ }%
+ {%
+ \pgfpointadd{\centerpoint}%
+ {\pgfpointpolar{+\secondangle}{+\radius}}%
+ }%
+ }%
+}%
+
+
+% \pgf@lib@shapespolygoncorneranchor
+%
+% Used internally to calculate corner anchor positions.
+%
+\def\pgf@lib@shapescorneranchor#1{%
+ %
+ % Redefine stuff for ease of use.
+ %
+ \pgf@y\sides%
+ \c@pgf@counta\pgf@y%
+ \divide\c@pgf@counta65536\relax%
+ \edef\sides{\the\c@pgf@counta}%
+ \pgf@y\rotate%
+ \edef\rotate{\pgf@sys@tonumber{\pgf@y}}%
+ %
+ % Get the inner angle.
+ %
+ \pgf@y360pt\relax%
+ \divide\pgf@y\sides\relax%
+ \edef\polgonanglestep{\pgf@sys@tonumber{\pgf@y}}%
+ %
+ % Recalculate the polygon corner radius...
+ %
+ \pgf@y.5\pgf@y%
+ \pgfmathcos@{\pgf@sys@tonumber{\pgf@y}}%
+ \pgfmathreciprocal@{\pgfmathresult}%
+ \pgf@x\radius\relax%
+ \pgf@x\pgfmathresult\pgf@x%
+ \edef\polygonradius{\the\pgf@x}%
+ %
+ % ...adjust for minimum size...
+ %
+ \pgf@xa\minimumsize\relax%
+ \ifdim\pgf@x<.5\pgf@xa%
+ \pgf@x.5\pgf@xa%
+ \fi%
+ %
+ % ...and add the outer sep.
+ %
+ \pgf@xa\outersep\relax%
+ \advance\pgf@x\pgf@xa%
+ \edef\polygonradius{\the\pgf@x}%
+ %
+ % Calculate the angle.
+ %
+ \c@pgf@counta#1\relax%
+ \advance\c@pgf@counta-1\relax%
+ \pgf@x2.0\pgf@y%
+ \multiply\pgf@x\c@pgf@counta%
+ \pgf@xa\rotate pt\relax%
+ \advance\pgf@x\pgf@xa%
+ \advance\pgf@x90pt\relax%
+ \ifodd\sides%
+ \else%
+ \advance\pgf@x-\pgf@y%
+ \fi%
+ \edef\polygonangle{\the\pgf@x}%
+ \pgfpointadd{\centerpoint}%
+ {\pgfpointpolar{\polygonangle}{\polygonradius}}%
+}%
+
+% \pgf@lib@shapespolygonsideanchor
+%
+% Used internally to calculate side anchor positions.
+%
+\def\pgf@lib@shapessideanchor#1{%
+ %
+ % Redefine stuff for ease of use.
+ %
+ \pgf@y\sides%
+ \c@pgf@counta\pgf@y%
+ \divide\c@pgf@counta65536\relax%
+ \edef\sides{\the\c@pgf@counta}%
+ \pgf@y\rotate%
+ \edef\rotate{\pgf@sys@tonumber{\pgf@y}}%
+ %
+ % Get the inner angle.
+ %
+ \pgf@y360pt\relax%
+ \divide\pgf@y\sides\relax%
+ \edef\polygonanglestep{\the\pgf@y}%
+ %
+ % Recalculate the polygon corner radius...
+ %
+ \pgf@y.5\pgf@y%
+ \pgfmathcos@{\pgf@sys@tonumber{\pgf@y}}%
+ \pgfmathreciprocal@{\pgfmathresult}%
+ \pgf@x\radius\relax%
+ \pgf@x\pgfmathresult\pgf@x%
+ %
+ % ...adjust for minimum size...
+ %
+ \pgf@xa\minimumsize\relax%
+ \ifdim\pgf@x<.5\pgf@xa%
+ \pgf@x.5\pgf@xa%
+ \fi%
+ %
+ % and add the outer sep.
+ %
+ \pgf@xa\outersep\relax%
+ \advance\pgf@x\pgf@xa%
+ \edef\polygonradius{\the\pgf@x}%
+ %
+ % Calculate the angle.
+ %
+ \pgf@y\polygonanglestep%
+ \c@pgf@counta#1\relax%
+ \advance\c@pgf@counta-1\relax%
+ \pgf@x\polygonanglestep pt\relax%
+ \multiply\pgf@x\c@pgf@counta%
+ \pgf@xa\rotate pt\relax%
+ \advance\pgf@x\pgf@xa%
+ \advance\pgf@x90pt\relax%
+ \ifodd\sides%
+ \else%
+ \advance\pgf@x-.5\pgf@y%
+ \fi%
+ \edef\firstangle{\the\pgf@x}%
+ \advance\pgf@x\pgf@y%
+ \edef\secondangle{\the\pgf@x}%
+ \pgfpointlineattime{0.5}{%
+ \pgfpointadd{\centerpoint}{\pgfpointpolar{+\firstangle}{+\polygonradius}}%
+ }{%
+ \pgfpointadd{\centerpoint}{\pgfpointpolar{+\secondangle}{+\polygonradius}}%
+ }%
+}%
+
+
+
+\endinput
diff --git a/Master/texmf-dist/tex/generic/pgf/libraries/pgflibraryshapes.misc.code.tex b/Master/texmf-dist/tex/generic/pgf/libraries/pgflibraryshapes.misc.code.tex
new file mode 100644
index 00000000000..6dcd610f612
--- /dev/null
+++ b/Master/texmf-dist/tex/generic/pgf/libraries/pgflibraryshapes.misc.code.tex
@@ -0,0 +1,70 @@
+% Copyright 2006 by Till Tantau
+%
+% This file may be distributed and/or modified
+%
+% 1. under the LaTeX Project Public License and/or
+% 2. under the GNU Public License.
+%
+% See the file doc/generic/pgf/licenses/LICENSE for more details.
+
+\ProvidesFileRCS[v\pgfversion] $Header: /cvsroot/pgf/pgf/generic/pgf/libraries/pgflibraryshapes.misc.code.tex,v 1.1 2007/06/08 11:24:59 tantau Exp $
+
+
+\pgfdeclareshape{cross out}
+{
+ \inheritsavedanchors[from=rectangle] % this is nearly a rectangle
+ \inheritanchorborder[from=rectangle]
+ \inheritanchor[from=rectangle]{north}
+ \inheritanchor[from=rectangle]{north west}
+ \inheritanchor[from=rectangle]{north east}
+ \inheritanchor[from=rectangle]{center}
+ \inheritanchor[from=rectangle]{west}
+ \inheritanchor[from=rectangle]{east}
+ \inheritanchor[from=rectangle]{mid}
+ \inheritanchor[from=rectangle]{mid west}
+ \inheritanchor[from=rectangle]{mid east}
+ \inheritanchor[from=rectangle]{base}
+ \inheritanchor[from=rectangle]{base west}
+ \inheritanchor[from=rectangle]{base east}
+ \inheritanchor[from=rectangle]{south}
+ \inheritanchor[from=rectangle]{south west}
+ \inheritanchor[from=rectangle]{south east}
+ \foregroundpath{
+ % store lower right in xa/ya and upper right in xb/yb
+ \southwest \pgf@xa=\pgf@x \pgf@ya=\pgf@y
+ \northeast \pgf@xb=\pgf@x \pgf@yb=\pgf@y
+ \pgfpathmoveto{\pgfqpoint{\pgf@xa}{\pgf@ya}}
+ \pgfpathlineto{\pgfqpoint{\pgf@xb}{\pgf@yb}}
+ \pgfpathmoveto{\pgfqpoint{\pgf@xa}{\pgf@yb}}
+ \pgfpathlineto{\pgfqpoint{\pgf@xb}{\pgf@ya}}
+ }
+}
+
+
+\pgfdeclareshape{strike out}
+{
+ \inheritsavedanchors[from=rectangle] % this is nearly a rectangle
+ \inheritanchorborder[from=rectangle]
+ \inheritanchor[from=rectangle]{north}
+ \inheritanchor[from=rectangle]{north west}
+ \inheritanchor[from=rectangle]{north east}
+ \inheritanchor[from=rectangle]{center}
+ \inheritanchor[from=rectangle]{west}
+ \inheritanchor[from=rectangle]{east}
+ \inheritanchor[from=rectangle]{mid}
+ \inheritanchor[from=rectangle]{mid west}
+ \inheritanchor[from=rectangle]{mid east}
+ \inheritanchor[from=rectangle]{base}
+ \inheritanchor[from=rectangle]{base west}
+ \inheritanchor[from=rectangle]{base east}
+ \inheritanchor[from=rectangle]{south}
+ \inheritanchor[from=rectangle]{south west}
+ \inheritanchor[from=rectangle]{south east}
+ \foregroundpath{
+ \pgfpathmoveto{\southwest}
+ \pgfpathlineto{\northeast}
+ }
+}
+
+
+\endinput
diff --git a/Master/texmf-dist/tex/generic/pgf/libraries/pgflibraryshapes.multipart.code.tex b/Master/texmf-dist/tex/generic/pgf/libraries/pgflibraryshapes.multipart.code.tex
new file mode 100644
index 00000000000..2299d9520c8
--- /dev/null
+++ b/Master/texmf-dist/tex/generic/pgf/libraries/pgflibraryshapes.multipart.code.tex
@@ -0,0 +1,165 @@
+% Copyright 2006 by Till Tantau
+%
+% This file may be distributed and/or modified
+%
+% 1. under the LaTeX Project Public License and/or
+% 2. under the GNU Public License.
+%
+% See the file doc/generic/pgf/licenses/LICENSE for more details.
+
+\ProvidesFileRCS[v\pgfversion] $Header: /cvsroot/pgf/pgf/generic/pgf/libraries/pgflibraryshapes.multipart.code.tex,v 1.1 2007/06/08 11:24:59 tantau Exp $
+
+\newbox\pgfnodepartlowerbox
+
+%
+% A circle that is split in the middle into an upper and a lower part.
+%
+% This node consists of two parts: The upper (main) part is shown in
+% the upper half of the circle. The second part is the (optional)
+% lower part.
+%
+% Parts: text, lower
+
+\pgfdeclareshape{circle split}
+{
+ %
+ % Node parts
+ %
+ \nodeparts{text,lower}
+
+ %
+ % Anchors
+ %
+ \savedanchor\centerpoint{%
+ \pgf@x=.5\wd\pgfnodeparttextbox%
+ \pgfmathsetlength{\pgf@y}{\pgfshapeinnerysep}%
+ \pgf@y=-\pgf@y%
+ \advance\pgf@y by-\dp\pgfnodeparttextbox%
+ \advance\pgf@y by-.5\pgflinewidth%
+ }%
+ \savedanchor\loweranchor{%
+ \pgf@x=-.5\wd\pgfnodepartlowerbox%
+ \advance\pgf@x by.5\wd\pgfnodeparttextbox%
+ \pgfmathsetlength{\pgf@y}{\pgfshapeinnerysep}%
+ \pgf@y=-2\pgf@y%
+ \advance\pgf@y by-\ht\pgfnodepartlowerbox%
+ \advance\pgf@y by-.5\pgflinewidth%
+ \advance\pgf@y by-\dp\pgfnodeparttextbox%
+ \advance\pgf@y by-.5\pgflinewidth%
+ }
+
+ \saveddimen\radius{%
+ %
+ % Caculate ``height radius''
+ %
+ \pgf@ya=.5\ht\pgfnodeparttextbox%
+ \advance\pgf@ya by.5\dp\pgfnodeparttextbox%
+ \advance\pgf@ya by.5\ht\pgfnodepartlowerbox%
+ \advance\pgf@ya by.5\dp\pgfnodepartlowerbox%
+ \advance\pgf@ya by.5\pgflinewidth%
+ \pgfmathsetlength\pgf@yb{\pgfshapeinnerysep}%
+ \advance\pgf@ya by2\pgf@yb%
+ %
+ % Caculate ``width radius''
+ %
+ \pgf@xa=.5\wd\pgfnodeparttextbox%
+ \ifdim\pgf@xa<.5\wd\pgfnodepartlowerbox%
+ \pgf@xa=.5\wd\pgfnodepartlowerbox%
+ \fi%
+ \pgfmathsetlength\pgf@xb{\pgfshapeinnerxsep}%
+ \advance\pgf@xa by\pgf@xb%
+ %
+ % Calculate length of radius vector:
+ %
+ \pgf@process{\pgfpointnormalised{\pgfqpoint{\pgf@xa}{\pgf@ya}}}%
+ \ifdim\pgf@x>\pgf@y%
+ \c@pgf@counta=\pgf@x%
+ \ifnum\c@pgf@counta=0\relax%
+ \else%
+ \divide\c@pgf@counta by 255\relax%
+ \pgf@xa=16\pgf@xa\relax%
+ \divide\pgf@xa by\c@pgf@counta%
+ \pgf@xa=16\pgf@xa\relax%
+ \fi%
+ \else%
+ \c@pgf@counta=\pgf@y%
+ \ifnum\c@pgf@counta=0\relax%
+ \else%
+ \divide\c@pgf@counta by 255\relax%
+ \pgf@ya=16\pgf@ya\relax%
+ \divide\pgf@ya by\c@pgf@counta%
+ \pgf@xa=16\pgf@ya\relax%
+ \fi%
+ \fi%
+ \pgf@x=\pgf@xa%
+ %
+ % If necessary, adjust radius so that the size requirements are
+ % met:
+ %
+ \pgfmathsetlength{\pgf@xb}{\pgfshapeminwidth}%
+ \pgfmathsetlength{\pgf@yb}{\pgfshapeminheight}%
+ \ifdim\pgf@x<.5\pgf@xb%
+ \pgf@x=.5\pgf@xb%
+ \fi%
+ \ifdim\pgf@x<.5\pgf@yb%
+ \pgf@x=.5\pgf@yb%
+ \fi%
+ %
+ % Now, add larger of outer sepearations.
+ %
+ \pgfmathsetlength{\pgf@xb}{\pgfshapeouterxsep}%
+ \pgfmathsetlength{\pgf@yb}{\pgfshapeouterysep}%
+ \ifdim\pgf@xb<\pgf@yb%
+ \advance\pgf@x by\pgf@yb%
+ \else%
+ \advance\pgf@x by\pgf@xb%
+ \fi%
+ }
+
+ %
+ % Anchors
+ %
+ \inheritanchorborder[from=circle]
+ \inheritanchor[from=circle]{north}
+ \inheritanchor[from=circle]{north west}
+ \inheritanchor[from=circle]{north east}
+ \inheritanchor[from=circle]{center}
+ \inheritanchor[from=circle]{west}
+ \inheritanchor[from=circle]{east}
+ \inheritanchor[from=circle]{mid}
+ \inheritanchor[from=circle]{mid west}
+ \inheritanchor[from=circle]{mid east}
+ \inheritanchor[from=circle]{base}
+ \inheritanchor[from=circle]{base west}
+ \inheritanchor[from=circle]{base east}
+ \inheritanchor[from=circle]{south}
+ \inheritanchor[from=circle]{south west}
+ \inheritanchor[from=circle]{south east}
+ \anchor{lower}{\loweranchor}
+
+ %
+ % Background path
+ %
+ \inheritbackgroundpath[from=circle]
+ \beforebackgroundpath{
+ \pgfutil@tempdima=\radius%
+ \pgfmathsetlength{\pgf@xb}{\pgfshapeouterxsep}%
+ \pgfmathsetlength{\pgf@yb}{\pgfshapeouterysep}%
+ \ifdim\pgf@xb<\pgf@yb%
+ \advance\pgfutil@tempdima by-\pgf@yb%
+ \else%
+ \advance\pgfutil@tempdima by-\pgf@xb%
+ \fi%
+ \advance\pgfutil@tempdima by-.5\pgflinewidth%
+ \pgfsetshortenstart{0pt}%
+ \pgfsetshortenend{0pt}%
+ \pgfsetarrows{-}%
+ \pgfpathmoveto{\pgfpointadd{\centerpoint}{\pgfqpoint{-1\pgfutil@tempdima}{0pt}}}%
+ \pgfpathlineto{\pgfpointadd{\centerpoint}{\pgfqpoint{\pgfutil@tempdima}{0pt}}}%
+ \pgfusepath{stroke}%
+ }
+}
+
+
+
+\endinput
diff --git a/Master/texmf-dist/tex/generic/pgf/libraries/pgflibraryshapes.symbols.code.tex b/Master/texmf-dist/tex/generic/pgf/libraries/pgflibraryshapes.symbols.code.tex
new file mode 100644
index 00000000000..50ee3ec9c6b
--- /dev/null
+++ b/Master/texmf-dist/tex/generic/pgf/libraries/pgflibraryshapes.symbols.code.tex
@@ -0,0 +1,50 @@
+% Copyright 2006 by Till Tantau
+%
+% This file may be distributed and/or modified
+%
+% 1. under the LaTeX Project Public License and/or
+% 2. under the GNU Public License.
+%
+% See the file doc/generic/pgf/licenses/LICENSE for more details.
+
+\ProvidesFileRCS[v\pgfversion] $Header: /cvsroot/pgf/pgf/generic/pgf/libraries/pgflibraryshapes.symbols.code.tex,v 1.1 2007/06/08 11:24:59 tantau Exp $
+
+\pgfdeclareshape{forbidden sign}
+{
+ \inheritsavedanchors[from=circle] % this is nearly a circle
+ \inheritanchorborder[from=circle]
+ \inheritanchor[from=circle]{north}
+ \inheritanchor[from=circle]{north west}
+ \inheritanchor[from=circle]{north east}
+ \inheritanchor[from=circle]{center}
+ \inheritanchor[from=circle]{west}
+ \inheritanchor[from=circle]{east}
+ \inheritanchor[from=circle]{mid}
+ \inheritanchor[from=circle]{mid west}
+ \inheritanchor[from=circle]{mid east}
+ \inheritanchor[from=circle]{base}
+ \inheritanchor[from=circle]{base west}
+ \inheritanchor[from=circle]{base east}
+ \inheritanchor[from=circle]{south}
+ \inheritanchor[from=circle]{south west}
+ \inheritanchor[from=circle]{south east}
+ \inheritbackgroundpath[from=circle]
+ \foregroundpath{
+ \centerpoint%
+ \pgf@xc=\pgf@x%
+ \pgf@yc=\pgf@y%
+ \pgfutil@tempdima=\radius%
+ \pgfmathsetlength{\pgf@xb}{\pgfshapeouterxsep}%
+ \pgfmathsetlength{\pgf@yb}{\pgfshapeouterysep}%
+ \ifdim\pgf@xb<\pgf@yb%
+ \advance\pgfutil@tempdima by-\pgf@yb%
+ \else%
+ \advance\pgfutil@tempdima by-\pgf@xb%
+ \fi%
+ \pgfpathmoveto{\pgfpointadd{\pgfqpoint{\pgf@xc}{\pgf@yc}}{\pgfqpoint{-0.707107\pgfutil@tempdima}{-0.707107\pgfutil@tempdima}}}
+ \pgfpathlineto{\pgfpointadd{\pgfqpoint{\pgf@xc}{\pgf@yc}}{\pgfqpoint{0.707107\pgfutil@tempdima}{0.707107\pgfutil@tempdima}}}
+ }
+}
+
+
+\endinput
diff --git a/Master/texmf-dist/tex/generic/pgf/libraries/pgflibrarysnakes.code.tex b/Master/texmf-dist/tex/generic/pgf/libraries/pgflibrarysnakes.code.tex
index f9795dc4a99..dde1a6db64c 100644
--- a/Master/texmf-dist/tex/generic/pgf/libraries/pgflibrarysnakes.code.tex
+++ b/Master/texmf-dist/tex/generic/pgf/libraries/pgflibrarysnakes.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/pgflibrarysnakes.code.tex,v 1.14 2006/10/11 15:22:26 tantau Exp $
+\ProvidesFileRCS[v\pgfversion] $Header: /cvsroot/pgf/pgf/generic/pgf/libraries/pgflibrarysnakes.code.tex,v 1.15 2007/03/09 17:49:32 tantau Exp $
\newdimen\pgfsnakesegmentamplitude
@@ -29,47 +29,47 @@
\pgfdeclaresnake{snake}{initial}
{
- \state{initial}[switch if less than=.625\pgfsnakesegmentlength to final,
- width=.3125\pgfsnakesegmentlength,
+ \state{initial}[switch if less than=+.625\pgfsnakesegmentlength to final,
+ width=+.3125\pgfsnakesegmentlength,
next state=down]
{
\pgfpathcurveto
- {\pgfpoint{.125\pgfsnakesegmentlength}{0pt}}
- {\pgfpoint{.1875\pgfsnakesegmentlength}{\pgfsnakesegmentamplitude}}
- {\pgfpoint{.3125\pgfsnakesegmentlength}{\pgfsnakesegmentamplitude}}
+ {\pgfqpoint{.125\pgfsnakesegmentlength}{0pt}}
+ {\pgfqpoint{.1875\pgfsnakesegmentlength}{\pgfsnakesegmentamplitude}}
+ {\pgfqpoint{.3125\pgfsnakesegmentlength}{\pgfsnakesegmentamplitude}}
}
- \state{down}[switch if less than=.8125\pgfsnakesegmentlength to end down,
- width=.5\pgfsnakesegmentlength,
+ \state{down}[switch if less than=+.8125\pgfsnakesegmentlength to end down,
+ width=+.5\pgfsnakesegmentlength,
next state=up]
{
- \pgfpathcosine{\pgfpoint{.25\pgfsnakesegmentlength}{-\pgfsnakesegmentamplitude}}
- \pgfpathsine{\pgfpoint{.25\pgfsnakesegmentlength}{-\pgfsnakesegmentamplitude}}
+ \pgfpathcosine{\pgfqpoint{.25\pgfsnakesegmentlength}{-1\pgfsnakesegmentamplitude}}
+ \pgfpathsine{\pgfqpoint{.25\pgfsnakesegmentlength}{-1\pgfsnakesegmentamplitude}}
}
- \state{up}[switch if less than=.8125\pgfsnakesegmentlength to end up,
- width=.5\pgfsnakesegmentlength,
+ \state{up}[switch if less than=+.8125\pgfsnakesegmentlength to end up,
+ width=+.5\pgfsnakesegmentlength,
next state=down]
{
- \pgfpathcosine{\pgfpoint{.25\pgfsnakesegmentlength}{\pgfsnakesegmentamplitude}}
- \pgfpathsine{\pgfpoint{.25\pgfsnakesegmentlength}{\pgfsnakesegmentamplitude}}
+ \pgfpathcosine{\pgfqpoint{.25\pgfsnakesegmentlength}{\pgfsnakesegmentamplitude}}
+ \pgfpathsine{\pgfqpoint{.25\pgfsnakesegmentlength}{\pgfsnakesegmentamplitude}}
}
- \state{end down}[width=.3125\pgfsnakesegmentlength,
+ \state{end down}[width=+.3125\pgfsnakesegmentlength,
next state=final]
{
\pgfpathcurveto
- {\pgfpoint{.125\pgfsnakesegmentlength}{\pgfsnakesegmentamplitude}}
- {\pgfpoint{.1875\pgfsnakesegmentlength}{0pt}}
- {\pgfpoint{.3125\pgfsnakesegmentlength}{0pt}}
+ {\pgfqpoint{.125\pgfsnakesegmentlength}{\pgfsnakesegmentamplitude}}
+ {\pgfqpoint{.1875\pgfsnakesegmentlength}{0pt}}
+ {\pgfqpoint{.3125\pgfsnakesegmentlength}{0pt}}
}
- \state{end up}[width=.3125\pgfsnakesegmentlength,
+ \state{end up}[width=+.3125\pgfsnakesegmentlength,
next state=final]
{
\pgfpathcurveto
- {\pgfpoint{.125\pgfsnakesegmentlength}{-\pgfsnakesegmentamplitude}}
- {\pgfpoint{.1875\pgfsnakesegmentlength}{0pt}}
- {\pgfpoint{.3125\pgfsnakesegmentlength}{0pt}}
+ {\pgfqpoint{.125\pgfsnakesegmentlength}{-\pgfsnakesegmentamplitude}}
+ {\pgfqpoint{.1875\pgfsnakesegmentlength}{0pt}}
+ {\pgfqpoint{.3125\pgfsnakesegmentlength}{0pt}}
}
\state{final}
- { \pgfpathlineto{\pgfpoint{\pgfsnakeremainingdistance}{0pt}} }
+ { \pgfpathlineto{\pgfqpoint{\pgfsnakeremainingdistance}{0pt}} }
}
@@ -81,20 +81,20 @@
\pgfdeclaresnake{zigzag}{up}
{
- \state{up}[width=.5\pgfsnakesegmentlength,%
+ \state{up}[width=+.5\pgfsnakesegmentlength,%
next state=down]
{
- \pgfpathlineto{\pgfpoint{.25\pgfsnakesegmentlength}{\pgfsnakesegmentamplitude}}
- \pgfpathlineto{\pgfpoint{.5\pgfsnakesegmentlength}{0pt}}
+ \pgfpathlineto{\pgfqpoint{.25\pgfsnakesegmentlength}{\pgfsnakesegmentamplitude}}
+ \pgfpathlineto{\pgfqpoint{.5\pgfsnakesegmentlength}{0pt}}
}
- \state{down}[width=.5\pgfsnakesegmentlength,%
+ \state{down}[width=+.5\pgfsnakesegmentlength,%
next state=up]
{
- \pgfpathlineto{\pgfpoint{.25\pgfsnakesegmentlength}{-\pgfsnakesegmentamplitude}}
- \pgfpathlineto{\pgfpoint{.5\pgfsnakesegmentlength}{0pt}}
+ \pgfpathlineto{\pgfqpoint{.25\pgfsnakesegmentlength}{-\pgfsnakesegmentamplitude}}
+ \pgfpathlineto{\pgfqpoint{.5\pgfsnakesegmentlength}{0pt}}
}
\state{final}
- { \pgfpathlineto{\pgfpoint{\pgfsnakeremainingdistance}{0pt}} }
+ { \pgfpathlineto{\pgfqpoint{\pgfsnakeremainingdistance}{0pt}} }
}
@@ -105,14 +105,14 @@
\pgfdeclaresnake{saw}{initial}
{
- \state{initial}[width=\pgfsnakesegmentlength]
+ \state{initial}[width=+\pgfsnakesegmentlength]
{
- \pgfpathlineto{\pgfpoint{\pgfsnakesegmentlength}{\pgfsnakesegmentamplitude}}
- \pgfpathlineto{\pgfpoint{\pgfsnakesegmentlength}{0pt}}
+ \pgfpathlineto{\pgfqpoint{\pgfsnakesegmentlength}{\pgfsnakesegmentamplitude}}
+ \pgfpathlineto{\pgfqpoint{\pgfsnakesegmentlength}{0pt}}
}
\state{final}
{
- \pgfpathlineto{\pgfpoint{\pgfsnakeremainingdistance}{0pt}}
+ \pgfpathlineto{\pgfqpoint{\pgfsnakeremainingdistance}{0pt}}
}
}
@@ -127,7 +127,7 @@
1.5\pgfsnakesegmentlength+%
\pgfsnakesegmentaspect\pgfsnakesegmentamplitude+%
\pgfsnakesegmentaspect\pgfsnakesegmentamplitude to last,
- width=\pgfsnakesegmentlength]
+ width=+\pgfsnakesegmentlength]
{
\pgfpathcurveto
{\pgfpoint@oncoil{0 }{ 0.555}{1}}
@@ -161,7 +161,7 @@
}
\state{final}
{
- \pgfpathlineto{\pgfpoint{\pgfsnakeremainingdistance}{0pt}}
+ \pgfpathlineto{\pgfqpoint{\pgfsnakeremainingdistance}{0pt}}
}
}
@@ -180,20 +180,20 @@
\pgfdeclaresnake{bumps}{initial}
{
- \state{initial}[width=.5\pgfsnakesegmentlength]
+ \state{initial}[width=+.5\pgfsnakesegmentlength]
{
\pgfpathcurveto
- {\pgfpoint{0pt}{.555\pgfsnakesegmentamplitude}}
- {\pgfpoint{0.11125\pgfsnakesegmentlength}{\pgfsnakesegmentamplitude}}
- {\pgfpoint{.25\pgfsnakesegmentlength}{\pgfsnakesegmentamplitude}}
+ {\pgfqpoint{0pt}{.555\pgfsnakesegmentamplitude}}
+ {\pgfqpoint{0.11125\pgfsnakesegmentlength}{\pgfsnakesegmentamplitude}}
+ {\pgfqpoint{.25\pgfsnakesegmentlength}{\pgfsnakesegmentamplitude}}
\pgfpathcurveto
- {\pgfpoint{.38875\pgfsnakesegmentlength}{\pgfsnakesegmentamplitude}}
- {\pgfpoint{.5\pgfsnakesegmentlength}{.5\pgfsnakesegmentamplitude}}
- {\pgfpoint{.5\pgfsnakesegmentlength}{0\pgfsnakesegmentamplitude}}
+ {\pgfqpoint{.38875\pgfsnakesegmentlength}{\pgfsnakesegmentamplitude}}
+ {\pgfqpoint{.5\pgfsnakesegmentlength}{.5\pgfsnakesegmentamplitude}}
+ {\pgfqpoint{.5\pgfsnakesegmentlength}{0\pgfsnakesegmentamplitude}}
}
\state{final}
{
- \pgfpathlineto{\pgfpoint{\pgfsnakeremainingdistance}{0pt}}
+ \pgfpathlineto{\pgfqpoint{\pgfsnakeremainingdistance}{0pt}}
}
}
@@ -205,29 +205,29 @@
\pgfdeclaresnake{expanding waves}{initial}
{
- \state{initial}[width=\pgfsnakesegmentlength,next state=wave]
+ \state{initial}[width=+\pgfsnakesegmentlength,next state=wave]
{}
- \state{wave}[switch if less than=\pgfsnakesegmentlength to last,
- width=\pgfsnakesegmentlength]
+ \state{wave}[switch if less than=+\pgfsnakesegmentlength to last,
+ width=+\pgfsnakesegmentlength]
{
\pgfpathmoveto{
\pgfpointadd
- {\pgfpoint{-\pgfsnakecompleteddistance}{0pt}}%
- {\pgfpointpolar{\pgfsnakesegmentangle}{\pgfsnakecompleteddistance}}}%
- \pgfpatharc{\pgfsnakesegmentangle}{-\pgfsnakesegmentangle}{\pgfsnakecompleteddistance}%
+ {\pgfqpoint{-\pgfsnakecompleteddistance}{0pt}}%
+ {\pgfpointpolar{\pgfsnakesegmentangle}{+\pgfsnakecompleteddistance}}}%
+ \pgfpatharc{\pgfsnakesegmentangle}{-\pgfsnakesegmentangle}{+\pgfsnakecompleteddistance}%
}
- \state{last}[width=0pt,next state=final]
+ \state{last}[width=+0pt,next state=final]
{
\pgfpathmoveto{
\pgfpointadd
- {\pgfpoint{-\pgfsnakecompleteddistance}{0pt}}%
- {\pgfpointpolar{\pgfsnakesegmentangle}{\pgfsnakecompleteddistance}}}%
- \pgfpatharc{\pgfsnakesegmentangle}{-\pgfsnakesegmentangle}{\pgfsnakecompleteddistance}%
+ {\pgfqpoint{-\pgfsnakecompleteddistance}{0pt}}%
+ {\pgfpointpolar{\pgfsnakesegmentangle}{+\pgfsnakecompleteddistance}}}%
+ \pgfpatharc{\pgfsnakesegmentangle}{-\pgfsnakesegmentangle}{+\pgfsnakecompleteddistance}%
}
\state{final}
{
- \pgfpathmoveto{\pgfpoint{\pgfsnakeremainingdistance}{0pt}}
+ \pgfpathmoveto{\pgfqpoint{\pgfsnakeremainingdistance}{0pt}}
}
}
@@ -241,16 +241,16 @@
{
\state{wave}[width=\pgfsnakesegmentlength]
{
- \pgftransformxshift{\pgfsnakesegmentlength}
+ \pgftransformxshift{+\pgfsnakesegmentlength}
\pgfpathmoveto{
\pgfpointadd
- {\pgfpoint{-\pgfsnakesegmentobjectlength}{0pt}}%
- {\pgfpointpolar{\pgfsnakesegmentangle}{\pgfsnakesegmentobjectlength}}}%
- \pgfpatharc{\pgfsnakesegmentangle}{-\pgfsnakesegmentangle}{\pgfsnakesegmentobjectlength}%
+ {\pgfqpoint{-\pgfsnakesegmentobjectlength}{0pt}}%
+ {\pgfpointpolar{\pgfsnakesegmentangle}{+\pgfsnakesegmentobjectlength}}}%
+ \pgfpatharc{\pgfsnakesegmentangle}{-\pgfsnakesegmentangle}{+\pgfsnakesegmentobjectlength}%
}
\state{final}
{
- \pgfpathmoveto{\pgfpoint{\pgfsnakeremainingdistance}{0pt}}
+ \pgfpathmoveto{\pgfqpoint{\pgfsnakeremainingdistance}{0pt}}
}
}
@@ -261,24 +261,24 @@
\pgfdeclaresnake{triangles}{triangle}
{
- \state{triangle}[switch if less than=\pgfsnakesegmentlength to last,
- width=\pgfsnakesegmentlength]
+ \state{triangle}[switch if less than=+\pgfsnakesegmentlength to last,
+ width=+\pgfsnakesegmentlength]
{
- \pgfpathmoveto{\pgfpoint{0pt}{\pgfsnakesegmentamplitude}}
- \pgfpathlineto{\pgfpoint{\pgfsnakesegmentobjectlength}{0pt}}
- \pgfpathlineto{\pgfpoint{0pt}{-\pgfsnakesegmentamplitude}}
+ \pgfpathmoveto{\pgfqpoint{0pt}{\pgfsnakesegmentamplitude}}
+ \pgfpathlineto{\pgfqpoint{\pgfsnakesegmentobjectlength}{0pt}}
+ \pgfpathlineto{\pgfqpoint{0pt}{-\pgfsnakesegmentamplitude}}
\pgfpathclose
}
- \state{last}[width=\pgfsnakesegmentobjectlength,next state=final]
+ \state{last}[width=+\pgfsnakesegmentobjectlength,next state=final]
{
- \pgfpathmoveto{\pgfpoint{0pt}{\pgfsnakesegmentamplitude}}
- \pgfpathlineto{\pgfpoint{\pgfsnakesegmentobjectlength}{0pt}}
- \pgfpathlineto{\pgfpoint{0pt}{-\pgfsnakesegmentamplitude}}
+ \pgfpathmoveto{\pgfqpoint{0pt}{\pgfsnakesegmentamplitude}}
+ \pgfpathlineto{\pgfqpoint{\pgfsnakesegmentobjectlength}{0pt}}
+ \pgfpathlineto{\pgfqpoint{0pt}{-\pgfsnakesegmentamplitude}}
\pgfpathclose
}
\state{final}
{
- \pgfpathmoveto{\pgfpoint{\pgfsnakeremainingdistance}{0pt}}
+ \pgfpathmoveto{\pgfqpoint{\pgfsnakeremainingdistance}{0pt}}
}
}
@@ -290,24 +290,24 @@
\pgfdeclaresnake{crosses}{crosses}
{
- \state{crosses}[switch if less than=\pgfsnakesegmentlength to last,
- width=\pgfsnakesegmentlength]
+ \state{crosses}[switch if less than=+\pgfsnakesegmentlength to last,
+ width=+\pgfsnakesegmentlength]
{
- \pgfpathmoveto{\pgfpoint{0pt}{\pgfsnakesegmentamplitude}}
- \pgfpathlineto{\pgfpoint{\pgfsnakesegmentobjectlength}{-\pgfsnakesegmentamplitude}}
- \pgfpathmoveto{\pgfpoint{0pt}{-\pgfsnakesegmentamplitude}}
- \pgfpathlineto{\pgfpoint{\pgfsnakesegmentobjectlength}{\pgfsnakesegmentamplitude}}
+ \pgfpathmoveto{\pgfqpoint{0pt}{\pgfsnakesegmentamplitude}}
+ \pgfpathlineto{\pgfqpoint{\pgfsnakesegmentobjectlength}{-\pgfsnakesegmentamplitude}}
+ \pgfpathmoveto{\pgfqpoint{0pt}{-\pgfsnakesegmentamplitude}}
+ \pgfpathlineto{\pgfqpoint{\pgfsnakesegmentobjectlength}{\pgfsnakesegmentamplitude}}
}
\state{last}[width=\pgfsnakesegmentobjectlength,next state=final]
{
- \pgfpathmoveto{\pgfpoint{0pt}{\pgfsnakesegmentamplitude}}
- \pgfpathlineto{\pgfpoint{\pgfsnakesegmentobjectlength}{-\pgfsnakesegmentamplitude}}
- \pgfpathmoveto{\pgfpoint{0pt}{-\pgfsnakesegmentamplitude}}
- \pgfpathlineto{\pgfpoint{\pgfsnakesegmentobjectlength}{\pgfsnakesegmentamplitude}}
+ \pgfpathmoveto{\pgfqpoint{0pt}{\pgfsnakesegmentamplitude}}
+ \pgfpathlineto{\pgfqpoint{\pgfsnakesegmentobjectlength}{-1\pgfsnakesegmentamplitude}}
+ \pgfpathmoveto{\pgfqpoint{0pt}{-\pgfsnakesegmentamplitude}}
+ \pgfpathlineto{\pgfqpoint{\pgfsnakesegmentobjectlength}{\pgfsnakesegmentamplitude}}
}
\state{final}
{
- \pgfpathmoveto{\pgfpoint{\pgfsnakeremainingdistance}{0pt}}
+ \pgfpathmoveto{\pgfqpoint{\pgfsnakeremainingdistance}{0pt}}
}
}
@@ -319,16 +319,16 @@
\pgfdeclaresnake{ticks}{ticks}
{
- \state{ticks}[width=\pgfsnakesegmentlength]
+ \state{ticks}[width=+\pgfsnakesegmentlength]
{
- \pgfpathmoveto{\pgfpoint{0pt}{\pgfsnakesegmentamplitude}}
- \pgfpathlineto{\pgfpoint{0pt}{-\pgfsnakesegmentamplitude}}
+ \pgfpathmoveto{\pgfqpoint{0pt}{\pgfsnakesegmentamplitude}}
+ \pgfpathlineto{\pgfqpoint{0pt}{-\pgfsnakesegmentamplitude}}
}
\state{final}
{
- \pgfpathmoveto{\pgfpoint{0pt}{\pgfsnakesegmentamplitude}}
- \pgfpathlineto{\pgfpoint{0pt}{-\pgfsnakesegmentamplitude}}
- \pgfpathmoveto{\pgfpoint{\pgfsnakeremainingdistance}{0pt}}
+ \pgfpathmoveto{\pgfqpoint{0pt}{\pgfsnakesegmentamplitude}}
+ \pgfpathlineto{\pgfqpoint{0pt}{-\pgfsnakesegmentamplitude}}
+ \pgfpathmoveto{\pgfqpoint{\pgfsnakeremainingdistance}{0pt}}
}
}
@@ -339,20 +339,20 @@
\pgfdeclaresnake{border}{tick}
{
- \state{tick}[switch if less than=\pgfsnakesegmentlength to last,
- width=\pgfsnakesegmentlength]
+ \state{tick}[switch if less than=+\pgfsnakesegmentlength to last,
+ width=+\pgfsnakesegmentlength]
{
\pgfpathmoveto{\pgfpointorigin}
- \pgfpathlineto{\pgfpointpolar{\pgfsnakesegmentangle}{\pgfsnakesegmentamplitude}}
+ \pgfpathlineto{\pgfpointpolar{\pgfsnakesegmentangle}{+\pgfsnakesegmentamplitude}}
}
- \state{last}[width=\pgfsnakesegmentamplitude,next state=final]
+ \state{last}[width=+\pgfsnakesegmentamplitude,next state=final]
{
\pgfpathmoveto{\pgfpointorigin}
- \pgfpathlineto{\pgfpointpolar{\pgfsnakesegmentangle}{\pgfsnakesegmentamplitude}}
+ \pgfpathlineto{\pgfpointpolar{\pgfsnakesegmentangle}{+\pgfsnakesegmentamplitude}}
}
\state{final}
{
- \pgfpathmoveto{\pgfpoint{\pgfsnakeremainingdistance}{0pt}}
+ \pgfpathmoveto{\pgfqpoint{\pgfsnakeremainingdistance}{0pt}}
}
}
@@ -365,32 +365,32 @@
\pgfdeclaresnake{brace}{brace}
{
- \state{brace}[width=\pgfsnakeremainingdistance,next state=final]
+ \state{brace}[width=+\pgfsnakeremainingdistance,next state=final]
{
- \pgfpathmoveto{\pgfpoint{0pt}{0pt}}
+ \pgfpathmoveto{\pgfpointorigin}
\pgfpathcurveto
- {\pgfpoint{.15\pgfsnakesegmentamplitude}{.3\pgfsnakesegmentamplitude}}
- {\pgfpoint{.5\pgfsnakesegmentamplitude}{.5\pgfsnakesegmentamplitude}}
- {\pgfpoint{\pgfsnakesegmentamplitude}{.5\pgfsnakesegmentamplitude}}
+ {\pgfqpoint{.15\pgfsnakesegmentamplitude}{.3\pgfsnakesegmentamplitude}}
+ {\pgfqpoint{.5\pgfsnakesegmentamplitude}{.5\pgfsnakesegmentamplitude}}
+ {\pgfqpoint{\pgfsnakesegmentamplitude}{.5\pgfsnakesegmentamplitude}}
{
- \pgftransformxshift{\pgfsnakesegmentaspect\pgfsnakeremainingdistance}
- \pgfpathlineto{\pgfpoint{-\pgfsnakesegmentamplitude}{.5\pgfsnakesegmentamplitude}}
+ \pgftransformxshift{+\pgfsnakesegmentaspect\pgfsnakeremainingdistance}
+ \pgfpathlineto{\pgfqpoint{-\pgfsnakesegmentamplitude}{.5\pgfsnakesegmentamplitude}}
\pgfpathcurveto
- {\pgfpoint{-.5\pgfsnakesegmentamplitude}{.5\pgfsnakesegmentamplitude}}
- {\pgfpoint{-.15\pgfsnakesegmentamplitude}{.7\pgfsnakesegmentamplitude}}
- {\pgfpoint{0\pgfsnakesegmentamplitude}{1\pgfsnakesegmentamplitude}}
+ {\pgfqpoint{-.5\pgfsnakesegmentamplitude}{.5\pgfsnakesegmentamplitude}}
+ {\pgfqpoint{-.15\pgfsnakesegmentamplitude}{.7\pgfsnakesegmentamplitude}}
+ {\pgfqpoint{0\pgfsnakesegmentamplitude}{1\pgfsnakesegmentamplitude}}
\pgfpathcurveto
- {\pgfpoint{.15\pgfsnakesegmentamplitude}{.7\pgfsnakesegmentamplitude}}
- {\pgfpoint{.5\pgfsnakesegmentamplitude}{.5\pgfsnakesegmentamplitude}}
- {\pgfpoint{\pgfsnakesegmentamplitude}{.5\pgfsnakesegmentamplitude}}
+ {\pgfqpoint{.15\pgfsnakesegmentamplitude}{.7\pgfsnakesegmentamplitude}}
+ {\pgfqpoint{.5\pgfsnakesegmentamplitude}{.5\pgfsnakesegmentamplitude}}
+ {\pgfqpoint{\pgfsnakesegmentamplitude}{.5\pgfsnakesegmentamplitude}}
}
{
- \pgftransformxshift{\pgfsnakeremainingdistance}
- \pgfpathlineto{\pgfpoint{-\pgfsnakesegmentamplitude}{.5\pgfsnakesegmentamplitude}}
+ \pgftransformxshift{+\pgfsnakeremainingdistance}
+ \pgfpathlineto{\pgfqpoint{-\pgfsnakesegmentamplitude}{.5\pgfsnakesegmentamplitude}}
\pgfpathcurveto
- {\pgfpoint{-.5\pgfsnakesegmentamplitude}{.5\pgfsnakesegmentamplitude}}
- {\pgfpoint{-.15\pgfsnakesegmentamplitude}{.3\pgfsnakesegmentamplitude}}
- {\pgfpoint{0pt}{0pt}}
+ {\pgfqpoint{-.5\pgfsnakesegmentamplitude}{.5\pgfsnakesegmentamplitude}}
+ {\pgfqpoint{-.15\pgfsnakesegmentamplitude}{.3\pgfsnakesegmentamplitude}}
+ {\pgfqpoint{0pt}{0pt}}
}
}
\state{final}
@@ -407,13 +407,13 @@
\pgfdeclaresnake{bent}{bent}
{
- \state{bent}[width=\pgfsnakeremainingdistance,next state=final]
+ \state{bent}[width=+\pgfsnakeremainingdistance,next state=final]
{
\pgfpathcurveto
- {\pgfpoint{\pgfsnakesegmentaspect\pgfsnakeremainingdistance}{\pgfsnakesegmentamplitude}}
- {\pgfpointadd{\pgfpoint{\pgfsnakeremainingdistance}{0pt}}
- {\pgfpoint{-\pgfsnakesegmentaspect\pgfsnakeremainingdistance}{\pgfsnakesegmentamplitude}}}
- {\pgfpoint{\pgfsnakeremainingdistance}{0pt}}
+ {\pgfqpoint{\pgfsnakesegmentaspect\pgfsnakeremainingdistance}{\pgfsnakesegmentamplitude}}
+ {\pgfpointadd{\pgfqpoint{\pgfsnakeremainingdistance}{0pt}}
+ {\pgfqpoint{-\pgfsnakesegmentaspect\pgfsnakeremainingdistance}{\pgfsnakesegmentamplitude}}}
+ {\pgfqpoint{\pgfsnakeremainingdistance}{0pt}}
}
\state{final}
{}
diff --git a/Master/texmf-dist/tex/generic/pgf/libraries/pgflibrarytikzbackgrounds.code.tex b/Master/texmf-dist/tex/generic/pgf/libraries/pgflibrarytikzbackgrounds.code.tex
index 6fa6b9963cc..5ae08cdf634 100644
--- a/Master/texmf-dist/tex/generic/pgf/libraries/pgflibrarytikzbackgrounds.code.tex
+++ b/Master/texmf-dist/tex/generic/pgf/libraries/pgflibrarytikzbackgrounds.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/pgflibrarytikzbackgrounds.code.tex,v 1.3 2006/10/11 15:22:26 tantau Exp $
+\ProvidesFileRCS[v\pgfversion] $Header: /cvsroot/pgf/pgf/generic/pgf/libraries/pgflibrarytikzbackgrounds.code.tex,v 1.5 2007/04/11 13:04:15 tantau Exp $
% Layers
@@ -27,7 +27,7 @@
\define@key{tikz}{inner frame sep}{\def\tikz@framexsep{#1}\def\tikz@frameysep{#1}}
\define@key{tikz}{inner frame xsep}{\def\tikz@framexsep{#1}}
-\define@key{tikz}{inerr frame ysep}{\def\tikz@frameysep{#1}}
+\define@key{tikz}{inner frame ysep}{\def\tikz@frameysep{#1}}
\def\tikz@framexsep{1ex}
\def\tikz@frameysep{1ex}
@@ -66,8 +66,8 @@
\pgf@yb=\pgf@picminy%
\pgf@xc=\pgf@picmaxx%
\pgf@yc=\pgf@picmaxy%
- \setlength{\pgf@x}{\tikz@framexsep}%
- \setlength{\pgf@y}{\tikz@frameysep}%
+ \pgfmathsetlength{\pgf@x}{\tikz@framexsep}%
+ \pgfmathsetlength{\pgf@y}{\tikz@frameysep}%
\advance\pgf@xb by-\pgf@x%
\advance\pgf@yb by-\pgf@y%
\advance\pgf@xc by\pgf@x%
@@ -76,8 +76,8 @@
\edef\tikz@bg@miny{\the\pgf@yb}%
\edef\tikz@bg@maxx{\the\pgf@xc}%
\edef\tikz@bg@maxy{\the\pgf@yc}%
- \setlength{\pgf@x}{\tikz@outerframexsep}%
- \setlength{\pgf@y}{\tikz@outerframeysep}%
+ \pgfmathsetlength{\pgf@x}{\tikz@outerframexsep}%
+ \pgfmathsetlength{\pgf@y}{\tikz@outerframeysep}%
\advance\pgf@xb by-\pgf@x%
\advance\pgf@yb by-\pgf@y%
\advance\pgf@xc by\pgf@x%
diff --git a/Master/texmf-dist/tex/generic/pgf/libraries/pgflibrarytikzcalendar.code.tex b/Master/texmf-dist/tex/generic/pgf/libraries/pgflibrarytikzcalendar.code.tex
new file mode 100644
index 00000000000..ec8cc93531b
--- /dev/null
+++ b/Master/texmf-dist/tex/generic/pgf/libraries/pgflibrarytikzcalendar.code.tex
@@ -0,0 +1,458 @@
+% Copyright 2006 by Till Tantau
+%
+% This file may be distributed and/or modified
+%
+% 1. under the LaTeX Project Public License and/or
+% 2. under the GNU Public License.
+%
+% See the file doc/generic/pgf/licenses/LICENSE for more details.
+
+\ProvidesFileRCS[v\pgfversion] $Header: /cvsroot/pgf/pgf/generic/pgf/libraries/pgflibrarytikzcalendar.code.tex,v 1.12 2007/03/09 17:49:32 tantau Exp $
+
+
+\pgfutil@usemodule{pgfcalendar}
+
+
+%
+% General options (these options affect all calendars typeset unsind \calendar):
+%
+% Start, end, and code executed for each current date
+%
+
+\tikzoption{dates}{\tikz@lib@cal@parse#1\relax}
+\def\tikz@lib@cal@parse#1to#2\relax{%
+ \def\tikz@lib@cal@start{#1}
+ \def\tikz@lib@cal@end{#2}%
+}
+\tikzoption{execute at begin day scope}{\expandafter\def\expandafter\tikz@atbegin@day\expandafter{\tikz@atbegin@day#1}}
+\tikzoption{execute at end day scope}{%
+ \def\pgf@temp{#1}%
+ \expandafter\expandafter\expandafter\def%
+ \expandafter\expandafter\expandafter\tikz@atend@day%
+ \expandafter\expandafter\expandafter{\expandafter\pgf@temp\tikz@atend@day}}
+\tikzoption{execute before day scope}{\expandafter\def\expandafter\tikz@before@day\expandafter{\tikz@before@day#1}}
+\tikzoption{execute after day scope}{\expandafter\def\expandafter\tikz@after@day\expandafter{\tikz@after@day#1}}
+
+\let\tikz@atbegin@day=\pgfutil@empty
+\let\tikz@atend@day=\pgfutil@empty
+\let\tikz@before@day=\pgfutil@empty
+\let\tikz@after@day=\pgfutil@empty
+
+
+
+%
+% Options affecting some calendars:
+%
+
+%
+% Shifts and skips
+%
+
+% Shift between days
+
+\tikzoption{day xshift}{\def\tikz@lib@cal@xshift{#1}}
+\tikzoption{day yshift}{\def\tikz@lib@cal@yshift{#1}}
+
+\def\tikz@lib@cal@yshift{3ex}
+\def\tikz@lib@cal@xshift{3.5ex}
+
+
+% Shift between months
+
+\tikzoption{month xshift}{\def\tikz@lib@cal@month@xshift{#1}}
+\tikzoption{month yshift}{\def\tikz@lib@cal@month@yshift{#1}}
+
+\def\tikz@lib@cal@month@yshift{9ex}
+\def\tikz@lib@cal@month@xshift{9ex}
+
+
+
+
+% Templates for typesetting days, month, years
+
+\tikzoption{day code}{\def\tikzdaycode{#1}}
+\tikzoption{day text}{\def\tikzdaytext{#1}}
+\tikzoption{days}{\tikzstyle{every day}+=[#1]}
+\tikzstyle{every day}=[anchor=base east]
+
+\tikzoption{month code}{\def\tikzmonthcode{#1}}
+\tikzoption{month text}{\def\tikzmonthtext{#1}}
+\tikzstyle{every month}=[]
+
+\tikzoption{year code}{\def\tikzyearcode{#1}}
+\tikzoption{year text}{\def\tikzyeartext{#1}}
+\tikzstyle{every year}=[]
+
+\def\tikzdaycode{\node[name=\pgfcalendarsuggestedname,every day]{\tikzdaytext};}
+\def\tikzmonthcode{\node[every month]{\tikzmonthtext};}
+\def\tikzyearcode{\node[every year]{\tikzyeartext};}
+
+\def\tikzdaytext{\%d-}
+\def\tikzmonthtext{\%mt}
+\def\tikzyeartext{\%y0}
+
+
+% Internal option for storing the "width" of a calendar as a number of
+% days
+
+\tikzoption{tikz@lib@cal@width}{\def\tikz@lib@cal@width{#1}}
+
+\def\tikz@lib@cal@width{1}
+
+%
+% Days on a line
+%
+
+\tikzstyle{day list downward}=[%
+ execute before day scope={
+ \ifdate{day of month=1}{\ifdate{equals=\pgfcalendarbeginiso}{}
+ {%
+ % On first of month, except when first date in calendar.
+ \pgfmathsetlength{\pgf@y}{\tikz@lib@cal@month@yshift}%
+ \pgftransformyshift{-\pgf@y}
+ }%
+ }{}%
+ },
+ execute after day scope={\pgfmathsetlength{\pgf@y}{\tikz@lib@cal@yshift}\pgftransformyshift{-\pgf@y}},
+ tikz@lib@cal@width=1
+]
+\tikzstyle{day list upward}=[%
+ execute before day scope={
+ \ifdate{day of month=1}{\ifdate{equals=\pgfcalendarbeginiso}{}
+ {%
+ % On first of month, except when first date in calendar.
+ \pgftransformyshift{\tikz@lib@cal@month@yshift}%
+ }%
+ }{}%
+ },
+ execute after day scope={\pgftransformyshift\tikz@lib@cal@yshift},
+ tikz@lib@cal@width=1
+]
+\tikzstyle{day list right}=[%
+ execute before day scope={
+ \ifdate{day of month=1}{\ifdate{equals=\pgfcalendarbeginiso}{}
+ {%
+ % On first of month, except when first date in calendar.
+ \pgftransformxshift{\tikz@lib@cal@month@xshift}%
+ }%
+ }{}%
+ },
+ execute after day scope={\pgftransformxshift\tikz@lib@cal@xshift},
+ tikz@lib@cal@width=30% not quite right, but close enough in most cases...
+]
+
+\tikzstyle{day list left}=[%
+ execute before day scope={
+ \ifdate{day of month=1}{\ifdate{equals=\pgfcalendarbeginiso}{}
+ {%
+ % On first of month, except when first date in calendar.
+ \pgfmathsetlength{\pgf@x}{\tikz@lib@cal@month@xshift}
+ \pgftransformxshift{-\pgf@x}%
+ }%
+ }{}%
+ },
+ execute after day scope={
+ \pgfmathsetlength{\pgf@x}{\tikz@lib@cal@xshift}
+ \pgftransformxshift{-\pgf@x}%
+ },
+ tikz@lib@cal@width=30% not quite right, but close enough in most cases...
+]
+
+
+
+%
+% Week list
+%
+
+\tikzstyle{week list}=[%
+ execute before day scope={%
+ \ifdate{day of month=1}{\ifdate{equals=\pgfcalendarbeginiso}{}
+ {%
+ % On first of month, except when first date in calendar.
+ \pgfmathsetlength{\pgf@y}{\tikz@lib@cal@month@yshift}%
+ \pgftransformyshift{-\pgf@y}
+ }%
+ }{}%
+ },
+ execute at begin day scope={%
+ \pgfmathsetlength\pgf@x{\tikz@lib@cal@xshift}%
+ \pgf@x=\pgfcalendarcurrentweekday\pgf@x%
+ \pgftransformxshift{\pgf@x}%
+ },
+ execute after day scope={%
+ \ifdate{Sunday}{%
+ \pgfmathsetlength{\pgf@y}{\tikz@lib@cal@yshift}%
+ \pgftransformyshift{-\pgf@y}
+ }{}%
+ },
+ tikz@lib@cal@width=7
+]
+
+
+
+%
+% Month list
+%
+
+\tikzstyle{month list}=[%
+ execute before day scope={%
+ \ifdate{day of month=1}{\ifdate{equals=\pgfcalendarbeginiso}{}
+ {%
+ % On first of month, except when first date in calendar.
+ \pgfmathsetlength{\pgf@y}{\tikz@lib@cal@month@yshift}%
+ \pgftransformyshift{-\pgf@y}
+ }%
+ }{}%
+ \ifdate{day of month=1}
+ {%
+ \edef\tikz@lib@cal@month@list@start{\pgfcalendarcurrentweekday}%
+ }{}%
+ \ifdate{equals=\pgfcalendarbeginiso}%
+ {%
+ % Computer day of week for start of month
+ {%
+ \c@pgf@counta=\pgfcalendarcurrentjulian%
+ \advance\c@pgf@counta by-\pgfcalendarcurrentday%
+ \advance\c@pgf@counta by1\relax%
+ \pgfcalendarjuliantoweekday{\c@pgf@counta}{\c@pgf@countb}%
+ \xdef\pgf@temp{\the\c@pgf@countb}%
+ }%
+ \let\tikz@lib@cal@month@list@start=\pgf@temp%
+ }{}%
+ },
+ execute at begin day scope={%
+ \pgfmathsetlength\pgf@xa{\tikz@lib@cal@xshift}%
+ \pgf@xb=\pgfcalendarcurrentday\pgf@xa%
+ \advance\pgf@xb by\tikz@lib@cal@month@list@start\pgf@xa%
+ \advance\pgf@xb by-\pgf@xa\relax%
+ \pgftransformxshift{\pgf@xb}%
+ },
+ tikz@lib@cal@width=37
+]
+
+
+
+
+%
+% Month labels
+%
+
+\tikzstyle{month label left}=[%
+ execute before day scope={\ifdate{day of month=1}{\tikzmonthcode}{}},
+ set style={{every month}+=[anchor=base east,xshift=-3.5ex]}
+]
+
+\tikzstyle{month label left vertical}=[%
+ execute before day scope={\ifdate{day of month=1}{\tikzmonthcode}{}},
+ set style={{every month}+=[anchor=base east,xshift=-4.5ex,yshift=2.25ex,rotate=90]}
+]
+
+\tikzstyle{month label right}=[%
+execute before day scope={\ifdate{day of month=1}{%
+ {%
+ \pgfmathsetlength{\pgf@xa}{\tikz@lib@cal@xshift}%
+ \pgftransformxshift{\tikz@lib@cal@width\pgf@xa}%
+ \pgftransformxshift{-\pgf@xa}%
+ \tikzmonthcode%
+ }}{}},
+ set style={{every month}+=[anchor=base west,xshift=1ex]}
+]
+
+\tikzstyle{month label right vertical}=[%
+ execute before day scope={\ifdate{day of month=1}{%
+ {%
+ \pgfmathsetlength{\pgf@xa}{\tikz@lib@cal@xshift}%
+ \pgftransformxshift{\tikz@lib@cal@width\pgf@xa}%
+ \pgftransformxshift{-\pgf@xa}%
+ \tikzmonthcode%
+ }}{}},
+ set style={{every month}+=[anchor=base west,xshift=2ex,yshift=2.25ex,rotate=-90]}
+]
+
+\tikzstyle{month label above centered}=[%
+ execute before day scope={%
+ \ifdate{day of month=1}{%
+ {
+ \pgfmathsetlength{\pgf@xa}{\tikz@lib@cal@xshift}%
+ \pgf@xb=\tikz@lib@cal@width\pgf@xa%
+ \advance\pgf@xb by-\pgf@xa%
+ \pgf@xb=.5\pgf@xb%
+ \pgftransformxshift{\pgf@xb}%
+ \pgftransformxshift{-1.5ex}%
+ \pgfmathsetlength{\pgf@y}{\tikz@lib@cal@yshift}%
+ \pgftransformyshift{1.25\pgf@y}
+ \tikzmonthcode%
+ }
+ }{}},
+ set style={{every month}+=[anchor=base]}
+]
+
+\tikzstyle{month label above left}=[%
+ execute before day scope={%
+ \ifdate{day of month=1}{%
+ {
+ \pgftransformxshift{-3.25ex}%
+ \pgfmathsetlength{\pgf@y}{\tikz@lib@cal@yshift}%
+ \pgftransformyshift{1.25\pgf@y}
+ \tikzmonthcode%
+ }
+ }{}},
+ set style={{every month}+=[anchor=base west]}
+]
+
+
+
+\tikzstyle{month label above right}=[%
+ execute before day scope={%
+ \ifdate{day of month=1}{%
+ {
+ \pgfmathsetlength{\pgf@xa}{\tikz@lib@cal@xshift}%
+ \pgf@xb=\tikz@lib@cal@width\pgf@xa%
+ \advance\pgf@xb by-\pgf@xa%
+ \pgftransformxshift{\pgf@xb}%
+ \pgfmathsetlength{\pgf@y}{\tikz@lib@cal@yshift}%
+ \pgftransformyshift{1.25\pgf@y}
+ \tikzmonthcode%
+ }
+ }{}},
+ set style={{every month}+=[anchor=base east]}
+]
+
+\tikzstyle{month label below centered}=[%
+ execute before day scope={%
+ \ifdate{day of month=1}{%
+ {
+ \pgfmathsetlength{\pgf@xa}{\tikz@lib@cal@xshift}%
+ \pgf@xb=\tikz@lib@cal@width\pgf@xa%
+ \advance\pgf@xb by-\pgf@xa%
+ \pgf@xb=.5\pgf@xb%
+ \pgftransformxshift{\pgf@xb}%
+ \pgftransformxshift{-1.5ex}%
+ \pgfmathsetlength{\pgf@y}{\tikz@lib@cal@yshift}%
+ \pgftransformyshift{-1.25\pgf@y}
+ \tikzmonthcode%
+ }
+ }{}},
+ set style={{every month}+=[anchor=base]}
+]
+
+\tikzstyle{month label below left}=[%
+ execute before day scope={%
+ \ifdate{day of month=1}{%
+ {
+ \pgftransformxshift{-3.25ex}%
+ \pgfmathsetlength{\pgf@y}{\tikz@lib@cal@yshift}%
+ \pgftransformyshift{-1.25\pgf@y}
+ \tikzmonthcode%
+ }
+ }{}},
+ set style={{every month}+=[anchor=base west]}
+]
+
+
+
+%
+% Code of the actual \calendar command (tikz.code.tex contains \let\calendar=\tikz@lib@cal@calendar):
+%
+
+\def\tikz@lib@cal@calendar{%
+ \begingroup%
+ \let\tikz@lib@cal@ifs=\pgfutil@empty%
+ \tikz@expandcount=1000\relax%
+ \tikz@setkeys{name=,at={(0,0)}}%
+ \let\%=\pgfcalendarshorthand%
+ \tikz@every@style{every calendar}%
+ \tikz@lib@cal@scanner%
+}
+
+\def\tikz@lib@cal@scanner{%
+ \afterassignment\tikz@lib@cal@handle\let\@let@token=%
+}
+
+\def\tikz@lib@cal@handle{%
+ \let\@next=\tikz@lib@cal@expand%
+ \ifx\@let@token;%
+ \let\@next=\tikz@lib@cal@stop%
+ \else%
+ \ifx\@let@token(%)
+ \let\@next=\tikz@lib@cal@name%
+ \else%
+ \ifx\@let@token a%
+ \let\@next=\tikz@lib@cal@at%
+ \else%
+ \ifx\@let@token[%
+ \let\@next=\tikz@lib@cal@option%
+ \else%
+ \ifx\@let@token i%
+ \let\@next=\tikz@lib@cal@if%
+ \fi%
+ \fi%
+ \fi%
+ \fi%
+ \fi%
+ \@next%
+}
+\def\tikz@lib@cal@expand{%
+ \advance\tikz@expandcount by -1%
+ \ifnum\tikz@expandcount<0\relax%
+ \PackageError{tikz}{Giving up on this calendar}{}%
+ \let\@next=\tikz@lib@cal@end%
+ \else%
+ \let\@next=\tikz@lib@cal@@expand
+ \fi%
+ \@next}
+
+\def\tikz@lib@cal@@expand{\expandafter\tikz@lib@cal@scanner\@let@token}
+
+
+\def\tikz@lib@cal@name#1){%
+ \tikz@setkeys{name=#1}%
+ \tikz@lib@cal@scanner%
+}
+\def\tikz@lib@cal@at t#1(#2){%
+ \tikz@setkeys{at={(#2)}}%
+ \tikz@lib@cal@scanner%
+}
+\def\tikz@lib@cal@option#1]{%
+ \tikz@setkeys{#1}%
+ \tikz@lib@cal@scanner%
+}
+\def\tikz@lib@cal@if f#1(#2){%
+ \pgfutil@ifnextchar[{\tikz@lib@cal@if@opt{#2}}{\tikz@lib@cal@if@code{#2}}}%}
+
+\def\tikz@lib@cal@if@opt#1[#2]{\tikz@lib@cal@if@code{#1}{\tikz@setkeys{#2}}}
+\def\tikz@lib@cal@if@code#1#2{%
+ \pgfutil@ifnextchar e{\tikz@lib@cal@if@else{#1}{#2}}{\tikz@lib@cal@if@else{#1}{#2}else{}}}
+
+\def\tikz@lib@cal@if@else#1#2else{%
+ \pgfutil@ifnextchar[{\tikz@lib@cal@if@else@opt{#1}{#2}}{\tikz@lib@cal@if@else@code{#1}{#2}}}%}
+\def\tikz@lib@cal@if@else@opt#1#2[#3]{\tikz@lib@cal@if@else@code{#1}{#2}{\tikz@setkeys{#3}}}
+\def\tikz@lib@cal@if@else@code#1#2#3{%
+ \expandafter\def\expandafter\tikz@lib@cal@ifs\expandafter{\tikz@lib@cal@ifs\ifdate{#1}{#2}{#3}}%
+ \tikz@lib@cal@scanner%
+}
+\def\tikz@lib@cal@stop{%
+ \pgftransformshift{\tikz@node@at}%
+ \expandafter\pgfcalendar\expandafter{\tikz@fig@name}{\tikz@lib@cal@start}{\tikz@lib@cal@end}%
+ {%
+ \tikz@before@day%
+ \scope%
+ \tikz@atbegin@day%
+ \tikz@lib@cal@ifs%
+ \tikzdaycode%
+ \tikz@atend@day%
+ \endscope%
+ \tikz@after@day%
+ }%
+ \endgroup%
+}
+
+\tikzoption{if}{%
+ \let\tikz@lib@cal@scanner@orig=\tikz@lib@cal@scanner%
+ \let\tikz@lib@cal@scanner=\relax%
+ \tikz@lib@cal@if f#1\relax%
+ \let\tikz@lib@cal@scanner=\tikz@lib@cal@scanner@orig}
+
+
+
+\endinput
diff --git a/Master/texmf-dist/tex/generic/pgf/libraries/pgflibrarytikzcoordinatesystems.code.tex b/Master/texmf-dist/tex/generic/pgf/libraries/pgflibrarytikzcoordinatesystems.code.tex
new file mode 100644
index 00000000000..68659de8138
--- /dev/null
+++ b/Master/texmf-dist/tex/generic/pgf/libraries/pgflibrarytikzcoordinatesystems.code.tex
@@ -0,0 +1,24 @@
+% Copyright 2007 by Till Tantau
+%
+% This file may be distributed and/or modified
+%
+% 1. under the LaTeX Project Public License and/or
+% 2. under the GNU Public License.
+%
+% See the file doc/generic/pgf/licenses/LICENSE for more details.
+
+\ProvidesFileRCS[v\pgfversion] $Header: /cvsroot/pgf/pgf/generic/pgf/libraries/pgflibrarytikzmatrix.code.tex,v 1.5 2007/01/08 10:42:19 tantau Exp $
+
+
+
+% Barycentric coordinates
+%
+% Usage: the argument of the coordinate system expression should be a
+% list of comma-separated pairs of the form node=number. For each
+% node, the center anchors is weighted by the number.
+%
+% Exampe: (barycentric cs:a=1,b=1,c=1) yields the weighted middle of
+% the three points a.center, b.center, c.center.
+
+
+\endinput
diff --git a/Master/texmf-dist/tex/generic/pgf/libraries/pgflibrarytikzfolding.code.tex b/Master/texmf-dist/tex/generic/pgf/libraries/pgflibrarytikzfolding.code.tex
new file mode 100644
index 00000000000..25ae5d3e39b
--- /dev/null
+++ b/Master/texmf-dist/tex/generic/pgf/libraries/pgflibrarytikzfolding.code.tex
@@ -0,0 +1,143 @@
+% Copyright 2006 by Till Tantau
+%
+% This file may be distributed and/or modified
+%
+% 1. under the LaTeX Project Public License and/or
+% 2. under the GNU Public License.
+%
+% See the file doc/generic/pgf/licenses/LICENSE for more details.
+
+\ProvidesFileRCS[v\pgfversion] $Header: /cvsroot/pgf/pgf/generic/pgf/libraries/pgflibrarytikzfolding.code.tex,v 1.3 2007/03/09 17:49:32 tantau Exp $
+
+
+%
+% Length of a standard line in a folding
+%
+
+\tikzoption{folding line length}{\pgfmathsetlength\tikz@lib@fold@length{#1}}
+\newdimen\tikz@lib@fold@length
+\tikz@lib@fold@length=2cm
+
+
+\def\tikz@lib@fold@pentagon#1#2#3#4#5#6{%
+ \begin{scope}[xshift=.5\tikz@lib@fold@length,yshift=0.68819\tikz@lib@fold@length]
+ #1
+ \end{scope}
+ \begin{scope}[shift={(108:\tikz@lib@fold@length)},shift={(36:\tikz@lib@fold@length)},rotate=-36]
+ #2
+ \end{scope}
+ \begin{scope}[xshift=\tikz@lib@fold@length,shift={(72:\tikz@lib@fold@length)},rotate=-108]
+ #3
+ \end{scope}
+ \begin{scope}[xshift=\tikz@lib@fold@length,rotate=180]
+ #4
+ \end{scope}
+ \begin{scope}[rotate=108]
+ #5
+ \end{scope}
+ \begin{scope}[shift={(108:\tikz@lib@fold@length)},rotate=36]
+ #6
+ \end{scope}
+}
+
+
+\def\tikz@lib@fold@path{\draw[every fold](0,0) -- (\tikz@lib@fold@length,0pt);}
+\def\tikz@lib@fold@cut@path{\draw[every cut](0,0) -- (\tikz@lib@fold@length,0pt);}
+\def\tikz@lib@fold@ear@path{
+ \draw[every fold](0,0) -- (\tikz@lib@fold@length,0pt);
+ \draw[every cut] (0,0) -- (.5\tikz@lib@fold@length,.2\tikz@lib@fold@length) --(\tikz@lib@fold@length,0pt);}
+
+\tikzstyle{every cut}=[]
+\tikzstyle{every fold}=[help lines]
+
+\tikzoption{face 1}{\def\tikz@lib@fold@face@A{#1}}
+\tikzoption{face 2}{\def\tikz@lib@fold@face@B{#1}}
+\tikzoption{face 3}{\def\tikz@lib@fold@face@C{#1}}
+\tikzoption{face 4}{\def\tikz@lib@fold@face@D{#1}}
+\tikzoption{face 5}{\def\tikz@lib@fold@face@E{#1}}
+\tikzoption{face 6}{\def\tikz@lib@fold@face@F{#1}}
+\tikzoption{face 7}{\def\tikz@lib@fold@face@G{#1}}
+\tikzoption{face 8}{\def\tikz@lib@fold@face@H{#1}}
+\tikzoption{face 9}{\def\tikz@lib@fold@face@I{#1}}
+\tikzoption{face 10}{\def\tikz@lib@fold@face@J{#1}}
+\tikzoption{face 11}{\def\tikz@lib@fold@face@K{#1}}
+\tikzoption{face 12}{\def\tikz@lib@fold@face@L{#1}}
+
+\let\tikz@lib@fold@face@A=\pgfutil@empty
+\let\tikz@lib@fold@face@B=\pgfutil@empty
+\let\tikz@lib@fold@face@C=\pgfutil@empty
+\let\tikz@lib@fold@face@D=\pgfutil@empty
+\let\tikz@lib@fold@face@E=\pgfutil@empty
+\let\tikz@lib@fold@face@F=\pgfutil@empty
+\let\tikz@lib@fold@face@G=\pgfutil@empty
+\let\tikz@lib@fold@face@H=\pgfutil@empty
+\let\tikz@lib@fold@face@I=\pgfutil@empty
+\let\tikz@lib@fold@face@J=\pgfutil@empty
+\let\tikz@lib@fold@face@K=\pgfutil@empty
+\let\tikz@lib@fold@face@L=\pgfutil@empty
+
+\def\tikzfoldingdodecahedron#1[#2]#3;{%
+ \begingroup%
+ \tikz@setkeys{#2}%
+ \tikz@lib@fold@pentagon{\tikz@lib@fold@face@A}
+ {
+ \tikz@lib@fold@pentagon{\tikz@lib@fold@face@B}
+ {
+ \tikz@lib@fold@pentagon{\tikz@lib@fold@face@C}{\tikz@lib@fold@ear@path}{\tikz@lib@fold@ear@path}{\tikz@lib@fold@path}{\tikz@lib@fold@ear@path}{\tikz@lib@fold@ear@path}
+ }
+ {\tikz@lib@fold@ear@path}
+ {\tikz@lib@fold@path}
+ {\tikz@lib@fold@ear@path}
+ {\tikz@lib@fold@ear@path}
+ }
+ {
+ \tikz@lib@fold@pentagon{\tikz@lib@fold@face@D}
+ {
+ \tikz@lib@fold@pentagon{\tikz@lib@fold@face@E}{\tikz@lib@fold@ear@path}{\tikz@lib@fold@ear@path}{\tikz@lib@fold@path}{\tikz@lib@fold@cut@path}{\tikz@lib@fold@ear@path}
+ }
+ {\tikz@lib@fold@ear@path}
+ {\tikz@lib@fold@path}
+ {\tikz@lib@fold@cut@path}
+ {\tikz@lib@fold@cut@path}
+ }
+ {
+ \tikz@lib@fold@pentagon{\tikz@lib@fold@face@F}
+ {
+ \tikz@lib@fold@pentagon{\tikz@lib@fold@face@G}{\tikz@lib@fold@ear@path}{\tikz@lib@fold@ear@path}{\tikz@lib@fold@path}{\tikz@lib@fold@cut@path}{\tikz@lib@fold@ear@path}
+ }
+ {\tikz@lib@fold@ear@path}
+ {\tikz@lib@fold@path}
+ {\tikz@lib@fold@cut@path}
+ {\tikz@lib@fold@cut@path}
+ }
+ {
+ \tikz@lib@fold@pentagon{\tikz@lib@fold@face@H}
+ {
+ \tikz@lib@fold@pentagon{\tikz@lib@fold@face@I}{\tikz@lib@fold@ear@path}{\tikz@lib@fold@ear@path}{\tikz@lib@fold@path}{\tikz@lib@fold@cut@path}{\tikz@lib@fold@ear@path}
+ }
+ {\tikz@lib@fold@ear@path}
+ {\tikz@lib@fold@path}
+ {\tikz@lib@fold@cut@path}
+ {\tikz@lib@fold@cut@path}
+ }
+ {
+ \tikz@lib@fold@pentagon{\tikz@lib@fold@face@J}
+ {
+ \tikz@lib@fold@pentagon{\tikz@lib@fold@face@K}
+ {\tikz@lib@fold@cut@path}
+ {\tikz@lib@fold@cut@path}
+ {\tikz@lib@fold@path}
+ {\tikz@lib@fold@cut@path}
+ {
+ \tikz@lib@fold@pentagon{\tikz@lib@fold@face@L}{\tikz@lib@fold@cut@path}{\tikz@lib@fold@cut@path}{\tikz@lib@fold@path}{\tikz@lib@fold@cut@path}{\tikz@lib@fold@cut@path}
+ }
+ }
+ {\tikz@lib@fold@cut@path}
+ {\tikz@lib@fold@path}
+ {\tikz@lib@fold@cut@path}
+ {\tikz@lib@fold@cut@path}
+ }
+ \endgroup
+}
+
+
diff --git a/Master/texmf-dist/tex/generic/pgf/libraries/pgflibrarytikzmatrix.code.tex b/Master/texmf-dist/tex/generic/pgf/libraries/pgflibrarytikzmatrix.code.tex
new file mode 100644
index 00000000000..afb1393dffe
--- /dev/null
+++ b/Master/texmf-dist/tex/generic/pgf/libraries/pgflibrarytikzmatrix.code.tex
@@ -0,0 +1,129 @@
+% Copyright 2006 by Till Tantau
+%
+% This file may be distributed and/or modified
+%
+% 1. under the LaTeX Project Public License and/or
+% 2. under the GNU Public License.
+%
+% See the file doc/generic/pgf/licenses/LICENSE for more details.
+
+\ProvidesFileRCS[v\pgfversion] $Header: /cvsroot/pgf/pgf/generic/pgf/libraries/pgflibrarytikzmatrix.code.tex,v 1.5 2007/01/08 10:42:19 tantau Exp $
+
+
+% A matrix of nodes contains a node in each cell.
+
+\tikzstyle{matrix of nodes}=[%
+ matrix,%
+ cells={anchor=base},%
+ nodes={%
+ execute at begin node=,%
+ execute at end node=,
+ name=\tikzmatrixname-\the\pgfmatrixcurrentrow-\the\pgfmatrixcurrentcolumn%
+ },
+ execute at begin cell=\tikz@lib@matrix@start@cell,%
+ execute at end cell=\tikz@lib@matrix@end@cell,%
+ execute at empty cell=\tikz@lib@matrix@empty@cell
+]
+
+\def\tikz@lib@matrix@empty@cell{\iftikz@lib@matrix@empty\node{};\fi}
+
+\newif\iftikz@lib@matrix@plain
+
+\def\tikz@lib@matrix@start@cell{%
+ \pgfutil@ifnextchar|{\tikz@lib@matrix@with@options}{\tikz@lib@matrix@normal@start@cell}}
+
+\def\tikz@lib@matrix@with@options|#1|{\tikz@lib@matrix@plainfalse\node#1\bgroup}
+
+
+\def\tikz@lib@matrix@normal@start@cell{\pgfutil@ifnextchar\let{\tikz@lib@matrix@check}{\tikz@lib@matrix@plainfalse\node\bgroup}}%
+
+\def\tikz@lib@matrix@check#1{% evil hackery to find out about start of path
+ \pgfutil@ifnextchar\tikz@signal@path{\tikz@lib@matrix@plaintrue\let}{\tikz@lib@matrix@plainfalse\node\bgroup\let}%
+}
+
+\def\tikz@lib@matrix@end@cell{%
+ \iftikz@lib@matrix@plain%
+ \else%
+ \expandafter\egroup\expandafter;%
+ \fi%
+}
+
+% Fill empty nodes in a matrix of nodes
+
+\newif\iftikz@lib@matrix@empty
+
+\tikzoption{nodes in empty cells}[true]{\csname tikz@lib@matrix@empty#1\endcsname}
+
+
+% Same as a matrix of nodes, but switch on math mode in each cell
+\tikzstyle{matrix of math nodes}=[%
+ matrix of nodes,
+ nodes={%
+ execute at begin node=$,%
+ execute at end node=$%
+ }%
+]
+
+
+
+% Provide a delimiter
+
+\tikzoption{left delimiter}{\tikz@add@after@node@path{\tikz@delimiter%
+ {south east}%
+ {south west}%
+ {every delimiter,every left delimiter}%
+ {south}%
+ {north}%
+ {#1}%
+ {.}%
+ {\pgf@y}}}
+
+\tikzoption{right delimiter}{\tikz@add@after@node@path{\tikz@delimiter%
+ {south west}%
+ {south east}%
+ {every delimiter,every right delimiter}%
+ {south}%
+ {north}%
+ {.}%
+ {#1}%
+ {\pgf@y}}}
+
+\tikzoption{above delimiter}{\tikz@add@after@node@path{\tikz@delimiter%
+ {south east}%
+ {north west}%
+ {every delimiter,every above delimiter,rotate=-90}%
+ {west}%
+ {east}%
+ {#1}%
+ {.}%
+ {\pgf@x}}}
+
+\tikzoption{below delimiter}{\tikz@add@after@node@path{\tikz@delimiter%
+ {south west}%
+ {south west}%
+ {every delimiter,every below delimiter,rotate=-90}%
+ {west}%
+ {east}%
+ {.}%
+ {#1}%
+ {\pgf@x}}}
+
+\def\tikz@delimiter#1#2#3#4#5#6#7#8{%
+ \bgroup
+ \pgfextra{\let\tikz@save@last@fig@name=\tikz@last@fig@name}%
+ node[outer sep=0pt,inner sep=0pt,draw=none,fill=none,anchor=#1,at=(\tikz@last@fig@name.#2),#3]
+ {%
+ {\nullfont\pgf@process{\pgfpointdiff{\pgfpointanchor{\tikz@last@fig@name}{#4}}{\pgfpointanchor{\tikz@last@fig@name}{#5}}}}%
+ $\left#6\vcenter{\hrule height .5#8 depth .5#8 width0pt}\right#7$%
+ }
+ \pgfextra{\global\let\tikz@last@fig@name=\tikz@save@last@fig@name}%
+ \egroup%
+}
+
+\tikzstyle{every delimiter}=[]
+\tikzstyle{every left delimiter}=[]
+\tikzstyle{every right delimiter}=[]
+\tikzstyle{every above delimiter}=[]
+\tikzstyle{every below delimiter}=[]
+
+\endinput
diff --git a/Master/texmf-dist/tex/generic/pgf/libraries/pgflibrarytikzmindmap.code.tex b/Master/texmf-dist/tex/generic/pgf/libraries/pgflibrarytikzmindmap.code.tex
index b7ec179de63..a370789d2f0 100644
--- a/Master/texmf-dist/tex/generic/pgf/libraries/pgflibrarytikzmindmap.code.tex
+++ b/Master/texmf-dist/tex/generic/pgf/libraries/pgflibrarytikzmindmap.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/pgflibrarytikzmindmap.code.tex,v 1.17 2006/10/17 18:57:25 tantau Exp $
+\ProvidesFileRCS[v\pgfversion] $Header: /cvsroot/pgf/pgf/generic/pgf/libraries/pgflibrarytikzmindmap.code.tex,v 1.21 2007/06/07 07:41:11 tantau Exp $
@@ -24,36 +24,36 @@
\pgftransformxshift{-\pgfsnakecirclestartradius}%
\pgfpathmoveto{\pgfpointpolar{\pgfsnakesegmentangle}{\pgfsnakecirclestartradius}}
\pgfpatharc{\pgfsnakesegmentangle}{-\pgfsnakesegmentangle}{\pgfsnakecirclestartradius}
- \@tempcnta=-\pgfsnakesegmentangle\relax
- \advance\@tempcnta by90\relax
- \setlength\@tempdima{\pgfsnakecirclestartradius}
- \setlength\@tempdimb{\pgfsnakesegmentamplitude}
+ \pgfutil@tempcnta=-\pgfsnakesegmentangle\relax
+ \advance\pgfutil@tempcnta by90\relax
+ \pgfmathsetlength\pgfutil@tempdima{\pgfsnakecirclestartradius}
+ \pgfmathsetlength\pgfutil@tempdimb{\pgfsnakesegmentamplitude}
\pgfpathcurveto
{\pgfpointadd
{\pgfpointpolar{-\pgfsnakesegmentangle}{\pgfsnakecirclestartradius}}
- {\pgfpointpolar{\the\@tempcnta}{.25\@tempdima}}}
- {\pgfpoint{1.25\@tempdima}{-.5\@tempdimb}}
- {\pgfpoint{1.5\@tempdima}{-.5\@tempdimb}}
- \pgfpathlineto{\pgfpoint{1.5\@tempdima}{.5\@tempdimb}}
- \@tempcnta=\pgfsnakesegmentangle\relax
- \advance\@tempcnta by-90\relax
+ {\pgfpointpolar{\the\pgfutil@tempcnta}{.25\pgfutil@tempdima}}}
+ {\pgfqpoint{1.25\pgfutil@tempdima}{-.5\pgfutil@tempdimb}}
+ {\pgfqpoint{1.5\pgfutil@tempdima}{-.5\pgfutil@tempdimb}}
+ \pgfpathlineto{\pgfpoint{1.5\pgfutil@tempdima}{.5\pgfutil@tempdimb}}
+ \pgfutil@tempcnta=\pgfsnakesegmentangle\relax
+ \advance\pgfutil@tempcnta by-90\relax
\pgfpathcurveto
- {\pgfpoint{1.25\@tempdima}{.5\@tempdimb}}
+ {\pgfpoint{1.25\pgfutil@tempdima}{.5\pgfutil@tempdimb}}
{\pgfpointadd
{\pgfpointpolar{\pgfsnakesegmentangle}{\pgfsnakecirclestartradius}}
- {\pgfpointpolar{\the\@tempcnta}{.25\@tempdima}}}
+ {\pgfpointpolar{\the\pgfutil@tempcnta}{.25\pgfutil@tempdima}}}
{\pgfpointpolar{\pgfsnakesegmentangle}{\pgfsnakecirclestartradius}}
\pgfpathclose
}
}
\state{bar}[width=0pt,next state=end]
{
- \setlength\@tempdima{\pgfsnakecirclestartradius}%
- \setlength\@tempdimb{\pgfsnakecircleendradius}%
- \setlength\pgf@xc{\pgfsnakesegmentamplitude}%
+ \pgfmathsetlength\pgfutil@tempdima{\pgfsnakecirclestartradius}%
+ \pgfmathsetlength\pgfutil@tempdimb{\pgfsnakecircleendradius}%
+ \pgfmathsetlength\pgf@xc{\pgfsnakesegmentamplitude}%
\pgfpathrectangle
- {\pgfpoint{.5\@tempdima}{-.5\pgf@xc}}
- {\pgfpoint{\pgfsnakeremainingdistance+-.5\@tempdimb+-.5\@tempdima}{\pgf@xc}}
+ {\pgfqpoint{.5\pgfutil@tempdima}{-.5\pgf@xc}}
+ {\pgfpoint{\pgfsnakeremainingdistance+-.5\pgfutil@tempdimb+-.5\pgfutil@tempdima}{\pgf@xc}}
}
\state{end}[width=0pt,next state=final]
{
@@ -63,24 +63,24 @@
\pgftransformxshift{-\pgfsnakecircleendradius}%
\pgfpathmoveto{\pgfpointpolar{\pgfsnakesegmentangle}{\pgfsnakecircleendradius}}
\pgfpatharc{\pgfsnakesegmentangle}{-\pgfsnakesegmentangle}{\pgfsnakecircleendradius}
- \@tempcnta=-\pgfsnakesegmentangle\relax
- \advance\@tempcnta by90\relax
- \setlength\@tempdima{\pgfsnakecircleendradius}
- \setlength\@tempdimb{\pgfsnakesegmentamplitude}%
+ \pgfutil@tempcnta=-\pgfsnakesegmentangle\relax
+ \advance\pgfutil@tempcnta by90\relax
+ \pgfmathsetlength\pgfutil@tempdima{\pgfsnakecircleendradius}
+ \pgfmathsetlength\pgfutil@tempdimb{\pgfsnakesegmentamplitude}%
\pgfpathcurveto
{\pgfpointadd
{\pgfpointpolar{-\pgfsnakesegmentangle}{\pgfsnakecircleendradius}}
- {\pgfpointpolar{\the\@tempcnta}{.25\@tempdima}}}
- {\pgfpoint{1.25\@tempdima}{-.5\@tempdimb}}
- {\pgfpoint{1.5\@tempdima}{-.5\@tempdimb}}
- \pgfpathlineto{\pgfpoint{1.5\@tempdima}{.5\@tempdimb}}
- \@tempcnta=\pgfsnakesegmentangle\relax
- \advance\@tempcnta by-90\relax
+ {\pgfpointpolar{\the\pgfutil@tempcnta}{.25\pgfutil@tempdima}}}
+ {\pgfqpoint{1.25\pgfutil@tempdima}{-.5\pgfutil@tempdimb}}
+ {\pgfqpoint{1.5\pgfutil@tempdima}{-.5\pgfutil@tempdimb}}
+ \pgfpathlineto{\pgfpoint{1.5\pgfutil@tempdima}{.5\pgfutil@tempdimb}}
+ \pgfutil@tempcnta=\pgfsnakesegmentangle\relax
+ \advance\pgfutil@tempcnta by-90\relax
\pgfpathcurveto
- {\pgfpoint{1.25\@tempdima}{.5\@tempdimb}}
+ {\pgfpoint{1.25\pgfutil@tempdima}{.5\pgfutil@tempdimb}}
{\pgfpointadd
{\pgfpointpolar{\pgfsnakesegmentangle}{\pgfsnakecircleendradius}}
- {\pgfpointpolar{\the\@tempcnta}{.25\@tempdima}}}
+ {\pgfpointpolar{\the\pgfutil@tempcnta}{.25\pgfutil@tempdima}}}
{\pgfpointpolar{\pgfsnakesegmentangle}{\pgfsnakecircleendradius}}
\pgfpathclose
}
@@ -316,5 +316,36 @@
every annotation]
\tikzstyle{every annotation}=[]
+
+
+\tikz@orig@define@key{tikz@mm@anno}{title}{\def\tikzmindmapinserttitle{#1}}
+\tikz@orig@define@key{tikz@mm@anno}{number}{\def\tikzmindmapinsertnumber{#1}}
+\tikz@orig@define@key{tikz@mm@anno}{url}{\def\tikz@mm@url{#1}}
+\tikz@orig@define@key{tikz@mm@anno}{date}{\def\tikz@mm@date{#1}}
+
+\def\tikz@mindmap@annotation[#1]{%
+ {%
+ \let\tikz@mm@at=\pgfutil@empty%
+ \let\tikz@mm@name=\pgfutil@empty%
+ \let\tikzmindmapinserttitle=\pgfutil@empty%
+ \let\tikzmindmapinsertnumber=\pgfutil@empty%
+ \tikz@orig@setkeys*{tikz@mm@anno}{#1}%
+ \edef\tikz@marshal{%
+ \noexpand\node%
+ [%
+ \XKV@rm,%
+ annotation,%
+ ]%
+ {%
+ \ifx\tikz@mm@url\pgfutil@empty\else%
+ \fi%
+ }%
+ }%
+ %
+ }%
+ \pgfutil@ifnextchar;{\pgfutil@gobble}{}%
+}
+
+
\endinput
diff --git a/Master/texmf-dist/tex/generic/pgf/libraries/pgflibrarytikzpetri.code.tex b/Master/texmf-dist/tex/generic/pgf/libraries/pgflibrarytikzpetri.code.tex
index 375713fa933..172f9b991d1 100644
--- a/Master/texmf-dist/tex/generic/pgf/libraries/pgflibrarytikzpetri.code.tex
+++ b/Master/texmf-dist/tex/generic/pgf/libraries/pgflibrarytikzpetri.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/pgflibrarytikzpetri.code.tex,v 1.4 2006/10/17 08:16:28 tantau Exp $
+\ProvidesFileRCS[v\pgfversion] $Header: /cvsroot/pgf/pgf/generic/pgf/libraries/pgflibrarytikzpetri.code.tex,v 1.5 2007/03/09 17:49:32 tantau Exp $
% Styles for places:
@@ -64,8 +64,8 @@
\def\tikz@grow@tokens{%
- \setlength{\pgf@xa}{\tikz@token@distance}%
- \setlength{\pgf@ya}{\tikz@token@distance}%
+ \pgfmathsetlength{\pgf@xa}{\tikz@token@distance}%
+ \pgfmathsetlength{\pgf@ya}{\tikz@token@distance}%
\pgf@xc=0pt%
\pgf@yc=0pt%
\csname tikz@grow@tokens@placer@\the\tikznumberofchildren @\the\tikznumberofcurrentchild\endcsname%
diff --git a/Master/texmf-dist/tex/generic/pgf/libraries/pgflibrarytikzshapes.arrows.code.tex b/Master/texmf-dist/tex/generic/pgf/libraries/pgflibrarytikzshapes.arrows.code.tex
new file mode 100644
index 00000000000..d96884ab716
--- /dev/null
+++ b/Master/texmf-dist/tex/generic/pgf/libraries/pgflibrarytikzshapes.arrows.code.tex
@@ -0,0 +1,14 @@
+% Copyright 2006 by Till Tantau
+%
+% This file may be distributed and/or modified
+%
+% 1. under the LaTeX Project Public License and/or
+% 2. under the GNU Public License.
+%
+% See the file doc/generic/pgf/licenses/LICENSE for more details.
+
+\ProvidesFileRCS[v\pgfversion] $Header: /cvsroot/pgf/pgf/generic/pgf/libraries/pgflibrarytikzshapes.arrows.code.tex,v 1.1 2007/06/08 11:24:59 tantau Exp $
+
+\usepgflibrary{shapes.arrows}
+
+\endinput
diff --git a/Master/texmf-dist/tex/generic/pgf/libraries/pgflibrarytikzshapes.code.tex b/Master/texmf-dist/tex/generic/pgf/libraries/pgflibrarytikzshapes.code.tex
index ef4dcca2a7b..0ad52cfb429 100644
--- a/Master/texmf-dist/tex/generic/pgf/libraries/pgflibrarytikzshapes.code.tex
+++ b/Master/texmf-dist/tex/generic/pgf/libraries/pgflibrarytikzshapes.code.tex
@@ -7,8 +7,12 @@
%
% See the file doc/generic/pgf/licenses/LICENSE for more details.
-\ProvidesFileRCS[v\pgfversion] $Header: /cvsroot/pgf/pgf/generic/pgf/libraries/pgflibrarytikzshapes.code.tex,v 1.2 2006/10/11 15:22:26 tantau Exp $
+\ProvidesFileRCS[v\pgfversion] $Header: /cvsroot/pgf/pgf/generic/pgf/libraries/pgflibrarytikzshapes.code.tex,v 1.3 2007/06/08 11:24:59 tantau Exp $
-\usepgflibrary{shapes}
+\usetikzlibrary{shapes.geometric}
+\usetikzlibrary{shapes.misc}
+\usetikzlibrary{shapes.symbols}
+\usetikzlibrary{shapes.arrows}
+\usetikzlibrary{shapes.multipart}
\endinput
diff --git a/Master/texmf-dist/tex/generic/pgf/libraries/pgflibrarytikzshapes.geometric.code.tex b/Master/texmf-dist/tex/generic/pgf/libraries/pgflibrarytikzshapes.geometric.code.tex
new file mode 100644
index 00000000000..76e2e2967b9
--- /dev/null
+++ b/Master/texmf-dist/tex/generic/pgf/libraries/pgflibrarytikzshapes.geometric.code.tex
@@ -0,0 +1,23 @@
+% Copyright 2006 by Till Tantau
+%
+% This file may be distributed and/or modified
+%
+% 1. under the LaTeX Project Public License and/or
+% 2. under the GNU Public License.
+%
+% See the file doc/generic/pgf/licenses/LICENSE for more details.
+
+\ProvidesFileRCS[v\pgfversion] $Header: /cvsroot/pgf/pgf/generic/pgf/libraries/pgflibrarytikzshapes.geometric.code.tex,v 1.1 2007/06/08 11:24:59 tantau Exp $
+
+
+\tikzoption{star points}{\pgfsetstarpoints{#1}}
+\tikzoption{star rotate}{\pgfsetstarrotate{#1}}
+\tikzoption{star point height}{\pgfsetstarpointheight{#1}}
+\tikzoption{star point ratio}{\pgfsetstarpointratio{#1}}
+
+\tikzoption{regular polygon sides}{\pgfsetpolygonsides{#1}}
+\tikzoption{regular polygon rotate}{\pgfsetpolygonrotate{#1}}
+
+\usepgflibrary{shapes.geometric}
+
+\endinput
diff --git a/Master/texmf-dist/tex/generic/pgf/libraries/pgflibrarytikzshapes.misc.code.tex b/Master/texmf-dist/tex/generic/pgf/libraries/pgflibrarytikzshapes.misc.code.tex
new file mode 100644
index 00000000000..92d9102c986
--- /dev/null
+++ b/Master/texmf-dist/tex/generic/pgf/libraries/pgflibrarytikzshapes.misc.code.tex
@@ -0,0 +1,14 @@
+% Copyright 2006 by Till Tantau
+%
+% This file may be distributed and/or modified
+%
+% 1. under the LaTeX Project Public License and/or
+% 2. under the GNU Public License.
+%
+% See the file doc/generic/pgf/licenses/LICENSE for more details.
+
+\ProvidesFileRCS[v\pgfversion] $Header: /cvsroot/pgf/pgf/generic/pgf/libraries/pgflibrarytikzshapes.misc.code.tex,v 1.1 2007/06/08 11:24:59 tantau Exp $
+
+\usepgflibrary{shapes.misc}
+
+\endinput
diff --git a/Master/texmf-dist/tex/generic/pgf/libraries/pgflibrarytikzshapes.multipart.code.tex b/Master/texmf-dist/tex/generic/pgf/libraries/pgflibrarytikzshapes.multipart.code.tex
new file mode 100644
index 00000000000..f9f29dbaea3
--- /dev/null
+++ b/Master/texmf-dist/tex/generic/pgf/libraries/pgflibrarytikzshapes.multipart.code.tex
@@ -0,0 +1,14 @@
+% Copyright 2006 by Till Tantau
+%
+% This file may be distributed and/or modified
+%
+% 1. under the LaTeX Project Public License and/or
+% 2. under the GNU Public License.
+%
+% See the file doc/generic/pgf/licenses/LICENSE for more details.
+
+\ProvidesFileRCS[v\pgfversion] $Header: /cvsroot/pgf/pgf/generic/pgf/libraries/pgflibrarytikzshapes.multipart.code.tex,v 1.1 2007/06/08 11:24:59 tantau Exp $
+
+\usepgflibrary{shapes.multipart}
+
+\endinput
diff --git a/Master/texmf-dist/tex/generic/pgf/libraries/pgflibrarytikzshapes.symbols.code.tex b/Master/texmf-dist/tex/generic/pgf/libraries/pgflibrarytikzshapes.symbols.code.tex
new file mode 100644
index 00000000000..9760b07fc8b
--- /dev/null
+++ b/Master/texmf-dist/tex/generic/pgf/libraries/pgflibrarytikzshapes.symbols.code.tex
@@ -0,0 +1,14 @@
+% Copyright 2006 by Till Tantau
+%
+% This file may be distributed and/or modified
+%
+% 1. under the LaTeX Project Public License and/or
+% 2. under the GNU Public License.
+%
+% See the file doc/generic/pgf/licenses/LICENSE for more details.
+
+\ProvidesFileRCS[v\pgfversion] $Header: /cvsroot/pgf/pgf/generic/pgf/libraries/pgflibrarytikzshapes.symbols.code.tex,v 1.1 2007/06/08 11:24:59 tantau Exp $
+
+\usepgflibrary{shapes.symbols}
+
+\endinput
diff --git a/Master/texmf-dist/tex/generic/pgf/libraries/pgflibrarytikztopaths.code.tex b/Master/texmf-dist/tex/generic/pgf/libraries/pgflibrarytikztopaths.code.tex
index 6e8cf9e0690..6c720fdc95f 100644
--- a/Master/texmf-dist/tex/generic/pgf/libraries/pgflibrarytikztopaths.code.tex
+++ b/Master/texmf-dist/tex/generic/pgf/libraries/pgflibrarytikztopaths.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/pgflibrarytikztopaths.code.tex,v 1.5 2006/10/16 22:32:59 tantau Exp $
+\ProvidesFileRCS[v\pgfversion] $Header: /cvsroot/pgf/pgf/generic/pgf/libraries/pgflibrarytikztopaths.code.tex,v 1.7 2007/06/07 07:41:11 tantau Exp $
% Straight to
@@ -177,7 +177,7 @@
%
% Calculate length of second to first vector:
%
- \pgf@process{\pgfpointnormalised{\pgfpoint{\pgf@xa}{\pgf@ya}}}%
+ \pgf@process{\pgfpointnormalised{\pgfqpoint{\pgf@xa}{\pgf@ya}}}%
\ifdim\pgf@x>\pgf@y%
\c@pgf@counta=\pgf@x%
\ifnum\c@pgf@counta=0\relax%
@@ -201,19 +201,19 @@
\pgf@xa=\tikz@to@out@looseness\pgf@x%
\pgf@xb=\tikz@to@in@looseness\pgf@x%
% Adjust as necessary
- \setlength{\pgf@ya}{\tikz@to@out@min}
+ \pgfmathsetlength{\pgf@ya}{\tikz@to@out@min}
\ifdim\pgf@xa<\pgf@ya%
\pgf@xa=\pgf@ya%
\fi%
- \setlength{\pgf@ya}{\tikz@to@out@max}
+ \pgfmathsetlength{\pgf@ya}{\tikz@to@out@max}
\ifdim\pgf@xa>\pgf@ya%
\pgf@xa=\pgf@ya%
\fi%
- \setlength{\pgf@ya}{\tikz@to@in@min}
+ \pgfmathsetlength{\pgf@ya}{\tikz@to@in@min}
\ifdim\pgf@xb<\pgf@ya%
\pgf@xb=\pgf@ya%
\fi%
- \setlength{\pgf@ya}{\tikz@to@in@max}
+ \pgfmathsetlength{\pgf@ya}{\tikz@to@in@max}
\ifdim\pgf@xb>\pgf@ya%
\pgf@xb=\pgf@ya%
\fi%
@@ -275,7 +275,7 @@
\pgf@xc=\pgf@x%
\pgf@yc=\pgf@y%
\pgfpointshapeborder{\tikztostart}{\pgfqpoint{\pgf@xc}{\pgf@yc}}%
- \xdef\tikz@tofrom@smuggle{\noexpand\pgfpoint{\the\pgf@x}{\the\pgf@y}}
+ \xdef\tikz@tofrom@smuggle{\noexpand\pgfqpoint{\the\pgf@x}{\the\pgf@y}}
}%
\let\tikz@first@point=\tikz@tofrom@smuggle%
\tikz@first@point%
@@ -302,7 +302,7 @@
\pgf@xc=\pgf@x%
\pgf@yc=\pgf@y%
\pgfpointshapeborder{\tikztotarget}{\pgfqpoint{\pgf@xc}{\pgf@yc}}%
- \xdef\tikz@toto@smuggle{\noexpand\pgfpoint{\the\pgf@x}{\the\pgf@y}}
+ \xdef\tikz@toto@smuggle{\noexpand\pgfqpoint{\the\pgf@x}{\the\pgf@y}}
}%
\let\tikz@second@point=\tikz@toto@smuggle%
}%
diff --git a/Master/texmf-dist/tex/generic/pgf/libraries/pgflibrarytikztrees.code.tex b/Master/texmf-dist/tex/generic/pgf/libraries/pgflibrarytikztrees.code.tex
index 841b534fed3..cba3a725ad1 100644
--- a/Master/texmf-dist/tex/generic/pgf/libraries/pgflibrarytikztrees.code.tex
+++ b/Master/texmf-dist/tex/generic/pgf/libraries/pgflibrarytikztrees.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/pgflibrarytikztrees.code.tex,v 1.7 2006/10/11 15:22:26 tantau Exp $
+\ProvidesFileRCS[v\pgfversion] $Header: /cvsroot/pgf/pgf/generic/pgf/libraries/pgflibrarytikztrees.code.tex,v 1.8 2007/03/09 17:49:32 tantau Exp $
@@ -49,7 +49,7 @@
\advance\pgf@xa by\pgf@xc%
\advance\pgf@ya by\pgf@yb%
\advance\pgf@ya by\pgf@yc%
- \edef\pgf@temp{\noexpand\pgftransformshift{\noexpand\pgfpoint{\the\pgf@xa}{\the\pgf@ya}}}%
+ \edef\pgf@temp{\noexpand\pgftransformshift{\noexpand\pgfqpoint{\the\pgf@xa}{\the\pgf@ya}}}%
\pgf@temp%
}