pgf/tikz 1.09 big update (13oct06)

git-svn-id: svn://tug.org/texlive/trunk@2332 c570f23f-e606-0410-a88d-b1316a301751

14 files changed, 934 insertions, 159 deletions

diff --git a/Master/texmf-dist/tex/generic/pgf/systemlayer/pgf.cfg b/Master/texmf-dist/tex/generic/pgf/systemlayer/pgf.cfg
index a719fda2380..0bed39c0541 100644
--- a/Master/texmf-dist/tex/generic/pgf/systemlayer/pgf.cfg
+++ b/Master/texmf-dist/tex/generic/pgf/systemlayer/pgf.cfg
@@ -1,11 +1,13 @@
-\ProvidesFileRCS $Header: /cvsroot/pgf/pgf/generic/pgf/systemlayer/pgf.cfg,v 1.1.1.1 2005/06/29 12:14:04 tantau Exp $
-
-% Copyright 2005 by Till Tantau <tantau@cs.tu-berlin.de>.
+% Copyright 2006 by Till Tantau
 %
-% This program can be redistributed and/or modified under the terms
-% of the GNU Public License, version 2.
-
+% 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 $Header: /cvsroot/pgf/pgf/generic/pgf/systemlayer/pgf.cfg,v 1.2 2006/10/11 15:22:26 tantau Exp $
 
 % Default driver:
 \ifx\pgfsysdriver\@undefined
diff --git a/Master/texmf-dist/tex/generic/pgf/systemlayer/pgfsys-common-pdf.def b/Master/texmf-dist/tex/generic/pgf/systemlayer/pgfsys-common-pdf.def
index 3f2c726beb8..bdc3c16b905 100644
--- a/Master/texmf-dist/tex/generic/pgf/systemlayer/pgfsys-common-pdf.def
+++ b/Master/texmf-dist/tex/generic/pgf/systemlayer/pgfsys-common-pdf.def
@@ -1,11 +1,13 @@
-\ProvidesFileRCS $Header: /cvsroot/pgf/pgf/generic/pgf/systemlayer/pgfsys-common-pdf.def,v 1.4 2005/10/18 18:03:38 tantau Exp $
-
-% Copyright 2005 by Till Tantau <tantau@cs.tu-berlin.de>.
+% Copyright 2006 by Till Tantau
 %
-% This program can be redistributed and/or modified under the terms
-% of the GNU Public License, version 2.
-
+% 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 $Header: /cvsroot/pgf/pgf/generic/pgf/systemlayer/pgfsys-common-pdf.def,v 1.6 2006/10/11 15:22:26 tantau Exp $
 
 
 % Driver commands for pdf
@@ -58,15 +60,15 @@
 \def\pgfsys@color@gray@fill#1{\pgfsysprotocol@literal{#1 g}}
 
 % Opacity
-\def\pgf@sys@pdf@addtopageresources#1{\pgf@sys@fail{adding to page resources}}
-\def\pgf@sys@pdf@readdtopageresources#1{}% not always used
+\def\pgf@sys@pdf@addtopageresources@extgs#1{\pgf@sys@fail{adding to page resources}}
+\def\pgf@sys@pdf@readdtopageresources@extgs#1{}% not always used
 \def\pgfsys@stroke@opacity#1{%
   \expandafter\ifx\csname pgf@sys@pdf@so@#1\endcsname\relax%
     % Hmm... define...
     \expandafter\gdef\csname pgf@sys@pdf@so@#1\endcsname{/pgf@CA#1}%
-    \pgf@sys@pdf@addtopageresources{/pgf@CA#1 << /CA #1 >>}%
+    \pgf@sys@pdf@addtopageresources@extgs{/pgf@CA#1 << /CA #1 >>}%
   \else%
-    \pgf@sys@pdf@readdtopageresources{/pgf@CA#1 << /CA #1 >>}%
+    \pgf@sys@pdf@readdtopageresources@extgs{/pgf@CA#1 << /CA #1 >>}%
   \fi%
   \pgfsysprotocol@literal{\csname pgf@sys@pdf@so@#1\endcsname\space gs}%  
 }
@@ -74,15 +76,14 @@
   \expandafter\ifx\csname pgf@sys@pdf@fo@#1\endcsname\relax%
     % Hmm... define...
     \expandafter\gdef\csname pgf@sys@pdf@fo@#1\endcsname{/pgf@ca#1}%
-    \pgf@sys@pdf@addtopageresources{/pgf@ca#1 << /ca #1 >>}%
+    \pgf@sys@pdf@addtopageresources@extgs{/pgf@ca#1 << /ca #1 >>}%
   \else%
-    \pgf@sys@pdf@readdtopageresources{/pgf@ca#1 << /ca #1 >>}%
+    \pgf@sys@pdf@readdtopageresources@extgs{/pgf@ca#1 << /ca #1 >>}%
   \fi%
   \pgfsysprotocol@literal{\csname pgf@sys@pdf@fo@#1\endcsname\space gs}%  
 }
 
 
-
 \endinput
 
 
diff --git a/Master/texmf-dist/tex/generic/pgf/systemlayer/pgfsys-common-postscript.def b/Master/texmf-dist/tex/generic/pgf/systemlayer/pgfsys-common-postscript.def
index 81b062a6a6e..89d1d34f958 100644
--- a/Master/texmf-dist/tex/generic/pgf/systemlayer/pgfsys-common-postscript.def
+++ b/Master/texmf-dist/tex/generic/pgf/systemlayer/pgfsys-common-postscript.def
@@ -1,11 +1,13 @@
-\ProvidesFileRCS $Header: /cvsroot/pgf/pgf/generic/pgf/systemlayer/pgfsys-common-postscript.def,v 1.7 2005/10/25 08:18:14 tantau Exp $
-
-% Copyright 2005 by Till Tantau <tantau@cs.tu-berlin.de>.
+% Copyright 2006 by Till Tantau
 %
-% This program can be redistributed and/or modified under the terms
-% of the GNU Public License, version 2.
-
+% 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 $Header: /cvsroot/pgf/pgf/generic/pgf/systemlayer/pgfsys-common-postscript.def,v 1.14 2006/10/11 15:22:26 tantau Exp $
 
 
 % Driver commands for postscript
@@ -155,7 +157,7 @@
   \expandafter\xdef\csname#1\endcsname{\the\pgf@objectcount}%
   \pgfsysprotocol@getcurrentprotocol\pgfsys@temp%
   {%
-    \pgfsysprotocol@setcurrentprotocol\@empty%
+    \pgfsysprotocol@setcurrentprotocol\pgf@empty%
     \pgfsysprotocol@bufferedtrue%
     #4%
     \pgfsysprotocol@getcurrentprotocol\pgfsys@@temp%
@@ -166,7 +168,7 @@
 \def\pgfsys@useobject#1#2{%
   \pgfsysprotocol@getcurrentprotocol\pgfsys@temp%
   {%
-    \pgfsysprotocol@setcurrentprotocol\@empty%
+    \pgfsysprotocol@setcurrentprotocol\pgf@empty%
     \pgfsysprotocol@bufferedfalse%
     #2%
     \pgfsysprotocol@invokecurrentprotocol%
@@ -187,7 +189,7 @@
     \expandafter\xdef\csname @pgfshading#1!\endcsname{\hbox to \the\pgf@max{%
         \noexpand\vrule width0pt height\the\pgf@xa%
         \noexpand\pgfsys@beginpurepicture%
-          \noexpand\pgfsys@rect{0pt}{0pt}{\the\pgf@y}{\the\pgf@x}%
+          \noexpand\pgfsys@rect{0pt}{0pt}{\the\pgf@max}{\the\pgf@xa}%
           \noexpand\pgfsys@clipnext%
           \noexpand\pgfsys@discardpath%
           \noexpand\pgfsys@invoke{\pgf@domb\space \pgf@sys@tonumber{\pgf@x} pgfH \pgf@psfuncs\space pop}%
@@ -206,7 +208,7 @@
     \expandafter\xdef\csname @pgfshading#1!\endcsname{\hbox to\the\pgf@xa{%
         \noexpand\vrule width0pt height\the\pgf@max%
         \noexpand\pgfsys@beginpurepicture%
-          \noexpand\pgfsys@rect{0pt}{0pt}{\the\pgf@x}{\the\pgf@y}%
+          \noexpand\pgfsys@rect{0pt}{0pt}{\the\pgf@xa}{\the\pgf@max}%
           \noexpand\pgfsys@clipnext%
           \noexpand\pgfsys@discardpath%
           \noexpand\pgfsys@invoke{\pgf@domb\space \pgf@sys@tonumber{\pgf@x} pgfV \pgf@psfuncs\space pop}%
@@ -218,6 +220,8 @@
   {%
     \pgf@parsefunc{#3}%
     \pgf@process{#2}%
+    \pgf@sys@bp@correct{\pgf@x}%
+    \pgf@sys@bp@correct{\pgf@y}%
     \pgf@xa=2\pgf@max%
     \pgf@sys@bp@correct{\pgf@max}%
     \advance\pgf@x by \pgf@max%
@@ -233,7 +237,69 @@
   }%
 }
 
-\AtBeginDocument{
+%
+% Patterns
+%
+
+
+\def\pgfsys@declarepattern#1#2#3#4#5#6#7#8#9{%
+  % Start building the pattern dictionary:
+  \pgf@xa=#2\relax%
+  \pgf@ya=#3\relax% 
+  \pgf@xb=#4\relax%
+  \pgf@yb=#5\relax%
+  \pgf@xc=#6\relax%
+  \pgf@yc=#7\relax%
+  \pgf@sys@bp@correct\pgf@xa%
+  \pgf@sys@bp@correct\pgf@ya%
+  \pgf@sys@bp@correct\pgf@xb%
+  \pgf@sys@bp@correct\pgf@yb%
+  \pgf@sys@bp@correct\pgf@xc%
+  \pgf@sys@bp@correct\pgf@yc%
+  \pgfsys@outerinvoke{
+    save true setglobal globaldict begin /pgfpat#1
+    {
+    \ifnum#9=0 [/Pattern /DeviceRGB] \else /Pattern \fi\space
+    setcolorspace
+    gsave
+    initgraphics
+    <<
+      /Type /Pattern
+      /PatternType 1
+      /PaintType \ifnum#9=0 2 \else 1 \fi
+      /TilingType 1
+      /BBox [\pgf@sys@tonumber\pgf@xa\space\pgf@sys@tonumber\pgf@ya\space\pgf@sys@tonumber\pgf@xb\space\pgf@sys@tonumber\pgf@yb]
+      /XStep \pgf@sys@tonumber\pgf@xc\space
+      /YStep \pgf@sys@tonumber\pgf@yc\space
+      /PaintProc
+      { begin 2 dict begin #8\space end end } bind
+    >>
+    matrix
+    makepattern
+    %/pgfpat#1\space exch def
+    grestore
+    setcolor
+    } bind def end restore
+  }%
+}
+
+\def\pgfsys@setpatternuncolored#1#2#3#4{%
+  \pgfsysprotocol@literal{/pgffc{#2 #3 #4 pgfpat#1}def}%
+%      [/Pattern /DeviceRGB] setcolorspace
+%      #2 #3 #4 pgfpat#1\space setcolor
+%    }def}%
+  \pgf@fillcolortrue%
+}
+
+\def\pgfsys@setpatterncolored#1{%
+  \pgfsysprotocol@literal{/pgffc{pgfpat#1}def}%/Pattern setcolorspace
+%      pgfpat#1\space setcolor}def}%
+  \pgf@fillcolortrue%
+}
+
+
+
+\def\pgfsys@atbegindocument{%
   % Parameters to horizontal pre axishade: \pgf@domb x
   \pgf@sys@postscript@header{/pgfH{%
       /pgfheight exch def 0.75 setlinewidth [] 0 setdash
diff --git a/Master/texmf-dist/tex/generic/pgf/systemlayer/pgfsys-common-svg.def b/Master/texmf-dist/tex/generic/pgf/systemlayer/pgfsys-common-svg.def
index 0046ff5a2c1..03a422f95e1 100644
--- a/Master/texmf-dist/tex/generic/pgf/systemlayer/pgfsys-common-svg.def
+++ b/Master/texmf-dist/tex/generic/pgf/systemlayer/pgfsys-common-svg.def
@@ -1,18 +1,20 @@
-\ProvidesFileRCS $Header: /cvsroot/pgf/pgf/generic/pgf/systemlayer/pgfsys-common-svg.def,v 1.13 2005/11/15 17:46:37 tantau Exp $
-
-% Copyright 2005 by Till Tantau <tantau@cs.tu-berlin.de>.
+% Copyright 2006 by Till Tantau
 %
-% This program can be redistributed and/or modified under the terms
-% of the GNU Public License, version 2.
-
+% 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 $Header: /cvsroot/pgf/pgf/generic/pgf/systemlayer/pgfsys-common-svg.def,v 1.17 2006/10/11 15:22:26 tantau Exp $
 
 
 % Driver commands for svg
 
 
 % Helping functions:
-\let\pgf@sys@svgpath=\@empty
+\let\pgf@sys@svgpath=\pgf@empty
 \def\pgf@sys@svgnum#1{%
   {%
     \pgf@x=#1\relax%
@@ -22,12 +24,12 @@
   }%
 }
 \def\pgf@sys@addtosvgpath#1{\g@addto@macro\pgf@sys@svgpath{#1\space}}
-\def\pgf@sys@flushsvgpath{\pgfsysprotocol@literal{\pgf@sys@svgpath}\global\let\pgf@sys@svgpath=\@empty}
+\def\pgf@sys@flushsvgpath{\pgfsysprotocol@literal{\pgf@sys@svgpath}\global\let\pgf@sys@svgpath=\pgf@empty}
 \def\pgf@sys@svg@gs#1{%
   {\pgfsysprotocol@literal{<g #1>\Hnewline }}\global\advance\pgf@sys@svg@scopecount by1\relax%
 }
 \newcount\pgf@sys@svg@objectcount
-\let\Hnewline=\@empty
+\let\Hnewline=\pgf@empty
 
 % Path construction:
 \def\pgfsys@lineto#1#2{\pgf@sys@addtosvgpath{L }\pgf@sys@svgnum{#1}\pgf@sys@svgnum{#2}}
@@ -77,7 +79,7 @@
     \pgf@sys@svg@gs{clip-path="url(\#pgfcp\the\pgf@sys@svg@objectcount)"}
     \pgf@sys@svg@clipnextfalse%
   \else%
-    \global\let\pgf@sys@svgpath=\@empty
+    \global\let\pgf@sys@svgpath=\pgf@empty
   \fi}
 
 % Fill rules:
@@ -114,7 +116,7 @@
 % Graphics state
 \def\pgfsys@setdash#1#2{%
   \edef\pgf@test@dashpattern{#1}%
-  \ifx\pgf@test@dashpattern\@empty%
+  \ifx\pgf@test@dashpattern\pgf@empty%
     \pgf@sys@svg@gs{stroke-dasharray="none" stroke-dashoffset="#2"}%
   \else%
     \pgf@sys@svg@gs{stroke-dasharray="#1" stroke-dashoffset="#2"}%
@@ -191,30 +193,34 @@
   }%
 }
 
+\def\pgf@sys@svg@gs@color#1{%
+  \ifpgfpicture\pgf@sys@svg@gs{#1}\fi%
+}
+
 \def\pgfsys@color@rgb@stroke#1#2#3{%
   \pgf@sys@svg@color@rgb#1,#2,#3\relax%
-  \pgf@sys@svg@gs{stroke="\pgf@sys@svg@prepared"}}
+  \pgf@sys@svg@gs@color{stroke="\pgf@sys@svg@prepared"}}
 \def\pgfsys@color@rgb@fill#1#2#3{%
   \pgf@sys@svg@color@rgb#1,#2,#3\relax%
-  \pgf@sys@svg@gs{fill="\pgf@sys@svg@prepared"}}
+  \pgf@sys@svg@gs@color{fill="\pgf@sys@svg@prepared"}}
 \def\pgfsys@color@cmyk@stroke#1#2#3#4{%
   \pgf@sys@svg@color@cmyk#1,#2,#3,#4\relax%
-  \pgf@sys@svg@gs{stroke="\pgf@sys@svg@prepared"}}
+  \pgf@sys@svg@gs@color{stroke="\pgf@sys@svg@prepared"}}
 \def\pgfsys@color@cmyk@fill#1#2#3#4{%
   \pgf@sys@svg@color@cmyk#1,#2,#3,#4\relax%
-  \pgf@sys@svg@gs{fill="\pgf@sys@svg@prepared"}}
+  \pgf@sys@svg@gs@color{fill="\pgf@sys@svg@prepared"}}
 \def\pgfsys@color@cmy@stroke#1#2#3{%
   \pgf@sys@svg@color@cmy#1,#2,#3\relax%
-  \pgf@sys@svg@gs{stroke="\pgf@sys@svg@prepared"}}
+  \pgf@sys@svg@gs@color{stroke="\pgf@sys@svg@prepared"}}
 \def\pgfsys@color@cmy@fill#1#2#3{%
   \pgf@sys@svg@color@cmy#1,#2,#3\relax%
-  \pgf@sys@svg@gs{fill="\pgf@sys@svg@prepared"}}
+  \pgf@sys@svg@gs@color{fill="\pgf@sys@svg@prepared"}}
 \def\pgfsys@color@gray@stroke#1{%
   \pgf@sys@svg@color@gray#1\relax%
-  \pgf@sys@svg@gs{stroke="\pgf@sys@svg@prepared"}}
+  \pgf@sys@svg@gs@color{stroke="\pgf@sys@svg@prepared"}}
 \def\pgfsys@color@gray@fill#1{%
   \pgf@sys@svg@color@gray#1\relax%
-  \pgf@sys@svg@gs{fill="\pgf@sys@svg@prepared"}}
+  \pgf@sys@svg@gs@color{fill="\pgf@sys@svg@prepared"}}
 
 
 % Shadings:
@@ -231,7 +237,7 @@
 }
 \def\pgf@sys@svg@shading@dostops#1{%
   \edef\pgf@test{#1}%
-  \ifx\pgf@test\@empty%
+  \ifx\pgf@test\pgf@empty%
   \else%
     \expandafter\pgf@sys@svg@shading@dostop\pgf@test%
     \expandafter\pgf@sys@svg@shading@dostops%
@@ -255,7 +261,7 @@
   \pgf@sys@svg@addtostops{\pgf@sys@svg@prepared}%
 }
 
-\let\pgf@sys@svg@thestops=\@empty
+\let\pgf@sys@svg@thestops=\pgf@empty
 \def\pgf@sys@svg@addtostops#1{%
   \edef\pgf@temp{#1}%
   \expandafter\expandafter\expandafter\def
@@ -345,6 +351,55 @@
 }
 
 
+% Patterns
+
+\def\pgfsys@declarepattern#1#2#3#4#5#6#7#8#9{%
+  % Start building the pattern dictionary:
+  \pgf@xa=#2\relax%
+  \pgf@ya=#3\relax% 
+  \pgf@xb=#4\relax%
+  \pgf@yb=#5\relax%
+  \pgf@xc=#6\relax%
+  \pgf@yc=#7\relax%
+  \ifnum#9=1\relax%
+    % Colored. That's easy:
+    \pgfsysprotocol@literal{
+      <pattern
+        id="pgfpat#1"
+        patternUnits="userSpaceOnUse"
+        width="\the\pgf@xc"
+        height="\the\pgf@yc">
+        #8
+      </pattern>}%
+  \else%
+    % Uncolored. Yikes!
+    \pgfsysprotocol@literal{
+      <pattern
+        id="pgfpat#1"
+        patternUnits="userSpaceOnUse"
+        width="\the\pgf@xc"
+        height="\the\pgf@yc"/>
+      <symbol id="pgfsym#1">
+        #8
+      </symbol>}%
+  \fi%
+}
+
+\def\pgfsys@setpatternuncolored#1#2#3#4{%
+  \global\advance\pgf@sys@svg@objectcount by1\relax%
+  \pgf@sys@svg@color@rgb#2,#3,#4\relax%
+  \pgfsysprotocol@literal{
+    <pattern id="pgfupat\the\pgf@sys@svg@objectcount" xlink:href="\#pgfpat#1">
+    <g stroke="\pgf@sys@svg@prepared" fill="\pgf@sys@svg@prepared"> <use xlink:href="\#pgfsym#1"/> </g>
+    </pattern>}
+  \pgf@sys@svg@gs@color{fill="url(\#pgfupat\the\pgf@sys@svg@objectcount)"}%
+}
+
+\def\pgfsys@setpatterncolored#1{%
+  \pgf@sys@svg@gs@color{fill="url(\#pgfpat#1)"}%
+}
+
+
 \endinput
 
 
diff --git a/Master/texmf-dist/tex/generic/pgf/systemlayer/pgfsys-dvi.def b/Master/texmf-dist/tex/generic/pgf/systemlayer/pgfsys-dvi.def
new file mode 100644
index 00000000000..164efe6a01e
--- /dev/null
+++ b/Master/texmf-dist/tex/generic/pgf/systemlayer/pgfsys-dvi.def
@@ -0,0 +1,392 @@
+% 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 $Header: /cvsroot/pgf/pgf/generic/pgf/systemlayer/pgfsys-dvi.def,v 1.3 2006/10/11 15:22:26 tantau Exp $
+
+% Driver commands for pure, ultra-portable dvi, in the tradition of
+% old-style LaTeX pictures.
+%
+% Do not expect magic from this file
+
+
+\newtoks\pgf@sys@dvi@path
+\def\pgf@sys@dvi@addtopath#1{\pgf@sys@dvi@path\expandafter{\the\pgf@sys@dvi@path#1}}
+
+% Placing an object:
+\def\pgf@sys@dvi@put#1#2#3{%
+  {%
+    \setbox\pgf@hbox=\hbox{\raise#2\hbox to0pt{\kern#1\relax#3\hss}}%
+    \wd\pgf@hbox=0pt%
+    \ht\pgf@hbox=0pt%
+    \dp\pgf@hbox=0pt%
+    \box\pgf@hbox%
+  }%
+}
+
+\def\pgf@sys@dvi@drawrect#1#2#3#4{%
+  {%
+    \pgf@x=#1%
+    \pgf@y=#2%
+    \pgf@xa=#3%
+    \pgf@ya=#4%
+    \ifdim\pgf@xa<0pt%
+      \advance\pgf@x by\pgf@xa%
+      \pgf@xa=-\pgf@xa%
+    \fi%
+    \ifdim\pgf@ya<0pt%
+      \advance\pgf@y by\pgf@ya%
+      \pgf@ya=-\pgf@ya%
+    \fi%
+    \pgf@sys@dvi@put{\pgf@x}{\pgf@y}{\vrule width\pgf@xa height\pgf@ya}%
+  }%
+}
+
+\def\pgf@sys@dvi@bezier{%
+  {%
+    % First iteration:
+    \pgf@x=\pgf@time@t\pgf@x\advance\pgf@x by\pgf@time@s\pgf@xa%
+    \pgf@y=\pgf@time@t\pgf@y\advance\pgf@y by\pgf@time@s\pgf@ya%
+    \pgf@xa=\pgf@time@t\pgf@xa\advance\pgf@xa by\pgf@time@s\pgf@xb%
+    \pgf@ya=\pgf@time@t\pgf@ya\advance\pgf@ya by\pgf@time@s\pgf@yb%
+    \pgf@xb=\pgf@time@t\pgf@xb\advance\pgf@xb by\pgf@time@s\pgf@xc%
+    \pgf@yb=\pgf@time@t\pgf@yb\advance\pgf@yb by\pgf@time@s\pgf@yc%
+    % Second iteration:
+    \pgf@x=\pgf@time@t\pgf@x\advance\pgf@x by\pgf@time@s\pgf@xa%
+    \pgf@y=\pgf@time@t\pgf@y\advance\pgf@y by\pgf@time@s\pgf@ya%
+    \pgf@xa=\pgf@time@t\pgf@xa\advance\pgf@xa by\pgf@time@s\pgf@xb%
+    \pgf@ya=\pgf@time@t\pgf@ya\advance\pgf@ya by\pgf@time@s\pgf@yb%
+    % Third iteration:
+    \pgf@x=\pgf@time@t\pgf@x\advance\pgf@x by\pgf@time@s\pgf@xa%
+    \pgf@y=\pgf@time@t\pgf@y\advance\pgf@y by\pgf@time@s\pgf@ya%
+    %
+    \advance\pgf@x by-.5\pgf@sys@dvi@linewidth%
+    \advance\pgf@y by-.5\pgf@sys@dvi@linewidth%
+    \pgf@sys@dvi@drawrect{\pgf@x}{\pgf@y}{\pgf@sys@dvi@linewidth}{\pgf@sys@dvi@linewidth}%
+  }%
+}
+
+\def\pgf@sys@dvi@drawcurve#1#2#3#4#5#6#7#8{%
+  {%
+    \pgf@x=#1%
+    \pgf@y=#2%
+    \pgf@xa=#3%
+    \pgf@ya=#4%
+    \pgf@xb=#5%
+    \pgf@yb=#6%
+    \pgf@xc=#7%
+    \pgf@yc=#8%
+    % Compute number of steps:
+    \@tempdima=\pgf@x%
+    \advance\@tempdima by-\pgf@xa%
+    \ifdim\@tempdima<0pt%
+      \@tempdimb=-\@tempdima%
+    \else%
+      \@tempdimb=\@tempdima%
+    \fi%
+    \@tempdima=\pgf@y%
+    \advance\@tempdima by-\pgf@ya%
+    \ifdim\@tempdima<0pt%
+      \@tempdima=-\@tempdima%
+    \fi%
+    \ifdim\@tempdima>\@tempdimb%  
+      \@tempdimb=\@tempdima%
+    \fi%
+    \@tempdima=\pgf@xb%
+    \advance\@tempdima by-\pgf@xc%
+    \ifdim\@tempdima<0pt%
+      \@tempdima=-\@tempdima%
+    \fi%
+    \ifdim\@tempdima>\@tempdimb%  
+      \@tempdimb=\@tempdima%
+    \fi%
+    \@tempdima=\pgf@yb%
+    \advance\@tempdima by-\pgf@yc%
+    \ifdim\@tempdima<0pt%
+      \@tempdima=-\@tempdima%
+    \fi%
+    \ifdim\@tempdima>\@tempdimb%  
+      \@tempdimb=\@tempdima%
+    \fi%
+    \@tempdima=\pgf@x%
+    \advance\@tempdima by-\pgf@xc%
+    \ifdim\@tempdima<0pt%
+      \@tempdima=-\@tempdima%
+    \fi%
+    \ifdim\@tempdima>\@tempdimb%  
+      \@tempdimb=\@tempdima%
+    \fi%
+    \@tempdima=\pgf@y%
+    \advance\@tempdima by-\pgf@yc%
+    \ifdim\@tempdima<0pt%
+      \@tempdima=-\@tempdima%
+    \fi%
+    \ifdim\@tempdima>\@tempdimb%  
+      \@tempdimb=\@tempdima%
+    \fi%
+    \@tempcnta=\@tempdimb%
+    \ifdim\pgf@sys@dvi@linewidth>0.3pt%
+      \@tempdimb=0.15pt%
+    \else%
+      \ifdim\pgf@sys@dvi@linewidth<0.05pt%  
+        \@tempdimb=.025pt%
+      \else%
+        \@tempdimb=.5\pgf@sys@dvi@linewidth%
+      \fi%
+    \fi%
+    \@tempcntb=\@tempdimb%  
+    \divide\@tempcnta by\@tempcntb\relax%
+    \ifnum\@tempcnta>0\relax%
+      \@tempcntb=0\relax%
+      \loop%
+        {%
+          \@tempdima=\the\@tempcntb pt%
+          \@tempdimb=\the\@tempcnta pt%
+          \advance\@tempdimb by-\@tempdima\relax%
+          \divide\@tempdima by\@tempcnta\relax%
+          \divide\@tempdimb by\@tempcnta\relax%
+          \edef\pgf@time@t{\pgf@sys@tonumber{\@tempdima}}%
+          \edef\pgf@time@s{\pgf@sys@tonumber{\@tempdimb}}%
+          \pgf@sys@dvi@bezier%
+        }%
+        \advance\@tempcntb by1\relax
+      \ifnum\@tempcntb<\@tempcnta%
+        {\def\pgf@time@t{1}\def\pgf@time@s{0}\pgf@sys@dvi@bezier}%  
+      \repeat%
+    \fi%
+  }%
+}
+
+% Text:
+\def\pgfsys@hbox#1{%
+  \wd#1=0pt%
+  \ht#1=0pt%
+  \dp#1=0pt%
+  \pgf@sys@dvi@put{\pgf@sys@dvi@pt@x}{\pgf@sys@dvi@pt@y}{\box#1}%
+}
+
+
+
+% Literals:
+
+\def\pgfsys@invoke#1{#1}
+
+
+% Buffered path construction:
+
+\def\pgfsys@moveto#1#2{\pgfsysprotocol@literal{\noexpand\pgf@sys@dvi@addtopath{\noexpand\pgf@sys@dvi@moveto{#1}{#2}}}}
+\def\pgfsys@lineto#1#2{\pgfsysprotocol@literal{\noexpand\pgf@sys@dvi@addtopath{\noexpand\pgf@sys@dvi@lineto{#1}{#2}}}}
+\def\pgfsys@curveto#1#2#3#4#5#6{\pgfsysprotocol@literal{\noexpand\pgf@sys@dvi@addtopath{\noexpand\pgf@sys@dvi@curveto{#1}{#2}{#3}{#4}{#5}{#6}}}}
+\def\pgfsys@rect#1#2#3#4{\pgfsysprotocol@literal{\noexpand\pgf@sys@dvi@addtopath{\noexpand\pgf@sys@dvi@rect{#1}{#2}{#3}{#4}}}}
+\def\pgfsys@closepath{\pgfsysprotocol@literal{\noexpand\pgf@sys@dvi@addtopath{\noexpand\pgf@sys@dvi@closepath}}}
+
+
+% Scoping
+\def\pgfsys@beginscope{\pgfsysprotocol@literal{\noexpand\pgf@sys@dvi@beginscope}}%
+\def\pgfsys@endscope{\pgfsysprotocol@literal{\noexpand\pgf@sys@dvi@endscope}}%
+
+\def\pgf@sys@dvi@beginscope{%
+  % Save current stuff...
+  \edef\pgf@sys@dvi@return{%
+    \global\pgf@sys@dvi@linewidth=\the\pgf@sys@dvi@linewidth%
+    \global\pgf@sys@dvi@pt@x=\the\pgf@sys@dvi@pt@x%
+    \global\pgf@sys@dvi@pt@y=\the\pgf@sys@dvi@pt@y%
+    \gdef\noexpand\pgf@sys@dvi@pt@aa{\pgf@sys@dvi@pt@aa}%
+    \gdef\noexpand\pgf@sys@dvi@pt@ab{\pgf@sys@dvi@pt@ab}%
+    \gdef\noexpand\pgf@sys@dvi@pt@ba{\pgf@sys@dvi@pt@ba}%
+    \gdef\noexpand\pgf@sys@dvi@pt@bb{\pgf@sys@dvi@pt@bb}%
+  }%
+  \begingroup%
+  \ignorespaces%
+}
+
+\def\pgf@sys@dvi@endscope{%
+  \endgroup%
+  \pgf@sys@dvi@return%
+}
+
+
+
+% Line width
+
+\newdimen\pgf@sys@dvi@linewidth
+\pgf@sys@dvi@linewidth=0.4pt
+
+\def\pgfsys@setlinewidth#1{\global\pgf@sys@dvi@linewidth=#1\relax}
+
+
+% Transformation matrix
+
+\newdimen\pgf@sys@dvi@pt@x
+\newdimen\pgf@sys@dvi@pt@y
+
+\def\pgf@sys@dvi@pt@aa{1.0} \def\pgf@sys@dvi@pt@ab{0.0}
+\def\pgf@sys@dvi@pt@ba{0.0} \def\pgf@sys@dvi@pt@bb{1.0}
+
+\def\pgf@sys@dvi@pos@transform#1#2{%
+  \pgf@pt@temp=#1%
+  #1=\pgf@sys@dvi@pt@aa#1%
+  \advance#1 by\pgf@sys@dvi@pt@ba#2%
+  #2=\pgf@sys@dvi@pt@bb#2%
+  \advance#2 by\pgf@sys@dvi@pt@ab\pgf@pt@temp%
+  \advance#1 by\pgf@sys@dvi@pt@x%
+  \advance#2 by\pgf@sys@dvi@pt@y%
+}
+
+\def\pgf@sys@dvi@transformcm#1#2#3#4#5#6{%
+  {%
+    \pgf@xc=#5%
+    \pgf@yc=#6%
+    %
+    \pgf@x=#1pt%
+    \pgf@y=#2pt%
+    %
+    \pgf@xa=\pgf@sys@dvi@pt@aa\pgf@x%
+    \advance\pgf@xa by \pgf@sys@dvi@pt@ba\pgf@y%
+    %
+    \pgf@ya=\pgf@sys@dvi@pt@ab\pgf@x%
+    \advance\pgf@ya by \pgf@sys@dvi@pt@bb\pgf@y%
+    %
+    \pgf@x=#3pt%
+    \pgf@y=#4pt%
+    %
+    \pgf@xb=\pgf@sys@dvi@pt@aa\pgf@x%
+    \advance\pgf@xb by \pgf@sys@dvi@pt@ba\pgf@y%
+    %
+    \pgf@yb=\pgf@sys@dvi@pt@ab\pgf@x%
+    \advance\pgf@yb by \pgf@sys@dvi@pt@bb\pgf@y%
+    %
+    \pgf@x=\pgf@sys@dvi@pt@aa\pgf@xc%
+    \advance\pgf@x by\pgf@sys@dvi@pt@ba\pgf@yc%
+    \advance\pgf@x by\pgf@sys@dvi@pt@x%
+    %
+    \pgf@y=\pgf@sys@dvi@pt@ab\pgf@xc%
+    \advance\pgf@y by\pgf@sys@dvi@pt@bb\pgf@yc%
+    \advance\pgf@y by\pgf@sys@dvi@pt@y%
+    %
+    \global\pgf@sys@dvi@pt@x=\pgf@x%
+    \global\pgf@sys@dvi@pt@y=\pgf@y%
+    \xdef\pgf@sys@dvi@pt@aa{\pgf@sys@tonumber{\pgf@xa}}%
+    \xdef\pgf@sys@dvi@pt@ab{\pgf@sys@tonumber{\pgf@ya}}%
+    \xdef\pgf@sys@dvi@pt@ba{\pgf@sys@tonumber{\pgf@xb}}%
+    \xdef\pgf@sys@dvi@pt@bb{\pgf@sys@tonumber{\pgf@yb}}%
+  }%
+}
+
+\def\pgfsys@transformcm#1#2#3#4#5#6{%
+  {%
+    \pgf@x=#5\relax%
+    \pgf@y=#6\relax%
+    \pgfsysprotocol@literal{\noexpand\pgf@sys@dvi@transformcm{#1}{#2}{#3}{#4}{\the\pgf@x}{\the\pgf@y}}%
+  }%
+}
+
+
+% Stroking
+
+\def\pgfsys@stroke{\pgfsysprotocol@literal{\noexpand\pgf@sys@dvi@stroke}}%
+
+
+\def\pgf@sys@dvi@stroke{%
+  \let\pgf@sys@dvi@moveto=\pgf@sys@dvi@moveto@stroke%
+  \let\pgf@sys@dvi@lineto=\pgf@sys@dvi@lineto@stroke%
+  \let\pgf@sys@dvi@curveto=\pgf@sys@dvi@curveto@stroke%
+  \let\pgf@sys@dvi@rect=\pgf@sys@dvi@rect@stroke%
+  \let\pgf@sys@dvi@closepath=\pgf@sys@dvi@closepath@stroke%
+  {\the\pgf@sys@dvi@path}%
+  \pgf@sys@dvi@path{}%
+}
+
+\def\pgf@sys@dvi@moveto@stroke#1#2{%
+  % These two store the current position:
+  \pgf@xc=#1\relax%
+  \pgf@yc=#2\relax%
+  % These two store the last moveto:
+  \pgf@xb=\pgf@xc%
+  \pgf@yb=\pgf@yc%
+}
+
+\def\pgf@sys@dvi@lineto@stroke#1#2{%
+  {%
+    \pgf@xa=#1\relax%
+    \pgf@ya=#2\relax%
+    \pgf@x=\pgf@xc%
+    \pgf@y=\pgf@yc%
+    \pgf@sys@dvi@pos@transform{\pgf@xa}{\pgf@ya}%
+    \pgf@sys@dvi@pos@transform{\pgf@x}{\pgf@y}%
+    % Now, we need to draw a line from (x/y) to (xa/ya)
+    %
+    % Horizontal?
+    \ifdim\pgf@y=\pgf@ya%
+      % Ok, that should be easy...
+      \pgf@xb=\pgf@xa%
+      \advance\pgf@xb by-\pgf@x%
+      \advance\pgf@y by-0.5\pgf@sys@dvi@linewidth%
+      \pgf@sys@dvi@drawrect{\pgf@x}{\pgf@y}{\pgf@xb}{\pgf@sys@dvi@linewidth}%
+    \else%
+      \ifdim\pgf@x=\pgf@xa%  
+        % Ok, also easy...
+        \pgf@yb=\pgf@ya%
+        \advance\pgf@yb by-\pgf@y%
+        \advance\pgf@x by-0.5\pgf@sys@dvi@linewidth%
+        \pgf@sys@dvi@drawrect{\pgf@x}{\pgf@y}{\pgf@sys@dvi@linewidth}{\pgf@yb}%
+      \else%
+        \edef\pgf@marshal{\noexpand\pgf@sys@dvi@drawcurve{\the\pgf@x}{\the\pgf@y}{\the\pgf@x}{\the\pgf@y}{\the\pgf@xa}{\the\pgf@ya}{\the\pgf@xa}{\the\pgf@ya}}%
+        \pgf@marshal%
+      \fi%
+    \fi%
+  }%  
+  % Remember:
+  \pgf@xc=#1\relax%
+  \pgf@yc=#2\relax%
+}
+
+
+\def\pgf@sys@dvi@curveto@stroke#1#2#3#4#5#6{%
+  \pgf@x=\pgf@xc%
+  \pgf@y=\pgf@yc%
+  \pgf@xa=#1%
+  \pgf@ya=#2%
+  \pgf@xb=#3%
+  \pgf@yb=#4%
+  \pgf@xc=#5%
+  \pgf@yc=#6%
+  {%
+    \pgf@sys@dvi@pos@transform{\pgf@x}{\pgf@y}%
+    \pgf@sys@dvi@pos@transform{\pgf@xa}{\pgf@ya}%
+    \pgf@sys@dvi@pos@transform{\pgf@xb}{\pgf@yb}%
+    \pgf@sys@dvi@pos@transform{\pgf@xc}{\pgf@yc}%
+    \pgf@sys@dvi@drawcurve{\pgf@x}{\pgf@y}{\pgf@xa}{\pgf@ya}{\pgf@xb}{\pgf@yb}{\pgf@xc}{\pgf@yc}%
+  }%
+}
+
+\def\pgf@sys@dvi@closepath@stroke{%
+  \pgf@sys@dvi@lineto@stroke{\pgf@xc}{\pgf@yc}%
+}
+
+\def\pgf@sys@dvi@rect@stroke#1#2#3#4{%
+  \pgf@x=#1\relax%
+  \pgf@y=#2\relax%
+  \pgf@xa=#3\relax%
+  \pgf@ya=#4\relax%
+  \advance\pgf@xa by\pgf@x%
+  \advance\pgf@ya by\pgf@y%
+  \pgf@sys@dvi@moveto@stroke{\pgf@x}{\pgf@y}%
+  \pgf@sys@dvi@lineto@stroke{\pgf@xa}{\pgf@y}%
+  \pgf@sys@dvi@lineto@stroke{\pgf@xa}{\pgf@ya}%
+  \pgf@sys@dvi@lineto@stroke{\pgf@x}{\pgf@ya}%
+  \pgf@sys@dvi@closepath@stroke%
+}
+
+
+
+\endinput
+
+%%% Local Variables: 
+%%% mode: latex
+%%% End: 
diff --git a/Master/texmf-dist/tex/generic/pgf/systemlayer/pgfsys-dvipdfm.def b/Master/texmf-dist/tex/generic/pgf/systemlayer/pgfsys-dvipdfm.def
index 224197f9b51..88cd20046e0 100644
--- a/Master/texmf-dist/tex/generic/pgf/systemlayer/pgfsys-dvipdfm.def
+++ b/Master/texmf-dist/tex/generic/pgf/systemlayer/pgfsys-dvipdfm.def
@@ -1,12 +1,13 @@
-\ProvidesFileRCS $Header: /cvsroot/pgf/pgf/generic/pgf/systemlayer/pgfsys-dvipdfm.def,v 1.7 2005/09/30 07:14:03 tantau Exp $
-
-% Copyright 2005 by Till Tantau <tantau@cs.tu-berlin.de>.
+% Copyright 2006 by Till Tantau
 %
-% This program can be redistributed and/or modified under the terms
-% of the GNU Public License, version 2.
-
-
+% 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 $Header: /cvsroot/pgf/pgf/generic/pgf/systemlayer/pgfsys-dvipdfm.def,v 1.10 2006/10/11 15:22:26 tantau Exp $
 
 % Driver commands for dvipdfm
 
@@ -43,7 +44,7 @@
 \def\pgfsys@beginpurepicture{\special{pdf: content q}}
 
 
-\def\pgf@sys@pdf@addtopageresources#1{%
+\def\pgf@sys@pdf@addtopageresources@extgs#1{%
   \ifx\pgf@sys@pdf@obj\@undefined%
     \global\let\pgf@sys@pdf@obj=\relax%
     \special{pdf: obj @pgfopacities << >>}%
@@ -51,7 +52,7 @@
   \special{pdf: put @pgfopacities << #1 >>}%
   \special{pdf: put @resources << /ExtGState @pgfopacities >>}%
 }
-\def\pgf@sys@pdf@readdtopageresources#1{%
+\def\pgf@sys@pdf@readdtopageresources@extgs#1{%
   \special{pdf: put @resources << /ExtGState @pgfopacities >>}%
 }
 
@@ -101,6 +102,10 @@
     \pgf@process{\pgfpoint{\pgf@max}{\pgf@max}}%
     \advance\pgf@xa by \pgf@x\relax%
     \advance\pgf@ya by \pgf@y\relax%
+    \pgf@sys@bp@correct{\pgf@x}%
+    \pgf@sys@bp@correct{\pgf@y}%
+    \pgf@sys@bp@correct{\pgf@xa}%
+    \pgf@sys@bp@correct{\pgf@ya}%
     \@tempdima=2\pgf@max\relax%
     \edef\@temp{\noexpand\pgf@sys@atbeginpage{\special{pdf: beginxobj @pgfshade#1 width \the\@tempdima\space height \the\@tempdima}}}\@temp%
     \edef\@temp{\noexpand\pgf@sys@atbeginpage{\special{pdf: put @resources <<
diff --git a/Master/texmf-dist/tex/generic/pgf/systemlayer/pgfsys-dvips.def b/Master/texmf-dist/tex/generic/pgf/systemlayer/pgfsys-dvips.def
index 75e0a857445..a633f7cc4e9 100644
--- a/Master/texmf-dist/tex/generic/pgf/systemlayer/pgfsys-dvips.def
+++ b/Master/texmf-dist/tex/generic/pgf/systemlayer/pgfsys-dvips.def
@@ -1,18 +1,19 @@
-\ProvidesFileRCS $Header: /cvsroot/pgf/pgf/generic/pgf/systemlayer/pgfsys-dvips.def,v 1.10 2005/10/25 08:18:14 tantau Exp $
-
-% Copyright 2005 by Till Tantau <tantau@cs.tu-berlin.de>.
+% Copyright 2006 by Till Tantau
 %
-% This program can be redistributed and/or modified under the terms
-% of the GNU Public License, version 2.
-
-
+% 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 $Header: /cvsroot/pgf/pgf/generic/pgf/systemlayer/pgfsys-dvips.def,v 1.14 2006/10/11 15:22:26 tantau Exp $
 
 % Driver commands for dvips
 
 \def\pgfsys@invoke#1{\special{ps:: #1}}
 \def\pgfsys@outerinvoke#1{\special{ps: #1}}
-\def\pgf@sys@postscript@header#1{\special{! #1}}
+\def\pgf@sys@postscript@header#1{\AtBeginDvi{\special{! #1}}}
 \def\pgf@sys@postscript@object#1{\special{! #1}}
 
 
@@ -50,9 +51,11 @@
 \def\pgfsys@color@unstacked#1{\special{ps: \XC@usecolor{#1}}}
 \def\pgfsys@imagesuffixlist{epsi:eps:ps}
 
-\AtBeginDocument{
-  % Always present specials.
-  \special{!
+\def\pgfsys@papersize#1#2{%
+  \expandafter\gdef\expandafter\pgfsys@atbegindocument\expandafter{\pgfsys@atbegindocument\special{papersize=#1,#2}}}
+
+\expandafter\gdef\expandafter\pgfsys@atbegindocument\expandafter{\pgfsys@atbegindocument%
+  \pgf@sys@postscript@header{
     /pgfsc{}B% stroke color is empty by default
     /pgffc{}B% fill color is empty by default
     /pgfstr{stroke}B%
@@ -78,7 +81,12 @@
     /pgffoa 1 def
     /pgfsoa 1 def
     end
-    }
+  }%
+}
+
+\AtBeginDocument{ % needed for plain TeX
+  \pgfsys@atbegindocument
+  \let\pgfsys@atbegindocument=\relax
 }
 
 \endinput
diff --git a/Master/texmf-dist/tex/generic/pgf/systemlayer/pgfsys-pdftex.def b/Master/texmf-dist/tex/generic/pgf/systemlayer/pgfsys-pdftex.def
index 79697fbb9f6..ce86689204c 100644
--- a/Master/texmf-dist/tex/generic/pgf/systemlayer/pgfsys-pdftex.def
+++ b/Master/texmf-dist/tex/generic/pgf/systemlayer/pgfsys-pdftex.def
@@ -1,11 +1,13 @@
-\ProvidesFileRCS $Header: /cvsroot/pgf/pgf/generic/pgf/systemlayer/pgfsys-pdftex.def,v 1.4 2005/10/06 13:16:09 tantau Exp $
-
-% Copyright 2005 by Till Tantau <tantau@cs.tu-berlin.de>.
+% Copyright 2006 by Till Tantau
 %
-% This program can be redistributed and/or modified under the terms
-% of the GNU Public License, version 2.
-
+% 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 $Header: /cvsroot/pgf/pgf/generic/pgf/systemlayer/pgfsys-pdftex.def,v 1.12 2006/10/11 15:22:26 tantau Exp $
 
 
 % Driver commands for pdf
@@ -40,23 +42,46 @@
   }%
 }
 
-\let\pgf@sys@pgf@resource@list=\@empty%
-\def\pgf@sys@pdf@addtopageresources#1{%
-  \xdef\pgf@sys@pgf@resource@list{\pgf@sys@pgf@resource@list\space#1}%
-  \edef\pgf@temp{{<<\pgf@sys@pgf@resource@list>>}}%
-  \expandafter\immediate\expandafter\pdfobj\pgf@temp%
-  \edef\pgf@temp{{/ExtGState \the\pdflastobj\space 0 R}}
-  \expandafter\global\expandafter\pdfpageresources\pgf@temp%
+\let\pgf@sys@pgf@resource@list@extgs=\pgf@empty%
+\let\pgf@sys@pgf@resource@list@patterns=\pgf@empty%
+
+\def\pgf@sys@pdf@addtopageresources@extgs#1{%
+  \xdef\pgf@sys@pgf@resource@list@extgs{\pgf@sys@pgf@resource@list@extgs\space#1}%
+  \pgf@sys@pdf@updateresources%
+}
+
+\def\pgf@sys@pdf@addtopageresources@patterns#1{%
+  \xdef\pgf@sys@pgf@resource@list@patterns{\pgf@sys@pgf@resource@list@patterns\space#1}%
+  \pgf@sys@pdf@updateresources%
+}
+
+\def\pgf@sys@pdf@updateresources{%
+  \let\pgf@temp=\pgf@empty%
+  \ifx\pgf@sys@pgf@resource@list@extgs\pgf@empty%
+  \else%
+    \immediate\pdfobj{<<\pgf@sys@pgf@resource@list@extgs>>}%
+    \edef\pgf@temp{/ExtGState \the\pdflastobj\space 0 R\space}%
+  \fi%
+  \ifx\pgf@sys@pgf@resource@list@patterns=\pgf@empty%
+  \else%
+    \immediate\pdfobj{<<\pgf@sys@pgf@resource@list@patterns>>}%
+    \edef\pgf@temp{%
+      \pgf@temp%
+      /ColorSpace << /pgfprgb [/Pattern /DeviceRGB] >>
+      /Pattern \the\pdflastobj\space 0 R\space%
+    }%
+  \fi%
+  \expandafter\global\expandafter\pdfpageresources\expandafter{\pgf@temp}%
 }
 
 
 \def\pgfsys@imagesuffixlist{pdf:jpg:jpeg:png}
 \def\pgfsys@defineimage{% width, height, page number
-  \ifx\pgf@imagewidth\@empty\else\edef\pgf@imagewidth{ width \pgf@imagewidth }\fi%
-  \ifx\pgf@imageheight\@empty\else\edef\pgf@imageheight{ height \pgf@imageheight }\fi%
-  \ifx\pgf@imagepage\@empty\else\edef\pgf@imagepage{ page \pgf@imagepage }\fi%
+  \ifx\pgf@imagewidth\pgf@empty\else\edef\pgf@imagewidth{ width \pgf@imagewidth }\fi%
+  \ifx\pgf@imageheight\pgf@empty\else\edef\pgf@imageheight{ height \pgf@imageheight }\fi%
+  \ifx\pgf@imagepage\pgf@empty\else\edef\pgf@imagepage{ page \pgf@imagepage }\fi%
   \ifx\pdfximage\@undefined% old version of pdflatex
-    \ifx\pgf@imagepage\@empty\else%
+    \ifx\pgf@imagepage\pgf@empty\else%
       \PackageWarning{pgf}{Page selection not supported. Ignoring
         page selection}%
     \fi%
@@ -72,7 +97,7 @@
   \fi
 }%
 \def\pgfsys@definemask{%
-  \ifx\pgf@maskmatte\@empty%
+  \ifx\pgf@maskmatte\pgf@empty%
   \else%
     \edef\pgf@maskmatte{/Matte [\pgf@maskmatte]}%
   \fi%
@@ -120,6 +145,10 @@
     \pgf@process{\pgfpoint{\pgf@max}{\pgf@max}}%
     \advance\pgf@xa by \pgf@x%
     \advance\pgf@ya by \pgf@y%
+    \pgf@sys@bp@correct{\pgf@x}%
+    \pgf@sys@bp@correct{\pgf@y}%
+    \pgf@sys@bp@correct{\pgf@xa}%
+    \pgf@sys@bp@correct{\pgf@ya}%
     \pdfxform resources {%
       /Shading << /Sh << /ShadingType 3
       /ColorSpace /DeviceRGB
@@ -131,6 +160,55 @@
   }%
 }%
 
+
+
+% Patterns
+
+\def\pgfsys@declarepattern#1#2#3#4#5#6#7#8#9{%
+  % Start building the pattern dictionary:
+  \pgf@xa=#2\relax%
+  \pgf@ya=#3\relax% 
+  \pgf@xb=#4\relax%
+  \pgf@yb=#5\relax%
+  \pgf@xc=#6\relax%
+  \pgf@yc=#7\relax%
+  \pgf@sys@bp@correct\pgf@xa%
+  \pgf@sys@bp@correct\pgf@ya%
+  \pgf@sys@bp@correct\pgf@xb%
+  \pgf@sys@bp@correct\pgf@yb%
+  \pgf@sys@bp@correct\pgf@xc%
+  \pgf@sys@bp@correct\pgf@yc%
+  % Now create the pattern object:
+  \immediate\pdfobj stream
+  attr
+  {
+    /Type /Pattern
+    /PatternType 1
+    /PaintType \ifnum#9=0 2 \else 1 \fi
+    /TilingType 1
+    /BBox [\pgf@sys@tonumber\pgf@xa\space\pgf@sys@tonumber\pgf@ya\space\pgf@sys@tonumber\pgf@xb\space\pgf@sys@tonumber\pgf@yb]
+    /XStep \pgf@sys@tonumber\pgf@xc\space
+    /YStep \pgf@sys@tonumber\pgf@yc\space
+    /Resources << >>
+  }
+  {#8}%
+  \pgf@sys@pdf@addtopageresources@patterns{/pgfpat#1\space \the\pdflastobj\space 0 R}%
+}
+
+\def\pgfsys@setpatternuncolored#1#2#3#4{%
+  \pgfsysprotocol@literal{/pgfprgb cs #2 #3 #4 /pgfpat#1\space scn}%
+}
+
+\def\pgfsys@setpatterncolored#1{%
+  \pgfsysprotocol@literal{/Pattern cs /pgfpat#1\space scn}%
+}
+
+
+\def\pgfsys@papersize#1#2{%
+  \pdfpageheight#2%
+  \pdfpagewidth#1}
+
+
   % XForm version, crashes ghostview.
   %\def\pgfsys@defobject#1#2#3#4{%
   %  \pgf@process{#2}
@@ -161,6 +239,31 @@
   %  \box\pgfobjectbox%
   %  \pgfsys@endscope}
 
+
+
+%
+% Position tracking
+%
+\def\pgfsys@markposition#1{%
+  \pdfsavepos%
+  \edef\pgf@temp{#1}%
+  \expandafter\write\expandafter\@auxout\expandafter{%
+    \expandafter\noexpand\expandafter\pgf@sys@pdf@mark\expandafter{\pgf@temp}{\the\pdflastxpos}{\the\pdflastypos}}%
+}
+
+\def\pgf@sys@pdf@mark#1#2#3{%
+  \expandafter\gdef\csname pgf@sys@pdf@mark@pos@#1\endcsname{\pgfqpoint{#2sp}{#3sp}}%
+}
+
+\def\pgfsys@getposition#1#2{%
+  \edef\pgf@marshal{\let\noexpand#2=\expandafter\noexpand\csname pgf@sys@pdf@mark@pos@#1\endcsname}%
+  \pgf@marshal%
+}
+
+\def\pgf@sys@pdf@mark@pos@pgfpageorigin{\pgfpointorigin}
+
+
+
 \endinput
 
 
diff --git a/Master/texmf-dist/tex/generic/pgf/systemlayer/pgfsys-tex4ht.def b/Master/texmf-dist/tex/generic/pgf/systemlayer/pgfsys-tex4ht.def
index 016f909d24f..5bab839a2db 100644
--- a/Master/texmf-dist/tex/generic/pgf/systemlayer/pgfsys-tex4ht.def
+++ b/Master/texmf-dist/tex/generic/pgf/systemlayer/pgfsys-tex4ht.def
@@ -1,9 +1,13 @@
-\ProvidesFileRCS $Header: /cvsroot/pgf/pgf/generic/pgf/systemlayer/pgfsys-tex4ht.def,v 1.9 2005/11/15 17:46:37 tantau Exp $
-
-% Copyright 2005 by Till Tantau <tantau@cs.tu-berlin.de>.
+% Copyright 2006 by Till Tantau
+%
+% This file may be distributed and/or modified
 %
-% This program can be redistributed and/or modified under the terms
-% of the GNU Public License, version 2.
+% 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 $Header: /cvsroot/pgf/pgf/generic/pgf/systemlayer/pgfsys-tex4ht.def,v 1.13 2006/10/11 15:22:26 tantau Exp $
 
 
 \RequirePackage{xcolor}
@@ -104,7 +108,7 @@
   \pgf@x=.5\wd#1%
   \ifx\tikz@textcolor\relax%
   \else%
-    \ifx\tikz@textcolor\@empty%
+    \ifx\tikz@textcolor\pgf@empty%
       \pgfsetfillcolor{.}%
     \else%
       \pgfsetfillcolor{\tikz@textcolor}%
@@ -115,7 +119,7 @@
     transform="scale(1,-1) translate(\pgf@sys@tonumber{\pgf@x},0)"
     text-anchor="middle"
   }%
-  \ifx\f@size\@empty%
+  \ifx\f@size\pgf@empty%
   \else%
     \HCode{ font-size="\f@size"}%
   \fi%  
@@ -127,7 +131,7 @@
   \HCode{</text>\Hnewline }%
 }
 
-\def\pgfsys@outerinvoke{\ifpgfpicture\expandafter\pgfsys@invoke\else\expandafter\@gobble\fi}
+\def\pgfsys@outerinvoke{\ifpgfpicture\expandafter\pgfsys@invoke\else\expandafter\pgf@gobble\fi}
 
 
 \def\pgfsys@shadingoutsidepgfpicture#1{%
diff --git a/Master/texmf-dist/tex/generic/pgf/systemlayer/pgfsys-textures.def b/Master/texmf-dist/tex/generic/pgf/systemlayer/pgfsys-textures.def
index 34448c295a0..2239a0166ec 100644
--- a/Master/texmf-dist/tex/generic/pgf/systemlayer/pgfsys-textures.def
+++ b/Master/texmf-dist/tex/generic/pgf/systemlayer/pgfsys-textures.def
@@ -1,11 +1,13 @@
-\ProvidesFileRCS $Header: /cvsroot/pgf/pgf/generic/pgf/systemlayer/pgfsys-textures.def,v 1.2 2005/11/09 08:52:19 tantau Exp $
-
-% Copyright 2005 by Till Tantau <tantau@cs.tu-berlin.de>.
+% Copyright 2006 by Till Tantau
 %
-% This program can be redistributed and/or modified under the terms
-% of the GNU Public License, version 2.
-
+% 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 $Header: /cvsroot/pgf/pgf/generic/pgf/systemlayer/pgfsys-textures.def,v 1.4 2006/10/11 15:22:26 tantau Exp $
 
 
 % Driver commands for textures driver
@@ -29,7 +31,7 @@
 \def\pgfsys@beginpicture{%
   \special{rawpostscript save}%
     \special{rawpostscript save pgfgetcoords}%
-    \special{postscript}% here come the coordiantes
+    \special{postscript}% here come the coordinates
     \special{rawpostscript restore}%
       \special{rawpostscript pgfbeginpicture}}
 \def\pgfsys@endpicture{\special{rawpostscript restore}}
diff --git a/Master/texmf-dist/tex/generic/pgf/systemlayer/pgfsys-vtex.def b/Master/texmf-dist/tex/generic/pgf/systemlayer/pgfsys-vtex.def
index 197a3e14e0a..cac83871b86 100644
--- a/Master/texmf-dist/tex/generic/pgf/systemlayer/pgfsys-vtex.def
+++ b/Master/texmf-dist/tex/generic/pgf/systemlayer/pgfsys-vtex.def
@@ -1,11 +1,13 @@
-\ProvidesFileRCS $Header: /cvsroot/pgf/pgf/generic/pgf/systemlayer/pgfsys-vtex.def,v 1.4 2005/10/25 08:39:23 tantau Exp $
-
-% Copyright 2005 by Till Tantau <tantau@cs.tu-berlin.de>.
+% Copyright 2006 by Till Tantau
 %
-% This program can be redistributed and/or modified under the terms
-% of the GNU Public License, version 2.
-
+% 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 $Header: /cvsroot/pgf/pgf/generic/pgf/systemlayer/pgfsys-vtex.def,v 1.6 2006/10/11 15:22:26 tantau Exp $
 
 
 % Driver commands for vtex
@@ -39,7 +41,7 @@
 }
 \def\pgf@sys@vtex@setcolor#1{%
   \colorlet{pgf@tempcolor}{#1}%
-  \@ifundefined{applycolormixins}{}{\applycolormixins{pgf@tempcolor}}%
+  \pgf@ifundefined{applycolormixins}{}{\applycolormixins{pgf@tempcolor}}%
   \expandafter\expandafter\expandafter\pgf@sys@vtex@@setcolor\csname\string\color@pgf@tempcolor\endcsname%
 }
 \def\pgf@sys@vtex@@setcolor#1#2#3#4#5{%
diff --git a/Master/texmf-dist/tex/generic/pgf/systemlayer/pgfsys.code.tex b/Master/texmf-dist/tex/generic/pgf/systemlayer/pgfsys.code.tex
index 22b257f7448..6057cbec149 100644
--- a/Master/texmf-dist/tex/generic/pgf/systemlayer/pgfsys.code.tex
+++ b/Master/texmf-dist/tex/generic/pgf/systemlayer/pgfsys.code.tex
@@ -1,11 +1,13 @@
-\ProvidesPackageRCS[v\pgfversion] $Header: /cvsroot/pgf/pgf/generic/pgf/systemlayer/pgfsys.code.tex,v 1.9 2005/10/18 18:03:38 tantau Exp $
-
-% Copyright 2005 by Till Tantau <tantau@cs.tu-berlin.de>.
+% Copyright 2006 by Till Tantau
 %
-% This program can be redistributed and/or modified under the terms
-% of the GNU Public License, version 2.
-
+% 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.
 
+\ProvidesPackageRCS[v\pgfversion] $Header: /cvsroot/pgf/pgf/generic/pgf/systemlayer/pgfsys.code.tex,v 1.18 2006/10/11 15:22:26 tantau Exp $
 
 
 %
@@ -36,6 +38,51 @@
   }%
 }
 
+
+%
+% Useful commands that are used throughout pgf. The corresponding
+% latex commands are not used because a) latex might not be in use and
+% b) the latex commands are redefined by some *very vile and evil*
+% packages. 
+%
+\long\def\pgf@ifundefined#1{%
+  \expandafter\ifx\csname#1\endcsname\relax
+    \expandafter\pgf@firstoftwo
+  \else
+    \expandafter\pgf@secondoftwo
+  \fi}
+\def\pgf@firstoftwo#1#2{#1}
+\def\pgf@secondoftwo#1#2{#2}
+\def\pgf@empty{}
+\def\pgf@gobble#1{}
+\def\pgf@gobbletwo#1#2{}
+\long\def\pgf@ifnextchar#1#2#3{%
+  \let\reserved@d=#1%
+  \def\reserved@a{#2}%
+  \def\reserved@b{#3}%
+  \futurelet\pgf@let@token\pgf@ifnch}
+\def\pgf@ifnch{%
+  \ifx\pgf@let@token\pgf@sptoken
+    \let\reserved@c\pgf@xifnch
+  \else
+    \ifx\pgf@let@token\reserved@d
+      \let\reserved@c\reserved@a
+    \else
+      \let\reserved@c\reserved@b
+    \fi
+  \fi
+  \reserved@c}
+\def\:{\global\let\pgf@sptoken= } \:
+\def\:{\pgf@xifnch} \expandafter\def\: {\futurelet\pgf@let@token\pgf@ifnch}
+\def\pgf@namedef#1{\expandafter\def\csname #1\endcsname}
+\long\def\pgf@g@addto@macro#1#2{%
+  \begingroup
+    \toks@\expandafter{#1#2}%
+    \xdef#1{\the\toks@}%
+ \endgroup}
+
+
+
 % internal dimensions that are always present when pgsys is loaded.
 \newdimen\pgf@x
 \newdimen\pgf@y
@@ -73,9 +120,9 @@
 % given at the end.
 
 \def\pgf@sys@fail#1{%
-  \expandafter\ifx\csname pgf@sys@fail@#1\endcsname\@empty%
+  \expandafter\ifx\csname pgf@sys@fail@#1\endcsname\pgf@empty%
   \else%
-    \expandafter\global\expandafter\let\csname pgf@sys@fail@#1\endcsname=\@empty%
+    \expandafter\global\expandafter\let\csname pgf@sys@fail@#1\endcsname=\pgf@empty%
     \PackageWarning{pgf}{%
       Your graphic driver \pgfsysdriver\space does not supported #1. This warning is given only once}%
   \fi%
@@ -543,6 +590,84 @@
 % The parameter #2 is a pgf point specification if the starting point
 % of the shading. See the pgfuserguide for details.
 
+
+
+
+
+%
+%
+% Pattern stuff
+%
+%
+
+\def\pgfsys@declarepattern#1#2#3#4#5#6#7#8#9{\pgf@sys@fail{patterns}}
+% This command declares a new colored or uncolored pattern. Uncolored
+% patterns have no inherent color, the color is provided when they are
+% set. Colored patters have an inherent color.
+% #1       = name of the pattern (must be a plain suffix for use in
+%            postscript/pdf/etc.) 
+% #2 to #5 = four coordinates describing the corners of a bounding box
+%            of pattern cells
+% #6       = x-step
+% #7       = y-step
+% #8       = pattern code
+% #9       = 0 if uncolored patter, 1 if colored pattern.
+
+\def\pgfsys@setpatternuncolored#1#2#3#4{\pgf@sys@fail{patterns}}
+% Sets an uncolored pattern #1 as filling color. The numbers #2, #3,
+% #4 must be an rgb-value to be used as the color of the pattern.
+
+\def\pgfsys@setpatterncolored#1{\pgf@sys@fail{patterns}}
+% Sets an colored pattern #1 as filling color.
+
+
+%
+%
+% Page size stuff
+%
+%
+\def\pgfsys@papersize#1#2{\pgf@sys@fail{papersize}}
+% This command sets the paper size in a portable way.
+% #1 = width
+% #2 = height
+
+
+
+%
+%
+% Position tracking commands
+%
+%
+
+% Marks the current position on the page. This position can later be
+% referenced using \pgfsys@getposition
+\def\pgfsys@markposition#1{\pgf@sys@fail{marking the current position}}
+
+% Sets #2 to a pgfpoint macro that returns the position #1 is
+% returned in a coordinate system where the x-axis goes right and the
+% y-axis goes up. The origin of this coordinate system may or may not
+% lie in the lower left corner; you should shift the coordinate system
+% to the position "pgfpageorigin" to make sure that the origin is at
+% the lower left corner. Typically, getting this position
+% requires two runs of TeX. On the first run, the macro will be set to
+% \relax, indicating that the position is not available. 
+%
+% If #1 is set to the special position "pgfpageorigin", the position
+% of the the lower left page corner is returned. 
+
+\def\pgfsys@getposition#1#2{\let#2=\relax}
+
+
+
+%
+%
+% Commands having a default implementation. These commands only need
+% not be implemented by drivers if this results in a better
+% preformance. 
+%
+%
+
+
 \def\pgfsys@shadingoutsidepgfpicture#1{%
   #1%
 }
@@ -568,15 +693,6 @@
 
 
 
-%
-%
-% Commands having a default implementation. These commands only need
-% not be implemented by drivers if this results in a better
-% preformance. 
-%
-%
-
-
 \def\pgfsys@closestroke{\pgfsys@closepath\pgfsys@stroke}
 % This command should have the same effect as first closing the path
 % and then stroking it.
@@ -608,7 +724,7 @@
   {\pgfsys@beginscope\pgflowlevelsynccm\pgfsys@hbox#1\pgfsys@endscope}%
 }
 % Called to insert a TeX hbox into a pgfpicture, but with the current
-% coordiante transformation matrix synced with the canvas
+% coordinate transformation matrix synced with the canvas
 % transformation matrix. 
 %
 % In essence, this command does the same as if you first said
@@ -651,9 +767,9 @@
 % Called at the end of a ``pure'' pgfpicture.
 
 \def\pgfsys@defineimage{%
-  \ifx\pgf@imagewidth\@empty\else\edef\pgf@imagewidth{width=\pgf@imagewidth,}\fi%
-  \ifx\pgf@imageheight\@empty\else\edef\pgf@imageheight{height=\pgf@imageheight,}\fi%
-  \ifx\pgf@imagepage\@empty\else\edef\pgf@imagepage{page=\pgf@imagepage,}\fi%
+  \ifx\pgf@imagewidth\pgf@empty\else\edef\pgf@imagewidth{width=\pgf@imagewidth,}\fi%
+  \ifx\pgf@imageheight\pgf@empty\else\edef\pgf@imageheight{height=\pgf@imageheight,}\fi%
+  \ifx\pgf@imagepage\pgf@empty\else\edef\pgf@imagepage{page=\pgf@imagepage,}\fi%
   \edef\pgf@image{\noexpand\includegraphics[\pgf@imageheight\pgf@imagewidth]{\pgf@filename}}%
 }
 % Called, when an image should be defined. 
@@ -706,7 +822,7 @@
 \def\pgfsys@defobject#1#2#3#4{%
   \pgfsysprotocol@getcurrentprotocol\pgfsys@temp%
   {%
-    \pgfsysprotocol@setcurrentprotocol\@empty%
+    \pgfsysprotocol@setcurrentprotocol\pgf@empty%
     \pgfsysprotocol@bufferedtrue%
     #4%
     \pgfsysprotocol@getcurrentprotocol\pgfsys@@temp%
@@ -727,7 +843,7 @@
 \def\pgfsys@useobject#1#2{%
   \pgfsysprotocol@getcurrentprotocol\pgfsys@temp%
   {%
-    \pgfsysprotocol@setcurrentprotocol\@empty%
+    \pgfsysprotocol@setcurrentprotocol\pgf@empty%
     \pgfsysprotocol@bufferedfalse%
     #2%
     \expandafter\pgfsysprotocol@setcurrentprotocol\csname #1\endcsname%
@@ -751,6 +867,20 @@
 % nested. In this case, only the `last' one restores visibility.
 
 
+\def\pgfsys@atbegindocument{}
+% This command will be executed at the begin of the document. If for
+% whatever reason this is not done, you may wish to execute this
+% command yourself. It will setup certain specials that need to be
+% inserted into the resulting .pdf/.ps/.xxx file.
+
+
+
+\AtBeginDocument{
+  \pgfsys@atbegindocument
+  \let\pgfsys@atbegindocument=\relax
+}
+
+
 
 
 % Discern the driver:
diff --git a/Master/texmf-dist/tex/generic/pgf/systemlayer/pgfsysprotocol.code.tex b/Master/texmf-dist/tex/generic/pgf/systemlayer/pgfsysprotocol.code.tex
index 119fc5d7128..a241c6fbf75 100644
--- a/Master/texmf-dist/tex/generic/pgf/systemlayer/pgfsysprotocol.code.tex
+++ b/Master/texmf-dist/tex/generic/pgf/systemlayer/pgfsysprotocol.code.tex
@@ -1,11 +1,13 @@
-\ProvidesFileRCS $Header: /cvsroot/pgf/pgf/generic/pgf/systemlayer/pgfsysprotocol.code.tex,v 1.1.1.1 2005/06/29 12:14:04 tantau Exp $
-
-% Copyright 2005 by Till Tantau <tantau@cs.tu-berlin.de>.
+% Copyright 2006 by Till Tantau
 %
-% This program can be redistributed and/or modified under the terms
-% of the GNU Public License, version 2.
-
+% 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 $Header: /cvsroot/pgf/pgf/generic/pgf/systemlayer/pgfsysprotocol.code.tex,v 1.3 2006/10/11 15:22:26 tantau Exp $
 
 
 
@@ -22,14 +24,14 @@
 
 
 
-\let\pgfsysprotocol@currentprotocol=\@empty
+\let\pgfsysprotocol@currentprotocol=\pgf@empty
 \newif\ifpgfsysprotocol@buffered
 
 
 % Add to the protocol buffered
 \def\pgfsysprotocol@literalbuffered#1{%
   \edef\pgfsysprotocol@temp{{#1\space}}%
-  \expandafter\g@addto@macro\expandafter\pgfsysprotocol@currentprotocol\pgfsysprotocol@temp%
+  \expandafter\pgf@g@addto@macro\expandafter\pgfsysprotocol@currentprotocol\pgfsysprotocol@temp%
 }
 
 % Add to the protocol
@@ -53,7 +55,7 @@
 
 % Invoking the current protocol
 \def\pgfsysprotocol@invokecurrentprotocol{%
-  \ifx\pgfsysprotocol@currentprotocol\@empty%
+  \ifx\pgfsysprotocol@currentprotocol\pgf@empty%
   \else%
     \expandafter\pgfsys@invoke\expandafter{\pgfsysprotocol@currentprotocol}%
   \fi%
@@ -61,7 +63,7 @@
 
 \def\pgfsysprotocol@flushcurrentprotocol{%
   \pgfsysprotocol@invokecurrentprotocol%
-  \pgfsysprotocol@setcurrentprotocol\@empty%
+  \pgfsysprotocol@setcurrentprotocol\pgf@empty%
 }
 
 
diff --git a/Master/texmf-dist/tex/generic/pgf/systemlayer/pgfsyssoftpath.code.tex b/Master/texmf-dist/tex/generic/pgf/systemlayer/pgfsyssoftpath.code.tex
index 1eecaf431e9..d92f0402782 100644
--- a/Master/texmf-dist/tex/generic/pgf/systemlayer/pgfsyssoftpath.code.tex
+++ b/Master/texmf-dist/tex/generic/pgf/systemlayer/pgfsyssoftpath.code.tex
@@ -1,10 +1,13 @@
-\ProvidesFileRCS $Header: /cvsroot/pgf/pgf/generic/pgf/systemlayer/pgfsyssoftpath.code.tex,v 1.1.1.1 2005/06/29 12:14:05 tantau Exp $
-
-% Copyright 2005 by Till Tantau <tantau@cs.tu-berlin.de>.
+% 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.
 %
-% This program can be redistributed and/or modified under the terms
-% of the GNU Public License, version 2.
+% See the file doc/generic/pgf/licenses/LICENSE for more details.
 
+\ProvidesFileRCS $Header: /cvsroot/pgf/pgf/generic/pgf/systemlayer/pgfsyssoftpath.code.tex,v 1.3 2006/10/11 15:22:26 tantau Exp $
 
 
 % This package provides the pgf system path abstraction layer. This
@@ -34,7 +37,7 @@
 
 
 
-\let\pgfsyssoftpath@currentpath=\@empty
+\let\pgfsyssoftpath@currentpath=\pgf@empty
 % The current path
 
 \def\pgfsyssoftpath@lastmoveto{{0pt}{0pt}}
@@ -44,7 +47,7 @@
   \edef\pgfsyssoftpath@temp{{%
     \noexpand\pgfsyssoftpath@movetotoken{#1}{#2}%
   }}%
-  \expandafter\g@addto@macro\expandafter\pgfsyssoftpath@currentpath\pgfsyssoftpath@temp%
+  \expandafter\pgf@g@addto@macro\expandafter\pgfsyssoftpath@currentpath\pgfsyssoftpath@temp%
   \xdef\pgfsyssoftpath@lastmoveto{{#1}{#2}}%
 }
 
@@ -53,7 +56,7 @@
   \edef\pgfsyssoftpath@temp{{%
     \noexpand\pgfsyssoftpath@linetotoken{#1}{#2}%
   }}%
- \expandafter\g@addto@macro\expandafter\pgfsyssoftpath@currentpath\pgfsyssoftpath@temp%
+ \expandafter\pgf@g@addto@macro\expandafter\pgfsyssoftpath@currentpath\pgfsyssoftpath@temp%
 }
 
 % Add curveto elements to the current path
@@ -63,7 +66,7 @@
     \noexpand\pgfsyssoftpath@curvetosupportbtoken{#3}{#4}%
     \noexpand\pgfsyssoftpath@curvetotoken{#5}{#6}%
   }}%
- \expandafter\g@addto@macro\expandafter\pgfsyssoftpath@currentpath\pgfsyssoftpath@temp%
+ \expandafter\pgf@g@addto@macro\expandafter\pgfsyssoftpath@currentpath\pgfsyssoftpath@temp%
 }
 
 % Add rectanlge elements to the current path
@@ -72,7 +75,7 @@
     \noexpand\pgfsyssoftpath@rectcornertoken{#1}{#2}%
     \noexpand\pgfsyssoftpath@rectsizetoken{#3}{#4}%
   }}%
- \expandafter\g@addto@macro\expandafter\pgfsyssoftpath@currentpath\pgfsyssoftpath@temp%
+ \expandafter\pgf@g@addto@macro\expandafter\pgfsyssoftpath@currentpath\pgfsyssoftpath@temp%
 }
 
 % Add closepath element to the current path
@@ -80,7 +83,7 @@
   \edef\pgfsyssoftpath@temp{{%
     \noexpand\pgfsyssoftpath@closepathtoken\pgfsyssoftpath@lastmoveto%
   }}%
-  \expandafter\g@addto@macro\expandafter\pgfsyssoftpath@currentpath\pgfsyssoftpath@temp%
+  \expandafter\pgf@g@addto@macro\expandafter\pgfsyssoftpath@currentpath\pgfsyssoftpath@temp%
 }
 
 % Add special element to the current path
@@ -88,7 +91,7 @@
   \edef\pgfsyssoftpath@temp{{%
     \noexpand\pgfsyssoftpath@specialroundtoken{#1}{#2}%
   }}%
- \expandafter\g@addto@macro\expandafter\pgfsyssoftpath@currentpath\pgfsyssoftpath@temp%
+ \expandafter\pgf@g@addto@macro\expandafter\pgfsyssoftpath@currentpath\pgfsyssoftpath@temp%
 }
 
 
@@ -109,7 +112,7 @@
 
 \def\pgfsyssoftpath@flushcurrentpath{%
   \pgfsyssoftpath@invokecurrentpath%
-  \pgfsyssoftpath@setcurrentpath\@empty%
+  \pgfsyssoftpath@setcurrentpath\pgf@empty%
 }
 
 % Marshallers
@@ -118,7 +121,7 @@
 \def\pgfsyssoftpath@rectcornertoken#1#2#3#4#5{\pgfsys@rect{#1}{#2}{#4}{#5}} % #3 = \pgfsyssoftpath@rectsizetoken
 \def\pgfsyssoftpath@curvetosupportatoken#1#2#3#4#5#6#7#8{\pgfsys@curveto{#1}{#2}{#4}{#5}{#7}{#8}}
 \def\pgfsyssoftpath@closepathtoken#1#2{\pgfsys@closepath}
-\let\pgfsyssoftpath@specialroundtoken=\@gobbletwo
+\let\pgfsyssoftpath@specialroundtoken=\pgf@gobbletwo
 
 
 \endinput