summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/generic/pst-plot
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2014-08-03 16:54:11 +0000
committerKarl Berry <karl@freefriends.org>2014-08-03 16:54:11 +0000
commit09802588a0720cc4857282650b590ec15f4bd5be (patch)
treeec749101aea607f2c746634df3381f2af21d5ef9 /Master/texmf-dist/tex/generic/pst-plot
parent9c48ca748960413acb3a2f49e5712ee0327cd0cd (diff)
pst-plot
git-svn-id: svn://tug.org/texlive/trunk@34812 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/generic/pst-plot')
-rw-r--r--Master/texmf-dist/tex/generic/pst-plot/pst-plot.tex38
-rw-r--r--Master/texmf-dist/tex/generic/pst-plot/pst-plot97.tex1
2 files changed, 23 insertions, 16 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 6da6f7eab16..f68a5473f94 100644
--- a/Master/texmf-dist/tex/generic/pst-plot/pst-plot.tex
+++ b/Master/texmf-dist/tex/generic/pst-plot/pst-plot.tex
@@ -1,10 +1,12 @@
+% $Id: pst-plot.tex 56 2014-07-30 07:34:07Z herbert $
+%%
%% BEGIN pst-plot.tex
%%
%% plotting functions and data with PSTricks.
%% See the betadoc documentation for usage.
%%
%% COPYRIGHT 1993, 1994, 1999 by Timothy Van Zandt, tvz@nwu.edu.
-%% COPYRIGHT 2009-2014 by Herbert Voss, hvoss@tug.org.
+%% COPYRIGHT 2009-2015 by Herbert Voss, hvoss@tug.org.
%%
%% This program can be redistributed and/or modified under the terms
%% of the LaTeX Project Public License Distributed from CTAN
@@ -20,8 +22,8 @@
\ifx\PSTFPloaded\endinput\else \input pst-fp.tex \fi
\ifx\MultidoLoaded\endinput\else \input multido.tex \fi
%
-\def\fileversion{1.64}
-\def\filedate{2014/07/07}
+\def\fileversion{1.66}
+\def\filedate{2014/07/30}
\message{ v\fileversion, \filedate\space (tvz,hv)}
%
\edef\TheAtCode{\the\catcode`\@}
@@ -1459,14 +1461,16 @@ D\space##1%
%% #4 : label
\def\psxTick{\pst@object{psxTick}}% idea by Martin Chicoine
\def\psxTick@i{\@ifnextchar({\psxTick@ii{0}}\psxTick@ii}
-\def\psxTick@ii#1(#2)#3{{
+\def\psxTick@ii#1(#2)#3{{%
\pst@killglue
\addbefore@par{arrows=-,linewidth=\psk@xtickwidth\pslinewidth}
\use@par
- \psline(#2, \pst@xticksizeB)(#2,\pst@xticksizeA)
+ \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
\rput[t]{#1}(! \psk@origin
#2 \pst@number\psxlabelsep \pst@number\pst@xticksizeB add
- \pst@number\psyunit div neg ){\pshlabel{#3\vphantom{1}}}}\ignorespaces}
+ \pst@number\psyunit div neg ){\pshlabel{#3\vphantom{1}}}%
+ }\ignorespaces}
%
%% #1 : optional arguments passed to psline
%% #2 : rotating angle
@@ -1474,23 +1478,25 @@ D\space##1%
%% #4 : label
\def\psyTick{\pst@object{psyTick}}% idea by Martin Chicoine
\def\psyTick@i{\@ifnextchar({\psyTick@ii{0}}\psyTick@ii}
-\def\psyTick@ii#1(#2)#3{{
+\def\psyTick@ii#1(#2)#3{{%
\pst@killglue
\addbefore@par{arrows=-,linewidth=\psk@ytickwidth\pslinewidth}
\use@par
- \psline(\pst@yticksizeB,#2)(\pst@yticksizeA,#2)
- \rput[r]{#1}(! \psk@origin
+ \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
+ \rput[r]{#1}(!\psk@origin
\pst@number\pst@yticksizeB \pst@number\psylabelsep add
\pst@number\psxunit div neg #2){\psvlabel{#3}}}\ignorespaces}
%
\def\psCoordinates{\pst@object{psCoordinates}}
\def\psCoordinates@i(#1){%
\pst@killglue%
- \begin@OpenObj
- \SpecialCoor%
- \psline(#1|0,0)(#1)\psline(#1)(0,0|#1)\psdot(#1)%
- \end@OpenObj%
- \ignorespaces%
+ \begingroup
+ \addbefore@par{showpoints}
+ \use@par
+ \psline(#1|0,0)(#1)\psline(#1)(0,0|#1)\ifshowpoints\psdot(#1)\fi%
+ \endgroup
+ \ignorespaces
}
%
\def\stripDecimals#1{\expandafter\@stripDecimals#1..\@nil}
@@ -2342,8 +2348,8 @@ D\space##1%
\pspicture(\pst@dimm,\pst@dimn)(\pst@dimo,\pst@dimp)\fi%
\let\psxunit\pst@xunit \let\psyunit\pst@yunit%
\ifdim\pst@xunit=\pst@yunit\relax\psset[pstricks]{runit=\pst@xunit}\fi%
- \bgroup%
- \use@par%
+ \bgroup
+ \use@par
\ifnum\psk@axespos=0
\psaxes(#1,#2)(#3,#4)%
\else
diff --git a/Master/texmf-dist/tex/generic/pst-plot/pst-plot97.tex b/Master/texmf-dist/tex/generic/pst-plot/pst-plot97.tex
index c72ea79624a..8129957f7b7 100644
--- a/Master/texmf-dist/tex/generic/pst-plot/pst-plot97.tex
+++ b/Master/texmf-dist/tex/generic/pst-plot/pst-plot97.tex
@@ -1,3 +1,4 @@
+% $Id: pst-plot97.tex 53 2014-07-26 18:41:20Z herbert $
%% BEGIN pst-plot.tex
\def\fileversion{0.93a-patch2}
\def\filedate{94/09/19}