X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=Documentation%2Flilypond-texi2html.init;h=928366317d497e3420a050f3ccaab3d0e65c0068;hb=32a34dcef0c0041c6d62677487a380b5c8b85712;hp=0b542ed777f5d93abf2edec69f8adf93e7a93386;hpb=f41973ff763d5972a85995b6d40c864281ec6714;p=lilypond.git

diff --git a/Documentation/lilypond-texi2html.init b/Documentation/lilypond-texi2html.init
index 0b542ed777..928366317d 100644
--- a/Documentation/lilypond-texi2html.init
+++ b/Documentation/lilypond-texi2html.init
@@ -55,6 +55,8 @@
 ###           makeinfo_like_foot_line_and_ref
 ###           makeinfo_like_foot_lines
 ###           makeinfo_like_paragraph
+### -) In tables, don't wrap <p> around the contents. Implemented in
+###           makeinfo_like_paragraph
 ###
 ###
 ### Useful helper functions:
@@ -114,7 +116,7 @@ $LY_LANGUAGES->{'fr'} = {
 
 $LY_LANGUAGES->{'hu'} = {
     'Back to Documentation Index' => 'Vissza a dokumentÃ¡ciÃ³k jegyzÃ©kÃ©hez',
-    '<p>Thanks to ${webdev_link} for hosting ${lily_site}.' => 'KÃ¶szÃ¶net a ${webdev_link} rÃ©szÃ©re a ${lily_site} tÃ¡rhelyÃ©rt.',
+    '<p>Thanks to ${webdev_link} for hosting ${lily_site}.' => '<p>KÃ¶szÃ¶net a ${webdev_link} rÃ©szÃ©re a ${lily_site} tÃ¡rhelyÃ©rt.',
 };
 
 $LY_LANGUAGES->{'it'} = {
@@ -124,7 +126,7 @@ $LY_LANGUAGES->{'it'} = {
 
 $LY_LANGUAGES->{'ja'} = {
     'Back to Documentation Index' => 'ãã­ã¥ã¡ã³ã ã¤ã³ããã¯ã¹ã«æ»ã',
-    '<p>Thanks to ${webdev_link} for hosting ${lily_site}.' => '${lily_site} ããã¹ãã£ã³ã°ãã¦ããã¦ãã ${webdev_link} ã«æè¬ãã¾ãã',
+    '<p>Thanks to ${webdev_link} for hosting ${lily_site}.' => '<p>${lily_site} ããã¹ãã£ã³ã°ãã¦ããã¦ãã ${webdev_link} ã«æè¬ãã¾ãã',
 };
 
 
@@ -135,7 +137,7 @@ $LY_LANGUAGES->{'nl'} = {
 
 $LY_LANGUAGES->{'zh'} = {
     'Back to Documentation Index' => 'åå°ææ¡£ç´¢å¼',
-    '<p>Thanks to ${webdev_link} for hosting ${lily_site}.' => 'éå¸¸æè°¢ ${webdev_link} æä¾ ${lily_site} çä¸»æºç©ºé´ã',
+    '<p>Thanks to ${webdev_link} for hosting ${lily_site}.' => '<p>éå¸¸æè°¢ ${webdev_link} æä¾ ${lily_site} çä¸»æºç©ºé´ã',
 };
 
 # FIXME: request the translations below then send them to texi2html/texinfo devs
@@ -847,7 +849,7 @@ $Texi2HTML::Config::DOCTYPE = '<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Tran
     );
 
 sub web_settings() {
-  print STDERR "Initializing settings for web site: [$Texi2HTML::THISDOC{current_lang}]\n";
+  print STDERR "Processing web site: [$Texi2HTML::THISDOC{current_lang}]\n";
   $Texi2HTML::Config::BODYTEXT = "";
   @Texi2HTML::Config::CSS_REFS      = (
       {FILENAME => "lilypond-website.css", TITLE => "Default style"}
@@ -1066,18 +1068,18 @@ sub lilypond_css_lines ($$)
   foreach my $ref (@CSS_REFS)
   {
     $Texi2HTML::THISDOC{'CSS_LINES'} .=
-	"<link rel=\"stylesheet\" type=\"text/css\" title=\"$ref->{TITLE}\" href=\"$ref->{FILENAME}\">\n";
+	"<link rel=\"stylesheet\" type=\"text/css\" title=\"$ref->{TITLE}\" href=\"css/$ref->{FILENAME}\">\n";
   }
   foreach my $ref (@Texi2HTML::Config::ALT_CSS_REFS)
   {
     $Texi2HTML::THISDOC{'CSS_LINES'} .=
-	"<link rel=\"alternate stylesheet\" type=\"text/css\" href=\"$ref->{FILENAME}\" title=\"$ref->{TITLE}\">\n";
+	"<link rel=\"alternate stylesheet\" type=\"text/css\" href=\"css/$ref->{FILENAME}\" title=\"$ref->{TITLE}\">\n";
   }
 
   # The ie-fixes stylesheet is needed for the docs, but not the website.
   if (not ($web_manual)) {
     $Texi2HTML::THISDOC{'CSS_LINES'} .=
-	"<!--[if lte IE 7]>\n<link href=\"lilypond-ie-fixes.css\" rel=\"stylesheet\" type=\"text/css\">\n<![endif]-->\n";
+	"<!--[if lte IE 7]>\n<link href=\"css/lilypond-ie-fixes.css\" rel=\"stylesheet\" type=\"text/css\">\n<![endif]-->\n";
   }
 
   if ($ENV{'AJAX_SEARCH'} == 1) {
@@ -1422,11 +1424,10 @@ sub lilypond_external_href($$$)
     $href = &$default_external_href($node, $node_id, $node_xhtml_id, lc_last($file));
     $href = remove_unneeded_anchor($href);
 
-    # TODO: very yucky, but will be fixed in issue 1004
     if ($web_manual) {
-      my $only_web = $ENV{ONLY_WEB};
-      if ($only_web) {
-        $href = "../../doc/v2.13/Documentation/web/".$href;
+      my $only_web_version = $ENV{ONLY_WEB_VERSION};
+      if ($only_web_version) {
+        $href = "../../doc/".$only_web_version."/Documentation/web/".$href;
       }
     }
 
@@ -1445,9 +1446,9 @@ sub remove_unneeded_anchor($)
   for ($i = 0; $i < @hrefsplit; $i++) {
     $item = @hrefsplit[$i];
     if ($item =~ /#/) {
-      @splitted = split(".html#", $item);
-      if (@splitted[0] eq @splitted[1]) {
-        @hrefsplit[$i] = @splitted[0] . ".html";
+      @split = split(".html#", $item);
+      if (@split[0] eq @split[1]) {
+        @hrefsplit[$i] = @split[0] . ".html";
       }
     }
   }
@@ -1511,7 +1512,7 @@ sub generate_ly_toc_entries($$$$$)
 	  'introduction' => [2, 2, 2, 2, 3, 3, 4, 4],
 	  'download' => [2, 2, 2, 3, 3, 4],
 	  'manuals' => [1, 1, 1, 2, 2, 2, 3, 3, 3, 3, 3, 4, 4, 4],
-	  'community' => [1, 1, 1, 2, 2, 2, 3, 3],
+	  'community' => [1, 1, 1, 2, 2, 2, 2, 3, 3, 3, 4],
 	  );
       my $addColor = "colorDefault";
       while (($top_section, $color_indices) = each %color_maps) {
@@ -2070,6 +2071,13 @@ sub makeinfo_like_paragraph ($$$$$$$$$$$$$)
          return $text  if (($format eq 'itemize' or $format eq 'enumerate') and
             ($$paragraph_number == 1));
     }
+    # The cells of a table should not be wrapped in a <p> tag, so just return the text
+    if (defined($command_stack_at_begin->[0]) and $command_stack_at_begin->[0] eq 'multitable')
+    {
+        return $text;
+    }
+
+    # Adjust all footnotes so that they look like good old makeinfo
     my $open = '<p';
     if ($align)
     {
