pst-plot (22may17)

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

4 files changed, 27 insertions, 24 deletions

diff --git a/Master/texmf-dist/doc/generic/pst-plot/Changes b/Master/texmf-dist/doc/generic/pst-plot/Changes
index 959afd83f35..8091033e5c1 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.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
 1.76  2017-01-18  - allow yLabels and xLabels for negative axes
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 72db4da9659..b4c733736ba 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 3a997ed183d..07403f64214 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
@@ -22,6 +22,8 @@
     escapechar=?}
 \def\textat{\char064}%
 
+%\usepackage{biblatex}
+\addbibresource{pst-plot-doc.bib}
 \begin{document}
 \title{\texttt{pst-plot}\\plotting data and functions \\\small v.\pstFV}
 \docauthor{Herbert Vo\ss}
@@ -3661,8 +3663,8 @@ inside PostScript code.
 \nocite{*}
 \bgroup
 \RaggedRight
-\bibliographystyle{plain}
-\bibliography{pst-plot-doc}
+%\bibliographystyle{plain}
+\printbibliography
 \egroup
 
 \printindex
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 da341ea0519..f4f970b0973 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.78}
-\def\filedate{2017/04/16}
+\def\fileversion{1.79}
+\def\filedate{2017/05/22}
 \message{ v\fileversion, \filedate\space (tvz,hv)}
 %
 \edef\TheAtCode{\the\catcode`\@}
@@ -1350,19 +1350,19 @@ D\space##1%
   \def\pst@@@hlabel##1{%
       \edef\@xyDecimals{\psk@xDecimals}%
 %      \ifnum\psk@ticks<\tw@  % ticks=all|x
-      \ifnum\psk@labels<\tw@  % labels=all|x
+      \ifnum\psk@labels<\tw@\relax% labels=all|x
         \ifx\psk@xlogBase\@empty
-          \pshlabel{\psk@xlabelFontSize\expandafter\@LabelComma##1..\@nil\psk@xlabelFactor}
+          \pshlabel{\psk@xlabelFontSize\expandafter\@LabelComma##1..\@nil\psk@xlabelFactor}%
         \else
-          \ifPst@xmathLabel%
+          \ifPst@xmathLabel
             \pshlabel{\psk@xlabelFontSize\psk@xlogBase^{\expandafter\@stripDecimals##1..\@nil}}%
-          \else%
+          \else
             \pshlabel{\psk@xlabelFontSize\psk@xlogBase\textsuperscript{\expandafter\@stripDecimals##1..\@nil}}%
           \fi
-        \fi%
-      \fi%
+        \fi
+      \fi
     }%
-    \ifPst@xmathLabel \def\pshlabel##1{$\psk@xlabelFontSize##1$}\else\def\pshlabel##1{\psk@xlabelFontSize##1}\fi
+    \ifPst@xmathLabel\def\pshlabel##1{$\psk@xlabelFontSize##1$}\else\def\pshlabel##1{\psk@xlabelFontSize##1}\fi
 }
 \def\setTrighLabels{%
     \def\pst@@@hlabel##1{\pshlabel{##1}}
@@ -1709,8 +1709,8 @@ D\space##1%
   \ifnum \@xyDecimals>\@get@digitcounter
     \bgroup
       0\@inc@digitcounter\@zeroFill
-    \egroup%
-  \fi%
+    \egroup
+  \fi
 }
 % #1 the value, maybe empty
 %
@@ -1730,7 +1730,7 @@ D\space##1%
       \ifmmode\expandafter\mathord\expandafter{\psk@decimalSeparator}\else\psk@decimalSeparator\fi%
 %      \psk@decimalSeparator
         \@Reset@digitcounter
-        \expandafter\@process@digits#1*;
+        \expandafter\@process@digits#1*;%
       \fi%
   \fi%
 }
@@ -1741,7 +1741,8 @@ D\space##1%
   \def\pst@tempA{#1}%
   \ifx\pst@tempA\@empty\the\@zero\else#1\fi% the integer part
   \def\pst@tempA{#2}%
-  \ifx\pst@tempA\@empty\@writeDecimals{}\else\@writeDecimals{#2}\fi}
+  \ifx\pst@tempA\@empty\@writeDecimals{}\else\@writeDecimals{#2}\fi
+}
 %
 %
 \def\set@xticksize#1{%
@@ -1943,7 +1944,7 @@ D\space##1%
 \def\psaxes@vi(#1)(#2)(#3)[#4,#5][#6,#7]{%
   \let\pst@par@save\pst@par
   \psaxes@vii(#1)(#2)(#3)%
-  \let\pst@par\pst@par@save  
+  \let\pst@par\pst@par@save
   \begingroup
   \SpecialCoor
   \use@par
@@ -1957,7 +1958,7 @@ D\space##1%
   \begingroup
   \pssetxlength\pst@dimc{#5}% ur-x
   \pssetylength\pst@dimd{#6}% ur-y
-  \ifdim\pst@dimc<\z@ \ifdim\pst@dimd<\z@ % axes show to left and down
+  \ifdim\pst@dimc<\z@\relax \ifdim\pst@dimd<\z@\relax% axes show to left and down
     \addbefore@par{xlabelPos=top,ylabelPos=right}\fi\fi
   \setbox\pst@hbox=\hbox\bgroup
   \use@par%	now the same with an optional unit=... in par
@@ -2004,8 +2005,7 @@ D\space##1%
     \ifdim\pst@dimb=\z@\else\showoriginfalse\fi
     \ifnum\psk@dx=\z@
       \pst@dimg=\psk@Dx\psxunit
-      \ifdim\pst@dimg<\p@\pst@cnta=\psk@Dx\edef\psk@Dx{\the\numexpr-1*\pst@cnta}% v.1.21
-      \fi% v.1.21
+      \ifdim\pst@dimg<\p@\pst@cnta=\psk@Dx\edef\psk@Dx{\the\numexpr-1*\pst@cnta}\fi% v.1.21
       \edef\psk@dx{\number\pst@dimg}%
     \fi
 %    \ifPst@yAxis\else\showorigintrue\fi%		2009-10-21
@@ -2398,21 +2398,21 @@ D\space##1%
 \def\pst@@hlabels{%
   \psDEBUG[pst@@hlabels]{xticksizeC=\the\pst@xticksizeC}%
   \setbox\z@=\vbox{%			save all in a box
-    \ifcase\psk@xlabelPos% 0
+    \ifcase\psk@xlabelPos  % 0
       \vskip-\pst@xticksizeA\vskip\psxlabelsep\or % 1
       \vskip-1ex\vskip-\pslabelsep\or % 2
       \vskip-\pst@xticksizeB\vskip-\psxlabelsep\vskip-1ex % 3
     \fi
     \ifnum\pst@cnta<\z@ \pst@dimb=-\pst@dimb\fi
     \hbox to\z@{%
-      \ifshoworigin\hbox to \z@{\hss\pst@@@hlabel{\psk@Ox}\hss}\fi%
+      \ifshoworigin\hbox to \z@{\hss\pst@@@hlabel{\psk@Ox}\hss}\fi
       \mmultido{\nA=\psk@Ox+\psk@Dx}{\pst@cnta}{%
-        \hskip\pst@dimb\hbox to \z@{\hss%
-          \ifdim\nA pt=\z@ \ifshoworigin\pst@@@hlabel{0}\fi
+        \hskip\pst@dimb \hbox to \z@{\hss
+          \ifdim\nA pt=\z@\relax\ifshoworigin\pst@@@hlabel{0}\fi
           \else\expandafter\pst@@@hlabel{\nA}%
           \fi% prevent -0, doesn't work with \ifnum
         \hss}%
-      }\hss%
+      }
     }%
   }\ht\z@\z@ \dp\z@\z@ \box\z@}% set all values to zero
 %