From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat, 5 Dec 2020 21:04:18 +0000 (+0000)
Subject: use rgb
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=5348ef0943ac7c3e1e459f644cce17dc23da845e;p=quacks.git

use rgb

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---

diff --git a/pumpkin-books.ps.pl b/pumpkin-books.ps.pl
index 8992c52..cc707ad 100755
--- a/pumpkin-books.ps.pl
+++ b/pumpkin-books.ps.pl
@@ -2,16 +2,16 @@
 
 use strict;
 
-our $black = '0 0 0 1 setcmykcolor';
+our $black = '0 0 0 setrgbcolor';
 
-my $pumpkin = ["0 .50 0 1.00 0", "0 0 0 1"];
-my $green = ["1 0 1 0", "0 0 0 0"];
-my $red = ["0 1 1 0", "0 0 0 1"];
-my $blue = ["0.6 0.6 0 0", "0 0 0 0"];
-my $yellow = ["0 0 1 0", "0 0 0 1"];
-my $moth = ["0 0 0 1", "0 0 0 0"];
-my $purple = ["0 1 0 0", "0 0 0 1"];
-my $lotus = ["1 0 0.6 0", "0 1 1 0"];
+my $pumpkin = [".9 .7 0", "0 0 0"];
+my $green = ["0 .5 0", "1 1 1"];
+my $red = ["1 0 0", "0 0 0"];
+my $blue = ["0.4 0.4 1", "1 1 1"];
+my $yellow = [".9 .9 0", "0 0 0"];
+my $moth = ["0 0 0", "1 1 1"];
+my $purple = ["1 0 0.8", "0 0 0"];
+my $lotus = ["0.6 0.7 .5", "0.5 0.5 0"];
 
 sub chip ($$) {
   my ($cary, $pips) = @_; # put in a gsave translate
@@ -19,8 +19,8 @@ sub chip ($$) {
   newpath
   0 0 chip 0.5 mul 0 360 arc
   gsave 1 setlinewidth $black stroke grestore
-  $cary->[0] setcmykcolor fill
-  $cary->[1] setcmykcolor
+  $cary->[0] setrgbcolor fill
+  $cary->[1] setrgbcolor
 END
   my $spot = sub {
     my ($x,$y) = @_;
@@ -83,7 +83,7 @@ sub ruby () { # put in gsave translate
     rubysz      0 lineto
     0      rubysz lineto
     closepath
-    0 1 0.5 0 setcmykcolor gsave fill grestore
+    1 0.5 0.5 setrgbcolor gsave fill grestore
     $black 1 setlinewidth stroke
 END
 }
@@ -117,7 +117,7 @@ sub general_book ($$) { # put in a gsave
 tw  0  translate
 
 3 setlinewidth
-0 0 0 0.2 setcmykcolor
+0.8 setgray
 newpath
 0 0 dc moveto
 0 1 dc lineto stroke