From d6a1db916ab8631116d946bd4d270ae537130d3c Mon Sep 17 00:00:00 2001
From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat, 2 Mar 2019 01:02:27 +0000
Subject: [PATCH] preoptimse: support 2nd L area, L2

---
 Parse.pm      | 5 +++--
 generate-plag | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/Parse.pm b/Parse.pm
index 565a322..147ecd3 100644
--- a/Parse.pm
+++ b/Parse.pm
@@ -42,7 +42,7 @@ sub read_in () {
       $ccolour = $&;
       next;
     }
-    if (my ($name, $water) = m{^\t(\S.*\w|L)(?: \[(\d+)\])?$}) {
+    if (my ($name, $water) = m{^\t(\S.*\w|L2?)(?: \[(\d+)\])?$}) {
       confess unless defined $ccolour;
       my $dname = $c{DisplayNames}{$name} // $name;
       $name =~ s{/}{}g;
@@ -59,7 +59,7 @@ sub read_in () {
       $cregion = $name;
       next;
     }
-    if (my ($aref, $adikes) = m{^\t\t(\S.*[A-Za-z.]|L)(?: (\+\+?))?$}) {
+    if (my ($aref, $adikes) = m{^\t\t(\S.*[A-Za-z.]|L2?)(?: (\+\+?))?$}) {
       my $adj = { Dikes => (length $adikes // 0), L => $. };
       if ($aref =~ m{\.}) {
 	$adj->{Pattern} = $aref;
@@ -108,6 +108,7 @@ sub unique_aref ($$) {
 
 sub region_cmp {
   ($a eq 'L' ) <=> ($b eq 'L' ) or
+  ($a eq 'L2') <=> ($b eq 'L2') or
   ($a eq 'NZ') <=> ($b eq 'NZ') or
    $a          cmp  $b
 }
diff --git a/generate-plag b/generate-plag
index 0a89ed2..72986e9 100755
--- a/generate-plag
+++ b/generate-plag
@@ -10,7 +10,7 @@ use Parse;
 sub output_planar_graph () {
   foreach my $ra (sort keys %region) {
     o(plag_prs($ra), "\n");
-    if ($ra eq 'NZ' || $ra eq 'L') { o(" :outer\n"); }
+    if ($ra eq 'NZ' || $ra =~ m/^L2?$/) { o(" :outer\n"); }
     my $adjs = $region{$ra}{Adj};
     foreach my $adj (reverse @$adjs) {
       o(" ", plag_prs($adj->{Name}), "\n");
-- 
2.30.2