pst-plot (4aug14)

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

1 files changed, 24 insertions, 19 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 f68a5473f94..d38596eddc2 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 56 2014-07-30 07:34:07Z herbert $
+% $Id: pst-plot.tex 64 2014-08-04 07:26:55Z 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.66}
-\def\filedate{2014/07/30}
+\def\fileversion{1.68}
+\def\filedate{2014/08/04}
 \message{ v\fileversion, \filedate\space (tvz,hv)}
 %
 \edef\TheAtCode{\the\catcode`\@}
@@ -1464,6 +1464,7 @@ D\space##1%
 \def\psxTick@ii#1(#2)#3{{%
   \pst@killglue
   \addbefore@par{arrows=-,linewidth=\psk@xtickwidth\pslinewidth}
+  \ifPst@xtrigLabels\addto@par{xtrigLabels=false}\fi 
   \use@par
   \edef\temp@coor{(!#2 \pst@number\pst@xticksizeB \pst@number\psyunit div)(!#2 \pst@number\pst@xticksizeA \pst@number\psyunit div)}%
   \expandafter\psline\temp@coor
@@ -1481,6 +1482,7 @@ D\space##1%
 \def\psyTick@ii#1(#2)#3{{%
   \pst@killglue
   \addbefore@par{arrows=-,linewidth=\psk@ytickwidth\pslinewidth}
+  \ifPst@ytrigLabels\addto@par{ytrigLabels=false}\fi
   \use@par
   \edef\temp@coor{(!\pst@number\pst@yticksizeB \pst@number\psxunit div #2)(!\pst@number\pst@yticksizeA \pst@number\psxunit div #2)}%
   \expandafter\psline\temp@coor
@@ -1749,6 +1751,7 @@ D\space##1%
   \begingroup%
   \SpecialCoor
   \use@par
+  \ifshowgrid\psgrid[style=gridstyleA]\fi
   \uput{\psxlabelsep}[#5](#3|#1){#4}\uput{\psylabelsep}[#7](#1|#3){#6}%
   \endgroup%
   \ignorespaces}
@@ -1762,6 +1765,7 @@ D\space##1%
     \addbefore@par{xlabelPos=top,ylabelPos=right}\fi\fi%
   \setbox\pst@hbox=\hbox\bgroup%
   \use@par%	now the same with an optional unit=... in par
+  \ifshowgrid\psgrid[style=gridstyleA]\fi
   \pssetxlength\pst@dimg{#1}% o-x
   \pssetylength\pst@dimh{#2}% o-y
   \pssetxlength\pst@dima{#3}% ll-x
@@ -2280,7 +2284,8 @@ D\space##1%
 \define@boolkey[psset]{pst-plot}[Pst@]{psgrid}[true]{}
 \define@key[psset]{pst-plot}{gridpara}[{}]{\def\psk@gridpara{#1}}
 \define@key[psset]{pst-plot}{gridcoor}[\relax]{\def\psk@gridcoor{#1}}
-\psset[pst-plot]{psgrid=false,gridpara={},gridcoor=\relax}
+\psset[pst-plot]{psgrid=false,gridpara={gridlabels=0pt,gridcolor=red!30,subgridcolor=green!30,subgridwidth=0.5\pslinewidth,
+  subgriddiv=5},gridcoor=\relax}
 %
 \define@key[psset]{pst-plot}{axespos}[bottom]{\pst@expandafter\psset@@axespos{#1}\@nil}
 \def\psset@@axespos#1#2\@nil{%
@@ -2318,14 +2323,10 @@ D\space##1%
 % minX | minY | maxX | maxY | Length x-axis | length y-axis%  
   \pst@killglue%
   \let\psgraph@para\pst@par
-  \begingroup%
-  \bgroup%
-  \use@keep@par%
-  \ifPst@psgrid%
-     \expandafter\psset\expandafter{\psk@gridpara}%
-      \rput(0,0){\expandafter\psgrid\psk@gridcoor}  
-  \fi%
-  \egroup%
+  \begingroup
+%  \bgroup
+  \use@keep@par
+%  \egroup%
   \pstFPsub\pst@tempA{#3}{#1}%
   \pst@dimm=#5%
   \pst@dimo=\pst@tempA pt%
@@ -2350,6 +2351,10 @@ D\space##1%
   \ifdim\pst@xunit=\pst@yunit\relax\psset[pstricks]{runit=\pst@xunit}\fi%
   \bgroup
     \use@par
+  \ifPst@psgrid
+     \expandafter\psset\expandafter{\psk@gridpara}%
+      \rput[lb](0,0){\expandafter\psgrid\psk@gridcoor}  
+  \fi
     \ifnum\psk@axespos=0
       \psaxes(#1,#2)(#3,#4)%
     \else
@@ -2363,13 +2368,9 @@ D\space##1%
   \pst@killglue%
   \let\psgraph@para\pst@par
   \begingroup%
-  \bgroup%
-  \use@keep@par%
-  \ifPst@psgrid%
-     \expandafter\psset\expandafter{\psk@gridpara}%
-      \rput(0,0){\expandafter\psgrid\psk@gridcoor}
-  \fi%
-  \egroup%
+%  \bgroup%
+  \use@keep@par
+%  \egroup%
   \pstFPsub\pst@tempA{#5}{#3}%
   \pst@dimm=#7%
   \pst@dimo=\pst@tempA pt%
@@ -2393,6 +2394,10 @@ D\space##1%
   \ifdim\pst@xunit=\pst@yunit \psset[pstricks]{runit=\pst@xunit}\fi%
   \bgroup%
     \use@par%
+  \ifPst@psgrid
+     \expandafter\psset\expandafter{\psk@gridpara}%
+      \rput[lb](0,0){\expandafter\psgrid\psk@gridcoor}
+  \fi%
     \ifnum\psk@axespos=0
       \psaxes(#1,#2)(#3,#4)(#5,#6)%
     \else