pst-plot (10nov13)

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

1 files changed, 23 insertions, 16 deletions

diff --git a/Master/texmf-dist/tex/generic/pst-plot/pst-plot.tex b/Master/texmf-dist/tex/generic/pst-plot/pst-plot.tex
index fc5f6a28ab4..0b5fb325621 100644
--- a/Master/texmf-dist/tex/generic/pst-plot/pst-plot.tex
+++ b/Master/texmf-dist/tex/generic/pst-plot/pst-plot.tex
@@ -4,7 +4,7 @@
 %% See the betadoc documentation for usage. 
 %%
 %% COPYRIGHT 1993, 1994, 1999 by Timothy Van Zandt, tvz@nwu.edu.
-%% COPYRIGHT 2009-2013 by Herbert Voss, hvoss@tug.org.
+%% COPYRIGHT 2009-2014 by Herbert Voss, hvoss@tug.org.
 %%
 %% This program can be redistributed and/or modified under the terms
 %% of the LaTeX Project Public License Distributed from CTAN
@@ -19,8 +19,8 @@
 \ifx\PSTFPloaded\endinput\else   \input pst-fp.tex  \fi
 \ifx\MultidoLoaded\endinput\else \input multido.tex \fi
 %
-\def\fileversion{1.52}
-\def\filedate{2013/10/18}
+\def\fileversion{1.54}
+\def\filedate{2013/11/08}
 \message{ v\fileversion, \filedate\space (tvz,hv)}
 %
 \edef\TheAtCode{\the\catcode`\@}
@@ -1680,13 +1680,14 @@ D\space##1%
   \def\pstXPSScale{#3 }%
   \def\pstYPSScale{#4 }%
   \pst@def{ScalePoints}<%
-    /y ED /x ED
-    /yPSOp { #4 y mul #2 mul } def
-    /xPSOp { #3 x mul #1 mul } def
+    /yVal ED /xVal ED
+    /yPSOp { #4 yVal mul #2 mul } def
+    /xPSOp { #3 xVal mul #1 mul } def
     counttomark dup dup cvi eq not { exch pop } if
     /m exch def /n m 2 div cvi def
     n {
-      yPSOp m 1 roll xPSOp m 1 roll
+      \ifPst@polarplot exch cvi 360 mod PtoC \fi  % x cvi 360 mod PtoC
+      yPSOp m 1 roll xPSOp m 1 roll 
       /m m 2 sub
       def } repeat>%
 }
@@ -1708,7 +1709,8 @@ D\space##1%
 \def\psaxes@vi(#1)(#2)(#3)[#4,#5][#6,#7]{%
   \psaxes@vii(#1)(#2)(#3)%
   \begingroup%
-  \use@par%
+  \SpecialCoor
+  \use@par
   \uput{\psxlabelsep}[#5](#3|#1){#4}\uput{\psylabelsep}[#7](#1|#3){#6}%
   \endgroup%
   \ignorespaces}
@@ -2009,7 +2011,7 @@ D\space##1%
       } for
 % end ticks ----------------------------------------------------------
 %\fi    
-    } if%
+    } if
    }%	end of \pscode
   \end@SpecialObj%
   % now draw the axes again with the correct linecolor
@@ -2402,21 +2404,26 @@ D\space##1%
 \def\psVectorfield@i(#1,#2)(#3,#4)#5{{%
   \addbefore@par{Dx=0.1,Dy=0.1,Ox=3,arrows=->,linewidth=0.2pt}%
   \begin@SpecialObj
+  \SpecialCoor
   \pstFPsub\pst@tempA{#3}{#1}%
   \pstFPsub\pst@tempB{#4}{#2}%
   \pstFPDiv{\pst@tempC}{\pst@tempA}{\psk@Dx}%
   \pstFPDiv{\pst@tempD}{\pst@tempB}{\psk@Dy}%
-  \pstVerb{ /y' \ifPst@algebraic (#5) tx@AlgToPs begin AlgToPs end cvx
+  \pstVerb{ /yStrich \ifPst@algebraic (#5) tx@AlgToPs begin AlgToPs end cvx
                 \else { #5 } \fi def }%
   \multido{\rX=#1+\psk@Dx}{\numexpr\pst@tempC+1}{%
     \multido{\rY=#2+\psk@Dy}{\numexpr\pst@tempD+1}{%
-     \pstVerb{ /x \rX\space def 
-%               /ocount 0 def  %%%%%%%%%%%%%%%%%%%% WARUM???? %%%%%%%%
-               /y \rY\space def 
-               /yTemp y' \psk@Dx\space \psk@Ox\space div mul def }%
        \psline%
-         (! \rX\space \psk@Dx\space \psk@Ox\space div sub \rY\space yTemp sub)%
-         (! \rX\space \psk@Dx\space \psk@Ox\space div add \rY\space yTemp add)%
+         (! /x \rX\space def 
+%           /ocount 0 def  %%%%%%%%%%%%%%%%%%%% WARUM???? %%%%%%%%
+            /y \rY\space def 
+            /yTemp yStrich \psk@Dx\space \psk@Ox\space div mul def 
+            \rX\space \psk@Dx\space \psk@Ox\space div sub \rY\space yTemp sub)%
+         (! /x \rX\space def 
+%           /ocount 0 def  %%%%%%%%%%%%%%%%%%%% WARUM???? %%%%%%%%
+            /y \rY\space def 
+            /yTemp yStrich \psk@Dx\space \psk@Ox\space div mul def 
+            \rX\space \psk@Dx\space \psk@Ox\space div add \rY\space yTemp add)%
    }}%
   \end@SpecialObj
 }\ignorespaces}