From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Fri, 1 Mar 2019 13:18:22 +0000 (+0000)
Subject: wip display name
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?a=commitdiff_plain;h=ad389c7be3c503cc9a7c107af3622305dbb18f5c;p=pandemic-rising-tide.git

wip display name
---

diff --git a/Parse.pm b/Parse.pm
index 1e06115..ce8c1a9 100644
--- a/Parse.pm
+++ b/Parse.pm
@@ -16,6 +16,7 @@ our %region;
 # $region{NAME}{Name}
 # $region{NAME}{L} # line number
 # $region{NAME}{Adj}[]{Name}
+# $region{NAME}{Adj}[]{DisplayName}[]
 # $region{NAME}{Adj}[]{Pattern}
 # $region{NAME}{Adj}[]{Regexp}
 # $region{NAME}{Adj}[]{Dikes}
@@ -40,10 +41,17 @@ sub read_in () {
     }
     if (my ($name, $water) = m{^\t(\S.*\w|L)(?: \[(\d+)\])?$}) {
       confess unless defined $ccolour;
+      my $dname = $name;
+      $name =~ s{/}{}g;
       confess "$name ?" if $region{$name};
       $region{$name}{Colour} = $ccolour;
       $region{$name}{Water} = $water;
       $region{$name}{L} = $.;
+      if ($dname =~ m{/}) {
+	$region{$name}{DisplayName} = [ grep m/./, split m{/}, $dname ];
+      } else {
+	$region{$name}{DisplayName} = [ split m{(?<=-)| }, $dname ];
+      }
       $cregion = $name;
       next;
     }
diff --git a/generate-board b/generate-board
index 621eecd..c4784ac 100755
--- a/generate-board
+++ b/generate-board
@@ -314,7 +314,10 @@ sub label_faces() {
   foreach my $rr (values %region) {
     next if $rr->{Special};
     o("   ", psvec($rr->{Centre}), " moveto");
-    o("   (",$rr->{Name},") show");
+    foreach my $word (@{ $rr->{DisplayName} }) {
+      o("   (",$word,") show");
+      o("   0 -18 rmoveto");
+    }
   }
 }
 
diff --git a/input-graph b/input-graph
index 703f639..d539349 100644
--- a/input-graph
+++ b/input-graph
@@ -1,5 +1,5 @@
 purple
-	Noorderzijlvest
+	Noorder/zijlvest
 		NZ +
 		L
 		Drenthe
@@ -11,7 +11,7 @@ purple
 		Vollenhove
 		Noordoostpolder +
 		ZZ +
-	Noordoostpolder [2]
+	Noordoost/polder [2]
 		ZZ
 		Fr. +
 		Vollenhove +
@@ -37,7 +37,7 @@ purple
 		ZZ +
 		M. +
 		Delfland
-	Wieringermeer [1]
+	Wieringer/meer [1]
 		NZ
 		ZZ
 		K. +