pst-plot (19oct13)

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

1 files changed, 45 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 15f868ee485..fc5f6a28ab4 100644
--- a/Master/texmf-dist/tex/generic/pst-plot/pst-plot.tex
+++ b/Master/texmf-dist/tex/generic/pst-plot/pst-plot.tex
@@ -1,4 +1,3 @@
-% $Id: pst-plot.tex 826 2013-09-21 07:08:00Z herbert $
 %% BEGIN pst-plot.tex
 %%
 %% plotting functions and data with PSTricks.
@@ -20,8 +19,8 @@
 \ifx\PSTFPloaded\endinput\else   \input pst-fp.tex  \fi
 \ifx\MultidoLoaded\endinput\else \input multido.tex \fi
 %
-\def\fileversion{1.50}
-\def\filedate{2013/09/20}
+\def\fileversion{1.52}
+\def\filedate{2013/10/18}
 \message{ v\fileversion, \filedate\space (tvz,hv)}
 %
 \edef\TheAtCode{\the\catcode`\@}
@@ -1612,6 +1611,8 @@ D\space##1%
 \define@key[psset]{pst-plot}{xlabelOffset}[0pt]{\pst@getlength{#1}\psk@xlabelOffset}
 \define@key[psset]{pst-plot}{ylabelOffset}[0pt]{\pst@getlength{#1}\psk@ylabelOffset}
 %
+\define@key[psset]{pst-plot}{frameOffset}[0pt]{\pst@getlength{#1}\psk@frameOffset}
+%
 \define@key[psset]{pst-plot}{tickcolor}[black]{%
     \pst@getcolor{#1}\psk@xtickcolor%
     \pst@getcolor{#1}\psk@ytickcolor}
@@ -1650,7 +1651,7 @@ D\space##1%
 %
 \psset[pst-plot]{subticksize=0.75,subticks=1,tickcolor=black,ticklinestyle=solid,
   subticklinestyle=solid,subtickcolor=gray,tickwidth=0.5\pslinewidth,
-  subtickwidth=0.25\pslinewidth,labelOffset=0pt}
+  subtickwidth=0.25\pslinewidth,labelOffset=0pt,frameOffset=0pt}
 %
 \define@key[psset]{pst-plot}{nStep}[1]{\def\psk@nStep{#1}}
 \define@key[psset]{pst-plot}{nStart}[0]{\def\psk@nStart{#1}}
@@ -1809,9 +1810,11 @@ D\space##1%
       \ifx\psk@axesstyle\@none   
         pop pop % axesstyle = none (only ticks) or frame (already drawn)
       \else
-        L                                  % the line with arrows 
-        \@nameuse{psls@\pslinestyle}                 % linestyle for the axes
-        stroke                                       % draw the main line
+        gsave                              		% save current state
+        L                                  		% the line with arrows 
+        \@nameuse{psls@\pslinestyle}                 	% linestyle for the axes
+        stroke                                       	% draw the main line
+        grestore
       \fi
       /yStart exch def
       /xStart exch def
@@ -1862,11 +1865,13 @@ D\space##1%
         \fi
       } def
       /LSstroke {                                  % set linestyle and stroke
-        \ifis@yAxis\@nameuse{psls@\psyticklinestyle}
-        \else\@nameuse{psls@\psxticklinestyle}\fi stroke} def
+        \ifis@yAxis \@nameuse{psls@\psyticklinestyle}
+        \else       \@nameuse{psls@\psxticklinestyle}\fi 
+        stroke} def
       /subLSstroke {                               % set sublinestyle and stroke
-        \ifis@yAxis\@nameuse{psls@\psysubticklinestyle}
-        \else\@nameuse{psls@\psxsubticklinestyle}\fi stroke} def
+        \ifis@yAxis \@nameuse{psls@\psysubticklinestyle}
+        \else       \@nameuse{psls@\psxsubticklinestyle}\fi 
+        stroke} def
 %\iffalse
 % start ticks ---------------------------------------------------------
 %      showOrigin { 0 }{ dT } ifelse
@@ -2016,12 +2021,13 @@ D\space##1%
 }%
 %
 \def\psxs@frame{%
+  \psset{axesstyle=none}%
   \begin@SpecialObj%
     \addto@pscode{					% the frame
-      \pst@number\pst@dima \pst@number\pst@dimb moveto 	% lower left
-      \pst@number\pst@dimc \pst@number\pst@dimb L	% upper left
-      \pst@number\pst@dimc \pst@number\pst@dimd L 	% upper right
-      \pst@number\pst@dima \pst@number\pst@dimd L 	% lower right
+      \pst@number\pst@dima \psk@frameOffset sub \pst@number\pst@dimb \psk@frameOffset sub moveto 	% lower left
+      \pst@number\pst@dimc \psk@frameOffset add \pst@number\pst@dimb \psk@frameOffset sub L	% upper left
+      \pst@number\pst@dimc \psk@frameOffset add \pst@number\pst@dimd \psk@frameOffset add L 	% upper right
+      \pst@number\pst@dima \psk@frameOffset sub \pst@number\pst@dimd \psk@frameOffset add L 	% lower right
       closepath 
       }%
     \pst@stroke%
@@ -2029,7 +2035,7 @@ D\space##1%
   \end@SpecialObj%
   \let\psk@arrowA\@empty%
   \let\psk@arrowB\@empty%
-  \pst@xticksizeC=\z@\pst@yticksizeC=\z@%
+  \pst@xticksizeC=\z@\pst@yticksizeC=\z@  
   \ifPst@xAxis\psxs@@axes\pst@dima\pst@dimb\pst@dimc\pst@dimd{}{x}\fi%		x axis
   \ifPst@yAxis\psxs@@axes\pst@dima\pst@dimb\pst@dimc\pst@dimd{ exch }{y}\fi%	y axis
   \ifnum\psk@tickstyle=\tw@	% llx,lly,urx,ury,exch,x|y,arrowA,arrowB	
@@ -2392,6 +2398,29 @@ D\space##1%
     \else #1\fi%
 }
 %
+\def\psVectorfield{\pst@object{psVectorfield}}
+\def\psVectorfield@i(#1,#2)(#3,#4)#5{{%
+  \addbefore@par{Dx=0.1,Dy=0.1,Ox=3,arrows=->,linewidth=0.2pt}%
+  \begin@SpecialObj
+  \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
+                \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)%
+   }}%
+  \end@SpecialObj
+}\ignorespaces}  
+%
 \def\psFixpoint{\pst@object{psFixpoint}}
 \def\psFixpoint@i#1#2#3{% #1: xStart #2: f(x) #3: number of iterations
   \pst@killglue%