pst-plot (23nov13)

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

4 files changed, 64 insertions, 31 deletions

diff --git a/Master/texmf-dist/doc/generic/pst-plot/Changes b/Master/texmf-dist/doc/generic/pst-plot/Changes
index f2bdebf1e0b..4a61d4bc1a2 100644
--- a/Master/texmf-dist/doc/generic/pst-plot/Changes
+++ b/Master/texmf-dist/doc/generic/pst-plot/Changes
@@ -1,4 +1,6 @@
 ----- pst-plot.tex
+1.56  2013-11-22  - deleted option quadrant and take coordinates
+                    into account for polar axes (x,phi)
 1.55  2013-11-21  - added option quadrant for polar axes
 1.54  2013-11-08  - support polarplot option for \pslistplot et al
 1.53  2013-11-05  - added \SpecialCoor for \psVectorfield
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 ffef1d78eee..b31d8adea0a 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 3dffb245d5c..a78c58456fa 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
@@ -1237,24 +1237,22 @@ There is a new axes style \Lkeyval{polar} which plots a  \Index{polar coordinate
 
 Syntax:
 \begin{lstlisting}[style=syntax]
-\psplot[axesstyle=polar](Rx,Ry)
-\psplot[axesstyle=polar](...)(Rx,Ry)
-\psplot[axesstyle=polar](...)(...)(Rx,Ry)
+\psplot[axesstyle=polar](Rx,Angle)
+\psplot[axesstyle=polar](...)(Rx,Angle)
+\psplot[axesstyle=polar](...)(...)(Rx,Angle)
 \end{lstlisting}
 
 
 Important is the fact, that only one pair of coordinates is taken into account for
-the radius. It is \emph{always} the last pair in a sequence of allowed coordinates
+the radius and the angle. It is \emph{always} the last pair in a sequence of allowed coordinates
 for the \Lcs{psaxes} macro. The other ones are ignored; they are not valid for the
-polar coordinate system.
-
-With the optional argument \Lkeyword{quadrant} the number of drawn quadrants can be defined.
-A valid number must be between 1 and 4. Counting always starts at 1.
+polar coordinate system. However, if the angle is set to 0 it is changed to 360 degrees for a 
+full circle. 
 
 \begin{LTXexample}[pos=r]
 \begin{pspicture}(-1,-1)(5.75,5.75)
-\psaxes[axesstyle=polar,subticks=2,
-   quadrant=1](5,5)
+\psaxes[axesstyle=polar,
+  subticks=2](5,90)
 \psline[linewidth=2pt]{->}(5;15)
 \psline[linewidth=2pt]{->}(2;40)
 \psline{->}(2;10)(4;85)
@@ -1262,25 +1260,54 @@ A valid number must be between 1 and 4. Counting always starts at 1.
 \end{LTXexample}
 
 
-\begin{LTXexample}[pos=b]
+All valid optional arguments for the axes are also possible for the polar style, if they make sense \ldots\ :-)
+Important are the \Lkeyword{Dy} option, it defines the angle interval and \Lkeyword{subticks}, for
+the intermediate circles and lines. The number can be different for the circles (\Lkeyword{ysubticks}) and the 
+lines (\Lkeyword{xsubticks}).
+
+
+
+\begin{LTXexample}[pos=r]
+\begin{pspicture}(-3,-1)(4.5,4.5)
+\psaxes[axesstyle=polar,
+   subticklinestyle=dashed, 
+   subticks=2,Dy=20](4,140)
+\psline[linewidth=2pt]{->}(4;15)
+\psline[linewidth=2pt]{->}(2;40)
+\psline{->}(2;10)(3;85)
+\end{pspicture}
+\end{LTXexample}
+
+
+\begin{lstlisting}
 \begin{pspicture}(-3.5,-3.5)(3.5,3.5)
-\psaxes[axesstyle=polar](3,3)
+\psaxes[axesstyle=polar](3,0)
 \psplot[polarplot,algebraic,linecolor=blue,linewidth=2pt,
     plotpoints=2000]{0}{TwoPi 4 mul}{2*(sin(x)-x)/(cos(x)+x)}
 \end{pspicture}
 %
 \begin{pspicture}(-3.5,-3.5)(3.5,3.5)
 \psaxes[axesstyle=polar,subticklinestyle=dashed,subticks=2,
-  labelFontSize=\scriptstyle](3,3)
+  labelFontSize=\scriptstyle](3,360)
 \psplot[polarplot,algebraic,linecolor=red,linewidth=2pt,
     plotpoints=2000]{0}{TwoPi}{6*sin(x)*cos(x)}
 \end{pspicture}
-\end{LTXexample}
+\end{lstlisting}
 
-All valid optional arguments for the axes are also possible for the polar style, if they make sense \ldots\ :-)
-Important are the \Lkeyword{Dy} option, it defines the angle interval and \Lkeyword{subticks}, for
-the intermediate circles and lines. The number can be different for the circles (\Lkeyword{ysubticks}) and the 
-lines (\Lkeyword{xsubticks}).
+%\begin{LTXexample}[pos=b]
+\begin{pspicture}(-3.5,-3.5)(3.5,3.5)
+\psaxes[axesstyle=polar](3,0)
+\psplot[polarplot,algebraic,linecolor=blue,linewidth=2pt,
+    plotpoints=2000]{0}{TwoPi 4 mul}{2*(sin(x)-x)/(cos(x)+x)}
+\end{pspicture}
+%
+\begin{pspicture}(-3.5,-3.5)(3.5,3.5)
+\psaxes[axesstyle=polar,subticklinestyle=dashed,subticks=2,
+  labelFontSize=\scriptstyle](3,360)
+\psplot[polarplot,algebraic,linecolor=red,linewidth=2pt,
+    plotpoints=2000]{0}{TwoPi}{6*sin(x)*cos(x)}
+\end{pspicture}
+%\end{LTXexample}
 
 
 
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 718777c2663..d3e473e8867 100644
--- a/Master/texmf-dist/tex/generic/pst-plot/pst-plot.tex
+++ b/Master/texmf-dist/tex/generic/pst-plot/pst-plot.tex
@@ -19,8 +19,8 @@
 \ifx\PSTFPloaded\endinput\else   \input pst-fp.tex  \fi
 \ifx\MultidoLoaded\endinput\else \input multido.tex \fi
 %
-\def\fileversion{1.55}
-\def\filedate{2013/11/21}
+\def\fileversion{1.56}
+\def\filedate{2013/11/22}
 \message{ v\fileversion, \filedate\space (tvz,hv)}
 %
 \edef\TheAtCode{\the\catcode`\@}
@@ -2051,22 +2051,24 @@ D\space##1%
   \fi%
 }
 %
-\def\psk@EndAngle{360}% be sure that it isn't undefined
-\define@key[psset]{pst-plot}{quadrant}[4]{%
-  \ifcase#1 \or
-    \def\psk@EndAngle{90}\or
-    \def\psk@EndAngle{180}\or
-    \def\psk@EndAngle{270}\else
-    \def\psk@EndAngle{360}%
-  \fi}
-\psset[pst-plot]{quadrant=4}
+%\def\psk@EndAngle{360}% be sure that it isn't undefined
+%\define@key[psset]{pst-plot}{quadrant}[4]{%
+%  \ifcase#1 \or
+%    \def\psk@EndAngle{90}\or
+%    \def\psk@EndAngle{180}\or
+%    \def\psk@EndAngle{270}\else
+%    \def\psk@EndAngle{360}%
+%  \fi}
+%\psset[pst-plot]{quadrant=4}
 
 \def\psxs@polar{% (rx,ry) % all other values are ignored
   \pst@killglue
   \begingroup
   \edef\pst@dimC{\strip@pt\pst@dimc}% 			RadiusX
   \pstFPDiv\pstR@dius{\pst@dimC}{\strip@pt\psxunit}%	in cm and as integer
-  \addbefore@par{Dy=30}%				for the angle step
+  \edef\pst@dimD{\strip@pt\pst@dimd}% 			RadiusX
+  \pstFPDiv\psk@EndAngle{\pst@dimD}{\strip@pt\psyunit}%	in cm and as integer
+  \ifnum\psk@EndAngle=0 \def\psk@EndAngle{360}\fi
   \use@keep@par
   \pstFPDiv\pstN@lpha{\psk@EndAngle}{\psk@Dy}% 			No. of (int) main lines
   \pstFPdiv\pstd@lpha{\psk@Dy}{\psk@ysubticks}% 	sub dAlpha
@@ -2099,10 +2101,12 @@ D\space##1%
   \Pst@xAxisfalse\Pst@yAxisfalse%
 }
 %
+\def\@polar{polar}
 \define@key[psset]{pst-plot}{axesstyle}[axes]{%
   \@ifundefined{psxs@#1}%
     {\@pstrickserr{Axes style `#1' not defined}\@eha}%
-    {\def\psk@axesstyle{#1}}}
+    {\def\psk@axesstyle{#1}%
+     \ifx\psk@axesstyle\@polar\psset{Dy=30}\fi}}
 \psset[pst-plot]{axesstyle=axes}
 \define@key[psset]{pst-plot}{xLabels}[]{\def\psk@xLabels{#1}}
 \define@key[psset]{pst-plot}{xLabelsRot}[0]{\pst@getangle{#1}\pst@xLabelsRot}