pstricks

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

2 files changed, 57 insertions, 30 deletions

diff --git a/Master/texmf-dist/tex/generic/pstricks/pstricks.tex b/Master/texmf-dist/tex/generic/pstricks/pstricks.tex
index bc406da7684..cb1830485a3 100644
--- a/Master/texmf-dist/tex/generic/pstricks/pstricks.tex
+++ b/Master/texmf-dist/tex/generic/pstricks/pstricks.tex
@@ -66,8 +66,8 @@
 \pst@addfams{pstricks}
 \ifx\PSTFPloaded\endinput\else   \input pst-fp.tex\fi
 %
-\def\fileversion{2.17}
-\def\filedate{2011/01/30}
+\def\fileversion{2.19}
+\def\filedate{2011/03/25}
 %
 % stolen from latex.ltx to make it TeX compatible
 \newcount\psLoopIndex
@@ -491,8 +491,8 @@
 \def\pst@@@@checknum#1\relax\@nil{\ifx\@nil#1\@nil\else\let\pst@num\z@\fi}
 %
 \def\pst@getnumii#1 #2 #3\@nil{%
-\pst@checknum{#1}\pst@tempg%
-\pst@checknum{#2}\pst@temph}
+  \pst@checknum{#1}\pst@tempg%
+  \ifx\relax#2\relax\let\pst@temph\pst@tempg\else\pst@checknum{#2}\pst@temph\fi}
 \def\pst@getnumiii#1 #2 #3 #4\@nil{%
 \pst@checknum{#1}\pst@tempg%
 \pst@checknum{#2}\pst@temph%
@@ -1446,8 +1446,8 @@
 \psset[pstricks]{arrows=-}
 %
 \define@key[psset]{pstricks}{arrowscale}[1]{%                                   hv --1.12
-  \pst@@arrowscale@i#1 \@nil%                               hv -- 1.12 
-  \pst@getscale{\pst@arrowscale}\psk@arrowscale}%           hv --1.12
+  \pst@getscale{#1}\psk@arrowscale
+  \pst@@arrowscale@i#1 \@nil}%           hv --1.12
 \def\pst@@arrowscale@i#1 #2\@nil{\edef\pst@arrowscale{#1}}% hv --1.12
 \psset[pstricks]{arrowscale=1}
 %
@@ -2558,11 +2558,11 @@
 \def\psgrid@ii(#1){\@ifnextchar({\psgrid@iii(#1)}{\psgrid@iv(0,0)(0,0)(#1)}}
 \def\psgrid@iii(#1)(#2){\@ifnextchar({\psgrid@iv(#1)(#2)}{\psgrid@iv(#1)(#1)(#2)}}
 \def\psgrid@iv(#1)(#2)(#3){%
-  \begin@SpecialObj
+  \begin@SpecialObj%
     \pst@getcoor{#1}\pst@tempA%  hv 1.11
-    \pst@getcoor{#2}\pst@tempB % hv 1.11
+    \pst@getcoor{#2}\pst@tempB%  hv 1.11
     \pst@@getcoor{#3}%
-    \ifnum\psk@subgriddiv>1
+    \ifnum\psk@subgriddiv>1\relax
       \addto@pscode{
         gsave
         \psk@subgridwidth SLW 
@@ -2576,7 +2576,7 @@
 	\tx@Grid 
 	grestore
       }%
-    \fi
+    \fi%
     \addto@pscode{
       gsave
       \psk@gridwidth SLW 
@@ -2736,13 +2736,15 @@
     \end@psclip%
     \endgroup}%
   \ignorespaces}
+%
 \def\endpsclip{\pst@misplaced\endpsclip}
 \let\begin@psclip\relax
 \def\end@psclip{\pstVerb{currentpoint initclip moveto}}
+%
 \def\AltClipMode{%
-\def\end@psclip{\pstVerb{\pst@grestore}}%
-\def\begin@psclip{\pstVerb{gsave}}}
-\def\clipbox{\@ifnextchar[{\clipbox@}{\clipbox@[\z@]}}
+  \def\end@psclip{\pstVerb{\pst@grestore}}%
+  \def\begin@psclip{\pstVerb{gsave}}}
+  \def\clipbox{\@ifnextchar[{\clipbox@}{\clipbox@[\z@]}}
 % DG modification begin - Apr. 3, 1997
 % From paulus@immd5.informatik.uni-erlangen.de (Dietrich Paulus)
 %\def\clipbox@[#1]{\pst@makebox\clipbox@@{#1}}
@@ -2769,6 +2771,7 @@
     setmatrix}%
   \unhbox\pst@hbox%
   \end@psclip}}
+%
 \def\psshadowbox{\def\pst@par{}\pst@object{psshadowbox}}
 \def\psshadowbox@i{\pst@makebox\psshadowbox@ii}
 \def\psshadowbox@ii{%
@@ -3250,6 +3253,7 @@ pop
 \def\psellipticarc@iii(#1){%
   \@ifnextchar({\psellipticarc@iv(#1)}{\psellipticarc@iv(0,0)(#1)}}
 \def\psellipticarc@iv(#1)(#2)#3#4{%
+%  \addbefore@par{correctAngle=false}
   \begin@OpenObj
   \pst@getcoor{#1}\pst@tempa%	origin
   \pst@getcoor{#2}\pst@tempb%	a,b
@@ -3330,7 +3334,19 @@ pop
   xOrig yOrig T
   rx ry scale
   0 0 moveto
-  0 0 1 \pst@tempc \pst@tempd
+  0 0 1 
+  \pst@tempc 
+  \ifPst@correctAngle
+     cvi 90 mod 0 eq { \pst@tempc } 
+       { rx ry \tx@UserCoor exch \pst@tempc tan mul exch atan 
+          \pst@tempc 180 div .5 add floor 180 mul sub } ifelse 
+    \fi
+  \pst@tempd
+   \ifPst@correctAngle
+     cvi 90 mod 0 eq { \pst@tempd } 
+       { rx ry \tx@UserCoor exch \pst@tempd tan mul exch atan 
+          \pst@tempd 180 div .5 add floor 180 mul sub } ifelse 
+    \fi
   \ifcase\psarc@type arc \or arcn \fi
   closepath
   mtrx setmatrix
@@ -3896,7 +3912,8 @@ pop
 %
 \def\pspicture{\begingroup\pst@ifstar\pst@picture}
 \def\pst@picture{\@ifnextchar[{\pst@@picture}{\pst@@picture[]}}
-\def\pst@@picture[#1]#2(#3,#4){\@ifnextchar(%
+\def\pst@@picture[#1]{\@ifnextchar({\pst@@picture@i[#1]}{\pst@@picture@i[#1](10,10)}}%
+\def\pst@@picture@i[#1]#2(#3,#4){\@ifnextchar(%   ignore anything between [] and ()
   {\pst@@@picture[#1](#3,#4)}%
   {\pst@@@picture[#1](0,0)(#3,#4)}}
 %
diff --git a/Master/texmf-dist/tex/latex/pstricks/pstricks.sty b/Master/texmf-dist/tex/latex/pstricks/pstricks.sty
index a12b8cd2499..15fb4d7c767 100644
--- a/Master/texmf-dist/tex/latex/pstricks/pstricks.sty
+++ b/Master/texmf-dist/tex/latex/pstricks/pstricks.sty
@@ -5,8 +5,8 @@
 %%
 %% pstricks.sty Copyright (C) 1997 Timothy Van Zandt
 %% pstcol.sty   Copyright (C) 1994-1996 1999 David Carlisle
-%% pstricks.sty Copyright (C) 2004-2010 Herbert Voss <voss@perce.de>
-%%                                 Rolf Niepraschk <Rolf.Niepraschk@ptb.de>
+%% pstricks.sty Copyright (C) 2004-2011 Rolf Niepraschk <Rolf.Niepraschk@gmx.de>
+%%                                      Herbert Voss <hvoss@tug.org>
 %%
 %% This package may be distributed under the terms of the LaTeX Project
 %% Public License, as described in lppl.txt in the base LaTeX distribution.
@@ -16,7 +16,7 @@
 \NeedsTeXFormat{LaTeX2e}
 
 \ProvidesPackage{pstricks}
-  [2010/09/18 v0.48 LaTeX wrapper for `PSTricks' (RN,HV)]
+  [2011/03/27 v0.49 LaTeX wrapper for `PSTricks' (RN,HV)]
 % 
 \def\documentclass{%
   \edef\@tempa{\jobname.tex }%
@@ -54,17 +54,6 @@
 
 \ProcessOptions\relax
 
-\iffalse
-\def\c@lor@to@ps{%
-    \@latex@error
-      {You have run the document with pdflatex, but PSTricks\MessageBreak
-      requires latex->dvips->ps2pdf or alternatively the use\MessageBreak
-      of the package auto-pst-pdf. Then you can run\MessageBreak
-      `pdflatex -shell-escape PSTfile.tex'}%
-      {See also the PSTricks web pages http://PSTricks.tug.org}\@gobble
-}
-\fi
-
 \ifpst@PDF
    \typeout{>>> Loading package auto-pst-pdf <<<}
    \AtBeginDocument{\usepackage{auto-pst-pdf}}%
@@ -75,9 +64,30 @@
     or a "pdflatex -enable-write18 <file>"           \MessageBreak
     (if you are using MikTeX)                        \MessageBreak  
 ************************************}
-  \fi%
+  \fi
 \fi
 
+\RequirePackage{ifpdf,ifluatex}
+
+\AtBeginDocument{%
+  \ifpdf
+    \ifluatex
+      \def\pst@tempA{lualatex} 
+    \else
+      \def\pst@tempA{pdflatex}
+    \fi
+    \@ifpackageloaded{pst-pdf}{}{%
+      \@latex@error{%
+        You have run the document with pdflatex, but PSTricks\MessageBreak
+        requires latex->dvips->ps2pdf or alternatively the use\MessageBreak
+        of the package `auto-pst-pdf'. Then you can run\MessageBreak
+        \space\space`\pst@tempA\space -shell-escape <file>' (TeX Live)
+        \MessageBreak or\MessageBreak
+        \space\space`\pst@tempA\space -enable-write18 <file>' (MikTeX)}%
+        {See also the PSTricks web pages http://PSTricks.tug.org}}%
+  \fi
+}
+
 \@ifundefined{PSTricksLoaded}
 {%
   \let\saved@scalebox\scalebox