pstricks update (10jun10)

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

1 files changed, 48 insertions, 42 deletions

diff --git a/Master/texmf-dist/tex/generic/pstricks/pstricks.tex b/Master/texmf-dist/tex/generic/pstricks/pstricks.tex
index 52d3f97566e..41ca3959d49 100644
--- a/Master/texmf-dist/tex/generic/pstricks/pstricks.tex
+++ b/Master/texmf-dist/tex/generic/pstricks/pstricks.tex
@@ -65,8 +65,8 @@
 \pst@addfams{pstricks}
 \ifx\PSTFPloaded\endinput\else   \input pst-fp.tex\fi
 %
-\def\fileversion{2.07}
-\def\filedate{2010/05/24}
+\def\fileversion{2.08}
+\def\filedate{2010/06/06}
 %
 % stolen from latex.ltx to make it TeX compatible
 \newcount\psLoopIndex
@@ -3416,17 +3416,7 @@ pop
 \def\getref@r{\def\psk@xref{1}}
 \psset[pstricks]{ref=c}
 %
-\define@key[psset]{pstricks}{rot}[0]{%
-  \pst@expandafter{\@ifnextchar*{\psset@@@rot}{\psset@@rot}}{#1}\@nil}
-\def\psset@@rot#1\@nil{%
-\def\ps@next##1@#1=##2@##3\@nil{%
-\ifx\relax##2\pst@getangle{#1}\psk@rot\else\def\psk@rot{##2}\fi}%
-\expandafter\ps@next\pst@rottable @#1=\relax @\@nil}
-%
-\def\psset@@@rot#1#2\@nil{%
-\psset@@rot#2\@nil
-\edef\psk@rot{\pst@rotlist \ifx\psk@rot\@empty\else\psk@rot add \fi}}
-\def\pst@rotlist{mark RAngle /a ED cleartomark a neg }
+\def\pst@rotlist{ mark RAngle /a ED cleartomark a neg }
 \def\pst@rottable{%
 @0=%
 @U=%
@@ -3437,6 +3427,28 @@ pop
 @W=\pst@rotlist 90 add %
 @S=\pst@rotlist 180 add %
 @E=\pst@rotlist 90 sub }
+\define@key[psset]{pstricks}{rot}[0]{%
+  \pst@expandafter{\@ifnextchar*{\psset@@@rot}{\psset@@rot}}{#1}\@nil}
+\def\psset@@rot#1\@nil{%
+  \def\next##1@#1=##2@##3\@nil{%
+    \ifx##2\relax\pst@getangle{#1}\psk@rot \else\def\psk@rot{##2}\fi%
+    \pst@Verb{ gsave  STV CP T /ps@rot \ifx\psk@rot\@empty 0 \else \psk@rot \fi def grestore }% (MJS)
+  }%
+  \expandafter\next\pst@rottable @#1=\relax @\@nil%
+  }
+%
+\def\psset@@@rot#1#2\@nil{%
+  \psset@@rot#2\@nil
+  \edef\psk@rot{\pst@rotlist \ifx\psk@rot\@empty\else ps@rot add \fi}}% (MJS)
+%
+%\def\psset@@rot#1\@nil{%
+%\def\ps@next##1@#1=##2@##3\@nil{%
+%\ifx\relax##2\pst@getangle{#1}\psk@rot\else\def\psk@rot{##2}\fi}%
+%\expandafter\ps@next\pst@rottable @#1=\relax @\@nil}
+%
+%\def\psset@@@rot#1#2\@nil{%
+%\psset@@rot#2\@nil
+%\edef\psk@rot{\pst@rotlist \ifx\psk@rot\@empty\else\psk@rot add \fi}}
 \psset[pstricks]{rot=0}
 %
 \def\tx@RotBegin{RotBegin }
@@ -3469,7 +3481,8 @@ pop
     \use@par%
     \if@star\pst@starbox\fi%
     \pst@makesmall\pst@hbox%
-    \pst@rotate\psk@rot\pst@hbox%
+    \ifx\psk@rot\@empty\else\pst@rotate{ps@rot }\pst@hbox\fi% (MJS)
+%    \pst@rotate\psk@rot\pst@hbox%
     \psput@{#1}\pst@hbox%
   \endgroup%
   \ignorespaces}
@@ -3491,7 +3504,8 @@ pop
     \use@par
     \if@star\pst@starbox\fi
     \pst@makesmall\pst@hbox
-    \pst@rotate\psk@rot\pst@hbox
+    \ifx\psk@rot\@empty\else\pst@rotate{ps@rot }\pst@hbox\fi% (MJS)
+%    \pst@rotate\psk@rot\pst@hbox
     \pssetxlength\pst@dima{#1}%
     \pssetylength\pst@dimb{#2}%
     \pssetxlength\pst@dimc{#3}%
@@ -3512,6 +3526,7 @@ pop
   \endgroup
   \ignorespaces%
 }
+%
 \newif\if@fixedradius
 \def\cput{\def\pst@par{}\pst@object{cput}}
 \def\cput@i{\@fixedradiusfalse\cput@ii}
@@ -3529,11 +3544,13 @@ pop
       \if@fixedradius\psCirclebox@ii\else\pscirclebox@ii\fi%
     }%
     \pst@@makesmall\pst@hbox
-    \pst@rotate\psk@rot\pst@hbox
+    \ifx\psk@rot\@empty\else\pst@rotate{ps@rot }\pst@hbox\fi% (MJS)
+%    \pst@rotate\psk@rot\pst@hbox
     \psput@{#1}\pst@hbox
   \endgroup
   \ignorespaces%
 }
+%
 \def\Cput{\def\pst@par{}\pst@object{Cput}}
 \def\Cput@i{\@fixedradiustrue\cput@ii}
 \newdimen\pslabelsep
@@ -3548,24 +3565,10 @@ pop
     \else
       \def\psk@refangle{##2 }%
       \def\psk@uputref{##3}%
-    \fi%
-    \pst@Verb{ gsave STV CP T /ps@refangle \psk@refangle\space def grestore }}%ADDED (MJS)
-%
-\expandafter\next\pst@refangletable @#1=\relax"@\@nil}
-% Fix \uput@vii
-\def\uput@vii#1#2{%
-  \edef\pst@coor{%
-    \pst@number\pslabelsep
-    #2%
-    \pst@number{\wd\pst@hbox}%
-    \pst@number{\ht\pst@hbox}%
-    \pst@number{\dp\pst@hbox}%
-    ps@refangle % CHANGED (MJS) FROM \psk@refangle\space
-    \ifx\psk@rot\@empty\else\psk@rot\space sub \fi
-    \tx@Uput #1}%
-  \setbox\pst@hbox=\hbox to\z@{\hss\vbox to\z@{\vss\box\pst@hbox\vss}\hss}%
-  \setbox\pst@hbox=\psput@special\pst@hbox
-  \ifx\psk@rot\@empty\else\pst@rotate\psk@rot\pst@hbox\fi}
+    \fi}%
+  \expandafter\next\pst@refangletable @#1=\relax"@\@nil%
+  \pst@Verb{ gsave STV CP T /ps@refangle \psk@refangle\space def grestore }%ADDED (MJS)
+}
 %
 \def\pst@refangletable{%
 @r=0"20%
@@ -3604,20 +3607,22 @@ pop
     \ifx\psk@rot\@empty\expandafter\uput@viii\psk@uputref%
     \else\uput@vii\tx@UUput{}\fi%
   \fi}
+
 % Fix \uput@vii
 \def\uput@vii#1#2{%
-  \edef\pst@coor{
+  \edef\pst@coor{%
     \pst@number\pslabelsep
-    #2
-    \pst@number{\wd\pst@hbox}
-    \pst@number{\ht\pst@hbox}
-    \pst@number{\dp\pst@hbox}
+    #2%
+    \pst@number{\wd\pst@hbox}%
+    \pst@number{\ht\pst@hbox}%
+    \pst@number{\dp\pst@hbox}%
     ps@refangle % CHANGED (MJS) FROM \psk@refangle\space
     \ifx\psk@rot\@empty\else\psk@rot\space sub \fi
     \tx@Uput #1}%
   \setbox\pst@hbox=\hbox to\z@{\hss\vbox to\z@{\vss\box\pst@hbox\vss}\hss}%
-  \setbox\pst@hbox=\psput@special\pst@hbox
-  \ifx\psk@rot\@empty\else\pst@rotate\psk@rot\pst@hbox\fi}
+  \setbox\pst@hbox=\psput@special\pst@hbox%
+  \ifx\psk@rot\@empty\else\pst@rotate{ps@rot }\pst@hbox\fi}% (MJS)
+%  \ifx\psk@rot\@empty\else\pst@rotate\psk@rot\pst@hbox\fi}
 %
 \def\uput@viii#1#2{%
   \ifnum#1>\z@\relax\ifnum#2>\z@\relax\pslabelsep=.707\pslabelsep\fi\fi%
@@ -3643,7 +3648,8 @@ pop
   \if@star\pst@starbox\fi
   \Rput@vi
   \pst@makesmall\pst@hbox
-  \pst@rotate\psk@rot\pst@hbox
+  \ifx\psk@rot\@empty\else\pst@rotate{ps@rot }\pst@hbox\fi% (MJS)
+%  \pst@rotate\psk@rot\pst@hbox
   \psput@{#1}\pst@hbox
   \endgroup
   \ignorespaces}