pstricks (9mar13)

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

1 files changed, 11 insertions, 10 deletions

diff --git a/Master/texmf-dist/tex/generic/pstricks/pstricks.tex b/Master/texmf-dist/tex/generic/pstricks/pstricks.tex
index 0f0995313e4..af63d770327 100644
--- a/Master/texmf-dist/tex/generic/pstricks/pstricks.tex
+++ b/Master/texmf-dist/tex/generic/pstricks/pstricks.tex
@@ -103,8 +103,8 @@
 \input pgffor.code.tex
 \let\pgfforeach\foreach
 %
-\def\fileversion{2.35}
-\def\filedate{2012/12/21}
+\def\fileversion{2.36}
+\def\filedate{2013/03/09}
 \catcode`\@=11\relax
 \pst@addfams{pstricks}
 %
@@ -917,7 +917,7 @@
   \pssetlength\pst@dimb{#1}%	hv 2007-10-16  g is already used in get@@angle
   \pst@@getangle{#2}%
 %  \edef\pst@coor{\pst@number\pst@dimg \pst@angle \tx@PtoC}%  dito
-  \edef\pst@coor{\pst@number\pst@dimb \pst@angle \tx@PtoC}%
+  \edef\pst@coor{\pst@number\pst@dimb \pst@angle \tx@PtoC }%
 }
 %
 \def\raw@coor#1;#2\@nil{%		PostScript code 
@@ -1220,8 +1220,8 @@
   \pst@checknum{#1}\psk@psscale}
 \psset[pstricks]{psscale=1}
 %
-\def\pst@dotFill#1{%
-  /clipType { \ifx\relax#1\relax clip \else#1\fi} def 
+\def\pst@dotFill[#1]{%
+  /clipType { \ifx\relax#1\relax clip \else #1 \fi } def 
   gsave
   \pst@number\pslinewidth SLW
   \pst@usecolor\pshatchcolor
@@ -1230,9 +1230,9 @@
   \psk@hatchwidth
   \tx@DotFill }
 
-\def\psfs@dots{\pst@fill{ /SolidDot false def \pst@dotFill }}
+\def\psfs@dots{\pst@fill{ /SolidDot false def \pst@dotFill[] }}
 \def\psfs@eodots{\pst@fill{ /SolidDot false def \pst@dotFill[eoclip] }}
-\@namedef{psfs@dots*}{\pst@fill{ /SolidDot true def \pst@dotFill }}
+\@namedef{psfs@dots*}{\pst@fill{ /SolidDot true def \pst@dotFill[] }}
 \@namedef{psfs@eodots*}{\pst@fill{ /SolidDot true def \pst@dotFill[eoclip] }}
 %
 \def\pst@penroseFill{%
@@ -3972,7 +3972,7 @@ pop
   \if@star\pst@starbox\fi%
   \pstCheckCoorType{#1}% needed for \uput@vii
   \uput@vi%
-  \psput@{#1}\pst@hbox
+  \psput@{#1}\pst@hbox%
   \endgroup%
   \ignorespaces}
 %
@@ -3985,7 +3985,8 @@ pop
 % 
 \def\uput@vii#1#2{%
   \edef\pst@coor{%
-    \pst@number\pslabelsep
+    \pst@number\pslabelsep %\ifdim\pslabelsep<\z@ 
+    neg %\fi
     #2%
     \pst@number{\wd\pst@hbox}%
     \pst@number{\ht\pst@hbox}%
@@ -4013,7 +4014,7 @@ pop
   \setbox\pst@hbox=\vbox to\z@{%
     \ifnum#2=1\relax\vskip\pslabelsep\else\vss\fi%
     \hbox to\z@{%
-      \ifnum#1=2\relax\hskip\pslabelsep\else\hss\fi%
+      \ifnum#1=2\relax\hskip\pslabelsep \else\hss\fi%
       \box\pst@hbox%
       \ifnum#1=1\relax\hskip\pslabelsep\else\hss\fi}%
     \ifnum#2=2\relax\vskip\pslabelsep\else\vss\fi}}