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

colours
---

diff --git a/pumpkin-books.ps.pl b/pumpkin-books.ps.pl
index acd4ad9..c1b5624 100755
--- a/pumpkin-books.ps.pl
+++ b/pumpkin-books.ps.pl
@@ -11,6 +11,8 @@ 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"];
 
+my $anychip = ['0.5', '0'];
+
 sub colour ($) {
   my ($c) = @_;
   if ($c =~ m/[^ 0-9.]/) {
@@ -87,7 +89,7 @@ gsave
   (Any) dup stringwidth  3 2 roll show
   pop pop
   20 0 translate
-  ${\ chip(['.5 .5 .5', '0 0 0'], $pips) }
+  ${\ chip($anychip, $pips) }
 grestore
 END
 }
@@ -100,7 +102,7 @@ sub ruby () { # put in gsave translate
     rubysz      0 lineto
     0      rubysz lineto
     closepath
-    1 0.5 0.5 setrgbcolor gsave fill grestore
+    ${\ colour('1 0.5 0.5') } gsave fill grestore
     $black 1 setlinewidth stroke
 END
 }
@@ -365,7 +367,7 @@ grestore
 gsave
    0.83 0.25 dc translate
    0.85 dup scale
-   ${\ chip(['.5 .5 .5', ''], 0) }
+   ${\ chip($anychip, 0) }
 grestore
 
 gsave