diff options
author | Karl Berry <karl@freefriends.org> | 2014-07-12 22:23:23 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2014-07-12 22:23:23 +0000 |
commit | 5d9940c6941c28a159b8a7d961a53307dc43de95 (patch) | |
tree | 5030a7431a1e45b327b0404853a6daea07fefdb1 | |
parent | 59222c9505c42ce998b7dbef0b08077a2b0adc3c (diff) |
pst-plot (12jul14)
git-svn-id: svn://tug.org/texlive/trunk@34579 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r-- | Master/texmf-dist/doc/generic/pst-plot/Changes | 1 | ||||
-rw-r--r-- | Master/texmf-dist/doc/generic/pst-plot/pst-plot-doc.pdf | bin | 1255335 -> 1255874 bytes | |||
-rw-r--r-- | Master/texmf-dist/doc/generic/pst-plot/pst-plot-doc.tex | 3 | ||||
-rw-r--r-- | Master/texmf-dist/tex/generic/pst-plot/pst-plot.tex | 43 |
4 files changed, 36 insertions, 11 deletions
diff --git a/Master/texmf-dist/doc/generic/pst-plot/Changes b/Master/texmf-dist/doc/generic/pst-plot/Changes index 108a050c143..febbecec3d0 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.64 2014-07-09 - added axespos for psgraph environment 1.63 2014-06-24 - added x|y versions of mathLabel and labelFontSize 1.62 2014-05-12 - moved comma and decimalSeparator into pst-tools 1.61 2014-03-12 - allow plotstyle cspline (cubic splines) 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 Binary files differindex 43965293b2d..342ff2b0ad3 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 48af2274cc6..706429b8708 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 @@ -868,7 +868,8 @@ which is LowerLeft, UpperLeft, LowerRight, and UpperRight. The values have no di \Lkeyword{llx} & 0pt & trim for the lower left x\\ \Lkeyword{lly} & 0pt & trim for the lower left y\\ \Lkeyword{urx} & 0pt & trim for the upper right x\\ -\Lkeyword{ury} & 0pt & trim for the upper right y +\Lkeyword{ury} & 0pt & trim for the upper right y\\ +\Lkeyword{axespos} & bottom & draw axes first (bottom or last (top) \end{tabular} \end{center} 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*} |