pst-plot (4nov11)

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

4 files changed, 16 insertions, 8 deletions

diff --git a/Master/texmf-dist/doc/generic/pst-plot/Changes b/Master/texmf-dist/doc/generic/pst-plot/Changes
index 2128f7e9b0d..cfe2251c2fa 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.33  2011-11-02  - fix bug with x|ylabelsep 
 1.32  2011-10-31  - take values Ox and Oy into account for 
                     plot styles LineToXAxis and LineToYAxis
 1.31  2011-10-24  - fixed bug with \psBoxplot
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 4d4cf57ba70..367fafe8fad 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 e093fe90da3..7fc4cb2c7b7 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
@@ -1049,7 +1049,7 @@ redefinition, then do it for \Lcs{pst@@@hlabel} and
 \end{pspicture}
 \end{LTXexample}
 
-
+The values for \Lkeyword{xlabelsep} and \Lkeyword{ylabelsep} are taken into account.
 %------------------------------------------------------------------------------------
 \subsection{Option \nxLkeyword{yMaxValue} and \nxLkeyword{yMinValue}}\label{yMaxValue}
 %------------------------------------------------------------------------------------
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 3a3a7488a93..809ac605698 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 592 2011-10-31 18:10:30Z herbert $
+% $Id: pst-plot.tex 598 2011-11-03 12:58:47Z 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.32}
-\def\filedate{2011/10/31}
+\def\fileversion{1.33}
+\def\filedate{2011/11/02}
 \message{ v\fileversion, \filedate\space (tvz,hv)}
 %
 \edef\TheAtCode{\the\catcode`\@}
@@ -1996,8 +1996,12 @@ D\space##1%
   \fi%
  \else
   \pst@cnta=#1\relax%                % Distance (in sp) to end.
-  \divide\pst@cnta\psk@dx\relax%     % Number of ticks/labels
-  \multido{\nA=#3+1}{\pst@cnta}{\uput{\psxlabelsep}[-90]{\pst@xLabelsRot}(\nA,\psxlabelsep){\psPutXLabel{\nA}}}%
+  \pstFPdiv\pst@tempA{\the\pst@cnta}{\psk@dx}
+  \pstFPadd\pst@tempA{0.55}{\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)
+  {\psPutXLabel{\nA}}}%
  \fi%
 }
 % Knows \pst@dimb and \pst@cnta
@@ -2038,8 +2042,11 @@ D\space##1%
   \fi%
  \else%
   \pst@cnta=#1\relax%          %      % Distance (in sp) to end.
-  \divide\pst@cnta\psk@dy\relax%   % Number of ticks/labels
-  \multido{\nA=#3+1}{\the\pst@cnta}{\uput{\psylabelsep}[180]{\pst@yLabelsRot}(\psylabelsep,\nA){\psPutYLabel{\nA}}}%
+  \pstFPdiv\pst@tempA{\the\pst@cnta}{\psk@dy}
+  \pstFPadd\pst@tempA{0.55}{\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){\psPutYLabel{\nA}}}%
  \fi%
 }
 % \pst@dima: the width between two labels in pt