From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Wed, 6 Mar 2019 12:57:06 +0000 (+0000)
Subject: move pscolor
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ian/git?a=commitdiff_plain;h=d308914d02076cc745058c70797bc823542f2809;p=pandemic-rising-tide.git

move pscolor
---

diff --git a/generate-board b/generate-board
index c371019..9dd9353 100755
--- a/generate-board
+++ b/generate-board
@@ -301,19 +301,6 @@ sub face_path ($) {
   o("    closepath\n");
 }
 
-sub pscolour ($;$) {
-  my ($spec, $adj1) = @_;
-  confess unless defined $spec;
-  my @rgb = map { hex($_) / 15.0 } split //, $spec;
-  $adj1 //= sub { };
-  $adj1->(@rgb);
-  my $r = join ' ',
-      (map { sprintf "%.6f ", $_ } @rgb
-      ),
-	   'setrgbcolor';
-  return $r;
-}
-
 sub computeboundings() {
   $bb{Entire} = [ 0,0, $a4_h, $a4_w + $a3_h ];
   $bb{PageB} = [ 0,0, $a4_h, $a4_w ];
@@ -401,6 +388,19 @@ showpage
 END
 }
 
+sub pscolour ($;$) {
+  my ($spec, $adj1) = @_;
+  confess unless defined $spec;
+  my @rgb = map { hex($_) / 15.0 } split //, $spec;
+  $adj1 //= sub { };
+  $adj1->(@rgb);
+  my $r = join ' ',
+      (map { sprintf "%.6f ", $_ } @rgb
+      ),
+	   'setrgbcolor';
+  return $r;
+}
+
 sub lighterpscolour ($$) {
   my ($colourname, $retain) = @_;
   pscolour($c{Colours}{$colourname},