From 8e2ab4056a0809727420771787ff88d33a9580db Mon Sep 17 00:00:00 2001
From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Mon, 14 Jan 2019 01:21:18 +0000
Subject: [PATCH] wip

---
 input-graph       | 23 ++++++++++++++++-------
 parse-input-graph |  5 ++++-
 2 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/input-graph b/input-graph
index 00a514d..4663a63 100644
--- a/input-graph
+++ b/input-graph
@@ -24,6 +24,7 @@ purple
 		Gelderse Vallei +
 		Utrechtse Heuvelrug
 		Kromme Rijn +
+		Markerwaard
 	Markerwaard [2]
 		ZZ
 		F.
@@ -55,7 +56,7 @@ yellow
 		N.
 		F.
 		D.
-		Tw.
+		Twente
 	Ijsseldelta
 		Rijn en Ijssel +
 		Veluwe
@@ -82,7 +83,7 @@ high
 		Betuwe
 		Kromme Rijn
 		F.
-		G.
+		G.V.
 
 yellow
 	Kromme Rijn
@@ -91,11 +92,19 @@ yellow
 		Delfland +
 		F. +
 		U.H.
+
+high
+	Twente
+		Rijn en Ijssel
+		Vo.
+		Dr.
+
+yellow
 	Rijn en Ijssel
 		Betuwe +
-		V.
-		I. +
-		V. ++
+		Ve.
+		Ij. +
+		Vo. ++
 	Betuwe
 		R.e.Ij. +
 		Land van Maas en Waal +
@@ -131,7 +140,7 @@ high
 	Oost-Brabant
 		West-Brabant
 		Land van Heusden
-		L.v.m.e.W.
+		L..W.
 		P.e.M.
 
 green
@@ -140,7 +149,7 @@ green
 		West-Brabant
 		Land van Altena +
 		Betuwe +
-		L.v.m.e.W. ++
+		L..W. ++
 	Land van Altena
 		West-Brabant +
 		Hoekse Waard +
diff --git a/parse-input-graph b/parse-input-graph
index f6f4189..7181002 100755
--- a/parse-input-graph
+++ b/parse-input-graph
@@ -40,7 +40,10 @@ sub read_in () {
       if ($aref =~ m{\.}) {
 	$adj->{Pattern} = $aref;
 	$aref =~ s{\-}{[^- ]*-}g;
-	$aref =~ s{\.}{[^- ]* ?}g;
+	$aref =~ s{\.+}{
+            length $& eq 1 ? qr{[^- ]* ?} :
+            length $& eq 2 ? qr{.*}       : confess "$aref"
+        }ge;
 	$adj->{Regexp} = $aref;
       } else {
 	$adj->{Name} = $aref;
-- 
2.30.2