From: Ian Jackson Date: Tue, 1 Sep 2009 15:11:36 +0000 (+0100) Subject: Cope with arch labels and a big ocean label X-Git-Tag: 3.4~43 X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?p=ypp-sc-tools.main.git;a=commitdiff_plain;h=66482684911b5a12a5182797de54a24c2b31c29a Cope with arch labels and a big ocean label --- diff --git a/yarrg/yppedia-chart-parser b/yarrg/yppedia-chart-parser index 84386b2..11c7484 100755 --- a/yarrg/yppedia-chart-parser +++ b/yarrg/yppedia-chart-parser @@ -126,9 +126,13 @@ sub yppedia_chart_parse () { if (($x,$y,$arch) = m/^\{\{ chart\ label \|(\d+)\|(\d+)\| .* - \'\[\[ [^][\']* \| (\S+)\ archipelago \]\]\'*\}\}$/xi) { + (?: \)? \'+ + \[\[ [^][\']* \| (\S+)\ archipelago \]\] + \'+ (?: \<\/big\>)? \}\}$/xi) { printf DEBUG "%2d,%-2d arch %s\n", $x,$y,$arch; push @wiarchlabels, [ $x,$y,$arch ]; + } elsif (m/^\{\{ chart\ label \|\d+\|\d+\| + \ \'+ \[\[ .* \b ocean \]\]/xi) { } elsif (($x,$y,$island) = m/^\{\{ chart\ island\ icon \|(\d+)\|(\d+)\| ([^| ][^|]*[^| ]) \| .*\}\}$/xi) {