chiark / gitweb /
Cope with {{ }} rather than [[ ]] in arch labels
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Tue, 1 Sep 2009 15:58:17 +0000 (16:58 +0100)
committerIan Jackson <Ian.Jackson@eu.citrix.com>
Tue, 1 Sep 2009 15:58:17 +0000 (16:58 +0100)
yarrg/yppedia-chart-parser

index b35d816..41ef985 100755 (executable)
@@ -127,7 +127,9 @@ sub yppedia_chart_parse () {
        if (($x,$y,$arch) =
            m/^\{\{ chart\ label \|(\d+)\|(\d+)\| .*
                    (?: \<(?: big|center )\>)* \'+
        if (($x,$y,$arch) =
            m/^\{\{ chart\ label \|(\d+)\|(\d+)\| .*
                    (?: \<(?: big|center )\>)* \'+
-                   \[\[ [^][\']* \| ([^][\'|]+)\ archipelago \]\]
+                   (?: \[\[ | \{\{ )
+                   [^][\']* \| ([^][\'|]+)\ archipelago
+                   (?: \]\] | \}\} )
                    \'+ (?: \<\/(?: big|center )\>)* \}\}$/xi) {
            printf DEBUG "%2d,%-2d arch %s\n", $x,$y,$arch;
            push @wiarchlabels, [ $x,$y,$arch ];
                    \'+ (?: \<\/(?: big|center )\>)* \}\}$/xi) {
            printf DEBUG "%2d,%-2d arch %s\n", $x,$y,$arch;
            push @wiarchlabels, [ $x,$y,$arch ];