wip display name

diff --git a/Parse.pm b/Parse.pm
index 1e06115357d086f7360eb7cb51bf2d8c2a261f3d..ce8c1a9e29296df5616472dfbeb1d0f01216034e 100644 (file)
--- 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 621eecd5dd0113540c284ab94ad30348c2ae4ca1..c4784ac0959bd935186d004e005125077a87b770 100755 (executable)
--- 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 703f639b574664ee8ef128401a27ed3ae30a9027..d5393495fb0ff74e6f398e0aaf5e300ad5dd7d72 100644 (file)
--- 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. +