pstricks

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

2 files changed, 71 insertions, 33 deletions

diff --git a/Master/texmf-dist/tex/generic/pstricks/config/xdvipdfmx.cfg b/Master/texmf-dist/tex/generic/pstricks/config/xdvipdfmx.cfg
index 9ca3de516d5..717283eb3ae 100644
--- a/Master/texmf-dist/tex/generic/pstricks/config/xdvipdfmx.cfg
+++ b/Master/texmf-dist/tex/generic/pstricks/config/xdvipdfmx.cfg
@@ -49,25 +49,25 @@
 \pstcustomize%
 \typeout{Using PSTricks configuration for XeTeX+xdvipdfmx}%
 \def\@@scalebox{%
-\leavevmode%
+\leavevmode
 \hbox{%
 \ifdim\pst@tempd\p@<\z@
-\pst@dimg=\pst@tempd\ht\pst@hbox%
-\pst@dimh=\pst@tempd\dp\pst@hbox%
-\dp\pst@hbox=-\pst@dimg%
-\ht\pst@hbox=-\pst@dimh%
+\pst@dimg=\pst@tempd\ht\pst@hbox
+\pst@dimh=\pst@tempd\dp\pst@hbox
+\dp\pst@hbox=-\pst@dimg
+\ht\pst@hbox=-\pst@dimh
 \else
-\ht\pst@hbox=\pst@tempd\ht\pst@hbox%
-\dp\pst@hbox=\pst@tempd\dp\pst@hbox%
+\ht\pst@hbox=\pst@tempd\ht\pst@hbox
+\dp\pst@hbox=\pst@tempd\dp\pst@hbox
 \fi
-\pst@dima=\pst@tempc\wd\pst@hbox%
-\ifdim\pst@dima<\z@\kern-\pst@dima\fi%
+\pst@dima=\pst@tempc\wd\pst@hbox
+\ifdim\pst@dima<\z@\kern-\pst@dima\fi
 \special{x: bscale \pst@tempc \pst@tempd}%
 \hbox to \z@{\box\pst@hbox\hss}%
 \special{x: escale}%
 \ifdim\pst@dima>\z@\kern\pst@dima\fi}}%
 %
-\let\ps@@scalebox\@@scalebox%
+\let\ps@@scalebox\@@scalebox
 \def\ps@rotateleft#1{%
 \leavevmode\hbox{\hskip\ht#1\hskip\dp#1\vbox{\vskip\wd#1%
 \pst@Verb{90 \tx@RotBegin}%
@@ -87,13 +87,13 @@
 \vbox to \z@{\hbox to \z@{\box#1\hss}\vss}%
 \pst@Verb{\tx@RotEnd}}}}%
 %
-\def\begin@psclip{\special{x: gsave}}
-\def\end@psclip{\special{x: grestore}}
+\def\begin@psclip{\special{x: gsave}}%
+\def\end@psclip{\special{x: grestore}}%
 \def\@newcolor#1#2#3{%
 \expandafter\edef\csname #1\endcsname{\noexpand\pst@color{#2}}%
 \expandafter\edef\csname\string\color@#1\endcsname{#2}%    hv 1.14 2005-12-17
 \expandafter\edef\csname\string\color@xetex@#1\endcsname{#3}%
-\ignorespaces}
+\ignorespaces}%
 %
 \def\newgray#1#2{%
   \pst@checknum{#2}\pst@tempg
@@ -102,16 +102,16 @@
 \def\newrgbcolor#1#2{%
   \pst@expandafter\pst@getnumiii{#2} {} {} {} {}\@nil
   \@newcolor{#1}{\pst@tempg \pst@temph \pst@tempi setrgbcolor}{rgb \pst@tempg \pst@temph \pst@tempi}%
-}
+}%
 \def\newhsbcolor#1#2{%
   \pst@expandafter\pst@getnumiii{#2} {} {} {} {}\@nil
   \@newcolor{#1}{\pst@tempg \pst@temph \pst@tempi sethsbcolor}{hsb \pst@tempg \pst@temph \pst@tempi}%
-}
+}%
 \def\newcmykcolor#1#2{%
   \pst@expandafter\pst@getnumiv{#2} {} {} {} {} {}\@nil
   \@newcolor{#1}{\pst@tempg \pst@temph \pst@tempi \pst@tempj setcmykcolor}%
                 {cmyk \pst@tempg \pst@temph \pst@tempi \pst@tempj}%
-}
+}%
 \newgray{black}{0}%
 \newgray{darkgray}{.25}%
 \newgray{gray}{.5}%
@@ -127,7 +127,7 @@
 \@ifundefined{LaTeXe}%
   {\def\current@@@@color{\csname\string\color@xetex@\psfillcolor\endcsname}}{%
   \AtBeginDocument{\@ifpackageloaded{xcolor}{\def\current@@@@color{\psfillcolor}}%
-    {\def\current@@@@color{\csname\string\color@\psfillcolor\endcsname}}}}
+    {\def\current@@@@color{\csname\string\color@\psfillcolor\endcsname}}}}%
 %
 \iffalse
 \def\pst@starbox{%
@@ -148,11 +148,11 @@
 \def\putoverlaybox#1{%
 \hbox{\special{x: gsave}\special{x: initoverlay #1}\copy\theoverlaybox\special{x: grestore}}}%
 %
-\def\pst@overlay#1{\edef\curr@overlay{#1}\special{x: clipoverlay #1}\aftergroup\pst@endoverlay}
-\def\pst@endoverlay{\special{x: clipoverlay \curr@overlay}}
-\def\AltOverlayMode{}
+\def\pst@overlay#1{\edef\curr@overlay{#1}\special{x: clipoverlay #1}\aftergroup\pst@endoverlay}%
+\def\pst@endoverlay{\special{x: clipoverlay \curr@overlay}}%
+\def\AltOverlayMode{}%
 %The next line is not necessary, if pstricks.sty of [2007/02/18 v0.33] or newer is used.
-\@ifundefined{LaTeXe}{}{\AtBeginDocument{\psset{fillcolor=white}}}
+\@ifundefined{LaTeXe}{}{\AtBeginDocument{\psset{fillcolor=white}}}%
 %
 \endinput
 %
diff --git a/Master/texmf-dist/tex/generic/pstricks/pstricks.tex b/Master/texmf-dist/tex/generic/pstricks/pstricks.tex
index 57fbc03fa1b..5aa9d422c40 100644
--- a/Master/texmf-dist/tex/generic/pstricks/pstricks.tex
+++ b/Master/texmf-dist/tex/generic/pstricks/pstricks.tex
@@ -109,8 +109,8 @@
 \input pgffor.code.tex
 \let\pgfforeach\foreach
 %
-\def\fileversion{2.56}
-\def\filedate{2014/07/31}
+\def\fileversion{2.57}
+\def\filedate{2014/08/27}
 \catcode`\@=11\relax
 \pst@addfams{pstricks}
 %
@@ -2488,7 +2488,7 @@
   \fi%
   \end@OpenObj%
 }
-\def\psline@iii{
+\def\psline@iii{%
   \ifdim\pslinearc>\z@
     /r \pst@number\pslinearc def
     /Lineto { \tx@Arcto } def
@@ -2642,14 +2642,36 @@
 \def\psframe@i(#1){%
   \@ifnextchar({\psframe@ii(#1)}{\psframe@ii(0,0)(#1)}}
 \def\psframe@ii(#1)(#2){%
-  \begin@ClosedObj%
-    \pst@getcoor{#1}\pst@tempa%
+  \begin@ClosedObj
+    \pst@getcoor{#1}\pst@tempa
     \pst@@getcoor{#2}%
     \addto@pscode{ \psk@cornersize \pst@tempa \pst@coor \psk@dimen \tx@Frame }%
     \def\pst@linetype{2}%
-    \showpointsfalse%
-  \end@ClosedObj%
+    \showpointsfalse
+  \end@ClosedObj
+}
+
+\iffalse
+\def\psSquare{\pst@object{psSquare}}
+\def\psSquare@i(#1)(#2){%
+  \begin@ClosedObj
+    \pst@getcoor{#1}\pst@tempa
+    \pst@getcoor{#2}\pst@tempb
+    \addto@pscode{ \psk@cornersize 
+      \pst@tempa /yA ED /xA ED 
+      \pst@tempb /yB ED /xB ED
+      xA yA moveto xB yB L
+      xA xB sub yA yB sub atan /Angle ED
+      xA yA xB yB Pyth2 dup xA add exch yA add 
+      \psk@dimen 
+      \tx@Frame 
+%      grestore
+    }%
+    \def\pst@linetype{2}%
+    \showpointsfalse
+  \end@ClosedObj
 }
+\fi
 %
 \def\psTextFrame{\pst@object{psTextFrame}}
 \def\psTextFrame@i(#1)(#2)#3{%
@@ -3470,7 +3492,7 @@ pop
 % I - Definition of \psellipticwedge, a generalization of \pswedge for wedges
 %     of ellipses (from the code of \pswedge and \psellipse)
 %
-\def\psellipticwedge{\def\pst@par{}\pst@object{psellipticwedge}}
+\def\psellipticwedge{\pst@object{psellipticwedge}}
 \def\psellipticwedge@i(#1){%
   \@ifnextchar({\psellipticwedge@ii(#1)}{\psellipticwedge@ii(0,0)(#1)}}
 \def\psellipticwedge@ii(#1)(#2)#3#4{%
@@ -3481,9 +3503,25 @@ pop
     \pst@@getcoor{#2}%
     \def\pst@linetype{1}%
     \addto@pscode{%
+      \pst@coor /ry ED /rx ED
       \ifx\psk@rot\@empty \else \psk@rot\space rotate \fi
-      \pst@tempa \pst@tempb
-      \pst@coor
+      \pst@tempa 
+      \ifPst@correctAngle
+       cvi 90 mod 0 eq { \pst@tempa } 
+         { rx abs ry abs sub cvi 0 eq { \pst@tempa }{ rx ry
+           \tx@UserCoor exch \pst@tempa tan mul exch atan 
+            \pst@tempa 180 div 0.5 add floor 
+            180 mul sub } ifelse } ifelse
+      \fi
+      \pst@tempb
+      \ifPst@correctAngle
+       cvi 90 mod 0 eq { \pst@tempb } 
+         { rx abs ry abs sub cvi 0 eq { \pst@tempb }{ rx ry
+           \tx@UserCoor exch \pst@tempb tan mul exch atan 
+            \pst@tempb 180 div 0.5 add floor 
+            180 mul sub } ifelse } ifelse
+      \fi
+      rx ry
       \pst@tempc moveto
       \ifdim\psk@dimen\p@=\z@\else
         \psk@dimen CLW mul dup 3 1 roll
@@ -3499,10 +3537,10 @@ pop
 %
 % Code mainly from "pstricks.tex'' 0.94 beta (TvZ)
 %
-\def\psellipticarcn{\def\pst@par{}\pst@object{psellipticarcn}}
+\def\psellipticarcn{\pst@object{psellipticarcn}}
 \def\psellipticarcn@i{\let\if@psarcn\iftrue\psellipticarc@ii}
 %
-\def\psellipticarc{\def\pst@par{}\pst@object{psellipticarc}}
+\def\psellipticarc{\pst@object{psellipticarc}}
 \def\psellipticarc@i{\let\if@psarcn\iffalse\psellipticarc@ii}
 \define@boolkey[psset]{pstricks}[Pst@]{correctAngle}[true]{}
 \psset{correctAngle}