From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Thu, 3 Dec 2020 14:57:02 +0000 (+0000)
Subject: break out chip()
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=885f42309dc560c3f10e8904b2168231ab357bdc;p=quacks.git

break out chip()
---

diff --git a/pumpkin-books.ps.pl b/pumpkin-books.ps.pl
index f0d763f..afe1986 100755
--- a/pumpkin-books.ps.pl
+++ b/pumpkin-books.ps.pl
@@ -2,6 +2,22 @@
 
 use strict;
 
+my $thiscolour = "1 0 1 0";
+my $spotcolour = "0 0 0 0";
+
+sub chip ($$) {
+  my ($this, $spot) = @_; # put in a gsave
+  <<END;
+  $thiscolour setcmykcolor
+  newpath
+  0 0 chip 0.5 mul 0 360 arc fill
+
+  $spotcolour setcmykcolor
+  newpath
+  0 0 spot 0.5 mul 0 360 arc fill
+END
+}
+
 print <<END or die $!;
 %!
 
@@ -19,9 +35,6 @@ print <<END or die $!;
 /spot 3.5 def
 
 
-/thiscolour { 1 0 1 0 setcmykcolor } def
-/spotcolour { 0 0 0 0 setcmykcolor } def
-
 tw  0  translate
 
 % diagonal conversion
@@ -66,13 +79,7 @@ newpath
 gsave
   -1 6 div costcirch dc translate
 
-  1 0 1 0 setcmykcolor
-  newpath
-  0 0 chip 0.5 mul 0 360 arc fill
-
-  0 0 0 0 setcmykcolor
-  newpath
-  0 0 spot 0.5 mul 0 360 arc fill
+  ${\ chip($thiscolour, $spotcolour) }
 grestore
 END