pstricks (24sep12)

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

1 files changed, 35 insertions, 32 deletions

diff --git a/Master/texmf-dist/tex/generic/pstricks/pstricks.tex b/Master/texmf-dist/tex/generic/pstricks/pstricks.tex
index 5e55998297f..de5412134e5 100644
--- a/Master/texmf-dist/tex/generic/pstricks/pstricks.tex
+++ b/Master/texmf-dist/tex/generic/pstricks/pstricks.tex
@@ -94,8 +94,8 @@
 \catcode`\@=\PstAtCode\relax
 \ifx\PSTFPloaded\endinput\else   \input pst-fp.tex\fi
 %
-\def\fileversion{2.31}
-\def\filedate{2012/08/24}
+\def\fileversion{2.33}
+\def\filedate{2012/09/23}
 \catcode`\@=11\relax
 \pst@addfams{pstricks}
 %
@@ -346,11 +346,11 @@
 }
 %
 \def\pst@pyth#1#2#3{% from pst-3d
-  \begingroup
-    \pst@dima=#1\relax
-    \ifnum\pst@dima<\z@\pst@dima=-\pst@dima\fi  % dima=abs(x)
-    \pst@dimb=#2\relax
-    \ifnum\pst@dimb<\z@\pst@dimb=-\pst@dimb\fi  % dimb=abs(y)
+  \begingroup%
+    \pst@dima=#1\relax%
+    \ifnum\pst@dima<\z@\pst@dima=-\pst@dima\fi% dima=abs(x)
+    \pst@dimb=#2\relax%
+    \ifnum\pst@dimb<\z@\pst@dimb=-\pst@dimb\fi% dimb=abs(y)
     \advance\pst@dimb\pst@dima         % dimb=s=abs(x)+abs(y)
     \ifnum\pst@dimb=\z@
       \global\pst@dimg=\z@             % dimg=z=sqrt(x^2+y^2)
@@ -380,7 +380,7 @@
 % ----- the old pst@pyth begin -----  did not use dimens
 \def\pst@Pyth#1#2#3{\ifdim#1>#2\pst@@Pyth#1#2#3\else\pst@@Pyth#2#1#3\fi}
 \def\pst@@Pyth#1#2#3{%
-  \ifdim4#1>9#2
+  \ifdim4#1>9#2\relax
     #3=#1\advance#3 .2122#2%
   \else
     #3=.8384#1\advance#3 .5758#2%
@@ -1126,8 +1126,11 @@
       /Normal \or
       /Compatible \or
       /Screen \or
-      /Multiply %\or
-%      /Hardlight 
+      /Multiply \or
+      /HardLight \or
+      /Darken \or
+      /Ligten \or
+      /Difference
     \else
       /Normal 
     \fi
@@ -2909,27 +2912,27 @@
 \def\pscirclebox{\pst@object{pscirclebox}}
 \def\pscirclebox@i{\pst@makebox\pscirclebox@ii}
 \def\pscirclebox@ii{%
-\begingroup
-\pst@useboxpar
+\begingroup%
+\pst@useboxpar%
 \setbox\pst@hbox=\hbox{%
-\pst@nodehook
-\pscirclebox@iii
+\pst@nodehook%
+\pscirclebox@iii%
 \box\pst@hbox}%
-\ifpsboxsep \pscirclebox@sep \fi
-\leavevmode
-\box\pst@hbox
+\ifpsboxsep\pscirclebox@sep\fi%
+\leavevmode%
+\box\pst@hbox%
 \endgroup}
 %
 \def\pscirclebox@iii{%
-  \if@star
-    \pslinewidth\z@
+  \if@star%
+    \pslinewidth\z@%
     \pstverb{\pst@dict \tx@STP \pst@usecolor\psfillcolor
              newpath \pscirclebox@iv \tx@SD end}%
-  \else
-    \begin@ClosedObj
-    \def\pst@linetype{4}\showpointsfalse
+  \else%
+    \begin@ClosedObj%
+    \def\pst@linetype{4}\showpointsfalse%
     \addto@pscode{ \pscirclebox@iv\space CLW 2 div add 0 360 arc closepath}%
-    \end@ClosedObj
+    \end@ClosedObj%
   \fi}
 %
 \def\pscirclebox@iv{
@@ -2939,16 +2942,16 @@
   \tx@Pyth \pst@number\psframesep add }
 %
 \def\pscirclebox@sep{%
-  \pst@dimn=\ht\pst@hbox    
-  \advance\pst@dimn by \dp\pst@hbox 
-  \divide\pst@dimn by 2		
-  \pst@dimm=0.5\wd\pst@hbox
-  \pst@Pyth\pst@dimm\pst@dimn\pst@dimo
-  \advance\pst@dimo by \pslinewidth
-  \advance\pst@dimo by \psframesep
-  \advance\pst@dimn by -\pst@dimo
+  \pst@dimn=\ht\pst@hbox%			% the height of the box
+  \advance\pst@dimn by \dp\pst@hbox%		% the depth  of the box added to \pst@dimn
+  \divide\pst@dimn by 2%			% \pst@dimn/2
+  \pst@dimm=0.5\wd\pst@hbox%			% the half of the width
+  \pst@Pyth\pst@dimm\pst@dimn\pst@dimo%		% the diameter
+  \advance\pst@dimo by \pslinewidth%
+  \advance\pst@dimo by \psframesep%
+  \advance\pst@dimn by -\pst@dimo%
   \setbox\pst@hbox=\hbox to 2\pst@dimo{\hss\vbox{\kern-\pst@dimn\box\pst@hbox}\hss}%
-  \advance\pst@dimn by -\dp\pst@hbox
+  \advance\pst@dimn by -\dp\pst@hbox%
   \dp\pst@hbox=-\pst@dimn}
 %  
 \let\pst@nodehook\relax