Merge branch 'master' of ssh://kainhofer@git.sv.gnu.org/srv/git/lilypond into dev...

[lilypond.git] / lilypond-texi2html.init

diff --git a/lilypond-texi2html.init b/lilypond-texi2html.init
index 5d31b054b699efbefed164b702e0d6ff351a12d1..0849c041d11e34b231a714f8e72d3adfa90f389f 100644 (file)
--- a/lilypond-texi2html.init
+++ b/lilypond-texi2html.init
@@ -158,14 +158,15 @@ sub load_map_file ($)
     my $node_map = ();
 
     if (open(XREFFILE, $mapfile)) {
-        while ( <XREFFILE> ) {
+        my $line;
+        while ( $line = <XREFFILE> ) {
             # parse the tab-separated entries and insert them into the map:
-            chomp($_);
-            my @entries = split(/\t/, $_);
+            chomp($line);
+            my @entries = split(/\t/, $line);
             if (scalar (@entries) == 3) {
               $node_map->{$entries[0]} = [$entries[1], $entries[2]];
             } else {
-              print STDERR "Invalid entry in the node file $mapfile: $_\n";
+              print STDERR "Invalid entry in the node file $mapfile: $line\n";
             }
         }
         close (XREFFILE);
@@ -410,7 +411,7 @@ sub lilypond_external_href($$$)
 {
   my $node = shift;
   my $node_id = shift;
-  my $node_xhtml_id = shift;
+  my $node_hxmlt_id = shift;
   my $file = shift;
   my $original_func = \&t2h_default_external_href;
 
@@ -436,7 +437,7 @@ sub lilypond_external_href($$$)
     my $section_name_map = $translated_books{$map_name};
     my $node_text = main::remove_texi($node);
     if (defined($section_name_map->{$node_text})) {
-      (my $node_id, $node_hxmlt_id) = @{$section_name_map->{$node_text}};
+      ($node_id, $node_hxmlt_id) = @{$section_name_map->{$node_text}};
     } else {
       print STDERR "Unable to find key '$node_text' in section_name_map for book $map_name\n";
     }