From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Fri, 8 Mar 2019 10:36:08 +0000 (+0000)
Subject: refactor to prep for multi on a1[m] nfc
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ian/git?a=commitdiff_plain;h=ca5059ee45ff75d83b09c396d94c0748de09d239;p=pandemic-rising-tide.git

refactor to prep for multi on a1[m] nfc
---

diff --git a/generate-board b/generate-board
index 24c9eeb..dbba958 100755
--- a/generate-board
+++ b/generate-board
@@ -393,7 +393,7 @@ END
 
 sub showboundings () {
   return unless $xopts =~ m/B/;
-  o("  grestore gsave\n");
+  o(" gsave\n");
   my $bb = $bb{$bounding};
   o("  $bb->[0] neg $bb->[1] neg translate\n");
   my $i = 0;
@@ -414,6 +414,7 @@ sub showboundings () {
     o("    closepath stroke\n");
     $i++;
   }
+  o(" grestore");
 }
 
 sub o_amble (@) {
@@ -437,11 +438,21 @@ sub preamble() {
 &&EndProlog
 &&BeginSetup
 << /PageSize [ @$sz ] >> setpagedevice
-/board {
+/all {
   gsave
   $bb->[0] neg  $bb->[1] neg  translate
   $preamble_from_boundings
-
+  board
+  grestore
+  showboundings
+} def
+/showboundings {
+END
+  showboundings();
+  o_amble(<<END);
+} def
+/board {
+  gsave
   % adjustment to actual image placement within prinable areas etc.:
   34 -15 translate
 END
@@ -453,13 +464,13 @@ END
 sub postamble () {
   o_amble(<<END);
   grestore
-} bind def
+} def % board
 &&EndSetup
 &&Page: 1
 &&BeginPageSetup
 /pgsave save def
 &&EndPageSetup
-board
+all
 pgsave restore
 showpage
 &&EOF
@@ -966,7 +977,6 @@ decks();
 sea_track();
 hs_initial();
 play_hint();
-showboundings();
 postamble();
 
 print STDERR Dumper(\%region) if $ENV{'GENERATE_BOARD_DUP'};