From 8c04f4af5028001802addd13c9ad12bf7c1b8e5d Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Tue, 14 Dec 2010 23:17:48 +0000 Subject: pst-plot 1.25 (15dec10) git-svn-id: svn://tug.org/texlive/trunk@20743 c570f23f-e606-0410-a88d-b1316a301751 --- .../texmf-dist/tex/generic/pst-plot/pst-plot.tex | 37 ++++++++++++++++++++-- 1 file changed, 34 insertions(+), 3 deletions(-) (limited to 'Master/texmf-dist/tex/generic') 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 7352e28515b..e89b28864ed 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 419 2010-11-14 18:37:29Z herbert $ +% $Id: pst-plot.tex 428 2010-11-28 16:22:11Z 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.24} -\def\filedate{2010/11/14} +\def\fileversion{1.25} +\def\filedate{2010/11/27} \message{ v\fileversion, \filedate\space (tvz,hv)} % \edef\TheAtCode{\the\catcode`\@} @@ -2061,6 +2061,21 @@ D\space##1% \newdimen\pst@xunit \newdimen\pst@yunit % +\def\pslegend{\@ifnextchar[\pslegend@i{\pslegend@i[rt]}} +\def\pslegend@i[#1]{\@ifnextchar({\pslegend@ii[#1]}{\pslegend@ii[#1](\pst@number\pslabelsep,\pst@number\pslabelsep)}} +\def\pslegend@ii[#1](#2,#3)#4{% + \gdef\pslegend@ref{#1}% + \xdef\pslegend@sepx{#2 }% + \xdef\pslegend@sepy{#3 }% + \gdef\pslegend@text{#4}} +% +\newpsstyle{legendstyle}{fillstyle=solid,fillcolor=white,linewidth=0.5pt} +% +\def\pslegend@iii[#1](#2){\rput[#1](#2){\psframebox[style=legendstyle]{% + \footnotesize\tabcolsep=2pt% + \tabular[t]{@{}ll@{}}\pslegend@text\endtabular}}\global\let\pslegend@text\relax} +\let\pslegend@text\relax% define it as empty +% \def\psgraph{\pst@object{psgraph}} \def\psgraph@i{\pst@getarrows\psgraph@ii} \def\psgraph@ii(#1,#2){\catcode`\!=12\relax @@ -2160,11 +2175,27 @@ D\space##1% \ifx\psk@yAxisLabelPos\@empty\uput[90](#1,#6){\psk@yAxisLabel}% \else\expandafter\setyLabelC@@r\psk@yAxisLabelPos(#4,#6)(#1,#2)\fi% \fi% + \def\lt@@{lt}\def\lb@@{lb}\def\rb@@{rb}% + \ifx\pslegend@ref\lb@@ \gdef\pslegend@coor{#3 \pslegend@sepx \pst@number\psxunit div add + \pslegend@sepy \pst@number\psyunit div}% + \else% + \ifx\pslegend@ref\lt@@ \gdef\pslegend@coor{#3 \pslegend@sepx \pst@number\psxunit div add + #6 \pslegend@sepy \pst@number\psyunit div sub}% + \else% + \ifx\pslegend@ref\rb@@\gdef\pslegend@coor{#5 \pslegend@sepx \pst@number\psxunit div sub + \pslegend@sepy \pst@number\psyunit div}% + \else \gdef\pslegend@coor{#5 \pslegend@sepx \pst@number\psxunit div sub + #6 \pslegend@sepy \pst@number\psyunit div sub}% + \fi% + \fi% + \fi% + \xdef\psgraphLLx{#3}\xdef\psgraphLLy{#4}\xdef\psgraphURx{#5}\xdef\psgraphURy{#6}% %\ignorespaces } % \def\endpsgraph{% % \pst@killglue% + \ifx\relax\pslegend@text\relax \else\pslegend@iii[\pslegend@ref](!\pslegend@coor)\fi% \endpspicture% \endgroup\ignorespaces} % -- cgit v1.2.3