X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=Documentation%2Flilypond-texi2html.init;h=928366317d497e3420a050f3ccaab3d0e65c0068;hb=9cba6d0b05bd28e2fc73f091b09ace570c976182;hp=3585a9e8ede21472bd4c36d9ad08b2f6ad2105d6;hpb=a066a93ee74edebb9d238a1bac93c3bc7e8e6e4a;p=lilypond.git

diff --git a/Documentation/lilypond-texi2html.init b/Documentation/lilypond-texi2html.init
index 3585a9e8ed..928366317d 100644
--- a/Documentation/lilypond-texi2html.init
+++ b/Documentation/lilypond-texi2html.init
@@ -116,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'} = {
@@ -126,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} に感謝します。',
 };
 
 
@@ -137,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
@@ -1068,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) {
@@ -1424,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;
       }
     }
 
@@ -1513,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) {