pst-plot (31aug18)

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

4 files changed, 83 insertions, 24 deletions

diff --git a/Master/texmf-dist/doc/generic/pst-plot/Changes b/Master/texmf-dist/doc/generic/pst-plot/Changes
index d92ab8d9599..f6a73776d22 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.91  2018-08-31  - fix for showorigin and triglabels
 1.90  2018-03-28  - fix for showoriginfalse and yAxis=false
 1.89  2018-02-18  - fix for trailing space in loglines=all
 1.88  2018-02-14  - add ignoreLines also for \psreadDataColumn
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 c9f1fdd94d7..f622e6d7a8e 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 c2edfbbf603..8eba29b72bb 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
@@ -1,10 +1,11 @@
-% $Id: pst-plot-doc.tex 734 2018-02-17 19:05:21Z herbert $
+% $Id: pst-plot-doc.tex 799 2018-08-31 16:27:35Z herbert $
 \documentclass[11pt,english,BCOR10mm,DIV12,bibliography=totoc,parskip=false,smallheadings
     headexclude,footexclude,oneside,dvipsnames,svgnames]{pst-doc}
 \listfiles
 \usepackage[utf8]{inputenc}
 \usepackage{pst-ode,
   pst-node,
+  pst-calculate,
   pst-plot
   }
 \let\pstFV\fileversion
@@ -2113,8 +2114,64 @@ or alternatively with \Lkeyword{ytrigLabels}=\true.
 \end{lstlisting}
 
 
+\clearpage
+
+\psset{yAxis=false,xtrigLabels,xtrigLabelBase=3}
+
+\begin{pspicture}(-\psPi,-5mm)(\psPiTwo,12pt)
+\def\pi{\omega}% Hold it local
+\psaxes[dx=\pstRadUnit,Ox=-3](-\psPi,-12pt)(\psPiTwo,12pt)
+\end{pspicture}
+
+\bigskip
+\begin{pspicture}(-\psPi,-5mm)(\psPiTwo,12pt)
+\psaxes[dx=\pstRadUnit,Ox=-3](-\psPi,-12pt)(\psPiTwo,12pt)
+\end{pspicture}
+
+\bigskip
+\begin{pspicture}(-\psPi,-5mm)(\psPiTwo,12pt)
+\def\pi{\sqrt2}% Hold it local
+\psaxes[dx=\pstRadUnit,Ox=-3](-\psPi,-12pt)(\psPiTwo,12pt)
+\end{pspicture}
+
+\bigskip
+\psset{trigLabels=false}
+\begin{pspicture}(-\psPi,-10mm)(\psPiTwo,12pt)
+\psaxes[dx=\pscalculate{3.14/2},Dx=90,Ox=-180](-\psPi,-12pt)(\psPiTwo,12pt)
+\end{pspicture}
+
+
+\bigskip
+\begin{lstlisting}
+\begin{pspicture}(-\psPi,-5mm)(\psPiTwo,12pt)
+\def\pi{\omega}% Hold it local
+\psaxes[dx=\pstRadUnit,Ox=-3](-\psPi,-12pt)(\psPiTwo,12pt)
+\end{pspicture}
+
+\bigskip
+\begin{pspicture}(-\psPi,-5mm)(\psPiTwo,12pt)
+\psaxes[dx=\pstRadUnit,Ox=-3](-\psPi,-12pt)(\psPiTwo,12pt)
+\end{pspicture}
+
+\bigskip
+\begin{pspicture}(-\psPi,-5mm)(\psPiTwo,12pt)
+\def\pi{\sqrt2}% Hold it local
+\psaxes[dx=\pstRadUnit,Ox=-3](-\psPi,-12pt)(\psPiTwo,12pt)
+\end{pspicture}
+
+\bigskip
+\psset{trigLabels=false}
+\begin{pspicture}(-\psPi,-10mm)(\psPiTwo,12pt)
+\psaxes[dx=\pscalculate{3.14/2},Dx=90,Ox=-180](-\psPi,-12pt)(\psPiTwo,12pt)
+\end{pspicture}
+\end{lstlisting}
+
+
 \psset{trigLabels=false,labelFontSize=\scriptstyle,unit=1cm}
 
+
+
+
 \clearpage
 
 %--------------------------------------------------------------------------------------
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 e02f99b6364..7f6ba8a1922 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 747 2018-03-28 10:54:04Z herbert $
+% $Id: pst-plot.tex 798 2018-08-31 14:47:43Z herbert $
 %%
 %% BEGIN 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.90}
-\def\filedate{2018/03/28}
+\def\fileversion{1.91}
+\def\filedate{2018/08/31}
 \message{ v\fileversion, \filedate\space (tvz,hv)}
 %
 \edef\TheAtCode{\the\catcode`\@}
@@ -1411,8 +1411,9 @@ D\space##1%
           \ifnum\pst@cnto=\@ne                % #1 = trigLabelBase
             \pi                 	      % print pi
           \else
+            \ifnum\pst@cnto=\z@ 0\else
             \the\pst@cnto\pi 	              % print \pst@cnto/\de@nominator pi
-          \fi$%   
+          \fi\fi$%   
 	\else%
           \psk@xlabelFontSize
   	  \ifnum\pst@tempA<0 -\fi
@@ -1445,14 +1446,14 @@ D\space##1%
             \else\ifnum\pst@tempA=-1 $\frac{-\pi}{\de@nominator}$%
               \else \ifnum\pst@tempA=1 $\frac{\pi}{\de@nominator}$%
                 \else$\frac{\pst@tempA\pi}{\de@nominator}$% (x pi)/y
-            \fi\fi\fi%
-          \else%
+            \fi\fi\fi
+          \else
             \ifnum\pst@tempA=1 $\frac{\pi}{\de@nominator}$%
             \else\ifnum\pst@tempA=\de@nominator $\pi$%
               \else$\frac{\pst@tempA\pi}{\de@nominator}$% 
-          \fi\fi\fi%
-	\fi%
-      \fi%
+          \fi\fi\fi
+	\fi
+      \fi
     }%
 }
 %
@@ -1476,7 +1477,7 @@ D\space##1%
     }%
 }%
 \def\setTrigvLabels{%
-  \def\pst@@@vlabel##1{\psvlabel{##1}}
+  \def\pst@@@vlabel##1{\psvlabel{##1}}%
     \def\psvlabel##1{%
       \ifnum\psk@ytrigLabelBase<2 \def\de@nominator{\@ne}\else\def\de@nominator{\psk@ytrigLabelBase}\fi
       \def\pst@tempA{##1} 
@@ -1494,14 +1495,14 @@ D\space##1%
           \fi$%   
 	\else%
           \psk@ylabelFontSize%
-  	  \ifnum\pst@tempA<0 -\fi%
+  	  \ifnum\pst@tempA<0 -\fi
           \ifnum\pst@cnto=\@ne%                % #1 = trigLabelBase
             $\pi$%                             % print pi
-          \else%
+          \else
             \the\pst@cnto$\pi$%                % print \pst@cnto/\de@nominator pi
-          \fi%
-	\fi%
-      \else%
+          \fi
+	\fi
+      \else
 	\ifPst@ymathLabel%
           $\psk@ylabelFontSize
           \ifnum\pst@cntp=\@ne%                % < 1 pi?    $
@@ -1524,19 +1525,19 @@ D\space##1%
             \else\ifnum\pst@tempA=-1 $\frac{-\pi}{\de@nominator}$%
               \else \ifnum\pst@tempA=1 $\frac{\pi}{\de@nominator}$%
                 \else$\frac{\pst@tempA\pi}{\de@nominator}$% (x pi)/y
-            \fi\fi\fi%
-          \else%
+            \fi\fi\fi
+          \else
             \ifnum\pst@tempA=1 $\frac{\pi}{\de@nominator}$%
             \else\ifnum\pst@tempA=\de@nominator $\pi$%
               \else$\frac{\pst@tempA\pi}{\de@nominator}$% 
-          \fi\fi\fi%
-	\fi%
-      \fi%
+          \fi\fi\fi
+	\fi
+      \fi
     }%
 }%$
 %
 \def\setFractionvLabels{%
-  \def\pst@@@vlabel##1{\psvlabel{##1}}
+  \def\pst@@@vlabel##1{\psvlabel{##1}}%
   \def\psvlabel##1{%
       \ifnum\psk@yfractionLabelBase<2 \def\de@nominator{\@ne}\else\def\de@nominator{\psk@yfractionLabelBase}\fi
       \def\pst@tempA{##1}% 
@@ -2015,7 +2016,7 @@ D\space##1%
     \ifPst@xAxis
       \SpecialLabelsDonefalse
       \begingroup
-      \ifdim\pst@dimb=\z@\else\showoriginfalse\fi
+      \ifdim\pst@dimb=\z@\else\ifPst@xtrigLabels\else\showoriginfalse\fi\fi
       \ifnum\psk@dx=\z@
         \pst@dimg=\psk@Dx\psxunit
         \ifdim\pst@dimg<\p@ 
@@ -2032,7 +2033,7 @@ D\space##1%
     \ifPst@yAxis
       \SpecialLabelsDonefalse
       \begingroup
-      \ifdim\pst@dima=\z@ \else\showoriginfalse\fi
+      \ifdim\pst@dima=\z@ \else\ifPst@xtrigLabels\showoriginfalse\fi\fi
       \ifnum\psk@dy=\z@
         \pst@dimg=\psk@Dy\psyunit
         \ifdim\pst@dimg<\p@