From 6d1e86b5da0b276520ce90ad45c1346edff64cd7 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Tue, 26 May 2009 23:24:13 +0000 Subject: pstricks-add 3.34 (26may09) git-svn-id: svn://tug.org/texlive/trunk@13485 c570f23f-e606-0410-a88d-b1316a301751 --- .../tex/generic/pstricks-add/pstricks-add.tex | 36 ++++++++++++++-------- 1 file changed, 24 insertions(+), 12 deletions(-) (limited to 'Master/texmf-dist/tex/generic/pstricks-add') diff --git a/Master/texmf-dist/tex/generic/pstricks-add/pstricks-add.tex b/Master/texmf-dist/tex/generic/pstricks-add/pstricks-add.tex index c81389f65b4..bcb74d07d02 100644 --- a/Master/texmf-dist/tex/generic/pstricks-add/pstricks-add.tex +++ b/Master/texmf-dist/tex/generic/pstricks-add/pstricks-add.tex @@ -1,4 +1,4 @@ -%% $Id: pstricks-add.tex 115 2009-04-29 08:19:40Z herbert $ +%% $Id: pstricks-add.tex 118 2009-05-25 18:47:43Z herbert $ %% %% %% This is file `pstricks-add.tex', @@ -31,8 +31,8 @@ \ifx\PSTFPloaded\endinput\else \input pst-fp \fi \ifx\PSTmathLoaded\endinput\else \input pst-math \fi % -\def\fileversion{3.32} -\def\filedate{2009/05/11} +\def\fileversion{3.34} +\def\filedate{2009/05/25} \message{`pstricks-add' v\fileversion, \filedate\space (dr,hv)} % \edef\PstAtCode{\the\catcode`\@} \catcode`\@=11\relax @@ -2388,7 +2388,6 @@ % xStep=0, yStep=0, xStart={}, xEnd={}, yStart={}, yEnd={}, comma=false,% % plotNo=1,plotNoMax=1}% % -\iffalse \def\pstScalePoints(#1,#2)#3#4{% % xScale | yScale | xOperator | yOperator % the operators can be any Postscript code @@ -2409,7 +2408,6 @@ } %\pstScalePoints(1,1){}{}% the default -> no special operators % -\fi \def\listplot@ii#1{% \@nameuse{beginplot@\psplotstyle}% \addto@pscode{/D {} def mark}% @@ -3659,13 +3657,18 @@ % ..... % ] def % +\define@key[psset]{pstricks-add}{colorType}[0]{\def\psk@colorType{#1}} +\psset[pstricks-add]{colorType=0} % 0-> two color mode 1->wavelength mode (400..700nm) \def\psMatrixPlot{\pst@object{psMatrixPlot}} \def\psMatrixPlot@i#1#2#3{% - \pst@killglue - \begingroup + \pst@killglue% + \addbefore@par{xStep=1,yStep=1}% \begin@SpecialObj% \addto@pscode{ (#3) run % load the data file + /Min 0 def /Max 0 def + dotmatrix { dup Min lt { /Min ED } { dup Max gt { /Max ED } { pop } ifelse } ifelse } forall + /dMaxMin Max Min sub def \psk@dotsize \@nameuse{psds@\psk@dotstyle} % /n 0 def % index for element @@ -3674,16 +3677,25 @@ 1 1 #2 { % the x loop (inner one) /x exch def % save x dotmatrix n get % get value from matrix - dup 0 gt { % test if > 0 - x \pst@number\psxunit mul - \ifPst@ChangeOrder #1 y sub 1 add \else y \fi \pst@number\psyunit mul Dot% - } { pop } ifelse + \ifcase\psk@colorType + dup 0 gt { % test if > 0 + \or + Min sub dMaxMin div 300 mul 400 add + tx@addDict begin wavelengthToRGB Red Green Blue end setrgbcolor + \or + Min sub dMaxMin div neg 1 add 300 mul 400 add + tx@addDict begin wavelengthToRGB Red Green Blue end setrgbcolor + \fi + x \psk@xStep\space mul \pst@number\psxunit mul + \ifPst@ChangeOrder #1 y sub 1 add \else y \fi \psk@yStep\space mul \pst@number\psyunit mul Dot% + \ifcase\psk@colorType + } { pop } ifelse + \fi /n n 1 add def } for } for }% \end@SpecialObj% - \endgroup% \ignorespaces% } % -- cgit v1.2.3