4 files changed, 23 insertions, 25 deletions
diff --git a/Master/texmf-dist/doc/generic/pst-plot/Changes b/Master/texmf-dist/doc/generic/pst-plot/Changes
index 8091033e5c1..de6ffe1618f 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.80  2017-05-23  - use \psx|ylabelsep for plotstyle xvalues
 1.79  2017-05-22  - fix trailing space in \setDefaulthLabels
 1.78  2017-04-16  - remove change of showorigin in \pst@hlabels
 1.77  2017-03-20  - new optional argument for \psCoordinates
diff --git a/Master/texmf-dist/doc/generic/pst-plot/data/zz.tex b/Master/texmf-dist/doc/generic/pst-plot/data/zz.tex
deleted file mode 100644
index c518596242e..00000000000
--- a/Master/texmf-dist/doc/generic/pst-plot/data/zz.tex
+++ /dev/null
@@ -1,5 +0,0 @@
-\documentclass{minimal}
-\usepackage{filecontents}
-\begin{document}
-\input{pst-plot-doc.dat}
-\end{document}
-\ No newline at end of file
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 b4c733736ba..62aafceb7d7 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 f4f970b0973..e46dd900cf4 100644
--- a/Master/texmf-dist/tex/generic/pst-plot/pst-plot.tex
+++ b/Master/texmf-dist/tex/generic/pst-plot/pst-plot.tex
@@ -23,8 +23,8 @@
 \ifx\PSTFPloaded\endinput\else   \input pst-fp.tex  \fi
 \ifx\MultidoLoaded\endinput\else \input multido.tex \fi
 %
-\def\fileversion{1.79}
-\def\filedate{2017/05/22}
+\def\fileversion{1.80}
+\def\filedate{2017/05/23}
 \message{ v\fileversion, \filedate\space (tvz,hv)}
 %
 \edef\TheAtCode{\the\catcode`\@}
@@ -1659,7 +1659,9 @@ D\space##1%
                  \pst@number\psyunit div neg ){\pshlabel{#3\vphantom{1}}}%
   }\ignorespaces}
 %
-%% #1 : optional arguments passed to psline
+%
+%
+%% #1 : optional arguments passed to psline and \rput
 %% #2 : rotating angle
 %% #3 : y value
 %% #4 : label
@@ -1672,9 +1674,9 @@ D\space##1%
   \use@par
   \edef\temp@coor{(!\pst@number\pst@yticksizeB \pst@number\psxunit div #2)(!\pst@number\pst@yticksizeA \pst@number\psxunit div #2)}%
   \expandafter\psline\temp@coor
-  \rput[r]{#1}(!\psk@origin
-                \pst@number\pst@yticksizeB \pst@number\psylabelsep add
-                \pst@number\psxunit div neg #2){\psvlabel{#3}}}\ignorespaces}
+    \rput[r]{#1}(!\psk@origin
+                  \pst@number\pst@yticksizeB \pst@number\psylabelsep add
+                  \pst@number\psxunit div neg #2){\psvlabel{#3}}}\ignorespaces}
 %
 \define@boolkey[psset]{pst-plot}[Pst@]{markPoint}[true]{}%
 \psset[pst-plot]{markPoint}
@@ -2540,26 +2542,26 @@ D\space##1%
   \use@keep@par
 %  \egroup%
   \pstFPsub\pst@tempA{#3}{#1}%
-  \pst@dimm=#5%
-  \pst@dimo=\pst@tempA pt%
+  \pst@dimm=#5
+  \pst@dimo=\pst@tempA pt
   \pstFPdiv\pst@@dx{\strip@pt\pst@dimm}{\pst@tempA}%
-  \pst@xunit=\pst@@dx\p@%
+  \pst@xunit=\pst@@dx\p@
 %
-  \ifx!#6\let\pst@yunit=\pst@xunit\else%
-    \pst@dimm=#6%
+  \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}%
     \pstFPdiv\pst@@dy{\strip@pt\pst@dimm}{\pst@tempA}%
-    \pst@yunit=\pst@@dy\p@%
-  \fi%
+    \pst@yunit=\pst@@dy\p@
+  \fi
   %
-  \pst@dimm=#1\pst@xunit\advance\pst@dimm by \psk@llx%
-  \pst@dimn=#2\pst@yunit\advance\pst@dimn by \psk@lly%
-  \pst@dimo=#3\pst@xunit\advance\pst@dimo by \psk@urx%
-  \pst@dimp=#4\pst@yunit\advance\pst@dimp by \psk@ury%
-  \if@star\pspicture*(\pst@dimm,\pst@dimn)(\pst@dimo,\pst@dimp)\else%
-  \pspicture(\pst@dimm,\pst@dimn)(\pst@dimo,\pst@dimp)\fi%
-  \let\psxunit\pst@xunit \let\psyunit\pst@yunit%
+  \pst@dimm=#1\pst@xunit\advance\pst@dimm by \psk@llx
+  \pst@dimn=#2\pst@yunit\advance\pst@dimn by \psk@lly
+  \pst@dimo=#3\pst@xunit\advance\pst@dimo by \psk@urx
+  \pst@dimp=#4\pst@yunit\advance\pst@dimp by \psk@ury
+  \if@star\pspicture*(\pst@dimm,\pst@dimn)(\pst@dimo,\pst@dimp)\else
+  \pspicture(\pst@dimm,\pst@dimn)(\pst@dimo,\pst@dimp)\fi
+  \let\psxunit\pst@xunit \let\psyunit\pst@yunit
   \ifdim\pst@xunit=\pst@yunit\relax\psset[pstricks]{runit=\pst@xunit}\fi%
   \bgroup
     \use@par