5 files changed, 20 insertions, 14 deletions
diff --git a/Master/texmf-dist/tex/generic/pgf/basiclayer/pgfbaselayers.code.tex b/Master/texmf-dist/tex/generic/pgf/basiclayer/pgfbaselayers.code.tex
index 8e6e97b8017..d97d742934e 100644
--- a/Master/texmf-dist/tex/generic/pgf/basiclayer/pgfbaselayers.code.tex
+++ b/Master/texmf-dist/tex/generic/pgf/basiclayer/pgfbaselayers.code.tex
@@ -1,4 +1,4 @@
-\ProvidesPackageRCS[v\pgfversion] $Header: /cvsroot/pgf/pgf/generic/pgf/basiclayer/pgfbaselayers.code.tex,v 1.1 2005/08/13 18:59:56 tantau Exp $
+\ProvidesPackageRCS[v\pgfversion] $Header: /cvsroot/pgf/pgf/generic/pgf/basiclayer/pgfbaselayers.code.tex,v 1.2 2005/10/24 15:14:48 tantau Exp $
 
 % Copyright 2005 by Till Tantau <tantau@cs.tu-berlin.de>.
 %
@@ -17,10 +17,10 @@
 % \pgfdeclarelayer{background}
 
 \def\pgfdeclarelayer#1{%
-  \expandafter\newbox\csname pgf@layerbox@#1\endcsname%
-  \expandafter\newbox\csname pgf@layerboxsaved@#1\endcsname%
+  \expandafter\pgf@newbox\csname pgf@layerbox@#1\endcsname%
+  \expandafter\pgf@newbox\csname pgf@layerboxsaved@#1\endcsname%
 }
-
+\let\pgf@newbox=\newbox % avoid plain TeX outer problem
 
 % Sets the layers that compose the picture
 %
diff --git a/Master/texmf-dist/tex/generic/pgf/basiclayer/pgfbasesnakes.code.tex b/Master/texmf-dist/tex/generic/pgf/basiclayer/pgfbasesnakes.code.tex
index 7403f2a7b8e..00169368ae1 100644
--- a/Master/texmf-dist/tex/generic/pgf/basiclayer/pgfbasesnakes.code.tex
+++ b/Master/texmf-dist/tex/generic/pgf/basiclayer/pgfbasesnakes.code.tex
@@ -1,4 +1,4 @@
-\ProvidesPackageRCS[v\pgfversion] $Header: /cvsroot/pgf/pgf/generic/pgf/basiclayer/pgfbasesnakes.code.tex,v 1.5 2005/10/10 08:38:29 tantau Exp $
+\ProvidesPackageRCS[v\pgfversion] $Header: /cvsroot/pgf/pgf/generic/pgf/basiclayer/pgfbasesnakes.code.tex,v 1.6 2005/10/25 08:18:14 tantau Exp $
 
 % Copyright 2005 by Till Tantau <tantau@cs.tu-berlin.de>.
 %
@@ -14,7 +14,7 @@
 %
 % #1 = snake name
 % #1 = initial state
-% #3= states of the snake
+% #3 = states of the snake
 %
 %
 % This command declares a new snake for later use. The second
@@ -273,7 +273,7 @@
   \expandafter\expandafter\expandafter\pgf@marshal
   \expandafter\expandafter\expandafter{\csname pgf@snake@@\pgf@snake@name @\pgf@snake@current@state @options\endcsname}%
   \ifx\pgf@snake@next\relax%
-    \pgf@snake@next=\pgf@snake@do@code%
+    \let\pgf@snake@next=\pgf@snake@do@code%
   \fi%
   \pgf@snake@next%
 }
@@ -291,7 +291,7 @@
   \advance\pgfsnakecompleteddistance by\pgf@xa%
   % Next iteration:
   \let\pgf@snake@current@state=\pgf@snake@next@state%
-  \pgf@snake@run 
+  \pgf@snake@run%
 }
 
 \define@key{pgfsnake}{width}{%
diff --git a/Master/texmf-dist/tex/generic/pgf/basiclayer/pgfcore.code.tex b/Master/texmf-dist/tex/generic/pgf/basiclayer/pgfcore.code.tex
index 3496b92cf6d..0a3df3dec31 100644
--- a/Master/texmf-dist/tex/generic/pgf/basiclayer/pgfcore.code.tex
+++ b/Master/texmf-dist/tex/generic/pgf/basiclayer/pgfcore.code.tex
@@ -1,4 +1,4 @@
-\ProvidesPackageRCS[v\pgfversion] $Header: /cvsroot/pgf/pgf/generic/pgf/basiclayer/pgfcore.code.tex,v 1.2 2005/07/06 15:58:57 tantau Exp $
+\ProvidesPackageRCS[v\pgfversion] $Header: /cvsroot/pgf/pgf/generic/pgf/basiclayer/pgfcore.code.tex,v 1.3 2005/10/25 08:18:14 tantau Exp $
 
 % Copyright 2005 by Till Tantau <tantau@cs.tu-berlin.de>.
 %
@@ -9,7 +9,7 @@
 
 \input pgfcoremath.code.tex
 \input pgfcorepoints.code.tex
-\input pgfcorepathconstruction.code.tex
+\input pgfcorepathconstruct.code.tex
 \input pgfcorepathusage.code.tex
 \input pgfcorescopes.code.tex
 \input pgfcoregraphicstate.code.tex
diff --git a/Master/texmf-dist/tex/generic/pgf/basiclayer/pgfcorepathconstruction.code.tex b/Master/texmf-dist/tex/generic/pgf/basiclayer/pgfcorepathconstruct.code.tex
index b96bf719320..97df7f0cf34 100644
--- a/Master/texmf-dist/tex/generic/pgf/basiclayer/pgfcorepathconstruction.code.tex
+++ b/Master/texmf-dist/tex/generic/pgf/basiclayer/pgfcorepathconstruct.code.tex
@@ -1,4 +1,4 @@
-\ProvidesFileRCS $Header: /cvsroot/pgf/pgf/generic/pgf/basiclayer/pgfcorepathconstruction.code.tex,v 1.2 2005/09/30 07:14:03 tantau Exp $
+\ProvidesFileRCS $Header: /cvsroot/pgf/pgf/generic/pgf/basiclayer/pgfcorepathconstruct.code.tex,v 1.1 2005/10/25 08:18:14 tantau Exp $
 
 % Copyright 2005 by Till Tantau <tantau@cs.tu-berlin.de>.
 %
diff --git a/Master/texmf-dist/tex/generic/pgf/basiclayer/pgfcorescopes.code.tex b/Master/texmf-dist/tex/generic/pgf/basiclayer/pgfcorescopes.code.tex
index 2f68e256038..f0b862575b7 100644
--- a/Master/texmf-dist/tex/generic/pgf/basiclayer/pgfcorescopes.code.tex
+++ b/Master/texmf-dist/tex/generic/pgf/basiclayer/pgfcorescopes.code.tex
@@ -1,4 +1,4 @@
-\ProvidesFileRCS $Header: /cvsroot/pgf/pgf/generic/pgf/basiclayer/pgfcorescopes.code.tex,v 1.9 2005/10/14 13:13:23 tantau Exp $
+\ProvidesFileRCS $Header: /cvsroot/pgf/pgf/generic/pgf/basiclayer/pgfcorescopes.code.tex,v 1.12 2005/11/15 17:46:37 tantau Exp $
 
 % Copyright 2005 by Till Tantau <tantau@cs.tu-berlin.de>.
 %
@@ -195,9 +195,10 @@
 \def\pgf@picture{%
   \setbox\pgfpic\hbox to0pt\bgroup%
     \begingroup%
-    \color{.}%
     \pgfsys@beginpicture%
       \pgfsys@beginscope%
+        \begingroup%
+        \color{.}%
         \pgfsetlinewidth{0.4pt}%
         \pgftransformreset%
         \pgfsyssoftpath@setcurrentpath\@empty%
@@ -216,10 +217,13 @@
               % Shift baseline outside:
               \global\let\pgf@shift@baseline=\pgf@baseline%
             \endgroup%
+            \hss%
           \egroup%
           \pgf@insertlayers%
         \endgroup%    
-      \pgfsys@discardpath\pgfsys@endscope%
+        \pgfsys@discardpath%
+        \endgroup%
+      \pgfsys@endscope%
     \pgfsys@endpicture%
     \endgroup%
     \hss
@@ -289,6 +293,7 @@
   \pgfsyssoftpath@getcurrentpath\pgf@interrupt@path%
   \pgfsyssoftpath@setcurrentpath\@empty%
   \edef\pgfscope@linewidth{\the\pgflinewidth}%
+  \let\pgf@interrupt@lastmoveto=\pgfsyssoftpath@lastmoveto%
   \begingroup%
 }
 \def\endpgfinterruptpath
@@ -299,6 +304,7 @@
   \pgf@setpathsizes\pgf@interrupt@pathsizes%
   \global\pgf@path@lastx=\pgf@interrupt@savex%
   \global\pgf@path@lasty=\pgf@interrupt@savey%
+  \global\let\pgfsyssoftpath@lastmoveto=\pgf@interrupt@lastmoveto%
   \endgroup%
 }