Build: think in EXTRA_DIST_FILES command.

[lilypond.git] / Documentation / lilypond-texi2html.init

diff --git a/Documentation/lilypond-texi2html.init b/Documentation/lilypond-texi2html.init
index 938d77fde84084314e30b87397334cc757bc2314..9635e3a41b9f206d7756ea9dd51669c43f42b586 100644 (file)
--- a/Documentation/lilypond-texi2html.init
+++ b/Documentation/lilypond-texi2html.init
@@ -806,7 +806,7 @@ sub lilypond_element_file_name($$$)
 
     # unnumbered sections (except those at top-level!) always go to the same
     # file as the previous numbered section
-    if (not $docu_name == "web" and not ($element->{number})
+    if (not ($web_manual) and not ($element->{number})
        and not ($lastfilename eq '') and ($element->{level} > 1)) {
       $filename = $lastfilename;
     }
@@ -879,8 +879,14 @@ sub lilypond_element_target_name($$$)
   }
   # TODO: Once texi2html correctly prints out the target and not the id for
   #       the sections, change this back to ($id, $target)
+  # I don't understand this comment, so I'm reluctant to delete it -gp
   $target = lc($target);
-  return ($target, $target);
+  if ($target eq lc($id)) {
+    $id = "";
+  } else {
+    $id = substr($id, 0, - 2); # remove the "-1"
+  }
+  return ($id, $target);
 }
 
 
@@ -976,8 +982,6 @@ sub lilypond_unknown($$$$$)
 }
 
 
-
-
 my %translated_books = ();
 # Construct a href to an external source of information.
 # node is the node with texinfo @-commands
@@ -1023,13 +1027,32 @@ sub lilypond_external_href($$$)
   }
 
   if (defined $file) {
-    return &$default_external_href($node, $node_id, $node_hxmlt_id, lc($file));
+    $href = &$default_external_href($node, $node_id, $node_hxmlt_id, lc($file));
+    remove_unneeded_anchor($href);
+    return $href;
   } else {
-    return &$default_external_href($node, $node_id, $node_hxmlt_id);
+    $href = &$default_external_href($node, $node_id, $node_hxmlt_id);
+    remove_unneeded_anchor($href);
+    return $href;
   }
 }
 
-
+sub remove_unneeded_anchor($)
+{
+  my $ref = shift;
+  my @hrefsplit = split("/", $href);
+  for ($i = 0; $i < @hrefsplit; $i++) {
+    $item = @hrefsplit[$i];
+    if ($item =~ /#/) {
+      @splitted = split("#", $item);
+      if (@splitted[0] == @splitted[1]) {
+        @hrefsplit[$i] = @splitted[0]
+      }
+    }
+  }
+  $href = join("/", @hrefsplit);
+  return $href
+}
 
 
 
@@ -1189,7 +1212,7 @@ sub lilypond_generate_page_toc_body($)
     open FILE, "$ENV{TOP_SRC_DIR}/Documentation/$lang/$name.ihtml" or
        open FILE, "$ENV{TOP_SRC_DIR}/Documentation/$name.ihtml"  or
        die "no such file: $name.ihtml: $!";
-    my $search_string = <FILE>;
+    my $search_string = decode ('UTF-8', <FILE>);
     $search_string = "<li>\n" . $search_string . "</li>\n";
     push (@toc_entries, $search_string);
     close FILE;
@@ -1225,9 +1248,8 @@ sub lilypond_print_toc_div ($$)
     } else {
       $lang = "";
     }
-    my $reldir = "";
-    $reldir = "../" if ($Texi2HTML::Config::SPLIT eq 'section');
-    my $uplink = $reldir."web/manuals.${lang}html";
+    my $reldir = $ENV{DEPTH};
+    my $uplink = $reldir."/Documentation/web/manuals.${lang}html";
 
     if (not $web_manual) {
       print $fh "<p class=\"toc_uplink\"><a href=\"$uplink\"