Merge branch 'master' of ssh+git://git.sv.gnu.org/srv/git/lilypond

[lilypond.git] / lilypond-texi2html.init

diff --git a/lilypond-texi2html.init b/lilypond-texi2html.init
index 8587ca76e5e63292495c6795380872bb665e7a1a..7f4c32a1750f29eb6b083c8c9bdc256f481eeee2 100644 (file)
--- a/lilypond-texi2html.init
+++ b/lilypond-texi2html.init
@@ -109,6 +109,7 @@ $Texi2HTML::Config::paragraph          = \&makeinfo_like_paragraph;
 $Texi2HTML::Config::complex_format_map->{'example'} = {
   'begin' => q{"<blockquote><pre class=\"example\">"},
   'end' => q{"</pre></blockquote>\n"},
+  'style' => 'code',
  };
 
 %Texi2HTML::config::misc_pages_targets = (
@@ -620,9 +621,29 @@ sub lilypond_print_toc_div ($$)
   if (@lines) {
   
     print $fh "\n\n<div id=\"tocframe\">\n";
+    
+    # Remove the leading "GNU LilyPond --- " from the manual title
+    my $topname = $Texi2HTML::NAME{'Top'};
+    $topname =~ s/^GNU LilyPond(:| &[mn]dash;) //;
+    
+    # construct the top-level Docs index (relative path and including language!)
+    my $lang = $Texi2HTML::THISDOC{current_lang};
+    if ($lang and $lang ne "en") {
+      $lang .= ".";
+    } else {
+      $lang = "";
+    }
+    my $reldir = "";
+    $reldir = "../" if ($Texi2HTML::Config::SPLIT eq 'section');
+    my $uplink = $reldir."index.${lang}html";
+
+    print $fh "<p class=\"toc_uplink\"><a href=\"$uplink\" 
+         title=\"Documentation Index\">&lt;&lt; Back to 
+         Documentation Index</a></p>\n";
+
     print $fh '<h4 class="toc_header"> ' . &$anchor('',
                                     $Texi2HTML::HREF{'Top'},
-                                    $Texi2HTML::NAME{'Top'},
+                                    $topname,
                                     'title="Start of the manual"'
                                    ) . "</h4>\n";
     foreach my $line (@lines) {