pstricks-add 2.88 (5sep07)

git-svn-id: svn://tug.org/texlive/trunk@4888 c570f23f-e606-0410-a88d-b1316a301751

1 files changed, 32 insertions, 3 deletions

diff --git a/Master/texmf-dist/dvips/pstricks-add/pstricks-add.pro b/Master/texmf-dist/dvips/pstricks-add/pstricks-add.pro
index fc4cc635271..9d6e72c0a8f 100644
--- a/Master/texmf-dist/dvips/pstricks-add/pstricks-add.pro
+++ b/Master/texmf-dist/dvips/pstricks-add/pstricks-add.pro
@@ -1,6 +1,6 @@
 %!
 % PostScript prologue for pstricks-add.tex.
-% Version 0.11, 2007/05/24
+% Version 0.12, 2007/09/04
 % For distribution, see pstricks.tex.
 %
 %       HISTORY -> see file Changes
@@ -45,14 +45,43 @@ end
   setmatrix grestore} def
 %
 /RGBtoCMYK {    % on stack r g b
+  3 dict begin
   /Blue ED /Green ED /Red ED
   1 Red sub     % Cyan
   1 Green sub   % Magenta
   1 Blue sub    % Yellow
   0   		% Black  
+  end
 } def
-
-
+%
+/CMYKtoGRAY { % c m y k on stack
+  exch 0.11 mul add
+  exch 0.59 mul add
+  exch 0.3 mul add
+  dup 1 gt { pop 1 }  if 
+  neg 1 add 
+} def
+%
+/RGBtoGRAY { 
+  0.11 mul
+  exch 0.59 mul add
+  exch 0.3 mul add 
+} def
+%
+/HSBtoGRAY { 
+  6 dict begin
+  /b exch def 
+  /s exch def 6 mul dup cvi dup 
+  /i exch def sub 
+  /f exch def
+  /F [[0 1 f sub 1][f 0 1][1 0 1 f sub][1 f 0][1 f sub 1 0][0 1 f][0 1 1]] def
+  F i get { s mul neg 1 add b mul} forall
+  0.11 mul
+  exch 0.59 mul add
+  exch 0.3 mul add 
+  end
+} def
+%
 %% convertisseur longueur d'onde ->R,G,B       Manuel Luque
 %% lambda max=780 nanomčtres
 %% lambda min=380 nanomčtres