From 939dde634ad7948bd96230fb63f3419446d78c31 Mon Sep 17 00:00:00 2001
From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Wed, 6 Mar 2019 13:35:35 +0000
Subject: [PATCH] use miscpscolour instead of a lot of open-coded setgray

---
 generate-board | 20 +++++++++++---------
 misc-data.pl   |  6 ++++++
 2 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/generate-board b/generate-board
index e7e4e68..9cbacdf 100755
--- a/generate-board
+++ b/generate-board
@@ -442,7 +442,7 @@ sub fill_faces() {
 our $edge_lw = 5;
 
 sub some_edge_faces (@) {
-  o("$edge_lw setlinewidth 1 setlinejoin 0 setgray\n");
+  o("$edge_lw setlinewidth 1 setlinejoin ",miscpscolour('edge'),"\n");
   foreach my $rr (@_) {
     next if $rr->{Name} =~ m/^L2?$/;
     face_path($rr);
@@ -500,7 +500,7 @@ sub one_hs ($$;$$) {
   token_circle("HS - $colour",
 	       $hspos,
 	       darkerpscolour($colour, 0.75),
-	       '0 setgray',
+	       miscpscolour('edge'),
 	      $sz,$lw);
 }
 
@@ -511,14 +511,16 @@ our $cube_lw = ($cube_sz * 0.1);
 sub label_faces() {
   my $sz = $text_sz;
   my $shadow = $sz * 0.1;
+  my $textc   = miscpscolour('text');
+  my $shadowc = miscpscolour('textshadow');
   o(<<END);
   /wordsshow {
-    0 setgray 0 10 359 {
+    $shadowc 0 10 359 {
       dup  cos $shadow mul
       exch sin $shadow mul
       words pop pop
     } bind for
-    1 setgray 0 0 words pop pop
+    $textc 0 0 words pop pop
   } def
 END
   o("  /Helvetica-Bold findfont  $sz scalefont setfont\n");
@@ -623,7 +625,7 @@ sub decks(){
   o("    newpath         deck1path\n");
   o("    200 0 translate deck1path\n");
   o("  } bind def");
-  o("  $lw setlinewidth 1 setgray\n");
+  o("  $lw setlinewidth ",miscpscolour('playerdeck'),"\n");
   o("  gsave 401 44 translate deckpairpathx stroke grestore");
   o("  $lw setlinewidth ",miscpscolour('dykefail'),"\n");
   o("  gsave 242 1363 translate 90 rotate deckpairpathx stroke grestore");
@@ -708,8 +710,8 @@ sub dykes(){
   o("  } bind def\n");
   o("  /dyke {\n");
   o("    newpath dykepath\n");
-  o("    gsave 0.50 setgray fill grestore\n");
-  o("    gsave 0.00 setgray $lw setlinewidth stroke grestore\n");
+  o("    gsave ",miscpscolour('dykefill')," fill grestore\n");
+  o("    gsave ",miscpscolour('edge')," $lw setlinewidth stroke grestore\n");
   o("  } bind def\n");
   my $symbol_sz = $w * 1.50;
   my $t_sz = $symbol_sz * 1.0;
@@ -726,7 +728,7 @@ sub dykes(){
   o("            @t1 lineto\n");
   o("            @t2 lineto closepath\n");
   o("    gsave ",miscpscolour('dykeinit')," fill grestore\n");
-  o("    gsave 0 setgray $lw setlinewidth stroke grestore\n");
+  o("    gsave ",miscpscolour('edge')," $lw setlinewidth stroke grestore\n");
   o("  } bind def\n");
   foreach my $rr (values %region) {
     next if $rr->{Special};
@@ -814,7 +816,7 @@ sub hs_initial () {
 
 sub play_hint () {
   my $sz = 20;
-  o("  gsave 0 setgray 260 1715 translate");
+  o("  gsave ",miscpscolour('hinttext')," 260 1715 translate");
   o("  /Helvetica-Bold findfont $sz scalefont setfont");
   my @t = split /\n/, $c{PlayHint};
   foreach my $i (0..$#t) {
diff --git a/misc-data.pl b/misc-data.pl
index 70e646d..028b6fd 100644
--- a/misc-data.pl
+++ b/misc-data.pl
@@ -12,9 +12,15 @@ our %c =
      sea    => '3ad',
      cube   => '8df',
      land   => '442',
+     edge   => '000',
+     text        => 'fff',
+     textshadow  => '000',
+     dykefill    => '7ff7ff7ff',
      dykeinit    => 'fff',
      dykehsadd   => '642',
      dykefail => '444',
+     playerdeck => 'fff',
+     hinttext   => '000',
  },
  DisplayNames => {
      ZZ => 'Zuiderzee',
-- 
2.30.2