compatibility with obsidian

[ypp-sc-tools.git] / yarrg / yppedia-chart-parser

diff --git a/yarrg/yppedia-chart-parser b/yarrg/yppedia-chart-parser
index 414f182eb9894d0f355d6d15fb618c7f2b24f9f8..9cda849c761f82333c52706eae9c3505a7c09d54 100755 (executable)
--- a/yarrg/yppedia-chart-parser
+++ b/yarrg/yppedia-chart-parser
@@ -221,7 +221,7 @@ sub yppedia_archs_chart_labels () {
            next unless exists $winode2island{$vertex};
            my $ccix= $wiarchs->connected_component_by_vertex($vertex);
            my @cc= $wiarchs->connected_component_by_index($ccix);
-           my ($vx,$vy) = split /,/, $vertex;
+           my ($vx,$vy) = split /,/, $vertex;  # /
            my $d2= ($vx-$ax)*($vx-$ax) + ($vy-$ay)*($vy-$ay);
            my $cmp= $best_d2 <=> $d2;
            printf $debugfh "%2d,%-2d arch-island-search %5s d2=%4d cc%-2d".
@@ -369,7 +369,8 @@ sub compare_island_lists () {
            if (!defined $wtarch) {
                error("island from chart not found on ocean page: $island");
            } elsif (defined $wiarch and $wtarch ne $wiarch) {
-               error("island in $wtarch on ocean page but".
+#              error("island in $wtarch on ocean page but".
+               warning("island in $wtarch on ocean page but".
                      " concluded $wiarch from chart: $island");
            }
        }
@@ -464,6 +465,7 @@ sub shortest_path_reduction ($$) {
         not essential and is therefore unnecessary.
 
 END
+    # `
     
     printf $debugfh "spr %s before %d\n", $what, scalar($g->edges());
 
@@ -536,10 +538,10 @@ sub yppedia_ocean_fetch_done () {
 
 sub yppedia_ocean_fetch_chart () {
     if ($stdin_chart) {
-       run_yppedia_chart_parse('STDIN');
+       run_yppedia_chart_parse('::STDIN');
     } else {
        yppedia_ocean_fetch_start(1);
-       run_yppedia_chart_parse('OCEAN');
+       run_yppedia_chart_parse('::OCEAN');
        yppedia_ocean_fetch_done();
     }
 }
@@ -555,7 +557,7 @@ sub yppedia_ocean_fetch_text () {
            die unless defined $arch;
            $wtisland2arch{$'}= $arch;
        } elsif (m/^ /) {
-           $arch= $';
+           $arch= $'; # '
        } else {
            die;
        }