X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?a=blobdiff_plain;ds=sidebyside;f=yarrg%2Fyppedia-chart-parser;fp=yarrg%2Fyppedia-chart-parser;h=b35d8165a016bfe1dbe28a9166ef5ebf008b9543;hb=243aacd694064310880840502e5fd4dba729dd0a;hp=a093a0cec965dba77827a3641af83f9563295ec5;hpb=162cecbf338e2b708599611f201d3f59c1872f0b;p=ypp-sc-tools.main.git diff --git a/yarrg/yppedia-chart-parser b/yarrg/yppedia-chart-parser index a093a0c..b35d816 100755 --- a/yarrg/yppedia-chart-parser +++ b/yarrg/yppedia-chart-parser @@ -118,7 +118,7 @@ sub yppedia_chart_parse () { s/\<--.*--\>//g; s/^\s*//; chomp; s/\s+$//; s/\s+/ /g; s/\<\/?(?:b|em)\>//g; - s/\{\{Chart\ style\|[^{}]*\}\}//g; + s/\{\{chart\ style\|[^{}]*\}\}//gi; next unless m/\{\{/; # only interested in chart template stuff my ($x,$y, $arch,$island,$solid,$dirn); @@ -126,9 +126,9 @@ sub yppedia_chart_parse () { if (($x,$y,$arch) = m/^\{\{ chart\ label \|(\d+)\|(\d+)\| .* - (?: \)? \'+ + (?: \<(?: big|center )\>)* \'+ \[\[ [^][\']* \| ([^][\'|]+)\ archipelago \]\] - \'+ (?: \<\/big\>)? \}\}$/xi) { + \'+ (?: \<\/(?: big|center )\>)* \}\}$/xi) { printf DEBUG "%2d,%-2d arch %s\n", $x,$y,$arch; push @wiarchlabels, [ $x,$y,$arch ]; } elsif (m/^\{\{ chart\ label \|\d+\|\d+\|