From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 3 Mar 2019 01:54:05 +0000 (+0000)
Subject: wip words
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ian/git?a=commitdiff_plain;h=21b417fd6e8f3140567ab34930884eb3e7e91cd5;p=pandemic-rising-tide.git

wip words
---

diff --git a/generate-board b/generate-board
index 3af70c3..ef9f9ce 100755
--- a/generate-board
+++ b/generate-board
@@ -662,10 +662,10 @@ sub dykes(){
 
 sub hs_initial_1 ($$$;$$) {
   my ($colour, $xi,$yi, $text, $fn) = @_;
-  my $interval = $hs_sz * 1.75;
+  my $interval = $hs_sz * 1.65;
   my $demo_h = $hs_sz; #water_cubes_sz(3);
   my $demo_x0 = $hs_sz * 0.75 + $dyke_l * 0.60;
-  my $demo_w = $demo_x0 + $dyke_l;
+  my $demo_w = $demo_x0 + $dyke_l * 0.60;
   o("  % HS I $colour\n");
   o("  gsave\n");
   o("    400 1720 translate\n");
@@ -678,7 +678,7 @@ sub hs_initial_1 ($$$;$$) {
   one_hs($colour, mkvec(0,0));
   if ($fn) {
     o("    /words { 2 copy moveto ($text) show } bind def");
-    o("    gsave 0 0 moveto wordsshow grestore\n");
+    o("    gsave $hs_sz $cube_gap translate wordsshow grestore\n");
     o("    $demo_x0 ",($hs_sz * -0.25)," translate\n");
     $fn->();
   }
@@ -689,6 +689,8 @@ sub hs_initial () {
   hs_initial_1('red',     0,0);
   hs_initial_1('purple',  0,1);
   hs_initial_1('green',   1,0, 'up to 6', sub {
+    o("    ",(water_cubes_sz(1))," 0 translate\n");
+    o("    /words { 2 copy moveto (fewer ) dup stringwidth pop -1 mul 0 rmoveto show } bind def wordsshow");
     o("    0 ",(-water_cubes_sz(1) * 0.5)," translate\n");
     water_cubes(1);
   });