pst-plot (14mar12)

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

4 files changed, 26 insertions, 8 deletions

diff --git a/Master/texmf-dist/doc/generic/pst-plot/Changes b/Master/texmf-dist/doc/generic/pst-plot/Changes
index 225ea08c70f..3afd5f3eff1 100644
--- a/Master/texmf-dist/doc/generic/pst-plot/Changes
+++ b/Master/texmf-dist/doc/generic/pst-plot/Changes
@@ -1,4 +1,5 @@
 ----- pst-plot.tex
+1.39  2012-03-13  - fixed bug for xLabels/yLabels
 1.38  2012-02-23  - added \strut for the x/y axis user labels
 1.37  2012-01-10  - fix bug with \psgraph and axesstyle=none
 1.36  2011-12-04  - add the dot specification for the outliners
diff --git a/Master/texmf-dist/doc/generic/pst-plot/demo.txt b/Master/texmf-dist/doc/generic/pst-plot/demo.txt
new file mode 100644
index 00000000000..8316b213dd4
--- /dev/null
+++ b/Master/texmf-dist/doc/generic/pst-plot/demo.txt
@@ -0,0 +1,18 @@
+% X1  X2      Y1      Y2
+  2   55.1500 10.35   11.26
+ 31   59.7167 11.06   11.11
+ 34   65.7167 11.87   10.83
+ 40   62.1833 11.59   11.19
+ 45   56.0500 10.74   11.50
+ 47   68.2667 12.65   11.11
+ 52   69.7500 13.23   11.38
+ 55   76.3333 14.28   11.22
+ 59   75.4000 14.69   11.69
+ 62   78.6000 15.25   11.64
+ 66   69.3167 14.06   12.17
+ 69   77.5500 15.24   11.79
+ 73   70.8833 14.52   12.29
+ 75   60.6167 13.10   12.97
+ 79   68.3833 14.43   12.66
+ 82   56.6833 12.05   12.75
+ 87   95.1333 21.10   13.31
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 bf580e3c024..044adeb5010 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/tex/generic/pst-plot/pst-plot.tex b/Master/texmf-dist/tex/generic/pst-plot/pst-plot.tex
index 0a41943f9ef..59aaeb82e9b 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 665 2012-02-23 07:26:33Z herbert $
+% $Id: pst-plot.tex 668 2012-03-13 16:48:37Z 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.38}
-\def\filedate{2012/02/23}
+\def\fileversion{1.39}
+\def\filedate{2012/03/13}
 \message{ v\fileversion, \filedate\space (tvz,hv)}
 %
 \edef\TheAtCode{\the\catcode`\@}
@@ -75,7 +75,6 @@ D\space##1%
 \fi*%
 \let(,\let),\let{,\let},\let ,\let^^M,\let_\@empty*% End def
 \endgroup
-%
 \define@key[psset]{pst-plot}{ignoreLines}[0]{\def\psk@ignoreLines{#1}}
 \psset[pst-plot]{ignoreLines=0}
 %
@@ -2016,10 +2015,10 @@ D\space##1%
  \else
   \pst@cnta=#1\relax%                % Distance (in sp) to end.
   \pstFPdiv\pst@tempA{\the\pst@cnta}{\psk@dx}
-  \pstFPadd\pst@tempA{0.55}{\pst@tempA}   % to prevent rounding errors
+  \pstFPadd\pst@tempA{0.555}{\pst@tempA}   % to prevent rounding errors
   \edef\pst@tempB{\pst@int{\pst@tempA}}
 %  \divide\pst@cnta\psk@dx\relax%     % Number of ticks/labels
-  \multido{\nA=#3+1}{\pst@tempB}{\uput{\psxlabelsep}[-90]{\pst@xLabelsRot}(\nA,0)%\psxlabelsep)
+  \multido{\nA=#3+1}{\numexpr \pst@tempB+1}{\uput{\psxlabelsep}[-90]{\pst@xLabelsRot}(\nA,0)%\psxlabelsep)
   {\strut\psPutXLabel{\nA}}}%
  \fi%
 }
@@ -2062,10 +2061,10 @@ D\space##1%
  \else%
   \pst@cnta=#1\relax%          %      % Distance (in sp) to end.
   \pstFPdiv\pst@tempA{\the\pst@cnta}{\psk@dy}
-  \pstFPadd\pst@tempA{0.55}{\pst@tempA}   % to prevent rounding errors
+  \pstFPadd\pst@tempA{0.555}{\pst@tempA}   % to prevent rounding errors
   \edef\pst@tempB{\pst@int{\pst@tempA}}
 %  \divide\pst@cnta\psk@dy\relax%   % Number of ticks/labels
-  \multido{\nA=#3+1}{\pst@tempB}{\uput{\psylabelsep}[180]{\pst@yLabelsRot}(0,\nA){\strut\psPutYLabel{\nA}}}%
+  \multido{\nA=#3+1}{\numexpr \pst@tempB+1}{\uput{\psylabelsep}[180]{\pst@yLabelsRot}(0,\nA){\strut\psPutYLabel{\nA}}}%
  \fi%
 }
 % \pst@dima: the width between two labels in pt