X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lilypond-texi2html.init;h=7f4c32a1750f29eb6b083c8c9bdc256f481eeee2;hb=5c14a087ca6cbd665fd631452b7b1283ba0387c3;hp=f05ee37a481289c984a0f3cf3b58d52e11c63231;hpb=f00e54157c3cd9e04f9b9100641a766fb036b56e;p=lilypond.git

diff --git a/lilypond-texi2html.init b/lilypond-texi2html.init
index f05ee37a48..7f4c32a175 100644
--- a/lilypond-texi2html.init
+++ b/lilypond-texi2html.init
@@ -73,15 +73,21 @@ package Texi2HTML::Config;
 ###  SETTINGS FOR TEXI2HTML
 #############################################################################
 
-@Texi2HTML::Config::CSS_REFS      = ("lilypond.css");
-@Texi2HTML::Config::ALT_CSS_REFS      = ( 
-    {FILENAME => "lilypond-mccarty.css", TITLE=>"Patrick McCarty's design"}
+@Texi2HTML::Config::CSS_REFS      = (
+    {FILENAME => "lilypond-mccarty.css", TITLE => "Patrick McCarty's design"}
+);
+@Texi2HTML::Config::ALT_CSS_REFS      = (
+    {FILENAME => "lilypond.css", TITLE => "Andrew Hawryluk's design" },
+    {FILENAME => "lilypond-blue.css", TITLE => "Kurt Kroon's blue design" },
 );
 $Texi2HTML::Config::USE_ACCESSKEY = 1;
 $Texi2HTML::Config::USE_LINKS     = 1;
 $Texi2HTML::Config::USE_REL_REV   = 1;
+$Texi2HTML::Config::SPLIT_INDEX   = 0;
 $Texi2HTML::Config::SEPARATED_FOOTNOTES = 0; # Print footnotes on same page, not separated
-$Texi2HTML::Config::element_file_name    = \&lilypond_element_file_name;
+if ($Texi2HTML::Config::SPLIT eq 'section') {
+  $Texi2HTML::Config::element_file_name    = \&lilypond_element_file_name;
+}
 $Texi2HTML::Config::element_target_name  = \&lilypond_element_target_name;
 $Texi2HTML::Config::print_element_header = \&lilypond_print_element_header;
 $Texi2HTML::Config::print_page_foot      = \&print_lilypond_page_foot;
@@ -103,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 = (
@@ -246,7 +253,7 @@ sub lilypond_css_lines ($$)
     }
     foreach my $ref (@CSS_REFS)
     {
-        $Texi2HTML::THISDOC{'CSS_LINES'} .= "<link rel=\"stylesheet\" type=\"text/css\" href=\"$ref\" title=\"Default style\">\n";
+        $Texi2HTML::THISDOC{'CSS_LINES'} .= "<link rel=\"stylesheet\" type=\"text/css\" title=\"$ref->{TITLE}\" href=\"$ref->{FILENAME}\">\n";
     }
     foreach my $ref (@ALT_CSS_REFS)
     {
@@ -612,8 +619,33 @@ sub lilypond_print_toc_div ($$)
   # use default TOC if no custom lines have been generated
   @lines = @default_toc if (not @lines);
   if (@lines) {
+  
     print $fh "\n\n<div id=\"tocframe\">\n";
-    print $fh '<h4> ' . $Texi2HTML::NAME{'Contents'}  . "</h4>\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'},
+                                    $topname,
+                                    'title="Start of the manual"'
+                                   ) . "</h4>\n";
     foreach my $line (@lines) {
       print $fh $line;
     }
@@ -628,7 +660,6 @@ sub lilypond_print_toc_div ($$)
 our @this_page_toc = ();
 sub lilypond_print_element_header
 {
-  my $fh = shift;
   my $first_in_page = shift;
   my $previous_is_top = shift;
   if ($first_in_page and not @this_page_toc) {
@@ -637,7 +668,7 @@ sub lilypond_print_element_header
       @this_page_toc = lilypond_generate_page_toc_body($Texi2HTML::THIS_ELEMENT);
     }
   }
-  return T2H_DEFAULT_print_element_header( $fh, $first_in_page, $previous_is_top);
+  return T2H_DEFAULT_print_element_header( $first_in_page, $previous_is_top);
 }
 
 # Generate the HTML output for the TOC
@@ -706,48 +737,45 @@ sub get_navigation_text
 # will contain the name of the next/previous section/chapter.
 sub lilypond_print_navigation
 {
-    my $fh = shift;
     my $buttons = shift;
     my $vertical = shift;
     my $spacing = 1;
-#     print $fh '<table cellpadding="', $spacing, '" cellspacing="', $spacing,
-#       "\" border=\"0\" class=\"nav_table\">\n";
-    print $fh "<table class=\"nav_table\">\n";
+    my $result = "<table class=\"nav_table\">\n";
 
-    print $fh "<tr>" unless $vertical;
+    $result .= "<tr>" unless $vertical;
     my $beginofline = 1;
     foreach my $button (@$buttons)
     {
-        print $fh qq{<tr valign="top" align="left">\n} if $vertical;
+        $result .= qq{<tr valign="top" align="left">\n} if $vertical;
         # Allow (left|right|center)-aligned-cell and newline as buttons!
         if ( $button =~ /^(.*)-aligned-cell-(.*)$/ )
         {
-          print $fh qq{</td>} unless $beginofline;
-          print $fh qq{<td valign="middle" align="$1" colspan="$2">};
+          $result .= qq{</td>} unless $beginofline;
+          $result .= qq{<td valign="middle" align="$1" colspan="$2">};
           $beginofline = 0;
         }
         elsif ( $button eq 'newline' )
         {
-          print $fh qq{</td>} unless $beginofline;
-          print $fh qq{</tr>};
-          print $fh qq{<tr>};
+          $result .= qq{</td>} unless $beginofline;
+          $result .= qq{</tr>};
+          $result .= qq{<tr>};
           $beginofline = 1;
 
         }
         elsif (ref($button) eq 'CODE')
         {
-            &$button($fh, $vertical);
+            $result .= &$button($vertical);
         }
         elsif (ref($button) eq 'SCALAR')
         {
-            print $fh "$$button" if defined($$button);
+            $result .= "$$button" if defined($$button);
         }
         elsif (ref($button) eq 'ARRAY')
         {
             my $text = $button->[1];
             my $button_href = $button->[0];
             # verify that $button_href is simple text and text is a reference
-            if (defined($button_href) and !ref($button_href)
+            if (defined($button_href) and !ref($button_href) 
                and defined($text) and (ref($text) eq 'SCALAR') and defined($$text))
             {             # use given text
                 if ($Texi2HTML::HREF{$button_href})
@@ -761,7 +789,7 @@ sub lilypond_print_navigation
                   {
                       $anchor_attributes .= " rel=\"$BUTTONS_REL{$button_href}\"";
                   }
-                  print $fh "" .
+                  $result .=  "" .
                         &$anchor('',
                                     $Texi2HTML::HREF{$button_href},
                                     get_navigation_text($$text),
@@ -770,13 +798,13 @@ sub lilypond_print_navigation
                 }
                 else
                 {
-                  print $fh get_navigation_text($$text);
+                  $result .=  get_navigation_text($$text);
                 }
             }
         }
         elsif ($button eq ' ')
         {                       # handle space button
-            print $fh
+            $result .= 
                 ($ICONS && $ACTIVE_ICONS{' '}) ?
                     &$button_icon_img($BUTTONS_NAME{$button}, $ACTIVE_ICONS{' '}) :
                         $NAVIGATION_TEXT{' '};
@@ -796,7 +824,7 @@ sub lilypond_print_navigation
             }
             if ($ICONS && $ACTIVE_ICONS{$button})
             {                   # use icon
-                print $fh '' .
+                $result .= '' .
                     &$anchor('',
                         $Texi2HTML::HREF{$button},
                         &$button_icon_img($BUTTONS_NAME{$button},
@@ -807,11 +835,11 @@ sub lilypond_print_navigation
             }
             else
             {                   # use text
-                print $fh
+                $result .= 
                     '[' .
                         &$anchor('',
                                     $Texi2HTML::HREF{$button},
-                                    get_navigation_text ($button),
+                                    get_navigation_text($button),
                                     $btitle
                                    ) .
                                        ']';
@@ -819,7 +847,7 @@ sub lilypond_print_navigation
         }
         else
         {                       # button is passive
-            print $fh
+            $result .= 
                 $ICONS && $PASSIVE_ICONS{$button} ?
                     &$button_icon_img($BUTTONS_NAME{$button},
                                           $PASSIVE_ICONS{$button},
@@ -827,12 +855,13 @@ sub lilypond_print_navigation
 
                                               "[" . get_navigation_text($button) . "]";
         }
-        print $fh "</td>\n" if $vertical;
-        print $fh "</tr>\n" if $vertical;
+        $result .= "</td>\n" if $vertical;
+        $result .= "</tr>\n" if $vertical;
     }
-    print $fh "</td>" unless $beginofline;
-    print $fh "</tr>" unless $vertical;
-    print $fh "</table>\n";
+    $result .= "</td>" unless $beginofline;
+    $result .= "</tr>" unless $vertical;
+    $result .= "</table>\n";
+    return $result;
 }