pstricks update (1jul08)

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

10 files changed, 350 insertions, 318 deletions

diff --git a/Master/texmf-dist/tex/latex/pstricks/pst-all.sty b/Master/texmf-dist/tex/generic/pstricks/latex/pst-all.sty
index 8ac0ada25bf..8ac0ada25bf 100644
--- a/Master/texmf-dist/tex/latex/pstricks/pst-all.sty
+++ b/Master/texmf-dist/tex/generic/pstricks/latex/pst-all.sty
diff --git a/Master/texmf-dist/tex/latex/pstricks/pst-key.sty b/Master/texmf-dist/tex/generic/pstricks/latex/pst-key.sty
index 74db6c70a9a..74db6c70a9a 100644
--- a/Master/texmf-dist/tex/latex/pstricks/pst-key.sty
+++ b/Master/texmf-dist/tex/generic/pstricks/latex/pst-key.sty
diff --git a/Master/texmf-dist/tex/latex/pstricks/pst-node.sty b/Master/texmf-dist/tex/generic/pstricks/latex/pst-node.sty
index e930966dc41..e930966dc41 100644
--- a/Master/texmf-dist/tex/latex/pstricks/pst-node.sty
+++ b/Master/texmf-dist/tex/generic/pstricks/latex/pst-node.sty
diff --git a/Master/texmf-dist/tex/latex/pstricks/pst-plot.sty b/Master/texmf-dist/tex/generic/pstricks/latex/pst-plot.sty
index 598b46de429..598b46de429 100644
--- a/Master/texmf-dist/tex/latex/pstricks/pst-plot.sty
+++ b/Master/texmf-dist/tex/generic/pstricks/latex/pst-plot.sty
diff --git a/Master/texmf-dist/tex/latex/pstricks/pst-tree.sty b/Master/texmf-dist/tex/generic/pstricks/latex/pst-tree.sty
index 73682620386..73682620386 100644
--- a/Master/texmf-dist/tex/latex/pstricks/pst-tree.sty
+++ b/Master/texmf-dist/tex/generic/pstricks/latex/pst-tree.sty
diff --git a/Master/texmf-dist/tex/latex/pstricks/pstcol.sty b/Master/texmf-dist/tex/generic/pstricks/latex/pstcol.sty
index 29c4affd9f9..29c4affd9f9 100644
--- a/Master/texmf-dist/tex/latex/pstricks/pstcol.sty
+++ b/Master/texmf-dist/tex/generic/pstricks/latex/pstcol.sty
diff --git a/Master/texmf-dist/tex/latex/pstricks/pstricks.sty b/Master/texmf-dist/tex/generic/pstricks/latex/pstricks.sty
index 13d26a87df4..2b7a1a875f9 100644
--- a/Master/texmf-dist/tex/latex/pstricks/pstricks.sty
+++ b/Master/texmf-dist/tex/generic/pstricks/latex/pstricks.sty
@@ -52,11 +52,11 @@
     [\filedate\space v\fileversion\space `PSTricks' (tvz)]
   \IfFileExists{pstricks.pro}{%
     \ProvidesFile{pstricks.pro}
-      [2008/01/01 v. 1.03,  PostScript prologue file (hv)]
+      [2008/01/01 v. 1.05,  PostScript prologue file (hv)]
       \@addtofilelist{pstricks.pro}}{}%
   \IfFileExists{pst-dots.pro}{%
     \ProvidesFile{pst-dots.pro}
-      [2006/12/19 v. 2.00,  PostScript prologue file (hv)]
+      [2006/12/19 v. 2.02,  PostScript prologue file (hv)]
       \@addtofilelist{pst-dots.pro}}{}%
   \IfFileExists{pst-algparser.pro}{%
     \ProvidesFile{pst-algparser.pro}
diff --git a/Master/texmf-dist/tex/generic/pstricks/pst-node.tex b/Master/texmf-dist/tex/generic/pstricks/pst-node.tex
index 30fc49962e6..36d61daba0e 100644
--- a/Master/texmf-dist/tex/generic/pstricks/pst-node.tex
+++ b/Master/texmf-dist/tex/generic/pstricks/pst-node.tex
@@ -4,10 +4,11 @@
 %% See the betadoc documentation for usage. 
 %% This uses the header file `pst-node.pro'.
 %%
-\def\fileversion{97 patch 11}
-\def\filedate{2000/11/09}
+\def\fileversion{1.00}
+\def\filedate{2007/10/16}
 %%
 %% COPYRIGHT 1993, 1994, 1999 by Timothy Van Zandt, tvz@nwu.edu.
+%% COPYRIGHT by Herbert Voss, hvoss@tug.org.
 %%
 %% This program can be redistributed and/or modified under the terms
 %% of the LaTeX Project Public License Distributed from CTAN
@@ -19,23 +20,26 @@
 \ifx\PSTricksLoaded\endinput\else\input pstricks.tex \fi\relax
 \edef\TheAtCode{\the\catcode`\@}
 \catcode`\@=11
+%
 \pstheader{pst-node.pro}
+%
 \def\pst@nodedict{tx@NodeDict begin }
 \def\pst@zapspace#1 #2{%
 #1%
 \ifx#2\@empty\else\expandafter\pst@zapspace\fi
 #2}
-\def\pst@getnode#1#2{%
-\pst@expandafter\pst@@getnode{#1},,\@nil#2}
+%
+\def\pst@getnode#1#2{\pst@expandafter\pst@@getnode{#1},,\@nil#2}
 \def\pst@@getnode#1,#2,#3\@nil#4{%
-\ifx\@empty#3\@empty
-\edef#4{/N@\pst@zapspace#1 \@empty\space}%
-\else
-\pst@cntg=#1\relax
-\pst@cnth=#2\relax
-\edef#4{/N@M-\ifnum\psmatrixcnt=\z@ 1\else\the\psmatrixcnt\fi
--\the\pst@cntg-\the\pst@cnth\space}%
-\fi}
+  \ifx\@empty#3\@empty
+    \edef#4{/N@\pst@zapspace#1 \@empty\space}%
+  \else
+    \pst@cntg=#1\relax
+    \pst@cnth=#2\relax
+    \edef#4{/N@M-\ifnum\psmatrixcnt=\z@ 1\else\the\psmatrixcnt\fi
+    -\the\pst@cntg-\the\pst@cnth\space}%
+  \fi}
+%
 \def\tx@NewNode{NewNode }
 \def\pst@newnode#1#2#3#4{%
 % DG/SR modification begin - Nov.  9, 2000 - Patch 11
@@ -44,14 +48,15 @@
 \leavevmode
 \pst@getnode{#1}\pst@thenode
 \pst@Verb{%
-\pst@nodedict
-{#3}
-\ifx\psk@name\relax false \else \psk@name true \fi
-\pst@thenode
-#2
-{#4}
-\tx@NewNode
-end}%
+  \pst@nodedict
+  {#3}
+  \ifx\psk@name\relax false \else \psk@name true \fi
+  \pst@thenode
+  #2
+  {#4}
+  \tx@NewNode
+  end }%
+%
 \global\let\psk@name\relax
 \pstree@nodehook
 \global\let\pstree@nodehook\relax}
@@ -100,20 +105,21 @@ end}%
 \def\Cnode{\pst@object{Cnode}}
 \def\Cnode@i{\@ifnextchar({\Cnode@ii}{\Cnode@ii(0,0)}}
 \def\Cnode@ii(#1)#2{\cnode@ii(#1){\psk@radius}{#2}}%
+%
 \def\cnodeput{\pst@object{cnodeput}}
 \def\cnodeput@i{\@ifnextchar({\cnodeput@iii}{\cnodeput@ii}}
 \def\cnodeput@ii#1{%
-\addto@par{rot={#1}}%
-\@ifnextchar({\cnodeput@iii}{\cnodeput@iii(\z@,\z@)}}
+  \addto@par{rot={#1}}%
+  \@ifnextchar({\cnodeput@iii}{\cnodeput@iii(\z@,\z@)}}
 \def\cnodeput@iii(#1)#2{%
-\pst@killglue
-\@fixedradiusfalse
-\def\pst@nodehook{\cnodeput@iv{#2}}%
-\pst@makebox{\cput@v{#1}}}
+  \pst@killglue
+  \@fixedradiusfalse
+  \def\pst@nodehook{\cnodeput@iv{#2}}%
+  \pst@makebox{\cput@v{#1}}}
 \def\cnodeput@iv#1{%
-\pst@newnode{#1}{11}{\pscirclebox@iv \pst@number\pslinewidth add}%
-{\tx@InitCnode}%
-\global\let\pst@nodehook\relax}
+  \pst@newnode{#1}{11}{\pscirclebox@iv \pst@number\pslinewidth add}{\tx@InitCnode}%
+  \global\let\pst@nodehook\relax}
+%  
 \def\Cnodeput{\pst@object{Cnodeput}}
 \def\Cnodeput@i{\@ifnextchar({\Cnodeput@iii}{\Cnodeput@ii}}
 \def\Cnodeput@ii#1{%
@@ -133,18 +139,18 @@ end}%
 \def\circlenode{\pst@object{circlenode}}
 \def\circlenode@i#1{\pst@makebox{\circlenode@ii{#1}}}
 \def\circlenode@ii#1{%
-\begingroup
-\pst@useboxpar
-\setbox\pst@hbox=\hbox{%
-\cnodeput@iv{#1}%
-\pscirclebox@iii
-\box\pst@hbox}%
-\ifnodealign \psboxseptrue \fi
-\ifpsboxsep \pscirclebox@sep \fi
-\leavevmode
-\ifnodealign\pst@nodealign\fi
-\box\pst@hbox
-\endgroup}
+  \begingroup
+  \pst@useboxpar
+  \setbox\pst@hbox=\hbox{%
+    \cnodeput@iv{#1}%
+    \pscirclebox@iii
+    \box\pst@hbox}%
+  \ifnodealign \psboxseptrue \fi
+  \ifpsboxsep \pscirclebox@sep \fi
+  \leavevmode
+  \ifnodealign\pst@nodealign\fi
+  \box\pst@hbox
+  \endgroup}
 \def\Circlenode{\pst@object{Circlenode}}
 \def\Circlenode@i#1{\pst@makebox{\Circlenode@ii{#1}}}
 \def\Circlenode@ii#1{%
@@ -466,48 +472,47 @@ x2 add /x2 ED
 \def\tx@GetEdgeB{GetEdgeB }
 \def\tx@GetArmA{GetArmA }
 \def\tx@GetArmB{GetArmB }
+%
 \def\check@arrow#1#2{%
-\check@@arrow#2-\@nil
-\if@pst
-\addto@par{arrows=#2}%
-\def\next{#1}%
-\else
-\def\next{#1{#2}}%
-\fi
-\next}
+  \check@@arrow#2-\@nil
+  \if@pst\addto@par{arrows=#2}\def\next{#1}%
+  \else\def\next{#1{#2}}\fi
+  \next}
 \def\check@@arrow#1-#2\@nil{%
 \ifx\@nil#2\@nil\@pstfalse\else\@psttrue\fi}
+%
 \def\tx@InitNC{InitNC }
 \def\nc@object#1#2#3#4#5{%
-\csname begin@#1Obj\endcsname
-\showpointsfalse
-\pst@getnode{#2}\pst@tempa
-\pst@getnode{#3}\pst@tempb
-\gdef\npos@default{#4 }%
-\addto@pscode{%
-/NCLW CLW def
-\pst@nodedict
-\psk@offsetA
-\psk@offsetB neg
-\psk@nodesepA
-\psk@nodesepB
-\psk@nodeseptypeA
-\psk@nodeseptypeB
-\pst@tempa
-\pst@tempb
-\tx@InitNC { #5 } if
-end}%
-\def\use@pscode{%
-\pst@Verb{gsave \tx@STV newpath \pst@code\space grestore}%
-\gdef\pst@code{}}%
-\csname end@#1Obj\endcsname
-\pst@shortput}
+  \csname begin@#1Obj\endcsname
+  \showpointsfalse
+  \pst@getnode{#2}\pst@tempa
+  \pst@getnode{#3}\pst@tempb
+  \gdef\npos@default{#4 }%
+  \addto@pscode{%
+    /NCLW CLW def
+    \pst@nodedict
+    \psk@offsetA
+    \psk@offsetB neg
+    \psk@nodesepA
+    \psk@nodesepB
+    \psk@nodeseptypeA
+    \psk@nodeseptypeB
+    \pst@tempa
+    \pst@tempb
+    \tx@InitNC { #5 } if
+    end }%
+  \def\use@pscode{%
+    \pst@Verb{gsave \tx@STV newpath \pst@code\space grestore}%
+    \gdef\pst@code{}}%
+  \csname end@#1Obj\endcsname
+  \pst@shortput}
+%
 \def\npos@default{.5 }
 \def\pc@object#1{%
 \@ifnextchar({\pc@@object#1}{\pst@getarrows{\pc@@object#1}}}
 \def\pc@@object#1(#2)(#3){%
-\pnode(#2){@@A}\pnode(#3){@@B}%
-#1{@@A}{@@B}}
+  \pnode(#2){@@A}\pnode(#3){@@B}%
+  #1{@@A}{@@B}}
 \def\tx@LPutLine{LPutLine }
 \def\tx@LPutLines{LPutLines }
 \def\tx@BezierMidpoint{BezierMidpoint }
@@ -522,11 +527,14 @@ end}%
 \def\tx@HPutCurve{HPutCurve }
 \def\tx@NCCoor{NCCoor }
 \def\tx@NCLine{NCLine }
+%
 \def\ncline{\pst@object{ncline}}
 \def\ncline@i{\check@arrow{\ncline@ii}}
 \def\ncline@ii#1#2{\nc@object{Open}{#1}{#2}{.5}{\tx@NCLine}}
+%
 \def\pcline{\pst@object{pcline}}
 \def\pcline@i{\pc@object\ncline@ii}
+%
 \def\ncLine{\pst@object{ncLine}}
 \def\ncLine@i{\check@arrow{\ncLine@ii}}
 \def\ncLine@ii#1#2{\nc@object{Open}{#1}{#2}{.5}%
@@ -534,6 +542,7 @@ end}%
 %{\tx@NCLine /LPutPos { xB xA yB yA \tx@LPutLine } def}}
 {\tx@NCLine /LPutPos { xB yB xA yA \tx@LPutLine } def}}
 % DG/SR modification end
+%
 \def\tx@NCLines{NCLines }
 \def\nclines{\pst@object{nclines}}
 \def\nclines@i{\check@arrow\nclines@ii}
@@ -553,34 +562,41 @@ mark \pst@coors \tx@NCLines}%
 \def\nccurve{\pst@object{nccurve}}
 \def\nccurve@i{\check@arrow{\nccurve@ii}}
 \def\nccurve@ii#1#2{\nc@object{Open}{#1}{#2}{.5}{%
-/AngleA \psk@angleA\space def /AngleB \psk@angleB\space def
-\psk@ncurvB\space \psk@ncurvA\space
-\tx@NCCurve}}
+  /AngleA \psk@angleA\space def /AngleB \psk@angleB\space def
+  \psk@ncurvB\space \psk@ncurvA\space
+  \tx@NCCurve}}
 \def\pccurve{\pst@object{pccurve}}
 \def\pccurve@i{\pc@object\nccurve@ii}
+%
 \def\ncarc{\pst@object{ncarc}}
 \def\ncarc@i{\check@arrow{\ncarc@ii}}
 \def\ncarc@ii#1#2{\nc@object{Open}{#1}{#2}{.5}{%
-yB yA sub xB xA sub \tx@Atan dup
-\psk@arcangleA\space add /AngleA ED
-\psk@arcangleB\space sub 180 add /AngleB ED
-\psk@ncurvB\space \psk@ncurvA\space
-\tx@NCCurve}}
+  yB yA sub xB xA sub \tx@Atan dup
+  \psk@arcangleA\space add /AngleA ED
+  \psk@arcangleB\space sub 180 add /AngleB ED
+  \psk@ncurvB\space \psk@ncurvA\space
+  \tx@NCCurve}}
 \def\pcarc{\pst@object{pcarc}}
 \def\pcarc@i{\pc@object\ncarc@ii}
+%
 \def\tx@NCAngles{NCAngles }
+\newif\ifPst@pcRef%		border or center as reference point (hv)
+\def\psset@pcRef#1{\@nameuse{Pst@pcRef#1}}
+\psset@pcRef{false}
 \def\ncangles{\pst@object{ncangles}}
 \def\ncangles@i{\check@arrow{\ncangles@ii}}
 \def\ncangles@ii#1#2{%
-\nc@object{Open}{#1}{#2}{1.5}{\ncangles@iii \tx@NCAngles}}
+  \nc@object{Open}{#1}{#2}{1.5}{\ncangles@iii \tx@NCAngles}}
 \def\ncangles@iii{%
-tx@Dict begin \psline@iii pop end
-/AngleA \psk@angleA def
-/AngleB \psk@angleB def
-/ArmA \psk@armA def
-/ArmB \psk@armB def
-/ArmTypeA \psk@armtypeA def
-/ArmTypeB \psk@armtypeB def }
+  tx@Dict begin \psline@iii pop end
+  /AngleA \psk@angleA def
+  /AngleB \psk@angleB def
+  /ArmA \psk@armA \ifPst@pcRef 
+    GetEdgeA yA yA1 sub dup mul xA xA1 sub dup mul add sqrt sub \fi def
+  /ArmB \psk@armB def
+  /ArmTypeA \psk@armtypeA def
+  /ArmTypeB \psk@armtypeB def }
+%
 \def\pcangles{\pst@object{pcangles}}
 \def\pcangles@i{\pc@object\ncangles@ii}
 \def\tx@NCAngle{NCAngle }
@@ -688,25 +704,25 @@ tx@Dict begin \psline@iii pop end
 \def\ncput{\pst@object{ncput}}
 \def\ncput@i{\pst@killglue\pst@makebox{\ncput@ii}}
 \def\ncput@ii{%
-\begingroup
-\use@par
-\if@star\pst@starbox\fi
-\pst@makesmall\pst@hbox
-\pst@rotate\psk@nrot\pst@hbox
-\ncput@iii
-\endgroup
-\pst@shortput}
+  \begingroup
+  \use@par
+  \if@star\pst@starbox\fi
+  \pst@makesmall\pst@hbox
+  \pst@rotate\psk@nrot\pst@hbox
+  \ncput@iii
+  \endgroup
+  \pst@shortput}
 \def\ncput@iii{%
-\leavevmode
-\hbox{%
-\pst@Verb{%
-\pst@nodedict
-/t \psk@npos def
-\tx@LPut
-end
-\tx@PutBegin}%
-\box\pst@hbox
-\pst@Verb{\tx@PutEnd}}}
+  \leavevmode
+  \hbox{%
+    \pst@Verb{%
+      \pst@nodedict
+      /t \psk@npos def
+      \tx@LPut
+      end
+      \tx@PutBegin}%
+    \box\pst@hbox
+    \pst@Verb{\tx@PutEnd}}}
 \def\naput{\pst@object{naput}}
 \def\naput@i{\pst@killglue\pst@makebox{\naput@ii{NAngle 90 add}}}
 \def\naput@ii#1{%
@@ -724,22 +740,22 @@ end
 \def\nbput{\pst@object{nbput}}
 \def\nbput@i{\pst@killglue\pst@makebox{\naput@ii{NAngle 90 sub}}}
 \def\psset@tpos#1{%
-\pst@checknum{#1}\psk@tpos
-\ifdim\psk@tpos \p@<\z@
-\def\psk@tpos{.5}%
+  \pst@checknum{#1}\psk@tpos
+  \ifdim\psk@tpos \p@<\z@
+    \def\psk@tpos{.5}%
 % DG/SR modification begin - Sep. 23, 1998 - Patch 7
 %\@pstrickserr{Bad `tpos' value: `#1'. Must be 0<tpos<1}\@epha
-\@pstrickserr{Bad `tpos' value: `#1'. Must be 0<tpos<1}\@ehpa
+    \@pstrickserr{Bad `tpos' value: `#1'. Must be 0<tpos<1}\@ehpa
 % DG/SR modification end
-\else
-\ifdim\psk@tpos \p@>\p@
-\def\psk@tpos{.5}%
+  \else
+    \ifdim\psk@tpos \p@>\p@
+      \def\psk@tpos{.5}%
 % DG/SR modification begin - Sep. 23, 1998 - Patch 7
 %\@pstrickserr{Bad `tpos' value: `#1'. Must be 0<tpos<1}\@epha
-\@pstrickserr{Bad `tpos' value: `#1'. Must be 0<tpos<1}\@ehpa
+      \@pstrickserr{Bad `tpos' value: `#1'. Must be 0<tpos<1}\@ehpa%
 % DG/SR modification end
-\fi
-\fi}
+    \fi%
+  \fi}
 \psset@tpos{.5}
 \def\tvput{\pst@object{tvput}}
 \def\tvput@i{\pst@makebox{\psput@tput{H}{1}}}
@@ -756,41 +772,43 @@ end
 \def\tx@HPutAdjust{HPutAdjust }
 \def\tx@VPutAdjust{VPutAdjust }
 \def\psput@tput#1#2{%
-\begingroup
-\use@par
-\pst@tputmakesmall
-\leavevmode
-\hbox{%
-\pst@Verb{%
-\pst@nodedict
-/t \psk@tpos \pst@tposflip def
-tx@NodeDict /HPutPos known
-{ #1PutPos }
-{ CP /Y ED /X ED /NAngle 0 def /NCLW 0 def }
-ifelse
-/Sin NAngle sin def
-/Cos NAngle cos def
-/s \pst@number\pslabelsep NCLW add def
-/l \pst@number\pst@dima def
-/r \pst@number\pst@dimb def
-/h \pst@number\pst@dimc def
-/d \pst@number\pst@dimd def
+  \begingroup
+  \use@par
+  \pst@tputmakesmall
+  \leavevmode
+  \hbox{%
+    \pst@Verb{%
+      \pst@nodedict
+      /t \psk@tpos \pst@tposflip def
+      tx@NodeDict /HPutPos known
+        { #1PutPos }
+        { CP /Y ED /X ED /NAngle 0 def /NCLW 0 def }
+      ifelse
+      /Sin NAngle sin def
+      /Cos NAngle cos def
+      /s \pst@number\pslabelsep NCLW add def
+      /l \pst@number\pst@dima def
+      /r \pst@number\pst@dimb def
+      /h \pst@number\pst@dimc def
+      /d \pst@number\pst@dimd def
 % DG/SR modification begin - Sep. 26, 1997 - Patch 4
 %\ifnum1=0#2\else
-\ifnum1=0#2 \else
+      \ifnum1=0#2 \else
 % DG/SR modification end
-/flag #2 def
-\csname tx@#1PutAdjust\endcsname
-\fi
-\tx@LPutCoor
-end
-\tx@PutBegin}%
-\box\pst@hbox
-\pst@Verb{\tx@PutEnd}}%
-\endgroup
-\pst@shortput}
+        /flag #2 def
+        \csname tx@#1PutAdjust\endcsname
+      \fi
+      \tx@LPutCoor
+      end
+      \tx@PutBegin}%
+    \box\pst@hbox
+    \pst@Verb{\tx@PutEnd}}%
+  \endgroup
+  \pst@shortput}
+%  
 \def\pst@tposflip{}
 \def\pst@tputmakesmall{%
+%
 \pst@dima=\wd\pst@hbox
 \divide\pst@dima 2
 \pst@dimg=\psk@href\pst@dimg
@@ -914,14 +932,13 @@ end
 \def\Bput{\def\pst@par{}\pst@ifstar{\@ifnextchar[{\Bput@i}{\nbput@i}}}
 \def\Bput@i[#1]{\addto@par{labelsep=#1}\nbput@i}
 \def\node@coor#1;#2\@nil{%
-\pst@getnode{#1}\pst@tempg
-\edef\pst@coor{%
-\pst@nodedict
-tx@NodeDict \pst@tempg known
-{ \pst@tempg load \tx@GetCenter }
-{ 0 0 }
-ifelse
-end }}
+  \pst@getnode{#1}\pst@tempg
+  \edef\pst@coor{%
+    \pst@nodedict
+    tx@NodeDict \pst@tempg known
+    \pslbrace \pst@tempg load \tx@GetCenter \psrbrace
+    \pslbrace 0 0 \psrbrace ifelse
+    end }}
 \def\Node@coor[#1]#2;#3\@nil{%
 \begingroup
 \psset{#1}%
@@ -978,95 +995,89 @@ end }}%
 %\let\mscount\@multicnt
 \ifx\mscount\@undefined\let\mscount\@multicnt\fi
 % DG/SR modification end
-\def\psmatrix{%
-  \begingroup
-{\ifnum0=`}\fi % Don't want to expand any &.
-\@ifnextchar[{\psmatrix@i}{\ifnum0=`{\fi}{}\psmatrix@ii}}
+\def\psmatrix{\begingroup{\ifnum0=`}\fi % Don't want to expand any &.
+  \@ifnextchar[{\psmatrix@i}{\ifnum0=`{\fi}{}\psmatrix@ii}}
 \def\psmatrix@i[#1]{%
-\ifnum0=`{\fi}{}%
-\psset{#1}%
-\psmatrix@ii}
+  \ifnum0=`{\fi}{}%
+  \psset{#1}%
+  \psmatrix@ii}
 \def\psmatrix@ii{%
-\KillGlue
-\edef\psm@beginmath{%
-\ifmmode$\m@th\ifinner\textstyle\else\displaystyle\fi\fi}%
-\edef\psm@endmath{\ifmmode$\fi}%
-\let\\\psm@cr
-\advance\psmatrixcnt 1
-\def\psm@thenode{M-\the\psmatrixcnt-\the\psrow-\the\pscol}%
-\tabskip\z@
-\psrow1
-\pscol\z@
-\psset@shortput{tablr}%
-\leavevmode
-\vbox\bgroup\halign\bgroup&%
-\begingroup
-\global\advance\pscol 1
-\csname psrowhook\romannumeral\psrow\endcsname
-\csname pscolhook\romannumeral\pscol\endcsname
-\psm@beginnode##\psm@endnode\endgroup
-\cr}
+  \KillGlue
+  \edef\psm@beginmath{%
+    \ifmmode$\m@th\ifinner\textstyle\else\displaystyle\fi\fi}%
+  \edef\psm@endmath{\ifmmode$\fi}%
+  \let\\\psm@cr
+  \advance\psmatrixcnt 1
+  \def\psm@thenode{M-\the\psmatrixcnt-\the\psrow-\the\pscol}%
+  \tabskip\z@
+  \psrow1
+  \pscol\z@
+  \psset@shortput{tablr}%
+  \leavevmode
+  \vbox\bgroup\halign\bgroup&%
+  \begingroup
+  \global\advance\pscol 1
+  \csname psrowhook\romannumeral\psrow\endcsname
+  \csname pscolhook\romannumeral\pscol\endcsname
+  \psm@beginnode##\psm@endnode\endgroup
+  \cr}
+%
 \def\endpsmatrix{%
-\crcr\egroup\unskip\egroup
-\endgroup}
-\def\psm@cr{{\ifnum0=`}\fi\@ifnextchar[{\psm@@cr}{\psm@@@cr{}}}
+  \crcr\egroup\unskip\egroup
+  \endgroup}
+%
+% hv 2007-10-16  fix bug with \\[name=...]
+%\def\psm@cr{{\ifnum0=`}\fi\@ifnextchar[{\psm@@cr}{\psm@@@cr{}}}
+\def\psm@cr{{\ifnum0=`}\fi\ps@ifnextchar[{\psm@@cr}{\psm@@@cr{}}}
+%
 \def\psm@@cr[#1]{\psm@@@cr{\vskip#1\relax}}
 \def\psm@@@cr#1{%
-\ifnum0=`{\fi}{}\cr
-\noalign{%
-\global\advance\psrow 1
-\global\pscol\z@
-\vskip\psrowsep
-#1}}
+  \ifnum0=`{\fi}{}\cr
+  \noalign{%
+  \global\advance\psrow 1
+  \global\pscol\z@
+  \vskip\psrowsep
+  #1}}
 \def\psm@beginnode{%
-\@ifnextchar\psm@endnode
-{\let\psm@endnode@i\relax\setbox\pst@hbox=\hbox{}}%
-{\pst@object{psm@beginnode}}}
+  \@ifnextchar\psm@endnode
+    {\let\psm@endnode@i\relax\setbox\pst@hbox=\hbox{}}%
+    {\pst@object{psm@beginnode}}}
 \def\psm@beginnode@i{%
-\setbox\pst@hbox=\hbox\bgroup
-\psm@beginmath
-\begingroup
-\ignorespaces}
+  \setbox\pst@hbox=\hbox\bgroup
+  \psm@beginmath
+  \begingroup
+  \ignorespaces}
 \def\psm@endnode@i{%
-\unskip
-\endgroup
-\psm@endmath
-\egroup
-\use@par
-\@psttrue}
+  \unskip
+  \endgroup
+  \psm@endmath
+  \egroup
+  \use@par
+  \@psttrue}
 \def\psm@endnode{%
-\@pstfalse
-\psm@endnode@i
-\ifnum\pscol>1 \hskip\pscolsep \fi
-\psk@mnodesize
-\hfil
-\nodealigntrue
-\if@pst
-\csname mnode@\psk@mnode\endcsname
-\else
-\csname mnode@\psk@emnode\endcsname
-\fi
-\psk@mcol
-\psk@@mnodesize}
+  \@pstfalse
+  \psm@endnode@i
+  \ifnum\pscol>1 \hskip\pscolsep \fi
+  \psk@mnodesize
+  \hfil
+  \nodealigntrue
+  \if@pst\csname mnode@\psk@mnode\endcsname
+  \else\csname mnode@\psk@emnode\endcsname\fi
+  \psk@mcol
+  \psk@@mnodesize}
 % DG/SR modification begin - Sep. 3, 1999 - Patch 10 - From Michael Sharpe
 %\def\psspan#1{\mscount#1\relax\loop\ifnum\mscount>\@ne \sp@n\repeat}
 \def\psspan#1{\global\mscount#1\relax\pstloop\ifnum\mscount>\@ne\sp@n\repeat}
 \def\pstloop#1\repeat{\gdef\pstiterate{#1\relax\expandafter\pstiterate\fi}%
-\pstiterate
-\let\pstiterate\relax}
+  \pstiterate
+  \let\pstiterate\relax}
 % DG/SR modification end
 \def\psset@name#1{\pst@getnode{#1}\psk@name}
 \let\psk@name\relax
 \def\psset@mcol#1{%
-\ifx r#1\relax
-\let\psk@mcol\relax
-\else
-\ifx l#1\relax
-\let\psk@mcol\hfill
-\else
-\let\psk@mcol\hfil
-\fi
-\fi}
+  \ifx r#1\relax\let\psk@mcol\relax\else
+    \ifx l#1\relax\let\psk@mcol\hfill\else
+    \let\psk@mcol\hfil\fi\fi}
 \psset@mcol{c}
 \def\psset@mnodesize#1{%
 \pssetlength\pst@dimg{#1}%
@@ -1086,6 +1097,9 @@ end }}%
 \def\mnode@C{{\nodealigntrue\cnode@ii(\z@,\z@){\psk@radius}{\psm@thenode}}}
 \def\mnode@f{{\nodealigntrue\fnode@ii(\z@,\z@){\psm@thenode}}}
 \def\mnode@circle{\circlenode@ii{\psm@thenode}}
+% hv modification begin - Aug. 16, 2007
+\def\mnode@Circle{\Circlenode@ii{\psm@thenode}}
+% hv modification end - Aug. 16, 2007
 \def\mnode@p{\pnode(\z@,\z@){\psm@thenode}}
 % DG/SR modification begin - Jul. 22, 1997 - Patch 1
 \def\mnode@dot{\dotnode@ii(\z@,\z@){\psm@thenode}}
diff --git a/Master/texmf-dist/tex/generic/pstricks/pst-plot.tex b/Master/texmf-dist/tex/generic/pstricks/pst-plot.tex
index 4ce191dde77..d2fff22ed98 100644
--- a/Master/texmf-dist/tex/generic/pstricks/pst-plot.tex
+++ b/Master/texmf-dist/tex/generic/pstricks/pst-plot.tex
@@ -24,8 +24,8 @@
   \expandafter\next
 \fi
 
-\def\fileversion{1.00}
-\def\filedate{2007/06/26}
+\def\fileversion{1.01}
+\def\filedate{2008/01/26}
 \message{ v\fileversion, \filedate}
 
 
@@ -66,6 +66,7 @@ D\space##1%
 \fi*%
 \let(,\let),\let{,\let},\let ,\let^^M,\let_\@empty*% End def
 \endgroup
+%
 \begingroup
 \catcode`\,=13
 \catcode`\_=13
@@ -75,14 +76,15 @@ D\space##1%
   \let#1\pst@tempg
   \global\let\pst@tempg\relax
   \ignorespaces}
+%
 \gdef\readdata@{%
   \read1 to \pst@tempa
   \expandafter\readdata@@\pst@tempa_\@nil
   \ifeof1\else\expandafter\readdata@\fi}
-\gdef\pst@@readfile#1#2\@nil{\addto@pscode{,#1#2}}%
-\gdef\readdata@@#1#2\@nil{\xdef\pst@tempg{\pst@tempg,#1#2}}%
+  \gdef\pst@@readfile#1#2\@nil{\addto@pscode{,#1#2}}%
+  \gdef\readdata@@#1#2\@nil{\xdef\pst@tempg{\pst@tempg,#1#2}}%
 \endgroup
-
+%
 \def\readdata#1#2{%
   \openin1=#2
   \begingroup
@@ -97,6 +99,7 @@ D\space##1%
   \fi
   \endgroup
   \let#1\pst@tempg
+%  \ifnum\Pst@Debug>0 \typeout{==DEBUG== pst-plot:readdata:\string\pst@tempg: \pst@tempg}\fi%  hv 2008-02-28
   \global\let\pst@tempg\relax
   \ignorespaces}
 
@@ -298,23 +301,19 @@ n 0 eq not
         \@nameuse{beginqp@\psplotstyle}%
         /Do { \@nameuse{doqp@\psplotstyle}} def
       } def}%
-    #1%
-    \addto@pscode{D}%
+    #1%			% this is \pst@readfile{#1} for fileplot
+    \addto@pscode{ D }%
   \@nameuse{endqp@\psplotstyle}}
 
 \def\fileplot{\def\pst@par{}\pst@object{fileplot}}
 \def\fileplot@i#1{%
-  \pst@killglue
-  \begingroup
-    \use@par
-    \@pstfalse
+  \pst@killglue%
+  \begingroup%
+    \use@par%
+    \@pstfalse%
     \@nameuse{testqp@\psplotstyle}%
-    \if@pst
-      \dataplot@ii{\pst@readfile{#1}}%
-    \else
-      \listplot@ii{\pst@altreadfile{#1}}%
-    \fi
-  \endgroup
+    \if@pst\dataplot@ii{\pst@readfile{#1}}\else\listplot@ii{\pst@altreadfile{#1}}\fi%
+  \endgroup%
   \ignorespaces}
 
 \pst@def{ScalePoints}<%
@@ -539,32 +538,38 @@ n 0 eq not
 % Now the ticks and labels. Start by checking for "\multido".
 % !!Need to fix this so that does nothing when there are 0 ticks.!!
     \begingroup
-      \ifdim\pst@dimb=\z@\else\showoriginfalse\fi
-      \ifnum\psk@dx=\z@
-        \pst@dimg=\psk@Dx\psxunit
-        \edef\psk@dx{\number\pst@dimg}%
-      \fi
-      \ifnum\psk@ticks<\tw@
-        \ifnum\psk@tickstyle>\z@\else
-          \advance\pslabelsep\psk@ticksize\p@
-        \fi
-      \fi
-      \pst@hlabels\pst@dimc\psk@arrowB
-      \pst@hlabels\pst@dima\psk@arrowA
+    \ifdim\pst@dimb=\z@\else\showoriginfalse\fi
+    \ifnum\psk@dx=\z@
+      \pst@dimg=\psk@Dx\psxunit
+      \psDEBUG[psaxes@iv]{\textbackslash pst@dimg=\the\pst@dimg}% v.1.01
+      \ifdim\pst@dimg<\p@ \pst@cnta=\psk@Dx \edef\psk@Dx{-\the\pst@cnta} % v.1.01
+	\ifnum\Pst@Debug>0 \typeout{==DEBUG== pst-plot(psaxes@iv): Dx -> -Dx (was negative)}\fi  % v.1.01
+      \fi % v.1.01
+      \edef\psk@dx{\number\pst@dimg}%
+      \psDEBUG[psaxes@iv]{\textbackslash psk@dx=\psk@dx}% v.1.01
+    \fi
+    \ifnum\psk@ticks<\tw@
+      \ifnum\psk@tickstyle>\z@ \else\advance\pslabelsep\psk@ticksize\p@\fi
+    \fi
+    \pst@hlabels\pst@dimc\psk@arrowB
+    \pst@hlabels\pst@dima\psk@arrowA
     \endgroup
     \begingroup
-      \ifdim\pst@dima=\z@\else\showoriginfalse\fi
-      \ifnum\psk@dy=\z@
-         \pst@dimg=\psk@Dy\psyunit
-         \edef\psk@dy{\number\pst@dimg}%
-      \fi
-      \ifodd\psk@ticks\else
-        \ifnum\psk@tickstyle>\z@\else
-          \advance\pslabelsep\psk@ticksize\p@
-        \fi
-      \fi
-      \pst@vlabels\pst@dimd\psk@arrowB
-      \pst@vlabels\pst@dimb\psk@arrowA
+    \ifdim\pst@dima=\z@\else\showoriginfalse\fi
+    \ifnum\psk@dy=\z@
+      \pst@dimg=\psk@Dy\psyunit
+      \psDEBUG[psaxes@iv]{\textbackslash pst@dimg=\the\pst@dimg}% v.1.01
+      \ifdim\pst@dimg<\p@ \pst@cnta=\psk@Dy \edef\psk@Dy{-\the\pst@cnta} % v.1.01
+        \psDEBUG[psaxes@iv]{Dy -> -Dy (was negative)}% v.1.01
+      \fi % v.1.01
+      \edef\psk@dy{\number\pst@dimg}%
+      \psDEBUG[psaxes@iv]{\textbackslash psk@dy=\psk@dy}% v.1.01
+    \fi
+    \ifodd\psk@ticks\else
+        \ifnum\psk@tickstyle>\z@ \else\advance\pslabelsep\psk@ticksize\p@\fi
+    \fi
+    \pst@vlabels\pst@dimd\psk@arrowB
+    \pst@vlabels\pst@dimb\psk@arrowA
     \endgroup
 % Now close "\pst@hbox" (which is 0-dimensional), and put it at the origin.
   \egroup
@@ -620,9 +625,7 @@ n 0 eq not
 % The origin is never the only label.
 \def\pst@hlabels#1#2{%
   \ifdim#1=\z@\else
-    \ifx#2\empty\else
-      \advance#1\ifdim#1>\z@-\fi7\pslinewidth
-    \fi
+    \ifx#2\empty\else\advance#1\ifdim#1>\z@-\fi7\pslinewidth\fi
     \pst@cnta=#1\relax                % Distance (in sp) to end.
     \divide\pst@cnta\psk@dx\relax     % Number of ticks/labels
     \ifnum\pst@cnta=\z@\else
@@ -632,22 +635,22 @@ n 0 eq not
       \fi
       \ifnum\psk@labels<\tw@ \pst@@hlabels\fi
       \showoriginfalse
-    \fi
-  \fi}
+  \fi
+\fi}
 
 % Knows \pst@dimb and \pst@cnta
 \def\pst@@hlabels{%
   \vbox to\z@{%
     \ifdim\pst@dimd>\z@\vskip\pslabelsep\else\vss\fi
-    \ifnum\pst@cnta<\z@
-      \pst@dimb=-\pst@dimb
-    \fi
+    \ifnum\pst@cnta<\z@ \pst@dimb=-\pst@dimb\fi
     \hbox to\z@{%
       \ifshoworigin\hbox to \z@{\hss\pshlabel{\psk@Ox}\hss}\fi
       \mmultido
-        {\n=\psk@Ox+\psk@Dx}%
+        {\nA=\psk@Ox+\psk@Dx}%
         {\pst@cnta}%
-        {\hskip\pst@dimb\hbox to \z@{\hss\pshlabel{\n}\hss}}%
+        {\hskip\pst@dimb\hbox to \z@{%
+	  \hss\ifdim\nA pt=\z@ \pshlabel{0}\else\pshlabel{\nA}\fi
+	  \hss}}% prevent "-0"
       \hss}%
     \ifdim\pst@dimd>\z@\vss\else\vskip\pslabelsep\fi}}%
 
@@ -684,11 +687,11 @@ n 0 eq not
         \ifdim\pst@dimc>\z@\hskip\pslabelsep\else\hss\fi}\vss}%
     \fi
     \mmultido
-      {\n=\psk@Oy+\psk@Dy}%
+      {\nA=\psk@Oy+\psk@Dy}%
       {\pst@cnta}%
       {\vbox to\pst@dima{\vss}\vbox to \z@{\vss\hbox to\z@{%
         \ifdim\pst@dimc>\z@\hss\else\hskip\pslabelsep\fi
-        \psvlabel{\n}%
+        \ifdim\nA pt=\z@ \psvlabel{0}\else\psvlabel{\nA}\fi% prevent -0, doesn't work with \ifnum
         \ifdim\pst@dimc>\z@\hskip\pslabelsep\else\hss\fi}\vss}}%
     \vss}}
 
diff --git a/Master/texmf-dist/tex/generic/pstricks/pstricks.tex b/Master/texmf-dist/tex/generic/pstricks/pstricks.tex
index 09d4be2988c..83cf7585a81 100644
--- a/Master/texmf-dist/tex/generic/pstricks/pstricks.tex
+++ b/Master/texmf-dist/tex/generic/pstricks/pstricks.tex
@@ -20,44 +20,44 @@
 % See the PSTricks User's Guide for description.
 % This uses the header file `pstricks.pro'.
 %
-\def\fileversion{1.24}
-\def\filedate{2008/06/17}
+\def\fileversion{1.25}
+\def\filedate{2008/06/26}
 %
 \csname PSTricksLoaded\endcsname
 \let\PSTricksLoaded\endinput
 \edef\PstAtCode{\the\catcode`\@}
 \catcode`\@=11\relax
-\expandafter\ifx\csname @latexerr\endcsname\relax
-\long\def\@ifundefined#1#2#3{\expandafter\ifx\csname
-  #1\endcsname\relax#2\else#3\fi}
-\def\@namedef#1{\expandafter\def\csname #1\endcsname}
-\def\@nameuse#1{\csname #1\endcsname}
-%
-\def\@eha{%
-  Your command was ignored.^^J
-  Type \space I <command> <return> \space to replace
-  it with another command,^^J
-  or \space <return> \space to continue without it.}
-\def\@spaces{\space\space\space\space}
-\def\typeout#1{\immediate\write\@unused{#1}}
-\alloc@7\write\chardef\sixt@@n\@unused
-\def\@empty{}
-\def\@gobble#1{}
-\def\@nnil{\@nil}
-%
-\def\@ifnextchar#1#2#3{%
-  \let\@tempe#1\def\@tempa{#2}\def\@tempb{#3}\futurelet\@tempc\@ifnch}
-%
-\def\@ifnch{%
-  \ifx\@tempc\@sptoken \let\@tempd\@xifnch
-  \else\ifx\@tempc\@tempe \let\@tempd\@tempa \else \let\@tempd\@tempb \fi
-  \fi
-  \@tempd}
-%
-\begingroup
-\def\:{\global\let\@sptoken= } \:
-\def\:{\@xifnch} \expandafter\gdef\: {\futurelet\@tempc\@ifnch}
-\endgroup
+\expandafter\ifx\csname @latexerr\endcsname\relax%	do we have LaTeX?
+  \def\typeout#1{\immediate\write\@unused{#1}}
+  \alloc@7\write\chardef\sixt@@n\@unused
+  \typeout{we are running tex and have to define some LaTeX commands ...} 
+  \long\def\@ifundefined#1#2#3{\expandafter\ifx\csname
+    #1\endcsname\relax#2\else#3\fi}
+  \def\@namedef#1{\expandafter\def\csname #1\endcsname}
+  \def\@nameuse#1{\csname #1\endcsname}
+  \def\@eha{%
+    Your command was ignored.^^J
+    Type \space I <command> <return> \space to replace
+    it with another command,^^J
+    or \space <return> \space to continue without it.}
+  \def\@spaces{\space\space\space\space}
+  \def\@empty{}
+  \def\@gobble#1{}
+  \def\@nnil{\@nil}
+%
+  \def\@ifnextchar#1#2#3{%
+    \let\@tempe#1\def\@tempa{#2}\def\@tempb{#3}\futurelet\@tempc\@ifnch}
+%
+  \def\@ifnch{%
+    \ifx\@tempc\@sptoken \let\@tempd\@xifnch
+    \else\ifx\@tempc\@tempe \let\@tempd\@tempa \else \let\@tempd\@tempb \fi
+    \fi
+    \@tempd%
+  }
+  \begingroup
+  \def\:{\global\let\@sptoken= } \:
+  \def\:{\@xifnch} \expandafter\gdef\: {\futurelet\@tempc\@ifnch}
+  \endgroup
 \fi
 %
 % hv 2007-10-16 to fix the bug in pst-node with \\[name=...]
@@ -460,7 +460,7 @@
 % v 1.05   begin
 \def\psset@PstDebug#1{\pst@getint{#1}{\Pst@Debug}}% hv 2004-06-22
 \psset{PstDebug=0}
-\def\psDEBUG{\@ifnextchar[\psDEBUG@i{\ps@DEBUG@i[PSTricks]}}
+\def\psDEBUG{\@ifnextchar[\psDEBUG@i{\psDEBUG@i[PSTricks]}}
 \def\psDEBUG@i[#1]#2{\ifnum\Pst@Debug>0 \expandafter\typeout{<#1>: #2}\fi}
 % end
 \def\pst@getlength#1#2{%
@@ -810,6 +810,9 @@
 % /HardLight  4
 \psset@blendmode{0}
 %
+\def\tx@LineFill{LineFill }
+\def\tx@PenroseFill{PenroseFill }
+%
 \def\psfs@none{}
 \def\psfs@solid{\pst@fill{\pst@usecolor\psfillcolor \tx@setTransparency fill }}
 \def\psfs@eofill{\pst@fill{\pst@usecolor\psfillcolor \tx@setTransparency eofill}}
@@ -847,7 +850,19 @@
 \@namedef{psfs@hlines*}{\psfs@solid \psfs@hlines}
 \def\psfs@crosshatch{\psfs@vlines \psfs@hlines}
 \@namedef{psfs@crosshatch*}{\psfs@solid \psfs@vlines \psfs@hlines}
-\def\tx@LineFill{LineFill }
+%
+\def\psset@psscale#1{\pst@checknum{#1}\psk@psscale}
+\psset@psscale{1}
+%
+\def\pst@penroseFill{%
+  gsave					% restore in PenroseFill
+  \pst@number\pslinewidth SLW
+  \pst@usecolor\pshatchcolor
+  \psk@psscale 
+  \tx@PenroseFill }
+\def\psfs@penrose{\pst@fill\pst@penroseFill}
+\@namedef{psfs@penrose*}{\psfs@solid \psfs@penrose}
+%
 \def\psset@fillstyle#1{%
   \edef\pst@tempg{#1}\def\pst@temph{none}%
   \ifx\pst@tempg\pst@temph