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

words
---

diff --git a/generate-board b/generate-board
index bb1cc49..0644ca8 100755
--- a/generate-board
+++ b/generate-board
@@ -662,8 +662,8 @@ sub dykes(){
   }
 }
 
-sub hs_initial_1 ($$$;$$) {
-  my ($colour, $xi,$yi, $text, $fn) = @_;
+sub hs_initial_1 ($$$;$$$) {
+  my ($colour, $xi,$yi, $text, $text2, $fn) = @_;
   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;
@@ -679,8 +679,11 @@ sub hs_initial_1 ($$$;$$) {
   }
   one_hs($colour, mkvec(0,0));
   if ($fn) {
-    o("    /words { 2 copy moveto ($text) show } bind def");
-    o("    gsave $hs_sz $cube_gap translate wordsshow grestore\n");
+    o("    /words {");
+    o("      2 copy moveto                      ($text) show");
+    o("      2 copy moveto 0 -$text_sz rmoveto ($text2) show");
+    o("    } bind def");
+    o("    gsave ".($hs_sz * 0.8)." $cube_gap translate wordsshow grestore\n");
     o("    $demo_x0 ",($hs_sz * -0.25)," translate\n");
     $fn->();
   }
@@ -690,13 +693,12 @@ sub hs_initial_1 ($$$;$$) {
 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 {
+  hs_initial_1('green',   1,0, 'up to 6', 'fewer', 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);
   });
-  hs_initial_1('yellow',  1,1, 'up to 4', sub {
+  hs_initial_1('yellow',  1,1, 'up to 4', '', sub {
     o("    newpath dykepath\n");
     o("    gsave 0.50 setgray fill grestore\n");
     o("    gsave ",pscolour($c{Colours}{dyke})," fill grestore\n");