pst-plot (23aug14)

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

5 files changed, 40 insertions, 35 deletions

diff --git a/Master/texmf-dist/doc/generic/pst-plot/Changes b/Master/texmf-dist/doc/generic/pst-plot/Changes
index a138420e059..dd596d6869f 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.70  2014-08-23  - added x|ytrigLabelBase 
 1.69  2014-08-17  - bugfix for \psgraph (arrows) 
 1.68  2014-08-04  - set trigLabels=false for \psx|yTick 
                     added documentation for options psgrid, gridpara and gridcoor
diff --git a/Master/texmf-dist/doc/generic/pst-plot/README-doc b/Master/texmf-dist/doc/generic/pst-plot/README-doc
deleted file mode 100644
index efdfe42fcfd..00000000000
--- a/Master/texmf-dist/doc/generic/pst-plot/README-doc
+++ /dev/null
@@ -1,3 +0,0 @@
-dtk02-1.pdf     : Die mathematischen Funktionen von PostScript
-dtk02-2.pdf     : Die Plotfunktionen von pst-plot
-tugboat01-4.pdf : The plot functions of pst-plot
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 762551a8fca..bb8cbaeabf1 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 edf562a3bc9..6a7e4d2b69c 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,4 +1,4 @@
-% $Id: pst-plot-doc.tex 64 2014-08-04 07:26:55Z herbert $
+% $Id: pst-plot-doc.tex 83 2014-08-23 15:04:57Z herbert $
 \documentclass[11pt,english,BCOR10mm,DIV12,bibliography=totoc,parskip=false,smallheadings
     headexclude,footexclude,oneside,dvipsnames,svgnames]{pst-doc}
 \listfiles
@@ -1191,6 +1191,7 @@ redefinition, then do it for \Lcs{pst@@@hlabel} and
 \Lkeyword{xtickcolor}       & color        & \Lkeyval{black}      & \pageref{tickcolor}\\
 \Lkeyword{xticksize}        & length \OptArg{length} & -4pt 4pt   & \pageref{ticksize}\\
 \Lkeyword{xtrigLabels}      & boolean      & \false               & \pageref{xtriglabels}\\
+\Lkeyword{xtrigLabelBase}    & integer      & 0                    & \pageref{triglabels}\\
 \Lkeyword{xyAxes}           & boolean      & \true                & \pageref{xyAxes}\\%ok
 \Lkeyword{xyDecimals}       & integer or empty & \{\}             & \pageref{xydecimals}\\%ok
 \Lkeyword{xylogBase}        & integer or empty & \{\}             & \pageref{xylogbase}\\
@@ -1222,11 +1223,12 @@ redefinition, then do it for \Lcs{pst@@@hlabel} and
                                            & \Lkeyval{solid}      &\pageref{ticklinestyle}\\
 \Lkeyword{yticksize}        & length \OptArg{length} & -4pt 4pt   & \pageref{ticksize}\\
 \Lkeyword{ytrigLabels}      & boolean      & \false               & \pageref{ytriglabels}\\
+\Lkeyword{ytrigLabelBase}    & integer      & 0                    & \pageref{triglabels}\\
 \end{longtable}
 }
 
 
-
+\clearpage
 
 %-------------------------------------------------------------------------------------------
 \subsection{Option \nxLkeyword{plotstyle} (Christoph Bersch)}\label{plotstyle}
@@ -1708,7 +1710,8 @@ behaviour.
 
 %--------------------------------------------------------------------------------------
 \subsection[Option \nxLkeyword{triglabels}]{Options \nxLkeyword{trigLabels},
-\nxLkeyword{xtrigLabels}, \nxLkeyword{ytrigLabels}, and \nxLkeyword{trigLabelBase} 
+\nxLkeyword{xtrigLabels}, \nxLkeyword{ytrigLabels}, \nxLkeyword{trigLabelBase}, \nxLkeyword{xtrigLabelBase}, 
+and \nxLkeyword{ytrigLabelBase} 
     for an axis with trigonmetrical units}\label{triglabels}
 %--------------------------------------------------------------------------------------
 With the option \Lkeyword{trigLabels}=\true\ \emph{only} the labels on the $x$ axis
@@ -2049,7 +2052,7 @@ is plotted from $0$ to $3\pi=9.424777961$.
 
 \psset{unit=1cm,trigLabels=false}
 
-The setting of trigonometrical labels with \Lkeyword{ytriglabels}=\true 
+The setting of trigonometrical labels with \Lkeyword{ytriglabels}=\true\
 for the $y$ axis is the same as for the $x$ axis.
 \label{xtriglabels}\label{ytriglabels}
 \begin{center}
@@ -2068,22 +2071,22 @@ for the $y$ axis is the same as for the $x$ axis.
 \end{pspicture} 
 \end{lstlisting}
 
-Also setting labels for the $x$ axis is possible with \Lkeyword{trigLabels}=\true
+Also setting labels for the $x$ axis is possible with \Lkeyword{trigLabels}=\true\ 
 or alternatively with \Lkeyword{ytrigLabels}=\true.
 
 \begin{center}
 \psset{unit=1cm}
 \begin{pspicture}(-6.5,-7)(6.5,7.5)
-\psaxes[trigLabelBase=2,dx=\psPiH,xunit=\psPi,xtrigLabels,ytrigLabels]
-  {->}(0,0)(-1.7,-6.5)(1.77,6.5)[$x$,0][$y$,90]
+\psaxes[trigLabels,xtrigLabelBase=2,ytrigLabelBase=3,dx=\psPiH,
+   xunit=\psPi,Dy=2]{->}(0,0)(-1.7,-6.5)(1.77,6.5)[$x$,0][$y$,90]
 \end{pspicture} 
 \end{center}
 
 \begin{lstlisting}
 \psset{unit=1cm}
 \begin{pspicture}(-6.5,-7)(6.5,7.5)
-\psaxes[trigLabelBase=2,dx=\psPiH,xunit=\psPi,xtrigLabels,ytrigLabels]
-  {->}(0,0)(-1.7,-6.5)(1.77,6.5)[$x$,0][$y$,90]
+\psaxes[trigLabels,xtrigLabelBase=2,ytrigLabelBase=3,dx=\psPiH,
+   xunit=\psPi,Dy=2]{->}(0,0)(-1.7,-6.5)(1.77,6.5)[$x$,0][$y$,90]
 \end{pspicture} 
 \end{lstlisting}
 
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 ce0d589e60b..d248c402a95 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 69 2014-08-17 20:35:59Z herbert $
+% $Id: pst-plot.tex 83 2014-08-23 15:04:57Z herbert $
 %%
 %% BEGIN pst-plot.tex
 %%
@@ -22,8 +22,8 @@
 \ifx\PSTFPloaded\endinput\else   \input pst-fp.tex  \fi
 \ifx\MultidoLoaded\endinput\else \input multido.tex \fi
 %
-\def\fileversion{1.69}
-\def\filedate{2014/08/17}
+\def\fileversion{1.70}
+\def\filedate{2014/08/23}
 \message{ v\fileversion, \filedate\space (tvz,hv)}
 %
 \edef\TheAtCode{\the\catcode`\@}
@@ -1257,21 +1257,25 @@ D\space##1%
 \define@key[psset]{pst-plot}{xylogBase}[{}]{\def\psk@xlogBase{#1}\def\psk@ylogBase{#1}}%
 \psset[pst-plot]{xylogBase={}}%
 %
-\define@key[psset]{pst-plot}{trigLabelBase}[0]{\pst@getint{#1}{\psk@trigLabelBase}}
+\define@key[psset]{pst-plot}{trigLabelBase}[0]{\pst@getint{#1}{\psk@xtrigLabelBase}\let\psk@ytrigLabelBase\psk@xtrigLabelBase}
+\define@key[psset]{pst-plot}{xtrigLabelBase}[0]{%
+  \pst@getint{#1}{\psk@xtrigLabelBase}\psset{xtrigLabels}}
+\define@key[psset]{pst-plot}{ytrigLabelBase}[0]{%
+  \pst@getint{#1}{\psk@ytrigLabelBase}\psset{ytrigLabels}}
 \psset[pst-plot]{trigLabelBase=0}
 %
 \define@boolkey[psset]{pst-plot}[Pst@]{xtrigLabels}[true]{%
   \ifPst@xtrigLabels
     \def\pst@@@hlabel##1{\pshlabel{##1}}
     \def\pshlabel##1{%
-      \ifnum\psk@trigLabelBase<2
-        \def\de@nominator{\@ne}\else\def\de@nominator{\psk@trigLabelBase}\fi
-      \def\pst@tempA{##1} 
+      \ifnum\psk@xtrigLabelBase<2
+        \def\de@nominator{\@ne}\else\def\de@nominator{\psk@xtrigLabelBase}\fi
+      \def\pst@tempA{##1}% 
       \pst@abs{\pst@tempA}\pst@cntm 
       \pst@mod{\pst@cntm}{\de@nominator}\pst@cntp % cntb=##1 modulo trigLabelBase
       \ifnum\@ne>\pst@cntp                  % 1 > modulo -> then we have pi/x
         \pst@cnto=\pst@cntm \divide\pst@cnto by \de@nominator  
-	\ifPst@xmathLabel%
+	\ifPst@xmathLabel
           $\psk@xlabelFontSize
   	  \ifnum\pst@tempA<0 -\fi
           \ifnum\pst@cnto=\@ne                % #1 = trigLabelBase
@@ -1280,8 +1284,8 @@ D\space##1%
             \the\pst@cnto\pi 	              % print \pst@cnto/\de@nominator pi
           \fi$%   
 	\else%
-          \psk@xlabelFontSize%
-  	  \ifnum\pst@tempA<0 -\fi%
+          \psk@xlabelFontSize
+  	  \ifnum\pst@tempA<0 -\fi
           \ifnum\pst@cnto=\@ne%                % #1 = trigLabelBase
             $\pi$%                             % print pi
           \else%
@@ -1345,8 +1349,8 @@ D\space##1%
   \ifPst@ytrigLabels
     \def\pst@@@vlabel##1{\psvlabel{##1}}
     \def\psvlabel##1{%
-      \ifnum\psk@trigLabelBase<2
-        \def\de@nominator{\@ne}\else\def\de@nominator{\psk@trigLabelBase}\fi
+      \ifnum\psk@ytrigLabelBase<2
+        \def\de@nominator{\@ne}\else\def\de@nominator{\psk@ytrigLabelBase}\fi
       \def\pst@tempA{##1} 
       \pst@abs{\pst@tempA}\pst@cntm 
       \pst@mod{\pst@cntm}{\de@nominator}\pst@cntp % cntb=##1 modulo trigLabelBase
@@ -1795,13 +1799,13 @@ D\space##1%
     \pst@vlabels{\pst@dimd}{\psk@arrowB}{#3}{#5}%
     \ifPst@xAxis\ifdim\pst@dima<\z@\showoriginfalse\fi\fi% no 0 when x- axis is crossing
     \pst@vlabels{\pst@dimb}{\psk@arrowA}{#3}{#5}%
-  \endgroup%
-  \fi%
-  \ifPst@xAxis%
-  \begingroup%
-    \ifdim\pst@dimb=\z@\else\showoriginfalse\fi%
-    \ifnum\psk@dx=\z@%
-      \pst@dimg=\psk@Dx\psxunit%
+  \endgroup
+  \fi
+  \ifPst@xAxis
+  \begingroup
+    \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\pst@cnta}% v.1.21
       \fi% v.1.21
       \edef\psk@dx{\number\pst@dimg}%
@@ -2174,11 +2178,11 @@ D\space##1%
   \fi%
  \else
   \pst@cnta=#1\relax%                % Distance (in sp) to end.
-  \pstFPdiv\pst@tempA{\the\pst@cnta}{\psk@dx}
-  \pstFPadd\pst@tempA{1.55}{\pst@tempA}   % to prevent rounding errors
-  \edef\pst@tempB{\pst@int{\pst@tempA}}
+  \pstFPdiv\pst@tempA{\the\pst@cnta}{\psk@dx}%
+  \pstFPadd\pst@tempA{1.55}{\pst@tempA}%   % to prevent rounding errors
+  \edef\pst@tempB{\pst@int{\pst@tempA}}%
 %  \divide\pst@cnta\psk@dx\relax%     % Number of ticks/labels
-  \edef\pst@tempA{\psk@Dx}
+  \edef\pst@tempA{\psk@Dx}%
   \multido{\iB=#3+1,\rB=#3+\pst@tempA}{\pst@tempB}%
     {\uput{\psxlabelsep}[-90]{\pst@xLabelsRot}(\rB,0)%\psxlabelsep)
     {\strut\pshlabel{\psPutXLabel{\iB}}}}%