diff options
Diffstat (limited to 'Master/texmf-dist/tex')
| -rw-r--r-- | Master/texmf-dist/tex/generic/pst-plot/pst-plot.tex | 47 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/latex/pst-plot/pst-plot.sty | 30 |
2 files changed, 56 insertions, 21 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 7e5ef72f8d2..b506876b75f 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 484 2011-04-13 13:07:33Z herbert $ +% $Id: pst-plot.tex 541 2011-07-20 16:38:34Z 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.29} -\def\filedate{2011/04/13} +\def\fileversion{1.30} +\def\filedate{2011/07/20} \message{ v\fileversion, \filedate\space (tvz,hv)} % \edef\TheAtCode{\the\catcode`\@} @@ -530,6 +530,13 @@ D\space##1% \define@key[psset]{pst-plot}{decimals}[-1]{\pst@getint{#1}\psk@decimals } \psset[pst-plot]{PSfont=Times-Roman,fontscale=10,valuewidth=10,decimals=-1} % +\newdimen\psxlabelsep +\newdimen\psylabelsep +\define@key[psset]{pst-plot}{xlabelsep}[5pt]{\pssetlength\psxlabelsep{#1}} +\define@key[psset]{pst-plot}{ylabelsep}[5pt]{\pssetlength\psylabelsep{#1}} +\psset[pst-plot]{xlabelsep=5pt,ylabelsep=5pt} + +% \newif\ifPst@valuesStar\Pst@valuesStarfalse \newif\ifPst@xvalues\Pst@xvaluesfalse % @@ -1320,7 +1327,7 @@ D\space##1% \use@par \psline(#2, \pst@xticksizeB)(#2,\pst@xticksizeA) \rput[t]{#1}(! \psk@origin - #2 \pst@number\pslabelsep \pst@number\pst@xticksizeB add + #2 \pst@number\psxlabelsep \pst@number\pst@xticksizeB add \pst@number\psyunit div neg ){\pshlabel{#3\vphantom{1}}}}\ignorespaces} % %% #1 : optional arguments passed to psline @@ -1335,7 +1342,7 @@ D\space##1% \use@par \psline(\pst@yticksizeB,#2)(\pst@yticksizeA,#2) \rput[r]{#1}(! \psk@origin - \pst@number\pst@yticksizeB \pst@number\pslabelsep add + \pst@number\pst@yticksizeB \pst@number\psylabelsep add \pst@number\psxunit div neg #2){\psvlabel{#3}}}\ignorespaces} % \def\psCoordinates{\pst@object{psCoordinates}} @@ -1594,7 +1601,7 @@ D\space##1% \psaxes@vii(#1)(#2)(#3)% \begingroup% \use@par% - \uput{\pslabelsep}[#5](#3|#1){#4}\uput{\pslabelsep}[#7](#1|#3){#6}% + \uput{\psxlabelsep}[#5](#3|#1){#4}\uput{\psylabelsep}[#7](#1|#3){#6}% \endgroup% \ignorespaces} % @@ -1681,7 +1688,7 @@ D\space##1% \fi% \fi% \let\pst@linetype\pst@arrowtype% - \def\pst@tempA{axes}% + \def\pst@axes{axes}% \pst@addarrowdef% \addto@pscode{ /showOrigin \ifPst@showOriginTick true \else false \fi def % ticks for 0/0 ? @@ -1690,17 +1697,17 @@ D\space##1% ArrowA CP 4 2 roll ArrowB + 2 copy /yEnd exch def /xEnd exch def - xEnd yEnd - \ifx\psk@axesstyle\pst@tempA + \ifx\psk@axesstyle\pst@axes L % the line with arrows + \@nameuse{psls@\pslinestyle} % linestyle for the axes + stroke % draw the main line \else pop pop % axesstyle = none (only ticks) or frame (already drawn) \fi /yStart exch def /xStart exch def - \@nameuse{psls@\pslinestyle} % linestyle for the axes - stroke % draw the main line % \psk@ticks: all=0; x=1; y=2; none=3 \number\psk@ticks\space dup 2 mod 0 eq \ifis@yAxis true \else false \fi and exch 2 lt \ifis@yAxis false \else true \fi and or { @@ -1985,7 +1992,7 @@ D\space##1% \else \pst@cnta=#1\relax% % Distance (in sp) to end. \divide\pst@cnta\psk@dx\relax% % Number of ticks/labels - \multido{\nA=#3+1}{\pst@cnta}{\uput{\pslabelsep}[-90]{\pst@xLabelsRot}(\nA,\pslabelsep){\psPutXLabel{\nA}}}% + \multido{\nA=#3+1}{\pst@cnta}{\uput{\psxlabelsep}[-90]{\pst@xLabelsRot}(\nA,\psxlabelsep){\psPutXLabel{\nA}}}% \fi% } % Knows \pst@dimb and \pst@cnta @@ -1993,9 +2000,9 @@ D\space##1% \psDEBUG[pst@@hlabels]{xticksizeC=\the\pst@xticksizeC}% \setbox\z@=\vbox{% save all in a box \ifcase\psk@xlabelPos - \vskip-\pst@xticksizeA\vskip\pslabelsep\or + \vskip-\pst@xticksizeA\vskip\psxlabelsep\or \vskip-1ex\vskip-\pslabelsep\or - \vskip-\pst@xticksizeB\vskip-\pslabelsep\vskip-1ex + \vskip-\pst@xticksizeB\vskip-\psxlabelsep\vskip-1ex \fi \ifnum\pst@cnta<\z@ \pst@dimb=-\pst@dimb\fi \hbox to\z@{% @@ -2027,7 +2034,7 @@ D\space##1% \else% \pst@cnta=#1\relax% % % Distance (in sp) to end. \divide\pst@cnta\psk@dy\relax% % Number of ticks/labels - \multido{\nA=#3+1}{\the\pst@cnta}{\uput{\pslabelsep}[180]{\pst@yLabelsRot}(\pslabelsep,\nA){\psPutYLabel{\nA}}}% + \multido{\nA=#3+1}{\the\pst@cnta}{\uput{\psylabelsep}[180]{\pst@yLabelsRot}(\psylabelsep,\nA){\psPutYLabel{\nA}}}% \fi% } % \pst@dima: the width between two labels in pt @@ -2043,9 +2050,9 @@ D\space##1% \ifshoworigin% \vbox to \z@{\vss\hbox to\z@{% \ifcase\psk@ylabelPos% - \hss\pst@@@vlabel{\psk@Oy}\hskip\pslabelsep\hskip-\pst@yticksizeA\or% + \hss\pst@@@vlabel{\psk@Oy}\hskip\psylabelsep\hskip-\pst@yticksizeA\or% \hskip\pslabelsep\hss\pst@@@vlabel{\psk@Oy}\hss\or % right labels - \hskip\pst@yticksizeB\hskip\pslabelsep\pst@@@vlabel{\psk@Oy}% + \hskip\pst@yticksizeB\hskip\psylabelsep\pst@@@vlabel{\psk@Oy}% \fi}\vss}% \fi% \mmultido{\nA=\psk@Oy+\psk@Dy}{\pst@cnta}{% @@ -2054,10 +2061,10 @@ D\space##1% \vss\hbox to\z@{% \ifcase\psk@ylabelPos% and also check for -0 \hss\ifdim\nA pt=\z@ \pst@@@vlabel{0}\else\pst@@@vlabel{\nA}\fi% - \hskip\pslabelsep\hskip-\pst@yticksizeA\or% top + \hskip\psylabelsep\hskip-\pst@yticksizeA\or% top \hss\ifdim\nA pt=\z@\pst@@@vlabel{0}\else\pst@@@vlabel{\nA}\fi% - \ifdim\pslabelsep=\z@\hss\else\kern-\pslabelsep\fi\or% axis - \hskip\pst@yticksizeB\hskip\pslabelsep% + \ifdim\psylabelsep=\z@\hss\else\kern-\psylabelsep\fi\or% axis + \hskip\pst@yticksizeB\hskip\psylabelsep% \ifdim\nA pt=\z@\pst@@@vlabel{0}\else\pst@@@vlabel{\nA}\fi% bottom \fi}\vss}% }\vss}% diff --git a/Master/texmf-dist/tex/latex/pst-plot/pst-plot.sty b/Master/texmf-dist/tex/latex/pst-plot/pst-plot.sty index 8113c9ff340..e515363d30d 100644 --- a/Master/texmf-dist/tex/latex/pst-plot/pst-plot.sty +++ b/Master/texmf-dist/tex/latex/pst-plot/pst-plot.sty @@ -1,4 +1,31 @@ -% $Id: pst-plot.sty 485 2011-04-13 13:09:14Z herbert $ +% $Id: pst-plot.sty 541 2011-07-20 16:38:34Z herbert $ +%% +%% This is file `pst-plot.sty'. +%% +%% IMPORTANT NOTICE: +%% +%% pst-plot.sty Copyright (C) 2004-2011 Herbert Voss <hvoss@tug.org> +%% +%% This package may be distributed under the terms of the LaTeX Project +%% Public License, as described in lppl.txt in the base LaTeX distribution. +%% Either version 1.0 or, at your option, any later version. +%% +%NeedsTeXFormat{LaTeX2e} + +\ProvidesPackage{pst-plot} + [2011/06/05 v1.00 LaTeX wrapper for `pst-plot' (HV)] +% +\newif\ifpst@OldVersion\pst@OldVersionfalse +\DeclareOption{97}{\pst@OldVersiontrue} +\ProcessOptions\relax +% +\ifpst@OldVersion +\RequirePackage[97]{pstricks} +\ProvidesPackage{pst-plot}[1993/03/12 package wrapper for pst-plot.tex] +\input{pst-plot97.tex} +\ProvidesFile{pst-plot.tex} + [\filedate\space \fileversion\space `pst-plot' (tvz)] +\else \RequirePackage{pstricks} \RequirePackage{pst-xkey} \RequirePackage{multido} @@ -6,4 +33,5 @@ \input{pst-plot.tex} \ProvidesFile{pst-plot.tex} [\filedate\space \fileversion\space `pst-plot' (tvz,hv)] +\fi \endinput |