pstricks-add 2.86 (25jun07)

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

5 files changed, 254 insertions, 77 deletions

diff --git a/Master/texmf-dist/doc/generic/pstricks-add/Changes b/Master/texmf-dist/doc/generic/pstricks-add/Changes
index bfc33cc3235..b4fa0666699 100644
--- a/Master/texmf-dist/doc/generic/pstricks-add/Changes
+++ b/Master/texmf-dist/doc/generic/pstricks-add/Changes
@@ -1,4 +1,6 @@
 pstricks-add.pro ----------- (Dominik Rodriguez/hv)
+ v 0.11 2007-06-23 - Added wavelengthToCMYK routine (hv)
+                   - RGBtoCMYK 
  v 0.10 2006-10-15 - bug correction, x^-1 (dr)
         	   - Constants into tx@Dict to make them global (hv)
                    - small stuff (hv)
@@ -17,6 +19,8 @@ pstricks-add.pro ----------- (Dominik Rodriguez/hv)
 
 
 pstricks-add ----------- (Dominik Rodriguez/hv)
+ v 2.86  2007-06-23 - add option CMYK
+		    - add additional arrow types
  v 2.85  2007-04-01 - fix bug with labelFontSize (missing in fractions)
  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 
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 55bff157fed..0b661dce2a7 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 3f8824f1758..36f38c09905 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
@@ -90,7 +90,7 @@
 %\usepackage{mathptmx}
 \usepackage[lmargin=2.5cm,bmargin=3cm]{geometry}
 \usepackage{tabularx}
-\usepackage{graphicx}
+\usepackage{graphicx,ragged2e}
 \usepackage[svgnames,dvipsnames]{pstricks}
 \usepackage{framed,xspace,multirow,caption}
 \usepackage{pst-eucl}
@@ -148,7 +148,7 @@
 \def\verbatim@font{\small\normalfont\ttfamily}
 \makeatother
 \usepackage{showexpl}
-\lstset{preset=\raggedright}
+\lstset{preset=\RaggedRight}
 \usepackage{amsmath}
 
 \newdimen\fullWidth 
@@ -826,9 +826,9 @@ name & default\\\hline
 
 \begin{center}
   \bgroup
-  \def\myline#1{\psline[linecolor=red,linewidth=1pt]{#1}(0,1ex)(1.3,1ex)}%
+  \def\myline#1{\psline[linecolor=red,linewidth=0.5pt,arrowscale=1.5]{#1}(0,1ex)(1.3,1ex)}%
   \psset{arrowscale=1.5}
-  \begin{tabular}{cp{1.8cm}l}%
+  \begin{tabular}{c@{\qquad}p{3cm}l}%
     Value & Example & Name \\[2pt]\hline
     \verb/-/      & \myline{-}      & None\\
     \verb/<->/    & \myline{<->}    & Arrowheads.\\
@@ -849,6 +849,12 @@ name & default\\\hline
     \verb/|>-<|/  & \myline{|>-<|}  & T-bars and reverse arrows.\\
     \verb/h-h|/   & \myline{h-h}    & left/right hook arrows.\\
     \verb/H-H|/   & \myline{H-H}    & left/right hook arrows.\\
+    \verb/v-v|/   & \myline{v-v}    & left/right inside vee arrows.\\
+    \verb/V-V|/   & \myline{V-V}    & left/right outside vee arrows.\\
+    \verb/f-f|/   & \myline{f-f}    & left/right inside filled arrows.\\
+    \verb/F-F|/   & \myline{F-F}    & left/right outside filled arrows.\\
+    \verb/t-t|/   & \myline{t-t}    & left/right inside slash arrows.\\[5pt]
+    \verb/T-T|/   & \myline{T-T}    & left/right outside slash arrows.\\
   \end{tabular}
   \egroup
 \end{center}
@@ -913,6 +919,7 @@ is like the one described in the old PSTricks manual.
 \end{center}
 
 
+
 \clearpage
 \subsection{\texttt{hookarrow}}
 \begin{LTXexample}
@@ -1429,6 +1436,74 @@ These examples also need the package \verb|pst-node|.
 \end{pspicture}
 \end{LTXexample}
 
+
+\subsection{Special arrows \texttt{v--V},\texttt{t--T}, and \texttt{f--F}} 
+
+Possible optional arguments are
+
+\psset{linecolor=black}
+
+\begin{center}
+\begin{tabular}{l|l}
+name & meaning\\\hline
+\verb|veearrowlength| & default is 3mm\\
+\verb|veearrowangle| & default is 30\\
+\verb|veearrowlinewidth| & default is 0.35mm\\
+\verb|filledveearrowlength| & default is 3mm\\
+\verb|filledveearrowangle| & default is 15\\
+\verb|filledveearrowlinewidth| & default is 0.35mm\\
+\verb|tickarrowlength| & default is 1.5mm\\
+\verb|tickarrowlinewidth| & default is 0.35mm\\
+\end{tabular}
+\end{center}
+
+
+\begin{LTXexample}[width=4cm]
+\psset{unit=5mm}
+\begin{pspicture}(4,6)
+  \psset{dimen=middle,arrows=c-c,
+    arrowscale=2,linewidth=.25mm}
+  \psline[linecolor=red,linewidth=.05mm](0,0)(0,6)
+  \psline[linecolor=red,linewidth=.05mm](4,0)(4,6)
+  \psline{v-v}(0,6)(4,6)
+  \psline{v-V}(0,4)(4,4)
+  \psline{V-v}(0,2)(4,2)
+  \psline{V-V}(0,0)(4,0)
+\end{pspicture}
+\end{LTXexample}
+
+
+\begin{LTXexample}[width=4cm]
+\psset{unit=5mm}
+\begin{pspicture}(4,6)
+  \psset{dimen=middle,arrows=c-c,
+    arrowscale=2,linewidth=.25mm}
+  \psline[linecolor=red,linewidth=.05mm](0,0)(0,6)
+  \psline[linecolor=red,linewidth=.05mm](4,0)(4,6)
+  \psline{f-f}(0,6)(4,6)
+  \psline{f-F}(0,4)(4,4)
+  \psline{F-f}(0,2)(4,2)
+  \psline{F-F}(0,0)(4,0)
+\end{pspicture}
+\end{LTXexample}
+
+
+\begin{LTXexample}[width=4cm]
+\psset{unit=5mm}
+\begin{pspicture}(4,6)
+  \psset{dimen=middle,arrows=c-c,linewidth=.25mm}
+  \psline[linecolor=red,linewidth=.05mm](0,0)(0,6)
+  \psline[linecolor=red,linewidth=.05mm](4,0)(4,6)
+  \psline{t-t}(0,6)(4,6)
+  \psline{t-T}(0,4)(4,4)
+  \psline{T-t}(0,2)(4,2)
+  \psline{T-T}(0,0)(4,0)
+\end{pspicture}
+\end{LTXexample}
+
+
+
+
 \clearpage
 %--------------------------------------------------------------------------------------
 \section{\CMD{psFormatInt}}
@@ -1803,7 +1878,7 @@ This is nearly the same macro as \verb|\psline| from the main \pnode{C}\verb|pst
 
 
 \begin{LTXexample}
-\raggedright This macro makes only sense when connecting two ''invisible`` nodes, 
+\RaggedRight This macro makes only sense when connecting two ''invisible`` nodes, 
 like this connection from here\pnode{D}\pclineII{->}(D)(C){} 
 to the above word \verb|pstricks|.
 \end{LTXexample}
@@ -6741,6 +6816,7 @@ PostScript uses the stack system and the LIFO system, "'Last In, First Out"`.
 {Hendri Adriaens | } 
 {Martin Chicoine | }
 {Ulrich Dirr | } 
+{Christophe Fourey | }
 {Hubert G\"a\ss lein |}
 {Denis Girou | } 
 {Peter Hutnick | } 
@@ -6758,7 +6834,7 @@ PostScript uses the stack system and the LIFO system, "'Last In, First Out"`.
 
 \nocite{*}
 \bgroup
-\raggedright
+\RaggedRight
 \bibliographystyle{plain}
 \bibliography{pstricks-add-doc}
 \egroup
diff --git a/Master/texmf-dist/dvips/pstricks-add/pstricks-add.pro b/Master/texmf-dist/dvips/pstricks-add/pstricks-add.pro
index 79541bfe970..fc4cc635271 100644
--- a/Master/texmf-dist/dvips/pstricks-add/pstricks-add.pro
+++ b/Master/texmf-dist/dvips/pstricks-add/pstricks-add.pro
@@ -1,13 +1,13 @@
 %!
 % PostScript prologue for pstricks-add.tex.
-% Version 0.10, 2006/10/15
+% Version 0.11, 2007/05/24
 % For distribution, see pstricks.tex.
 %
 %       HISTORY -> see file Changes
 %
 tx@Dict begin 	% make it global for TeX
 %% Pi and Euler are defined in pstricks.pro
-/psTan { dup cos abs 1.e-10 lt 
+/tan { dup cos abs 1.e-10 lt 
   { pop 1.e10 } 			% return 1.e10 as infinit
   { dup sin exch cos div } ifelse 	% default sin/cos
 } def
@@ -44,6 +44,15 @@ end
   mtrx
   setmatrix grestore} def
 %
+/RGBtoCMYK {    % on stack r g b
+  /Blue ED /Green ED /Red ED
+  1 Red sub     % Cyan
+  1 Green sub   % Magenta
+  1 Blue sub    % Yellow
+  0   		% Black  
+} def
+
+
 %% convertisseur longueur d'onde ->R,G,B       Manuel Luque
 %% lambda max=780 nanom�ètres
 %% lambda min=380 nanom�ètres
@@ -109,6 +118,14 @@ end
   calculateRGB
 } def %  now the colors are saved in Red Green Blue
 %
+/wavelengthToCMYK { % the wavelength in nm must be on top of the stack
+  cvi /lambda exch def % no floating point here
+  gsave
+  calculateRGB Red Green Blue RGBtoCMYK 
+  /Black ED /Yellow ED /Magenta ED /Cyan ED
+  grestore
+} def %  now the colors are saved in Cyan Magenta Yellow Black
+%
 /axfill {
     8 dict begin
     /xw exch def /nl exch def
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 faffa4cb2e6..e46fd28383e 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.85}
-\def\filedate{2007/04/01}
+\def\fileversion{2.86}
+\def\filedate{2007/06/23}
 \message{`pstricks-add' v\fileversion, \filedate\space (dr,hv)}
 %
 \edef\PstAtCode{\the\catcode`\@} \catcode`\@=11\relax
@@ -154,6 +154,9 @@
 }
 %
 %--------------------------------------- small stuff -------------------------------
+\define@boolkey[psset]{pstricks-add}[Pst@]{CMYK}[true]{}
+\psset[pstricks-add]{CMYK=true}
+%
 % transalpha needs a run through latex -> dvips -> ps2pdf14(!) 
 % and view with Acrobat >= 5.0
 % use transpalpha=<mumber> to the the opacity level
@@ -176,6 +179,14 @@
 \defineTColor{TGreen}{green}
 \defineTColor{TBlue}{blue}
 %
+\define@key[psset]{pstricks-add}{fsAngle}{\pst@getangle{#1}\pst@fsAngle }
+\define@key[psset]{pstricks-add}{fsOrigin}{%
+  \pst@@getcoor{#1}\edef\pst@fsOrigin{\pst@coor T }}
+\psset[pstricks-add]{fsOrigin={0,0},fsAngle=137.50775}
+%
+\def\psfs@spiral{\pst@fill{\pst@fsOrigin \pst@usecolor\psfillcolor clip newpath
+0 .1 500 { dup dup sqrt 4 div 0 360 arc fill \pst@fsAngle rotate } for }}
+%
 \def\rmultiput{\def\pst@par{}\pst@ifstar{\@ifnextchar[{\rmultiput@i}{\rmultiput@i[]}}}
 \def\rmultiput@i[#1]{\begingroup\psset{#1}\rmultiput@ii}
 \def\rmultiput@ii#1{\def\@rmultiputArg{#1}%
@@ -183,8 +194,7 @@
 \def\rmultiput@iii(#1){%
   \pst@killglue%
   \if@star\rput*(#1){\@rmultiputArg}
-  \else\rput(#1){\@rmultiputArg}%
-  \fi
+  \else\rput(#1){\@rmultiputArg}\fi
   \@ifnextchar({\rmultiput@iii}{\endgroup}%
 }
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -193,7 +203,7 @@
 %%% par la rotation de centre (x,y)  %%%
 %%% et d'angle a.                    %%%
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\def\psrotate{\pst@object{psrotate}} % idea from Jean-C�ï�¿�½e Charpentier
+\def\psrotate{\pst@object{psrotate}} % idea from Jean-C�e Charpentier
 \def\psrotate@i(#1,#2)#3#4{%
   \pst@killglue
   \begin@SpecialObj%
@@ -219,18 +229,18 @@
  % modification 04-08-07:
  \pst@cntm0
  \def\next##1 ##2\relax{%
-   \expandafter\ifnum\psk@maxdashes>\pst@cntm\relax% 04-08-07
-   \edef\@tempa{##1}%
-   \ifx\@tempa\@empty\else% gobble leading spaces
-   \pssetlength\pst@dimc{##1}%
+   \expandafter\ifnum\psk@maxdashes>\pst@cntm\relax  % 04-08-07
+     \edef\@tempa{##1}%
+     \ifx\@tempa\@empty\else% gobble leading spaces
+       \pssetlength\pst@dimc{##1}%
        \advance\pst@cntm by 1
-   \edef\psk@dash{\psk@dash\space\pst@number\pst@dimc}%
-   \fi%
-   \edef\@tempa{##2}%
-   \ifx\@tempa\@empty\else% detect end
-   \ifx\@tempa\space\else% gobble trailing spaces
-     \next##2\relax%
-   \fi\fi%
+       \edef\psk@dash{\psk@dash\space\pst@number\pst@dimc}%
+     \fi%
+     \edef\@tempa{##2}%
+     \ifx\@tempa\@empty\else% detect end
+       \ifx\@tempa\space\else% gobble trailing spaces
+         \next##2\relax%
+     \fi\fi%
    \else% 04-08-07
      \@pstrickserr{Number of dashes > \psk@maxdashes. Increasing 
         'maxdashes' might work.}\@ehpa% 04-08-07
@@ -276,7 +286,6 @@
 %% TN end patch; Date (YY-MM-DD): 04-07-17;
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
-%
 \define@key[psset]{pstricks-add}{intSeparator}{\def\psk@intSeparator{#1}}
 %\psset{intSeparator={,}}
 %
@@ -319,22 +328,21 @@
 %
 \def\@@rput@iv(#1){\pst@killglue\pst@makebox{\@@rput@v{#1}}}
 \def\@@rput@v#1{%
-  \begingroup
-    \use@par
-    \pst@makesmall\pst@hbox
-    \pst@Verb{%
-      Alpha 90 sub \pst@number\pst@braceWidth  0 lt {180 add} if
-      \ifx\psk@rot\@empty\else\psk@rot add \fi
-      /rotAngle exch def
+  \begingroup%
+    \use@par%
+    \pst@makesmall\pst@hbox%
+    \pst@Verb{
+      Alpha 90 sub \pst@number\pst@braceWidth  0 lt { 180 add } if
+      \ifx\psk@rot\@empty\else\psk@rot\space add \fi
+      /rotAngle ED
     }%
     \setbox\pst@hbox=\hbox{%
-      \pst@Verb{rotAngle \tx@RotBegin}%
-      \box\pst@hbox\pst@Verb{\tx@RotEnd}%
+      \pst@Verb{ rotAngle \tx@RotBegin }%
+      \box\pst@hbox\pst@Verb{ \tx@RotEnd }%
     }%
-    \psput@{#1}\pst@hbox
-  \endgroup
-  \ignorespaces%
-}
+    \psput@{#1}\pst@hbox%
+  \endgroup%
+  \ignorespaces}
 %
 \def\psbrace{\pst@object{psbrace}}
 \def\psbrace@i(#1)(#2)#3{%
@@ -377,6 +385,79 @@
 %  the original table
 % \def\pst@arrowtable{,<->,<<->>,>-<,>>-<<,(-),[-],)-(,]-[,|>-<|}
 %
+% v : Vee arrow (inside)                 v,V,f and F by Christophe FOUREY
+% V : Vee arrow (outside)
+% f : Filled vee arrow (inside)
+% F : Filled vee arrow (outside)
+\edef\pst@arrowtable{\pst@arrowtable,v-v,V-V,f-f,F-F,t-t,T-T}
+
+% Vee arrow
+\define@key[psset]{pstricks-add}{veearrowlength}{\pst@getlength{#1}\psk@veearrowlength}
+\psset[pstricks-add]{veearrowlength=3mm} % default projected length
+\define@key[psset]{pstricks-add}{veearrowangle}{\pst@getangle{#1}\psk@veearrowangle}
+\psset[pstricks-add]{veearrowangle=30} % default angle
+\define@key[psset]{pstricks-add}{veearrowlinewidth}{\pst@getlength{#1}\psk@veearrowlinewidth}
+\psset[pstricks-add]{veearrowlinewidth=.35mm} % default vee arrow line width
+
+% Filled vee arrow
+\define@key[psset]{pstricks-add}{filledveearrowlength}{\pst@getlength{#1}\psk@filledveearrowlength}
+\psset[pstricks-add]{filledveearrowlength=3mm} % default projected length
+\define@key[psset]{pstricks-add}{filledveearrowangle}{\pst@getangle{#1}\psk@filledveearrowangle}
+\psset[pstricks-add]{filledveearrowangle=15} % default angle
+\define@key[psset]{pstricks-add}{filledveearrowlinewidth}{\pst@getlength{#1}\psk@filledveearrowlinewidth}
+\psset[pstricks-add]{filledveearrowlinewidth=.35mm} % default vee arrow line width
+
+\pst@def{VeeArrow}<%
+    1 setlinecap            % round caps
+    1 setlinejoin            % round join
+    setlinewidth            % vee arrow line width
+    /y ED                % projected length
+    2 div /a ED                % angle (divide by 2)
+    /t ED                % false = inside, true = outside
+    a sin a cos div y mul /x ED        % perpendicular length : x=tan(a).y
+    t { 1 -1 scale } if            % if outside : symmetry
+    x neg y moveto            % point #1
+    0 0 L                % point #2
+    x y L                % point #3
+    {closepath gsave fill grestore} if    % if filled : close and fill
+    stroke                % draw line
+    0 t {y 2 mul} {0} ifelse moveto>    % if outside : twice longer line
+
+% VeeArrow : filled?   outside?   (total) angle   (projected) length   (arrow) line width
+
+\@namedef{psas@v}{%
+  false false \psk@veearrowangle \psk@veearrowlength \psk@veearrowlinewidth \tx@VeeArrow}
+\@namedef{psas@V}{%
+  false true \psk@veearrowangle \psk@veearrowlength \psk@veearrowlinewidth \tx@VeeArrow}
+\@namedef{psas@f}{%
+  true false \psk@filledveearrowangle \psk@filledveearrowlength \psk@filledveearrowlinewidth \tx@VeeArrow}
+\@namedef{psas@F}{%
+  true true \psk@filledveearrowangle \psk@filledveearrowlength \psk@filledveearrowlinewidth \tx@VeeArrow}
+
+% And An another arrowhead
+% architectural tick / oblique arrow
+
+% Tick arrow
+\define@key[psset]{pstricks-add}{tickarrowlength}{\pst@getlength{#1}\psk@tickarrowlength}
+\psset[pstricks-add]{tickarrowlength=1.5mm} % default projected length
+\define@key[psset]{pstricks-add}{tickarrowlinewidth}{\pst@getlength{#1}\psk@tickarrowlinewidth}
+\psset[pstricks-add]{tickarrowlinewidth=.35mm} % default tick arrow line width
+
+\pst@def{TickArrow}<%
+    1 setlinecap            % round caps
+    1 setlinejoin            % round join
+    setlinewidth            % tick line width
+    /y ED                % projected length
+    /t ED                % false = normal, true = reversed
+    t { 1 -1 scale } if            % if reversed : symmetry
+    y neg y moveto            % point #1
+    y y neg L                % point #2
+    stroke                % draw line
+    0 0 moveto>                % origin
+
+\@namedef{psas@t}{ false \psk@tickarrowlength \psk@tickarrowlinewidth \tx@TickArrow }
+\@namedef{psas@T}{ true \psk@tickarrowlength \psk@tickarrowlinewidth \tx@TickArrow }
+%
 % HookLeft/RightArrow
 \newdimen\pshooklength
 \newdimen\pshookwidth
@@ -524,15 +605,14 @@
 %
 % Modified version of \begin@ClosedObj
 \def\begin@ClosedObj{%
-    \leavevmode
-    \pst@killglue
-    \begingroup
-	\use@par
-	\solid@star
-	\ifpsdoubleline \pst@setdoublesep \fi
-	\pst@addarrowdef% DG addition
-	\init@pscode%
-}
+  \leavevmode%
+  \pst@killglue%
+  \begingroup%
+  \use@par%
+  \solid@star%
+  \ifpsdoubleline\pst@setdoublesep\fi%
+  \pst@addarrowdef% DG addition
+  \init@pscode}
 %
 % Redefinition of the PostScript /Line macro to print the intermediate
 % arrow on each segment of the line
@@ -2670,7 +2750,7 @@
 %% #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
+\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
@@ -2680,7 +2760,7 @@
   \use@par%
   \@nameuse{beginplot@\psplotstyle}%
   \addto@pscode{%
-    \ifPST@saveData /PST@data (\psk@filename) (w) file def \fi
+    \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
@@ -2836,12 +2916,12 @@
         \ifx\psk@whichord\@empty 0 \else \psk@whichord\space \fi  get %
       \else \psk@plotfuncy\space \fi
       \pst@number\psyunit mul  
-      \ifPST@saveData 
+      \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 
+        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
   }%
@@ -2849,7 +2929,7 @@
   \@pstfalse
   \@nameuse{testqp@\psplotstyle}%
   \if@pst\psplot@ii\else\psplot@iii\fi
-  \addto@pscode{\ifPST@saveData PST@data closefile \fi}
+  \addto@pscode{\ifPst@saveData Pst@data closefile \fi}
   \endgroup%
   \ignorespaces%
 }
@@ -3025,28 +3105,28 @@
   braceWidth=0.35,bracePos=0.5,%
   arrowscale=1,%
   %%%%%%%%% pst-node %%%%%%%%%%
-  lineAngle=0,%
-  nodealign=false,%
-  href=0,%
-  vref=.7ex,%
-  framesize=10pt,%
-  nodesep=0pt,%
-  arm=10pt,%
-  offset=0pt,%
-  angle=0,%
-  arcangle=8,%
-  ncurv=.67,%
-  loopsize=1cm,%
-  boxsize=.4cm,%
-  nrot=0,%
-  npos=,%
-  tpos=0.5,%
-  shortput=none,%
-  colsep=1.5cm,%
-  rowsep=1.5cm,%
-  mcol=c,%
-  mnode=R,%
-  emnode=none
+  lineAngle=0,
+  nodealign=false,
+  href=0,
+  vref=.7ex,
+  framesize=10pt,
+  nodesep=0pt,
+  arm=10pt,
+  offset=0pt,
+  angle=0,
+  arcangle=8,
+  ncurv=.67,
+  loopsize=1cm,
+  boxsize=.4cm,
+  nrot=0,
+  npos=,
+  tpos=0.5,
+  shortput=none,
+  colsep=1.5cm,
+  rowsep=1.5cm,
+  mcol=c,
+  mnode=R,
+  emnode=none%
 }}
 %
 \resetOptions