pst-plot 1.28 (23mar11)

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

6 files changed, 67 insertions, 36 deletions

diff --git a/Master/texmf-dist/doc/generic/pst-plot/Changes b/Master/texmf-dist/doc/generic/pst-plot/Changes
index 20417b00835..7d024d67a81 100644
--- a/Master/texmf-dist/doc/generic/pst-plot/Changes
+++ b/Master/texmf-dist/doc/generic/pst-plot/Changes
@@ -1,4 +1,10 @@
 ----- pst-plot.tex
+1.28  2011-03-22  - added rot option for \psx|ytick
+1.27  2011-02-20  - fixed bug with trailing spaces when inside
+                    psgraph \psclip is used with \psgrid
+                  - new options grid, gridparas, and gridcoor
+                    to use \psgrid inside psgraph (experimental)
+                  - change behaviour of setting yMaxValue
 1.26  2011-01-24  - added \psCoordinates for drawing the coordinates
                     of a given point
                   - added \psFixpoint for visualizing the fixpoint
diff --git a/Master/texmf-dist/doc/generic/pst-plot/README b/Master/texmf-dist/doc/generic/pst-plot/README
index 663d4fbe63e..57233cad60e 100644
--- a/Master/texmf-dist/doc/generic/pst-plot/README
+++ b/Master/texmf-dist/doc/generic/pst-plot/README
@@ -12,3 +12,4 @@ TeX Frequently Asked Questions:
 pst-plot needs pstricks, which should be part of your
 local TeX installation, otherwise get it from a CTAN server, f.ex.
 http://mirror.ctan.org/graphics/pstricks/
+
diff --git a/Master/texmf-dist/doc/generic/pst-plot/pst-plot-doc.bib b/Master/texmf-dist/doc/generic/pst-plot/pst-plot-doc.bib
index 14e8fc1c736..aedc6e8adfc 100644
--- a/Master/texmf-dist/doc/generic/pst-plot/pst-plot-doc.bib
+++ b/Master/texmf-dist/doc/generic/pst-plot/pst-plot-doc.bib
@@ -61,9 +61,9 @@
 @Book{PSTricksE,
   author	= {Herbert Vo\ss{}},
   title		= {\texttt{PSTricks} -- {G}raphics and {P}ost{S}cript for \LaTeX},
-  edition	= {1st},
+  edition	= {1.},
   publisher	= {UIT},
-  year		= {2010},
+  year		= {2011},
   address	= {Cambridge -- UK}
 }
 
diff --git a/Master/texmf-dist/doc/generic/pst-plot/pst-plot-doc.pdf b/Master/texmf-dist/doc/generic/pst-plot/pst-plot-doc.pdf
index 92f45d0d669..7e99eed202c 100644
--- a/Master/texmf-dist/doc/generic/pst-plot/pst-plot-doc.pdf
+++ b/Master/texmf-dist/doc/generic/pst-plot/pst-plot-doc.pdf
diff --git a/Master/texmf-dist/doc/generic/pst-plot/pst-plot-doc.tex b/Master/texmf-dist/doc/generic/pst-plot/pst-plot-doc.tex
index 64bf18cd442..a35004296ee 100644
--- a/Master/texmf-dist/doc/generic/pst-plot/pst-plot-doc.tex
+++ b/Master/texmf-dist/doc/generic/pst-plot/pst-plot-doc.tex
@@ -253,24 +253,25 @@ two arguments have the usual \verb+PSTricks+ behaviour.
 The y-length maybe given as !; then the macro uses the same unit
 as for the x-axis.
 
+\psset{unit=1cm}
 \begin{center}
 \readdata{\data}{demo1.data}
-\pstScalePoints(1,0.000001){}{}% (x,y){additional x operator}{y op}
+\pstScalePoints(1,1e-08){}{}% (x,y){additional x operator}{y op}
 \psset{llx=-1cm,lly=-1cm}
-\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
+\begin{psgraph}[axesstyle=frame,xticksize=0 7.59,yticksize=0 25,%
+    subticks=0,ylabelFactor=\cdot 10^8,
+    Dx=5,dy=1\psyunit,Dy=1](0,0)(25,7.5){10cm}{6cm} % parameters
    \listplot[linecolor=red,linewidth=2pt,showpoints=true]{\data}
 \end{psgraph}
 \end{center}
 
 \begin{lstlisting}
 \readdata{\data}{demo1.data}
-\pstScalePoints(1,0.000001){}{}% (x,y){additional x operator}{y op}
+\pstScalePoints(1,1e-08){}{}% (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
+?\ON?\begin{psgraph}?\OFF?[axesstyle=frame,xticksize=0 7.59,yticksize=0 25,%
+    subticks=0,ylabelFactor=\cdot 10^8,
+    Dx=5,dy=1\psyunit,Dy=1](0,0)(25,7.5){10cm}{6cm} % parameters
    \listplot[linecolor=red,linewidth=2pt,showpoints=true]{\data}
 ?\ON?\end{psgraph}?\OFF?
 \end{lstlisting}
@@ -661,15 +662,15 @@ macros \Lcs{psxTick} and \Lcs{psyTick}. The label is set with the macro \Lcs{psh
 the setting of \Lkeyword{mathLabel} is taken into account.
 
 \begin{BDef}
-\Lcs{psxTick}\OptArgs\Largs{x value}\Largb{label}\\
-\Lcs{psyTick}\OptArgs\Largs{y value}\Largb{label}
+\Lcs{psxTick}\OptArgs\OptArg*{\Largb{rotation}}\Largr{x value}\Largb{label}\\
+\Lcs{psyTick}\OptArgs\OptArg*{\Largb{rotation}}\Largr{y value}\Largb{label}
 \end{BDef}
 
 
-\begin{LTXexample}[width=.5\linewidth]
+\begin{LTXexample}[width=.4\linewidth]
 \begin{psgraph}[Dx=2,Dy=2](0,0)(-4,-2.2)(4,2.2){.5\textwidth}{!}
-  \psxTick[linecolor=red](1.5){x_0}
-  \psyTick[linecolor=blue](1.7){y_0}
+  \psxTick[linecolor=red,labelsep=-20pt]{45}(1.25){x_0}
+  \psyTick[linecolor=blue](1){y_0}
 \end{psgraph}
 \end{LTXexample}
 
@@ -2666,7 +2667,7 @@ of vertical. For \Lkeyword{yLabels} see section~\ref{yLabels}.
 \subsection{Plotstyle \nxLkeyval{LSM}}\label{LSM}
 %--------------------------------------------------------------------------------------
 With the setting \Lkeyset{plotstyle=LSM} (\textbf{L}east \textbf{S}quare \textbf{Method})\index{Least square method}
-the data recordsare not printed in the usual way as dots or a line,
+the data records are not printed in the usual way as dots or a line,
 the \Lcs{listplot} macro calculates the values for a line $y=v\cdot x+u$ which fits
 best all data records.
 
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 6910192a1bc..55c751c7c1f 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,4 @@
-% $Id: pst-plot.tex 449 2011-01-25 17:43:06Z herbert $
+% $Id: pst-plot.tex 478 2011-03-22 13:55:18Z herbert $
 %% BEGIN pst-plot.tex
 %%
 %% plotting functions and data with PSTricks.
@@ -20,8 +20,8 @@
 \ifx\PSTFPloaded\endinput\else   \input pst-fp.tex  \fi
 \ifx\MultidoLoaded\endinput\else \input multido.tex \fi
 %
-\def\fileversion{1.26}
-\def\filedate{2011/01/24}
+\def\fileversion{1.28}
+\def\filedate{2011/03/22}
 \message{ v\fileversion, \filedate\space (tvz,hv)}
 %
 \edef\TheAtCode{\the\catcode`\@}
@@ -415,7 +415,7 @@ D\space##1%
 \psset[pst-plot]{plotpoints=50}
 %
 %the following works only for plotstyle line, polygon and bezier
-\define@key[psset]{pst-plot}{yMaxValue}[1.e30]{\def\psk@yMaxValue{#1 }}
+\define@key[psset]{pst-plot}{yMaxValue}[1.e30]{\def\psk@yMaxValue{#1 }\def\psk@yMinValue{#1 neg }}
 \psset{yMaxValue=1.e30}
 \define@key[psset]{pst-plot}{yMinValue}[-1.e30]{\def\psk@yMinValue{#1 }}
 \psset{yMinValue=-1.e30}
@@ -1309,30 +1309,34 @@ D\space##1%
 \psset[pst-plot]{xlabelFactor=\relax,ylabelFactor=\relax,showOriginTick}%
 
 %% #1 : optional arguments passed to psline
-%% #2 : x value
-%% #3 : label
+%% #2 : rotating angle
+%% #3 : x value
+%% #4 : label
 \def\psxTick{\pst@object{psxTick}}% idea by Martin Chicoine
-\def\psxTick@i(#1)#2{{
+\def\psxTick@i{\@ifnextchar({\psxTick@ii{0}}\psxTick@ii}
+\def\psxTick@ii#1(#2)#3{{
   \pst@killglue
   \addbefore@par{arrows=-,linewidth=\psk@xtickwidth\pslinewidth}
   \use@par
-  \psline(#1,\pst@xticksizeB)(#1,\pst@xticksizeA)
-  \rput[t](! \psk@origin 
-             #1 \pst@number\pslabelsep \pst@number\pst@xticksizeB add
-             \pst@number\psyunit div neg ){\pshlabel{#2\vphantom{1}}}}\ignorespaces}
+  \psline(#2,\pst@xticksizeB)(#2,\pst@xticksizeA)
+  \rput[t]{#1}(! \psk@origin 
+             #2 \pst@number\pslabelsep \pst@number\pst@xticksizeB add
+             \pst@number\psyunit div neg ){\pshlabel{#3\vphantom{1}}}}\ignorespaces}
 %
 %% #1 : optional arguments passed to psline
-%% #2 : y value
-%% #3 : label
+%% #2 : rotating angle
+%% #3 : y value
+%% #4 : label
 \def\psyTick{\pst@object{psyTick}}% idea by Martin Chicoine
-\def\psyTick@i(#1)#2{{
+\def\psyTick@i{\@ifnextchar({\psyTick@ii{0}}\psyTick@ii}
+\def\psyTick@ii#1(#2)#3{{
   \pst@killglue
   \addbefore@par{arrows=-,linewidth=\psk@ytickwidth\pslinewidth}
   \use@par
-  \psline(\pst@yticksizeB,#1)(\pst@yticksizeA,#1)
-  \rput[r]{0}(! \psk@origin
+  \psline(\pst@yticksizeB,#2)(\pst@yticksizeA,#2)
+  \rput[r]{#1}(! \psk@origin
                 \pst@number\pst@yticksizeB \pst@number\pslabelsep add
-                \pst@number\psxunit div neg #1){\psvlabel{#2}}}\ignorespaces}
+                \pst@number\psxunit div neg #2){\psvlabel{#3}}}\ignorespaces}
 %
 \def\psCoordinates{\pst@object{psCoordinates}}
 \def\psCoordinates@i(#1){%
@@ -2076,6 +2080,11 @@ D\space##1%
 \define@key[psset]{pst-plot}{ury}[\z@]{\pssetylength\psk@ury{#1}}
 \psset[pst-plot]{llx=\z@, lly=\z@, urx=\z@, ury=\z@}% prevents rounding errors 
 %
+\define@boolkey[psset]{pst-plot}[Pst@]{psgrid}[true]{}
+\define@key[psset]{pst-plot}{gridpara}[{}]{\def\psk@gridpara{#1}}
+\define@key[psset]{pst-plot}{gridcoor}[\relax]{\def\psk@gridcoor{#1}}
+\psset[pst-plot]{psgrid=false,gridpara={},gridcoor=\relax}
+%
 \newdimen\pst@xunit
 \newdimen\pst@yunit
 %
@@ -2104,13 +2113,20 @@ D\space##1%
 % minX | minY | maxX | maxY | Length x-axis | length y-axis%  
   \pst@killglue%
   \begingroup%
+  \bgroup%
+  \use@keep@par%
+  \ifPst@psgrid%
+     \expandafter\psset\expandafter{\psk@gridpara}%
+      \rput(0,0){\expandafter\psgrid\psk@gridcoor}  
+  \fi%
+  \egroup%
   \pstFPsub\pst@tempA{#3}{#1}%
   \pst@dimm=#5%
   \pst@dimo=\pst@tempA pt%
   \pstFPdiv\pst@@dx{\strip@pt\pst@dimm}{\pst@tempA}%
   \pst@xunit=\pst@@dx\p@%
 %
-  \ifx!#6\let\pst@yunit=\pst@xunit\else
+  \ifx!#6\let\pst@yunit=\pst@xunit\else%
     \pst@dimm=#6%
 %  \pst@dimm=\pst@@dx\pst@dimo\else\pst@dimm=#6\fi%
     \pstFPsub\pst@tempA{#4}{#2}%
@@ -2136,6 +2152,13 @@ D\space##1%
 % Xorig | yorig | minX | minY | maxX | maxY | Length x-axis | length y-axis%  
   \pst@killglue%
   \begingroup%
+  \bgroup%
+  \use@keep@par%
+  \ifPst@psgrid%
+     \expandafter\psset\expandafter{\psk@gridpara}%
+      \rput(0,0){\expandafter\psgrid\psk@gridcoor}
+  \fi%
+  \egroup%
   \pstFPsub\pst@tempA{#5}{#3}%
   \pst@dimm=#7%
   \pst@dimo=\pst@tempA pt%
@@ -2161,7 +2184,7 @@ D\space##1%
   \use@par%
   \psaxes(#1,#2)(#3,#4)(#5,#6)%
   \egroup%
-  \psgraph@vi(#1,#2)(#3,#4)(#5,#6)
+  \psgraph@vi(#1,#2)(#3,#4)(#5,#6)%
 }
 %
 \def\setxLabelC@@r#1,#2(#3,#4)(#5){%
@@ -2208,7 +2231,7 @@ D\space##1%
     \fi%
   \fi%
   \xdef\psgraphLLx{#3}\xdef\psgraphLLy{#4}\xdef\psgraphURx{#5}\xdef\psgraphURy{#6}%
-  %\ignorespaces
+  \ignorespaces
 }
 %
 \def\endpsgraph{%