pstricks-add (13mar07)

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

5 files changed, 219 insertions, 53 deletions

diff --git a/Master/texmf-dist/doc/generic/pstricks-add/Changes b/Master/texmf-dist/doc/generic/pstricks-add/Changes
index 2d3a68cc45c..72dfe321a40 100644
--- a/Master/texmf-dist/doc/generic/pstricks-add/Changes
+++ b/Master/texmf-dist/doc/generic/pstricks-add/Changes
@@ -17,9 +17,14 @@ pstricks-add.pro ----------- (Dominik Rodriguez/hv)
 
 
 pstricks-add ----------- (Dominik Rodriguez/hv)
- v 2.82  2006-11-22 - add boolean key for angleCheck (hv)
- v 2.81  2006-10-10 - fix a trailing space in \pstScalePoints (hv)
-		    - add macro \psforeach (hv)
+ v 2.84  2007-03-13 - add plotstyle LSM for a Least Square Method to calculate
+                      the values for a line y=v*x+u, which fits best all 
+		      data records (hv)
+ v 2.83  2007-01-22 - write the  x-y values of psDiffEqn to a file (hv)
+                    - fix bug in pst@Triangle
+ v 2.82  2007-01-02 - rename \pstranspalpha to \psk@transpalpha (hv)
+ v 2.81  2006-10-10 - fix a trailing space in \pstScalePoints
+		    - add macro \psforeach
 		    - fix bug in the line macros \length -> \linelength
  v 2.80  2006-09-25 - fix a trailing space for fillstyle transparent
  v 2.79  2006-09-21 - make ! not active (for french language and SpecialCoor)
diff --git a/Master/texmf-dist/doc/generic/pstricks-add/pstricks-add-doc.pdf b/Master/texmf-dist/doc/generic/pstricks-add/pstricks-add-doc.pdf
index 7b0f1c70f95..55bff157fed 100644
--- a/Master/texmf-dist/doc/generic/pstricks-add/pstricks-add-doc.pdf
+++ b/Master/texmf-dist/doc/generic/pstricks-add/pstricks-add-doc.pdf
diff --git a/Master/texmf-dist/doc/generic/pstricks-add/pstricks-add-doc.tex b/Master/texmf-dist/doc/generic/pstricks-add/pstricks-add-doc.tex
index 6d472d25700..3f8824f1758 100644
--- a/Master/texmf-dist/doc/generic/pstricks-add/pstricks-add-doc.tex
+++ b/Master/texmf-dist/doc/generic/pstricks-add/pstricks-add-doc.tex
@@ -612,6 +612,7 @@ or \verb|t| (top), where the default is \verb|c|, the center of the object.
 \end{LTXexample}
 
 
+\clearpage
 It is also possible to put a vertical brace around a default paragraph. This works
 with setting two invisible nodes at the beginning and the end of the paragraph.
 Inentation is possible with a minipage.
@@ -3523,7 +3524,8 @@ The following constants are are defined in the package:
 Because it is a bit complicating to set the right values, we show some more examples
 here.
 
-For \textbf{all} following examples in this section we did a global\\ \lstinline[frame=single]|\psset{trigLabels=true,labelFontSize=\small}|.
+For \textbf{all} following examples in this section we did a 
+global\\ \lstinline[frame=single]|\psset{trigLabels=true,labelFontSize=\small}|.
 
 
 
@@ -3880,7 +3882,8 @@ some nonsense in this line ���time forcex forcey
 %--------------------------------------------------------------------------------------
 By default the plot macros \verb|\dataplot|, \verb|\fileplot| and \verb|\listplot| plot every
 data record. The package \verb|pst-plot-add| defines additional keys \verb|nStep, nStart, nEnd| and \verb|xStep, xStart, xEnd|, which allows
-to plot only a selected part of the data records, e.g. \verb|nStep=10|. These "n" options mark the number of the record to be plot ($0,1,2,...$) and the "x" ones the x-values of the data records.
+to plot only a selected part of the data records, e.g. \verb|nStep=10|. These "`n"' 
+options mark the number of the record to be plot ($0,1,2,...$) and the "`x"' ones the x-values of the data records.
 
 
 \begin{center}
@@ -3896,7 +3899,8 @@ Name & Default setting\\\hline
 \verb|xStep|  &  \verb|0|\\
 \verb|plotNo|  &  \verb|1|\\
 \verb|plotNoMax|  &  \verb|1|\\
-\verb|ChangeOrder|  &  \verb|false|
+\verb|ChangeOrder|  &  \verb|false|\\
+(\verb+plotstyle+)& \verb+line+
 \end{tabular}
 \end{center}
 
@@ -4114,6 +4118,7 @@ without any modification to the data file:
 \end{pspicture}
 \end{LTXexample}
 
+\clearpage
 
 
 %--------------------------------------------------------------------------------------
@@ -4132,6 +4137,7 @@ the values are used in a reverse order:
   7 3.5 5
   10 2 9
 \end{filecontents*}
+\psset{lly=-.5cm}
 \begin{psgraph}[axesstyle=frame,ticklinestyle=dotted,ticksize=0 10](0,0)(10,10){4in}{2in}%
    \readdata{\data}{test.dat}%
    \pscustom[fillstyle=solid,fillcolor=gray]{%
@@ -4141,8 +4147,117 @@ the values are used in a reverse order:
 \end{LTXexample}
 
 
+\clearpage
+%--------------------------------------------------------------------------------------
+\subsubsection{Example for \texttt{plotstyle}}
+%--------------------------------------------------------------------------------------
+The \verb+plotstyle+ option is defined in the package \verb+pst-plot+, but its value
+\verb+LSM+ (\textbf{L}east \textbf{S}quare \textbf{Method}) is only valid for the
+\verb+pstricks-add+ package. Instead of plotting the data records as dots or a line,
+the \verb+listplot+ macro calculates the values for a line $y=v\cdot x+u$ which fits
+best all data records.
+
+\bgroup
+\centering
+\begin{filecontents*}{LSM.dat}
+0 1 1 3 2.8 4 3 2.9 2 5 4 4 5 5.5 6 8.2 8 7 
+\end{filecontents*}
+\psset{lly=-.5cm}
+\readdata{\data}{LSM.dat}
+\begin{psgraph}[arrows=->](0,0)(0,0)(8,8){.5\textwidth}{!}
+  \listplot[plotstyle=dots]{\data}
+  \listplot[plotstyle=LSM,linecolor=red]{\data}
+\end{psgraph}
+\egroup
+
+
+\begin{lstlisting}
+\begin{filecontents*}{LSM.dat}
+0 1 1 3 2.8 4 3 2.9 2 5 4 4 5 5.5 6 8.2 8 7 
+\end{filecontents*}
+\psset{lly=-.5cm}
+\readdata{\data}{LSM.dat}
+\begin{psgraph}[arrows=->](0,0)(0,0)(8,8){.5\textwidth}{!}
+  \listplot[plotstyle=dots]{\data}
+  \listplot[§\ON§plotstyle§\OFF§=§\ON§LSM§\OFF§,linecolor=red]{\data}
+\end{psgraph}
+\end{lstlisting}
+
+
+The macro looks for the lowest and biggest x-value and draws the line for this interval.
+It is possible to pass another values to the macro by setting the \verb+xStart+ and/or
+\verb+xEnd+ options. They are preset with an empty value \verb+{}+.
+
+\bgroup
+\centering
+\begin{filecontents*}{LSM.dat}
+0 1 1 3 2.8 4 3 2.9 2 5 4 4 5 5.5 6 8.2 8 7 
+\end{filecontents*}
+\readdata{\data}{LSM.dat}
+\psset{lly=-1.75cm}
+\begin{psgraph}[arrows=->](0,0)(0,0)(8,8){.5\textwidth}{!}
+  \listplot[plotstyle=dots]{\data}
+  \listplot[PstDebug=1,plotstyle=LSM,xStart=-0.5,xEnd=8.5,linecolor=red]{\data}
+\end{psgraph}
+\egroup
+
+\begin{lstlisting}
+\begin{filecontents*}{LSM.dat}
+0 1 1 3 2.8 4 3 2.9 2 5 4 4 5 5.5 6 8.2 8 7 
+\end{filecontents*}
+\readdata{\data}{LSM.dat}
+\psset{lly=-1.75cm}
+\begin{psgraph}[arrows=->](0,0)(0,0)(8,8){.5\textwidth}{!}
+  \listplot[plotstyle=dots]{\data}
+  \listplot[§\ON§PstDebug§\OFF§=1,plotstyle=§\ON§LSM§\OFF§,§\ON§xStart§\OFF§=-0.5,§\ON§xEnd§\OFF§=8.5,linecolor=red]{\data}
+\end{psgraph}
+\end{lstlisting}
+
+
+With \verb+PstDebug=1+ one gets the equation $y=v\cdot x+u$ printed, beginning at
+the position (0|-50pt). This cannot be changed, because it is only for some kind
+of debugging. Pay attention for the correct \verb+xStart+- and \verb+xEnd+-values,
+when you use the \verb+\pstScalePoints+-Macro. In the following example we use an
+x-interval from 0 to 3 to plot the values; first we substract 0.003 from all x-values
+and then scale them with 10000. This is not taken into account for the \verb+xStart+- 
+and \verb+xEnd+-values.
 
 
+\bgroup
+\centering
+\begin{filecontents*}{LSM.dat}
+0.003298697 1.397785583
+0.003193358 1.615489564
+0.003094538 2.044019006
+0.003001651 2.259240127
+\end{filecontents*}
+\readdata{\data}{LSM.dat}
+\pstScalePoints(10000,1){ 0.003 sub }{}
+\psset{lly=-1.75cm}
+\psgraph[arrows=->,Ox=0.0030,Dx=0.0001,dx=\psxunit](0,0)(3.2,3){10cm}{5cm}
+  \listplot[showpoints=true,linewidth=1pt,linecolor=blue]{\data}
+  \listplot[PstDebug=1,plotstyle=LSM,linewidth=0.1pt,linestyle=dashed,%
+    xStart=-0.25,xEnd=3.3]{\data}
+\endpsgraph
+\egroup
+
+\begin{lstlisting}
+\begin{filecontents*}{LSM.dat}
+0.003298697 1.397785583
+0.003193358 1.615489564
+0.003094538 2.044019006
+0.003001651 2.259240127
+\end{filecontents*}
+\readdata{\data}{LSM.dat}
+§\ON§\pstScalePoints§\OFF§(10000,1){ 0.003 sub }{}
+\psset{lly=-1.75cm}
+\psgraph[arrows=->,Ox=0.0030,Dx=0.0001,dx=\psxunit](0,0)(3.2,3){10cm}{5cm}
+  \listplot[showpoints=true,linewidth=1pt,linecolor=blue]{\data}
+  \listplot[PstDebug=1,plotstyle=§\ON§LSM§\OFF§,linewidth=0.1pt,linestyle=dashed,%
+    xStart=-0.25,xEnd=3.3]{\data}
+\endpsgraph
+\end{lstlisting}
+
 
 %--------------------------------------------------------------------------------------
 \section{Polar plots}
@@ -4337,10 +4452,10 @@ In the following example, the y unit gets the same value as the one for the x-ax
 
 \begin{center}
 \readdata{\data}{demo1.dat}
-\psset{xAxisLabel=x-Axes,yAxisLabel=y-Axes,llx=-.5cm,ury=0.5cm%
+\psset{xAxisLabel=x-Axes,yAxisLabel=y-Axes,llx=-.5cm,ury=0.5cm,
    xAxisLabelPos={3cm,-1cm},yAxisLabelPos={-1.5cm,2.5cm}}
 \pstScalePoints(1,0.00000001){}{}
-\begin{psgraph}[axesstyle=frame,xticksize=0 7.5,yticksize=0 25,subticksize=1,%
+\begin{psgraph}[axesstyle=frame,xticksize=0 7.5,yticksize=0 25,subticksize=1,
      ylabelFactor={\cdot 10^8},Dx=5,Dy=1,xsubticks=2](0,0)(25,7.5){5.5cm}{5cm}
   \listplot[linecolor=red, linewidth=2pt, showpoints=true]{\data}
 \end{psgraph}
@@ -4348,10 +4463,10 @@ In the following example, the y unit gets the same value as the one for the x-ax
 
 \begin{lstlisting}
 \readdata{\data}{demo1.dat}
-\psset{§\ON§xAxisLabel§\OFF§=x-Axes,§\ON§yAxisLabel§\OFF§=y-Axes,llx=-.5cm,ury=0.5cm%
+\psset{§\ON§xAxisLabel§\OFF§=x-Axes,§\ON§yAxisLabel§\OFF§=y-Axes,llx=-.5cm,ury=0.5cm,
    §\ON§xAxisLabelPos§\OFF§={3cm,-1cm},§\ON§yAxisLabelPos§\OFF§={-1.5cm,2.5cm}}
 \pstScalePoints(1,0.00000001){}{}
-\begin{psgraph}[axesstyle=frame,xticksize=0 7.5,yticksize=0 25,subticksize=1,%
+\begin{psgraph}[axesstyle=frame,xticksize=0 7.5,yticksize=0 25,subticksize=1,
      §\ON§ylabelFactor§\OFF§={\cdot 10^8},Dx=5,Dy=1,xsubticks=2](0,0)(25,7.5){5.5cm}{5cm}
   \listplot[linecolor=red, linewidth=2pt, showpoints=true]{\data}
 \end{psgraph}
diff --git a/Master/texmf-dist/tex/generic/pstricks-add/pstricks-add.tex b/Master/texmf-dist/tex/generic/pstricks-add/pstricks-add.tex
index be90c409c70..80b2678334f 100644
--- a/Master/texmf-dist/tex/generic/pstricks-add/pstricks-add.tex
+++ b/Master/texmf-dist/tex/generic/pstricks-add/pstricks-add.tex
@@ -26,8 +26,8 @@
 \ifx\MultidoLoaded\endinput\else \input multido  \fi
 \ifx\PSTXKeyLoaded\endinput\else \input pst-xkey \fi
 %
-\def\fileversion{2.82}
-\def\filedate{2006/11/22}
+\def\fileversion{2.84}
+\def\filedate{2007/03/13}
 \message{`pstricks-add' v\fileversion, \filedate\space (dr,hv)}
 %
 \edef\PstAtCode{\the\catcode`\@} \catcode`\@=11\relax
@@ -153,22 +153,15 @@
   \endgroup%
 }
 %
-\define@boolkey[psset]{pstricks-add}[Pst@]{angleCheck}[true]{}
-\psset[pstricks-add]{angleCheck=true}
-%
-\def\pst@getangle#1#2{%
-  \ifPst@angleCheck\pst@@getangle{#1}\else\def\pst@angle{#1 }\fi%
-  \let#2\pst@angle}
-%
 %--------------------------------------- small stuff -------------------------------
 % transalpha needs a run through latex -> dvips -> ps2pdf14(!) 
 % and view with Acrobat >= 5.0
 % use transpalpha=<mumber> to the the opacity level
 %
-\define@key[psset]{pstricks-add}{transpalpha}{\pst@checknum{#1}\pstranspalpha }
+\define@key[psset]{pstricks-add}{transpalpha}{\pst@checknum{#1}\psk@transpalpha }
 %\psset[pstricks-add]{transpalpha=1}
 \def\psfs@transparent{%
-  \addto@pscode{/Normal .setblendmode \pstranspalpha .setshapealpha }%
+  \addto@pscode{/Normal .setblendmode \psk@transpalpha .setshapealpha }%
   \psfs@solid}
 %
 \def\defineTColor{\@ifnextchar[{\defineTColor@i}{\defineTColor@i[]}}
@@ -348,10 +341,10 @@
   \addbefore@par{ArrowInside=-,linearc=2mm,linewidth=1pt,%
     nodesepA=0pt,nodesepB=0pt,bracePos=0.5}% the default
   \begin@SpecialObj
-  \use@par%
-  \pst@getcoor{#1}\pst@tempA%
-  \pst@getcoor{#2}\pst@tempB%
-  \pnode(!%
+  \use@par
+  \pst@getcoor{#1}\pst@tempA
+  \pst@getcoor{#2}\pst@tempB
+  \pnode(!
     /bW2 \pst@number\pst@braceWidth \pst@number\psyunit div 2.0 div def
     \pst@tempA /YA exch \pst@number\psyunit div def
     /XA exch \pst@number\psxunit div def
@@ -555,8 +548,7 @@
     \ifx\psk@arrowA\arrowType@H   % do we have a Hook arrow at the beginning?
       \pst@number\pshooklength  % yes 
     \else
-      \psk@arrowsize\space CLW mul add dup \psk@arrowlength\space mul 
-      exch \psk@arrowinset mul neg add  
+      \psk@arrowsize\space CLW mul add dup \psk@arrowlength\space mul exch \psk@arrowinset mul neg add  
     \fi
     /arrowlength exch def 
     4 copy 				% copy all four values for the arrow line
@@ -574,11 +566,11 @@
       \psk@ArrowInsidePos\space 1 gt {
         /Alpha y2 y1 sub x2 x1 sub Atan def
         /ArrowPos \psk@ArrowInsideOffset\space def
-        /ALength x2 x1 sub y2 y1 sub Pyth def
+        /Length x2 x1 sub y2 y1 sub Pyth def
         /dArrowPos \psk@ArrowInsidePos\space abs def
         {
           /ArrowPos ArrowPos dArrowPos add def
-          ArrowPos ALength gt { exit } if
+          ArrowPos Length gt { exit } if
           x1 Alpha cos ArrowPos mul add
           y1 Alpha sin ArrowPos mul add
           ArrowInside
@@ -627,11 +619,11 @@
 	    \psk@ArrowInsidePos\space 1 gt {
 		/Alpha y12 y11 sub x12 x11 sub atan def
 		/ArrowPos \psk@ArrowInsideOffset\space def
-		/ALength x12 x11 sub y12 y11 sub Pyth def
+		/Length x12 x11 sub y12 y11 sub Pyth def
 		/dArrowPos \psk@ArrowInsidePos\space abs def
 		{
 		    /ArrowPos ArrowPos dArrowPos add def
-		    ArrowPos ALength gt { exit } if
+		    ArrowPos Length gt { exit } if
 		    x11 Alpha cos ArrowPos mul add
 		    y11 Alpha sin ArrowPos mul add
 		    currentdict /ArrowInside known { ArrowInside } if
@@ -752,11 +744,11 @@
 	\psk@ArrowInsidePos\space 1 gt {
 		/Alpha y2 y1 sub x2 x1 sub atan def
 		/ArrowPos \psk@ArrowInsideOffset\space def
-		/ALength x2 x1 sub y2 y1 sub Pyth def
+		/Length x2 x1 sub y2 y1 sub Pyth def
 		/dArrowPos \psk@ArrowInsidePos\space abs def
 		{%
 			/ArrowPos ArrowPos dArrowPos add def
-			ArrowPos ALength gt { exit } if
+			ArrowPos Length gt { exit } if
 			x1 Alpha cos ArrowPos mul add
 			y1 Alpha sin ArrowPos mul add
 			ArrowInside
@@ -2468,6 +2460,49 @@
   \end@SpecialObj%
 }
 %
+% LSM Least Square Method 2006-03-13 (hv)
+\def\psLSM@ii{\addto@pscode{false \tx@NArray \psLSM@iii}}
+\def\psLSM@iii{%
+  /xiSquare 0 def				% xi*xi
+  /xi 0 def					% xi
+  /fi 0 def					% f(xi)
+  /xifi 0 def					% xi*f(xi)
+  exch dup dup /xEnd ED /xStart ED exch
+  n { 						% number of data pairs
+    /Yval ED /Xval ED 				% save x y values
+    /xi xi Xval add def				% sum xi
+    /xiSquare xiSquare Xval dup mul add def	% sum xi*xi
+    /xifi xifi Xval Yval mul add def		% sum xi*yi, same as xi*f(xi)
+    /fi fi Yval add def				% sum yi, same as f(xi)
+    Xval xStart lt { /xStart Xval def } if	% find the lowest xi
+    Xval xEnd gt { /xEnd Xval def } if		% find the largest xi
+  } repeat
+  /u xiSquare fi mul xi xifi mul sub n xiSquare mul xi dup mul sub div def
+  /v n xifi mul xi fi mul sub n xiSquare mul xi dup mul sub div def
+  \Pst@Debug\space 0 gt { 			% print the equation
+    /Helvetica findfont 12 scalefont setfont	
+    0 -50 moveto (y=)show 			% print y=
+    v 20 string cvs show ( x+) show		% v x+
+    u \pst@number\psyunit div 20 string cvs show } if
+  newpath
+  (\psk@xStart) length 0 gt 			% special start value?
+    { \psk@xStart\space \pst@number\psxunit mul }
+    { xStart } ifelse  
+  dup v mul u add 				% xStart f(xStart)  
+  moveto		 			% goto first point x1 y(x1)
+  (\psk@xEnd) length 0 gt 			% special end value?
+    { \psk@xEnd\space \pst@number\psxunit mul }
+    { xEnd } ifelse 
+  dup v mul u add 				% xEnd f(xEnd)	
+  lineto					% line to second point x2 y(x2)
+}%
+%
+\def\beginplot@LSM{\begin@SpecialObj}
+\def\endplot@LSM{%
+  \psLSM@ii\psk@fillstyle\ifpsshadow\pst@closedshadow\fi%
+  \pst@stroke
+  \end@SpecialObj%
+}
 \define@key[psset]{pstricks-add}{StepType}{\pst@expandafter\psset@@StepType{#1}\@nil}%
 \def\psset@@StepType#1#2\@nil{%
   \ifx#1u\let\psk@StepType\@ne
@@ -2633,6 +2668,10 @@
 %% #3 initial value of y (which is a vector) y(0) y'(0) y''(0) ...
 %% #4 value of the derivative (y and t can be used)
 %
+\define@key[psset]{pstricks-add}{filename}{\def\psk@filename{#1}}%
+\define@boolkey[psset]{pstricks-add}[PST@]{saveData}[true]{}% \ifPST@saveData
+\psset[pstricks-add]{saveData=false,filename=PSTdata}
+%
 \def\psplotDiffEqn{\pst@object{psplotDiffEqn}}% initial code by Dominique 2005-05-21
 \def\psplotDiffEqn@i#1#2#3#4{%
   \pst@killglue%
@@ -2640,6 +2679,7 @@
   \use@par%
   \@nameuse{beginplot@\psplotstyle}%
   \addto@pscode{%
+    \ifPST@saveData /PST@data (\psk@filename) (w) file def \fi
     /x #1 def				% first value
     /x1 #2 def				% last value
     /y [ #3 ] def			% values for t=0
@@ -2657,8 +2697,7 @@
         dup 4 -1 roll mul 2 index 2 add 1 roll
       } repeat
       pop pop } def
-    /divvect { ylength exch 1 index { dup 4 -1 roll exch div 2 
-	index 2 add 1 roll } repeat pop pop } def
+    /divvect { ylength exch 1 index { dup 4 -1 roll exch div 2 index 2 add 1 roll } repeat pop pop } def
     /k0 0 def /k1 0 def /k2 0 def /k3 0 def
     \ifPst@algebraic /F@pstplot (#4) tx@addDict begin AlgParser end cvx def \fi
     /Func {
@@ -2668,8 +2707,7 @@
         \ifPst@buildvector\else ylength array astore \fi
       \fi
     } def
-    \ifx\psk@method\@adams /F1 0 def /F2 0 def /F3 0 def /F4 0 def 
-	/F5 0 def /F6 0 def /INIT 1 def \fi
+    \ifx\psk@method\@adams /F1 0 def /F2 0 def /F3 0 def /F4 0 def /F5 0 def /F6 0 def /INIT 1 def \fi
     \ifx\psk@method\@empty\else
       \ifx\psk@method\@varrkiv	%% RUNGE-KUTTA method with var step algorithm
         /VarStep false def /VarStepRatio 1 def
@@ -2709,8 +2747,7 @@
             %{ \psk@varsteptol\space div .1 lt { /VarStep true def } if pop exit } if
             %pop /dx dx 4 div def exch /y exch def } loop
             { .001 div dup .1 lt
-              { dup 1e-6 lt { pop 3 } { log neg } ifelse 
-	        /VarStepRatio exch def /VarStep true def }
+              { dup 1e-6 lt { pop 3 } { log neg } ifelse /VarStepRatio exch def /VarStep true def }
               { pop } ifelse pop exit } if
             pop /dx dx 4 div def exch /y exch def } loop
         } def
@@ -2769,16 +2806,16 @@
       \ifx\psk@plotfuncx\@empty
         \ifx\psk@whichabs\@empty x \else y \psk@whichabs\space get \fi
       \else \psk@plotfuncx\space \fi
-      \pst@number\psxunit mul y
-      \ifx\psk@method\@empty					%% EULER method
+      \pst@number\psxunit mul y 
+      \ifx\psk@method\@empty							%% EULER method
         /y Func { dx mul } forall y aload pop addvect ylength array astore def
       \else%
-        \ifx\psk@method\@varrkiv				%% RUNGE-KUTTA method
+        \ifx\psk@method\@varrkiv						%% RUNGE-KUTTA method
 	  VARRK
-        \else\ifx\psk@method\@rkiv				%% RUNGE-KUTTA method
+        \else\ifx\psk@method\@rkiv						%% RUNGE-KUTTA method
 	  RK
         \else
-          /F1 F2 def /F2 F3 def /F3 F4 def /F4 			%% ADAMS method
+          /F1 F2 def /F2 F3 def /F3 F4 def /F4 				        %% ADAMS method
           \ifcase\psk@adamsorder\or\or\or\or
            %% ORDRE 4
            Func def
@@ -2797,17 +2834,26 @@
       \ifx\psk@plotfuncy\@empty
         \ifx\psk@whichord\@empty 0 \else \psk@whichord\space \fi  get %
       \else \psk@plotfuncy\space \fi
-      \pst@number\psyunit mul
+      \pst@number\psyunit mul  
+      \ifPST@saveData 
+        2 copy \pst@number\psyunit div exch  \pst@number\psxunit div
+        20 string cvs PST@data exch writestring 
+        PST@data (\space) writestring 
+        20 string cvs PST@data exch writestring 
+        PST@data (\string\n) writestring 
+      \fi
     } def
   }%
   \gdef\psplot@init{}%
   \@pstfalse
   \@nameuse{testqp@\psplotstyle}%
   \if@pst\psplot@ii\else\psplot@iii\fi
+  \addto@pscode{\ifPST@saveData PST@data closefile \fi}
   \endgroup%
   \ignorespaces%
-}%
-%%
+}
+%
+%
 \def\psGTriangle{\pst@object{psGTriangle}}
 \def\psGTriangle@i(#1)(#2)(#3)#4#5#6{{%
   \def\solid@star{}%
@@ -2829,11 +2875,11 @@
     [ \pst@colorB ] aload length 1 eq { dup dup } if 3 array astore
     [ \pst@colorA ] aload length 1 eq { dup dup } if 3 array astore
     tx@addDict begin GTriangle end % PS part
-  }
-  \if@star\pspolygon(#1)(#2)(#3)\fi
+  }%
+  \if@star\pspolygon(#1)(#2)(#3)\fi%	draw borderline
   \def\pst@linetype{2}%
   \end@ClosedObj%
-}\ignorespaces}
+}}
 %
 \define@key[psset]{pstricks-add}{dicescale}{\def\psk@dicescale{#1}}
 \def\psdice{\pst@object{psdice}}
diff --git a/Master/texmf-dist/tpm/pstricks-add.tpm b/Master/texmf-dist/tpm/pstricks-add.tpm
index e9f37100df5..cf0fe90f29f 100644
--- a/Master/texmf-dist/tpm/pstricks-add.tpm
+++ b/Master/texmf-dist/tpm/pstricks-add.tpm
@@ -3,7 +3,7 @@
   <rdf:Description about="http://texlive.dante.de/texlive/Package/pstricks-add.zip">
     <TPM:Name>pstricks-add</TPM:Name>
     <TPM:Type>Package</TPM:Type>
-    <TPM:Date>2006/12/31 23:43:51</TPM:Date>
+    <TPM:Date>2007/03/13 21:48:42</TPM:Date>
     <TPM:Version>1.0</TPM:Version>
     <TPM:Creator>rahtz</TPM:Creator>
     <TPM:Title>
@@ -24,13 +24,13 @@ pst-plot, pst-node, pst-tree and pst-grad.
     <TPM:Size>2109337</TPM:Size>
     <TPM:License></TPM:License>
     <TPM:Build/>
-    <TPM:RunFiles size="140525">
+    <TPM:RunFiles size="142551">
 texmf-dist/dvips/pstricks-add/pstricks-add.pro
 texmf-dist/tex/generic/pstricks-add/pstricks-add.tex
 texmf-dist/tex/latex/pstricks-add/pstricks-add.sty
 texmf-dist/tpm/pstricks-add.tpm
     </TPM:RunFiles>
-    <TPM:DocFiles size="1967720">
+    <TPM:DocFiles size="2145877">
 texmf-dist/doc/generic/pstricks-add/Changes
 texmf-dist/doc/generic/pstricks-add/README
 texmf-dist/doc/generic/pstricks-add/examples/12-1.txt