pst-plot 1.14 (24apr10)

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

1 files changed, 19 insertions, 14 deletions

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 2ec81a98c09..7376d0df1e4 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 287 2010-02-11 13:36:38Z herbert $
+% $Id: pst-plot.tex 305 2010-04-24 06:53:47Z herbert $
 %% BEGIN pst-plot.tex
 %%
 %% plotting functions and data with PSTricks.
@@ -20,8 +20,8 @@
 \ifx\PSTFPloaded\endinput\else   \input pst-fp.tex  \fi
 \ifx\MultidoLoaded\endinput\else \input multido.tex \fi
 %
-\def\fileversion{1.13}
-\def\filedate{2010/04/15}
+\def\fileversion{1.14}
+\def\filedate{2010/04/24}
 \message{ v\fileversion, \filedate}
 %
 \edef\TheAtCode{\the\catcode`\@}
@@ -681,7 +681,7 @@ D\space##1%
 %
 % \psplot
 % D.G. addition - Jun.  9, 1998 - Polar plots using the \psplot macro
-% Code added according the way suggested by Ulrich Dirr <udirr@das-team.com>
+% Code added according the way suggested by Ulrich Dirr
 % For polar plots
 \define@boolkey[psset]{pst-plot}[Pst@]{polarplot}[true]{}
 \define@boolkey[psset]{pst-plot}[Pst@]{VarStep}[true]{}
@@ -954,19 +954,19 @@ D\space##1%
 %
 \define@key[psset]{pst-plot}{tickstyle}[full]{\pst@expandafter\psset@@tickstyle{#1}\@nil}
 \def\psset@@tickstyle#1#2\@nil{%
-  \ifx#1f\let\psk@tickstyle\z@\else
-    \ifx#1t\let\psk@tickstyle\@ne\else
-      \ifx#1b\let\psk@tickstyle\m@ne\else
+  \ifx#1f\let\psk@tickstyle\z@\else%			0=f)ull
+    \ifx#1t\let\psk@tickstyle\@ne\else%			1=t)op
+      \ifx#1b\let\psk@tickstyle\m@ne\else%		2=b)ottom
         \@pstrickserr{Bad tick style: `#1#2'}\@ehpa
   \fi\fi\fi}
 \psset[pst-plot]{tickstyle=full}
 %
 \define@key[psset]{pst-plot}{ticks}[all]{\pst@expandafter\psset@@ticks{#1}\@nil\psk@ticks}
 \def\psset@@ticks#1#2\@nil#3{%
-  \ifx#1a\let#3\z@\else
-    \ifx#1x\let#3\@ne\else
-      \ifx#1y\let#3\tw@\else
-        \ifx#1n\let#3\thr@@\else
+  \ifx#1a\let#3\z@\else%				0=a)ll
+    \ifx#1x\let#3\@ne\else%				1=x
+      \ifx#1y\let#3\tw@\else%				2=y
+        \ifx#1n\let#3\thr@@\else%			3=n)one
           \@pstrickserr{Bad argument: `#1#2'}\@ehpa
   \fi\fi\fi\fi}
 \psset[pst-plot]{ticks=all}
@@ -1843,7 +1843,7 @@ D\space##1%
   \pst@killglue
   \begingroup
   \edef\pst@dimC{\strip@pt\pst@dimc}% 			RadiusX
-  \pstFPDiv\pstR@dius{\pst@dimC}{\strip@pt\psxunit}%		in cm and as int
+  \pstFPDiv\pstR@dius{\pst@dimC}{\strip@pt\psxunit}%	in cm and as integer
   \addbefore@par{Dy=30}%				for the angle step
   \use@keep@par
   \pstFPDiv\pstN@lpha{360}{\psk@Dy}% 			No of (int) main lines
@@ -1855,7 +1855,9 @@ D\space##1%
       linecolor=\psk@xsubtickcolor,linewidth=\psk@xsubtickwidth pt]{\rA}}    
     \pscircle[linestyle=\psxticklinestyle,linecolor=\psk@xtickcolor,
 		linewidth=\psk@xtickwidth pt]{\iA}%
-    \uput[-45](\iB,0){\pshlabel{\iB}}\uput[45](0,\iB){\pshlabel{\iB}}%
+    \ifnum\psk@labels<2\relax% is all or x (0,1)
+      \uput[-45](\iB,0){\pshlabel{\iB}}\uput[45](0,\iB){\pshlabel{\iB}}%
+    \fi%
   }%
 %  \uput[-45](\pstR@dius,0){\pstR@dius}\uput[45](0,\pstR@dius){\pstR@dius}%
   \pst@cntm=\psk@ysubticks\advance\pst@cntm by \m@ne
@@ -1864,7 +1866,10 @@ D\space##1%
       linecolor=\psk@ysubtickcolor,linewidth=\psk@ysubtickwidth pt](\pstR@dius;\rA)} 
     \psline[linestyle=\psyticklinestyle,
       linecolor=\psk@ytickcolor,linewidth=\psk@ytickwidth pt](\pstR@dius;\iA)%
-    \uput[\iA](\pstR@dius;\iA){\psvlabel{\iA}}}
+    \ifodd\psk@labels\else% is all or y (0,3)
+      \uput[\iA](\pstR@dius;\iA){\psvlabel{\iA}}%
+    \fi%
+  }
   \endgroup\ignorespaces%
   \Pst@xAxisfalse\Pst@yAxisfalse%
 }