Fix 1323 - links "Back to documentation index" in HTML docs

diff --git a/Documentation/lilypond-texi2html.init b/Documentation/lilypond-texi2html.init
index 8f46fd5ee21d3517cdcb29cad0e52fa66cb271eb..57340912510302b52f96a6ee8a2c9953bb262cd2 100644 (file)
--- a/Documentation/lilypond-texi2html.init
+++ b/Documentation/lilypond-texi2html.init
@@ -1374,9 +1374,13 @@ sub lilypond_print_toc_div ($$)
       $lang = "";
     }
     my $reldir = $ENV{DEPTH};
-    # add a / at the end if there isn't one.  I cannot believe perl syntax!
-    if (!($reldir =~ m/\/$/ )) {
-        $reldir .= '/'
+    # strip one depth level for translations
+    if ($lang and $lang ne "en" and substr ($reldir, 0, 3) eq '../') {
+       $reldir = substr ($reldir, 3);
+    }
+    # add a / at the end if there isn't one.
+    if (substr ($reldir, -1) ne '/') {
+        $reldir .= '/';
     }
     my $uplink = $reldir."Documentation/web/manuals.${lang}html";
 

diff --git a/python/auxiliar/postprocess_html.py b/python/auxiliar/postprocess_html.py
index 38e325e297835021380fe2ca8b4f349d7feb421d..ab1c68520faf5bd7fbbbfadaa3dc857abb87e7a1 100644 (file)
--- a/python/auxiliar/postprocess_html.py
+++ b/python/auxiliar/postprocess_html.py
@@ -107,13 +107,13 @@ lily_snippets_re = re.compile ('(href|src)="([0-9a-f]{2}/lily-.*?)"')
 pictures_re = re.compile ('src="(pictures/.*?)"')
 
 docindex_link_re = re.compile (r'href="index.html"')
-
+manuals_page_link_re = re.compile (r'href="((?:\.\./)+)Documentation/web/manuals')
 
 ## Windows does not support symlinks.
 # This function avoids creating symlinks for splitted HTML manuals
 # Get rid of symlinks in GNUmakefile.in (local-WWW-post)
 # this also fixes missing PNGs only present in translated docs
-def hack_urls (s, prefix):
+def hack_urls (s, prefix, target, is_development_branch):
     if splitted_docs_re.match (prefix):
         s = lily_snippets_re.sub ('\\1="../\\2"', s)
         s = pictures_re.sub ('src="../\\1"', s)
@@ -130,7 +130,15 @@ def hack_urls (s, prefix):
         else:
             indexfile = "index"
         s = docindex_link_re.sub ('href="' + rel_link + indexfile + '.html\"', s)
-
+    # make the "return to doc index" work with the online website.
+    if target == 'online':
+        if (('Documentation/contributor' in prefix) or
+            is_development_branch):
+            manuals_page = 'development'
+        else:
+            manuals_page = 'manuals'
+        s = manuals_page_link_re.sub (r'href="../../\1website/%s'
+                                      % manuals_page, s)
     source_path = os.path.join (os.path.dirname (prefix), 'source')
     if not os.path.islink (source_path):
         return s
@@ -343,19 +351,8 @@ def process_html_files (package_name = '',
             in_f.close()
 
             s = s.replace ('%', '%%')
-            s = hack_urls (s, prefix)
+            s = hack_urls (s, prefix, target, bool (int (versiontup[1]) %  2))
             s = add_header (s, prefix)
-            # make the "return to doc index" work with the online website.
-            if target == 'online':
-                if (('Documentation/contributor' in prefix) or
-                    (int (versiontup[1]) %  2)):
-                    s = s.replace (
-                        'href=\"../..//Documentation/web/manuals.html\"',
-                        'href=\"../../../../website/development.html\"')
-                else:
-                    s = s.replace (
-                        'href=\"../..//Documentation/web/manuals.html\"',
-                        'href=\"../../../../website/manuals.html\"')
 
             ### add footer
             if footer_tag_re.search (s) == None: