pst-plot (12jul14)

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

1 files changed, 33 insertions, 10 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 1a9e012a327..6da6f7eab16 100644
--- a/Master/texmf-dist/tex/generic/pst-plot/pst-plot.tex
+++ b/Master/texmf-dist/tex/generic/pst-plot/pst-plot.tex
@@ -20,8 +20,8 @@
 \ifx\PSTFPloaded\endinput\else   \input pst-fp.tex  \fi
 \ifx\MultidoLoaded\endinput\else \input multido.tex \fi
 %
-\def\fileversion{1.63}
-\def\filedate{2014/06/24}
+\def\fileversion{1.64}
+\def\filedate{2014/07/07}
 \message{ v\fileversion, \filedate\space (tvz,hv)}
 %
 \edef\TheAtCode{\the\catcode`\@}
@@ -2276,6 +2276,14 @@ D\space##1%
 \define@key[psset]{pst-plot}{gridcoor}[\relax]{\def\psk@gridcoor{#1}}
 \psset[pst-plot]{psgrid=false,gridpara={},gridcoor=\relax}
 %
+\define@key[psset]{pst-plot}{axespos}[bottom]{\pst@expandafter\psset@@axespos{#1}\@nil}
+\def\psset@@axespos#1#2\@nil{%
+  \ifx#1b\let\psk@axespos\z@\else		% 0=b)bottom
+    \ifx#1t\let\psk@axespos\@ne			% 1=t)op
+      \else\@pstrickserr{Bad axes position: `#1#2'}\@ehpa
+  \fi\fi}
+\psset[pst-plot]{axespos=b}
+%
 \newdimen\pst@xunit
 \newdimen\pst@yunit
 %
@@ -2303,6 +2311,7 @@ D\space##1%
 \def\psgraph@iv(#1,#2)(#3,#4)#5#6{%  no special origin defined
 % minX | minY | maxX | maxY | Length x-axis | length y-axis%  
   \pst@killglue%
+  \let\psgraph@para\pst@par
   \begingroup%
   \bgroup%
   \use@keep@par%
@@ -2334,14 +2343,19 @@ D\space##1%
   \let\psxunit\pst@xunit \let\psyunit\pst@yunit%
   \ifdim\pst@xunit=\pst@yunit\relax\psset[pstricks]{runit=\pst@xunit}\fi%
   \bgroup%
-  \use@par%
-  \psaxes(#1,#2)(#3,#4)%
-  \egroup%
+    \use@par%
+    \ifnum\psk@axespos=0
+      \psaxes(#1,#2)(#3,#4)%
+    \else
+      \xdef\psgraph@coor{(#1,#2)(#3,#4)(#5,#6)}%
+    \fi
+  \egroup
   \psgraph@vi(#1,#2)(#1,#2)(#3,#4)%
 }
 \def\psgraph@v(#1,#2)(#3,#4)(#5,#6)#7#8{%  with special origin
 % Xorig | yorig | minX | minY | maxX | maxY | Length x-axis | length y-axis%  
   \pst@killglue%
+  \let\psgraph@para\pst@par
   \begingroup%
   \bgroup%
   \use@keep@par%
@@ -2372,9 +2386,13 @@ D\space##1%
   \psset[pstricks]{xunit=\pst@xunit,yunit=\pst@yunit}
   \ifdim\pst@xunit=\pst@yunit \psset[pstricks]{runit=\pst@xunit}\fi%
   \bgroup%
-  \use@par%
-  \psaxes(#1,#2)(#3,#4)(#5,#6)%
-  \egroup%
+    \use@par%
+    \ifnum\psk@axespos=0
+      \psaxes(#1,#2)(#3,#4)(#5,#6)%
+    \else
+      \xdef\psgraph@coor{(#1,#2)(#3,#4)(#5,#6)}%
+    \fi
+  \egroup
   \psgraph@vi(#1,#2)(#3,#4)(#5,#6)%
 }
 %
@@ -2427,8 +2445,13 @@ D\space##1%
 %
 \def\endpsgraph{%
 %  \pst@killglue%
-  \ifx\relax\pslegend@text\relax \else\pslegend@iii[\pslegend@ref](!\pslegend@coor)\fi%
-  \endpspicture%
+  \ifx\relax\pslegend@text\relax \else\pslegend@iii[\pslegend@ref](!\pslegend@coor)\fi
+  \expandafter\psset\expandafter{\psgraph@para}%
+  \ifnum\psk@axespos>0
+    \typeout{\psgraph@para}%
+    \expandafter\psaxes\psgraph@coor
+  \fi
+  \endpspicture
   \endgroup\ignorespaces}
 %
 \@namedef{psgraph*}{\psgraph*}