pstricks-add update

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

3 files changed, 120 insertions, 51 deletions

diff --git a/Master/texmf-dist/doc/generic/pstricks-add/Changes b/Master/texmf-dist/doc/generic/pstricks-add/Changes
index 892738afc96..951c45a1d33 100644
--- a/Master/texmf-dist/doc/generic/pstricks-add/Changes
+++ b/Master/texmf-dist/doc/generic/pstricks-add/Changes
@@ -12,6 +12,8 @@ pstricks-add.pro ----------- (Dominik Rodriguez/hv)
 
 
 pstricks-add -----------
+ v 2.78  2006-08-07 - allow ! for the y Length in \psgraph
+                      fix bug with undefined \psk@barwidth (missing \psset}
  v 2.77  2006-07-12 - use of abs(dx) to get labels for negative \pst@dx
 		    - fix bug in trigLabels
  v 2.76  2006-06-24 - renaming all \Pixxx macros to \psPixx
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 f60ac91705e..6ad86fc8626 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 9206c0fb492..574dfebd400 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
@@ -3677,8 +3677,8 @@ of all records with the plotstyle option \verb|curve|.
 \begin{LTXexample}[preset=\centering,pos=t]
 \readdata{\data}{examples/data.dat}
 \psset{xunit=0.125mm,yunit=0.0002mm}
-\begin{pspicture}(-80,-30000)(1000,310000)
-\psaxes[axesstyle=frame,Dx=100,dx=100,Dy=50000,dy=50000](1000,300000)
+\begin{pspicture}(-80,-30000)(1000,270000)
+\psaxes[Dx=100,dx=100,Dy=50000,dy=50000](1000,250000)
 \listplot[nStep=50,linewidth=3pt,linecolor=red,plotstyle=dots]{\data}
 \listplot[linewidth=1pt,linecolor=blue]{\data}
 \end{pspicture}
@@ -3694,8 +3694,8 @@ of all records with the plotstyle option \verb|curve|.
 \begin{LTXexample}[preset=\centering,pos=t]
 \readdata{\data}{examples/data.dat}
 \psset{xunit=0.125mm,yunit=0.0002mm}
-\begin{pspicture}(-80,-30000)(1000,310000)
-\psaxes[axesstyle=frame,Dx=100,dx=100,Dy=50000,dy=50000](1000,300000)
+\begin{pspicture}(-80,-30000)(1000,270000)
+\psaxes[Dx=100,dx=100,Dy=50000,dy=50000](1000,250000)
 \listplot[nStart=200,linewidth=3pt,linecolor=blue]{\data}
 \end{pspicture}
 \end{LTXexample}
@@ -4039,31 +4039,76 @@ two arguments have the usual \verb+PSTricks+ behaviour.
 	substituted to \verb+(0,0)+.
 \end{itemize}
 
+The y-length maybe given as !, then the macro uses the same unit as for the x-axis.
 
-\begin{LTXexample}[pos=t]
+%-----------------------------------------------------------------------------
+
+\begin{center}
 \readdata{\data}{demo1.dat}
 \pstScalePoints(1,0.000001){}{}% (x,y){additional x operator}{y op}
 \psset{llx=-1cm,lly=-1cm}
-\psgraph[axesstyle=frame,xticksize=0 759,yticksize=0 25,%
+\begin{psgraph}[axesstyle=frame,xticksize=0 759,yticksize=0 25,%
     subticks=0,ylabelFactor={\cdot 10^6},%
     Dx=5,dy=100\psyunit,Dy=100](0,0)(25,750){10cm}{6cm} % parameters
    \listplot[linecolor=red,linewidth=2pt,showpoints=true]{\data}
-\endpsgraph
-\end{LTXexample}
+\end{psgraph}
+\end{center}
 
+\begin{lstlisting}
+\readdata{\data}{demo1.dat}
+\pstScalePoints(1,0.000001){}{}% (x,y){additional x operator}{y op}
+\psset{llx=-1cm,lly=-1cm}
+§\ON§\begin{psgraph}§\OFF§[axesstyle=frame,xticksize=0 759,yticksize=0 25,%
+    subticks=0,ylabelFactor={\cdot 10^6},%
+    Dx=5,dy=100\psyunit,Dy=100](0,0)(25,750){10cm}{6cm} % parameters
+   \listplot[linecolor=red,linewidth=2pt,showpoints=true]{\data}
+§\ON§\end{psgraph}§\OFF§
+\end{lstlisting}
 
-\begin{LTXexample}[width=7cm]
+%-----------------------------------------------------------------------------
+
+In the following example, the y unit gets the same value as the one for the x-axis.
+\begin{center}
+\psset{llx=-1cm,lly=-0.5cm,ury=0.5cm}
+\begin{psgraph}(0,0)(5,3){6cm}{!} % x-y-axis with same unit
+   \psplot[linecolor=red,linewidth=1pt]{0}{5}{x dup mul 10 div}
+\end{psgraph}
+\end{center}
+
+\begin{lstlisting}
+\psset{llx=-1cm,lly=-0.5cm,ury=0.5cm}
+\begin{psgraph}(0,0)(5,3){6cm}§\ON§{!}§\OFF§ % x-y-axis with same unit
+   \psplot[linecolor=red,linewidth=1pt]{0}{5}{x dup mul 10 div}
+\end{psgraph}
+\end{lstlisting}
+
+%-----------------------------------------------------------------------------
+
+\begin{center}
 \readdata{\data}{demo1.dat}
-\psset{xAxisLabel=x-Axes,yAxisLabel=y-Axes,llx=-1cm,%
+\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,%
      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}
-\end{LTXexample}
+\end{center}
 
-\begin{LTXexample}[width=6.5cm]
+\begin{lstlisting}
+\readdata{\data}{demo1.dat}
+\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,%
+     §\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}
+\end{lstlisting}
+
+%-----------------------------------------------------------------------------
+
+\begin{LTXexample}[pos=t,preset=\centering]
 \readdata{\data}{demo1.dat}
 \psset{llx=-0.5cm,lly=-1cm}
 \pstScalePoints(1,0.000001){}{}
@@ -4074,20 +4119,31 @@ two arguments have the usual \verb+PSTricks+ behaviour.
 \endpsgraph
 \end{LTXexample}
 
+%-----------------------------------------------------------------------------
 
-\begin{LTXexample}[pos=t,preset=\centering]
+\begin{center}
 \readdata{\data}{demo1.dat}
 \pstScalePoints(1,0.2){}{log}
 \psset{lly=-0.75cm}
 \psgraph[ylogBase=10,Dx=5,Dy=1,subticks=5](0,0)(25,2){12cm}{4cm}
   \listplot[linecolor=red, linewidth=2pt, showpoints=true]{\data}
 \endpsgraph
-\end{LTXexample}
+\end{center}
+
+\begin{lstlisting}
+\readdata{\data}{demo1.dat}
+\pstScalePoints(1,0.2){}{log}
+\psset{lly=-0.75cm}
+\psgraph[§\ON§ylogBase§\OFF§=10,Dx=5,Dy=1,subticks=5](0,0)(25,2){12cm}{4cm}
+  \listplot[linecolor=red, linewidth=2pt, showpoints=true]{\data}
+\endpsgraph
+\end{lstlisting}
 
+%-----------------------------------------------------------------------------
 
 \begin{LTXexample}[pos=t,preset=\centering]
 \readdata{\data}{demo0.dat}
-\psset{lly=-0.5cm}
+\psset{lly=-0.75cm,ury=0.5cm}
 \pstScalePoints(1,1){}{log}
 \begin{psgraph}[arrows=->,Dx=0.5,ylogBase=10,Oy=-1,xsubticks=10,%
      ysubticks=2](0,-3)(3,1){12cm}{4cm}
@@ -4096,7 +4152,8 @@ two arguments have the usual \verb+PSTricks+ behaviour.
 \end{LTXexample}
 
 
-\begin{LTXexample}[width=6.5cm]
+\begin{LTXexample}[pos=t,preset=\centering]
+\psset{lly=-0.75cm,ury=0.5cm}
 \readdata{\data}{demo0.dat}
 \pstScalePoints(1,1){}{log}
 \psgraph[arrows=->,Dx=0.5,ylogBase=10,Oy=-1,subticks=4](0,-3)(3,1){6cm}{3cm}
@@ -4105,7 +4162,8 @@ two arguments have the usual \verb+PSTricks+ behaviour.
 \end{LTXexample}
 
 
-\begin{LTXexample}[pos=t,preset=\centering]
+%-----------------------------------------------------------------------------
+\begin{center}
 \readdata{\data}{demo2.dat}%
 \readdata{\dataII}{demo3.dat}%
 \pstScalePoints(1,1){1989 sub}{}
@@ -4116,8 +4174,21 @@ two arguments have the usual \verb+PSTricks+ behaviour.
   \listplot[linecolor=blue,linewidth=2pt]{\dataII}
   \listplot[linecolor=cyan,linewidth=2pt,yunit=0.5]{\dataII}
 \endpsgraph
-\end{LTXexample}
+\end{center}
 
+\begin{lstlisting}
+\readdata{\data}{demo2.dat}%
+\readdata{\dataII}{demo3.dat}%
+\pstScalePoints(1,1){1989 sub}{}
+\psset{llx=-0.5cm,lly=-1cm, §\ON§xAxisLabel§\OFF§=Year,§\ON§yAxisLabel§\OFF§=Whatever,%
+     §\ON§xAxisLabelPos§\OFF§={2in,-0.4in},§\ON§yAxisLabelPos§\OFF§={-0.4in,1in}}
+\psgraph[axesstyle=frame,Dx=2,Ox=1989,subticks=2](0,0)(12,6){4in}{2in}%
+  \listplot[linecolor=red,linewidth=2pt]{\data}
+  \listplot[linecolor=blue,linewidth=2pt]{\dataII}
+  \listplot[linecolor=cyan,linewidth=2pt,yunit=0.5]{\dataII}
+\endpsgraph
+\end{lstlisting}
+%-----------------------------------------------------------------------------
 
 \begin{LTXexample}[pos=t,preset=\centering]
 \readdata{\data}{demo2.dat}%
@@ -4310,7 +4381,7 @@ in postfix or algebraic notation (with \verb+algebraic=true+).
 \begin{pspicture}(-0.5,-0.5)(10,3) \psaxes{->}(10,3)
  \psplot[plotpoints=100,linewidth=1.5pt,algebraic,%
     labelFontSize=\footnotesize]{0}{10}{sqrt(x)}
- \psStep[linecolor=magenta,StepType=upper,fillstyle=hlines](0,9){9}{x sqrt}
+ \psStep[linecolor=magenta,§\ON§StepType=upper§\OFF§,fillstyle=hlines](0,9){9}{x sqrt}
  \psStep[linecolor=blue,fillstyle=vlines](0,9){9}{x sqrt }
 \end{pspicture}
 
@@ -4323,7 +4394,7 @@ in postfix or algebraic notation (with \verb+algebraic=true+).
 
 \psset{yunit=1.25cm}
 \begin{pspicture}(-0.5,-1.5)(10,1.5) \psaxes{->}(0,0)(0,-1.5)(10,1.5)
- \psStep[algebraic,StepType=Riemann,fillstyle=solid,fillcolor=black!10](0,10){50}%
+ \psStep[§\ON§algebraic§\OFF§,§\ON§StepType=Riemann§\OFF§,fillstyle=solid,fillcolor=black!10](0,10){50}%
     {sqrt(x)*cos(x)*sin(x)}
  \psplot[linewidth=1.5pt,algebraic,labelFontSize=\footnotesize]%
     {0}{10}{sqrt(x)*cos(x)*sin(x)}
@@ -4392,7 +4463,7 @@ radian unit!
   \psset{linecolor=red, arrows=<->, arrowscale=2}
   \multido{\n=-7+1}{8}{\psplotTangent{\n}{1}{\F}}
   \psset{linecolor=magenta, arrows=<->, arrowscale=2}%
-  \multido{\n=0+1}{8}{\psplotTangent[linecolor=blue, Derive=\Fp]{\n}{1}{\F}}
+  \multido{\n=0+1}{8}{\psplotTangent[linecolor=blue, §\ON§Derive=\Fp§\OFF§]{\n}{1}{\F}}
 \end{pspicture}
 \end{lstlisting}
 
@@ -4417,7 +4488,7 @@ radian unit!
   \psplot[linewidth=1.5pt,algebraic,plotpoints=500]{-7.5}{7.5}{\Falg}
   \multido{\n=-7+1}{8}{\psplotTangent[linecolor=red,arrows=<->,arrowscale=2,algebraic]{\n}{1}{\Falg}}
   \multido{\n=0+1}{8}{\psplotTangent[linecolor=magenta,%
-     arrows=<->,arrowscale=2,algebraic,Derive={\Fpalg}]{\n}{1}{\Falg}}
+     arrows=<->,arrowscale=2,algebraic,§\ON§Derive={\Fpalg}§\OFF§]{\n}{1}{\Falg}}
 \end{pspicture}
 \end{lstlisting}
 
@@ -5476,8 +5547,8 @@ equation. In the following example the masses of the stars are 1 and 20.
 \end{pspicture}}
 \]
 
-\begin{table}[htbp]
-  \begin{center}\small
+\begin{table}[!htbp]
+  \centering\small
     \begin{tabular}{|l@{}>{\ttfamily}l@{}>{ \ttfamily \%\% }l|}
       \hline
       && x1 y1 x'1 y'1 x2 y2 x'2 y'2\\
@@ -5492,13 +5563,12 @@ equation. In the following example the masses of the stars are 1 and 20.
       &3 index -20 mul&calcul de y''2=-20y''1\\
       \hline
     \end{tabular}
-    \caption{\PostScript source code for the gravitational interaction}
-    \label{intgravcode}
-  \end{center}
+    \caption{\PostScript source code for the gravitational interaction}\label{intgravcode}
 \end{table}
 
-\begin{table}[htbp]
-  \begin{center}\small\newcommand{\POW}{\symbol{'136}}
+\begin{table}[!htbp]
+  \centering
+    \small\newcommand{\POW}{\symbol{'136}}
     \begin{tabular}{|l@{}>{\ttfamily}l@{}>{ \ttfamily \%\% }l|}
       \hline
       &y[2]|&y'[0]\\
@@ -5511,11 +5581,9 @@ equation. In the following example the masses of the stars are 1 and 20.
       &20*(y[1]-y[5])/((y[4]-y[0])\POW 2+(y[5]-y[1])\POW 2)\POW 1.5&y'[7]=y''[5]\\
       \hline
     \end{tabular}
-    \caption{Algebraic description for the gravitational interaction}
-    \label{intgravalgcode}
-  \end{center}
+    \caption{Algebraic description for the gravitational interaction}\label{intgravalgcode}
 \end{table}
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
 \newcommand\Grav{%
   /yp2 exch def /xp2 exch def /ay2 exch def /ax2 exch def
   /yp1 exch def /xp1 exch def /ay1 exch def /ax1 exch def
@@ -5533,33 +5601,33 @@ equation. In the following example the masses of the stars are 1 and 20.
   y[6]|y[7]|%
   20*(y[0]-y[4])/((y[4]-y[0])^2+(y[5]-y[1])^2)^1.5|%
   20*(y[1]-y[5])/((y[4]-y[0])^2+(y[5]-y[1])^2)^1.5}
-           %%  0  1   2   3  4  5   6   7
-           %% x1 y1 x'1 y'1 x2 y2 x'2 y'2
+%%  0  1   2   3  4  5   6   7
+%% x1 y1 x'1 y'1 x2 y2 x'2 y'2
 
 
-\begin{LTXexample}[width=5cm]
-\def\InitCond{ 1  1  .1   0 -1 -1  -2   0}
-\begin{pspicture}[shift=-2,showgrid=true](-3,-2)(2,2)
-  \psplotDiffEqn[whichabs=0, whichord=1, linecolor=blue, method=rk4, plotpoints=100]{0}{3.95}
-      {\InitCond}{\Grav}
+\begin{LTXexample}[width=5cm,wide]
+\def\InitCond{ 1  1  .1  0 -1 -1  -2   0}
+\begin{pspicture}[shift=-2,showgrid=true](-3,-1.75)(2,1.5)
+  \psplotDiffEqn[whichabs=0, whichord=1, linecolor=blue, method=rk4, plotpoints=100]{0}{3.95}{\InitCond}{\Grav}
   \psset{showpoints=true,whichabs=4, whichord=5}
-  \psplotDiffEqn[linecolor=black, method=varrkiv, varsteptol=.0001, plotpoints=200]{0}{3.9}
-      {\InitCond}{\Grav}
+  \psplotDiffEqn[linecolor=black, method=varrkiv, varsteptol=.0001, plotpoints=200]{0}{3.9}{\InitCond}{\Grav}
 \end{pspicture}
 \end{LTXexample}
+\vspace{-2ex}
 \captionof{figure}{Gravitational interaction : fixed landmark, trajectory of the stars}\label{fig:InterGravRepFix}
 
 
 
-\begin{LTXexample}[width=5cm]
-\def\InitCond{ 1  1  .1   0 -1 -1  -2   0}
-\begin{pspicture}[shift=-1.5,showgrid=true](-4,-2)(1,1)
-  \psset{showpoints=true}
-  \psplotDiffEqn[linecolor=red, plotpoints=200,method=varrkiv, varsteptol=.0001,
-      plotfuncx=y dup 4 get exch 0 get sub ,
+\bigskip
+\begin{LTXexample}[width=5cm,wide]
+\def\InitCond{ 1  1  .1  0 -1 -1  -2   0}
+\begin{pspicture}[shift=-1.5,showgrid=true](-4,-1.75)(1,1)
+  \psplotDiffEqn[linecolor=red, plotpoints=200,method=varrkiv, varsteptol=.0001, showpoints=true,
+      plotfuncx=y dup 4 get exch 0 get sub,
       plotfuncy=dup 5 get exch 1 get sub ]{0}{3.9}{\InitCond}{\Grav}
 \end{pspicture}
 \end{LTXexample}
+\vspace{-2ex}
 \captionof{figure}{Gravitational interaction : landmark defined by one star}\label{fig:IGnewrep}
 
 
@@ -5590,7 +5658,7 @@ equation. In the following example the masses of the stars are 1 and 20.
 \end{lstlisting}
 
 %--------------------------------------------------------------------------------------
-\subsubsection{Simple equation of first order$y'=y$}
+\subsubsection{Simple equation of first order $y'=y$}
 %--------------------------------------------------------------------------------------
 
 For the initial value $y(0)=1$ we have the solution $y(x)=e^x$. $y$ is always
@@ -5645,7 +5713,6 @@ with $y_0=1$:
 \end{pspicture}
 \end{lstlisting}
 
-\clearpage
 %--------------------------------------------------------------------------------------
 \subsubsection{$y'=\displaystyle\frac{2-ty}{4-t^2}$}% $
 %--------------------------------------------------------------------------------------
@@ -5801,7 +5868,6 @@ The integrals of Fresnel :
 
 
 
-\clearpage
 %--------------------------------------------------------------------------------------
 \subsubsection{Lotka-Volterra}
 %--------------------------------------------------------------------------------------
@@ -6287,6 +6353,7 @@ options of the packages \verb+pstricks+, \verb+pst-plot+ and \verb+pst-node+.
 \section{Credits}
 %--------------------------------------------------------------------------------------
 {Hendri Adriaens | } 
+{Martin Chicoine | }
 {Ulrich Dirr | } 
 {Hubert G\"a\ss lein |}
 {Denis Girou | }