From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Fri, 1 Mar 2019 13:03:56 +0000 (+0000)
Subject: break out pscolour
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ian/git?a=commitdiff_plain;h=6e3d337ab284610d5f9a6a2147394101f0be8d2f;p=pandemic-rising-tide.git

break out pscolour
---

diff --git a/generate-board b/generate-board
index 54a565f..76f3849 100755
--- a/generate-board
+++ b/generate-board
@@ -277,14 +277,20 @@ sub face_path ($) {
   o("    closepath\n");
 }
 
+sub pscolour ($) {
+  my ($spec) = @_;
+  confess unless defined $spec;
+  join ' ',
+      (map { sprintf "%.6f ", hex($_) / 15.0 }
+       split //, $spec),
+	   'setrgbcolor';
+}
+
 sub fill_faces() {
   foreach my $rr (values %region) {
     next if $rr->{Name} eq 'L';
     face_path($rr);
-    my $chex = $c{Colours}{$rr->{Colour}};
-    next unless $chex;
-    o(sprintf " %.6f ", hex($_) / 15.0) foreach split //, $chex;
-    o(" setrgbcolor eofill\n");
+    o(" ", pscolour($c{Colours}{$rr->{Colour}}), " eofill\n");
   }
 }