From: Heikki Junes <heikki.junes@hut.fi>
Date: Tue, 18 Apr 2006 18:28:23 +0000 (+0000)
Subject: fix footer position in generated html files
X-Git-Tag: release/2.9.3~49
X-Git-Url: https://git.donarmstrong.com/lilypond.git?a=commitdiff_plain;h=3152e2de8181f567baa0eafd01970ba3ba4ede02;p=lilypond.git

fix footer position in generated html files
---

diff --git a/ChangeLog b/ChangeLog
index 7e88403c7b..c26f44a258 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-04-18  Heikki Junes  <hjunes@cc.hut.fi>
+
+	* stepmake/bin/add-html-footer.py: fix footer position in
+	generated html files: before </body> and </html> tags.
+
 2006-04-18  Heikki Junes  <hjunes@cc.hut.fi>
 
 	* scripts/GNUmakefile: revert last "fix", which rather broke make.
diff --git a/THANKS b/THANKS
index 932175aa31..9ea568b509 100644
--- a/THANKS
+++ b/THANKS
@@ -15,6 +15,7 @@ CONTRIBUTORS
 
 Erlend Aasland
 David Feuer
+Heikki Junes
 Joe Neeman
 
 
diff --git a/stepmake/bin/add-html-footer.py b/stepmake/bin/add-html-footer.py
index ed45c0aaf0..3304b3514a 100644
--- a/stepmake/bin/add-html-footer.py
+++ b/stepmake/bin/add-html-footer.py
@@ -58,8 +58,6 @@ This page is for %(package_name)s-%(package_version)s (%(branch_str)s). <br>
 Report errors to <a href="%(mail_address_url)s">%(mail_address)s</a>.</font></address>
 </p>
 </div>
-
-
 """
 
 
@@ -223,14 +221,12 @@ def do_file (f):
 			s = doctype + s
 
 	if re.search (footer_tag, s) == None:
-		s = s + footer_tag + '\n'
-
 		if re.search ('(?i)</body', s):
-			s = re.sub ('(?i)</body>', footer + '</BODY>', s, 1)
+			s = re.sub ('(?i)</body>', footer_tag + footer + '\n' + '</BODY>', s, 1)
 		elif re.search ('(?i)</html', s):		
-			s = re.sub ('(?i)</html>', footer + '</HTML>', s, 1)
+			s = re.sub ('(?i)</html>', footer_tag + footer + '\n' + '</HTML>', s, 1)
 		else:
-			s = s + footer
+			s = s + footer_tag + footer + '\n'
 
 		s = i18n (f, s)
 
@@ -357,8 +353,18 @@ def i18n (file_name, page):
 	languages = ''
 	if language_menu:
 		languages = LANGUAGES_TEMPLATE % vars ()
+	else:
+		languages = LANGUAGES_TEMPLATE % vars ()
+
+	# Put language menu before '</body>' and '</html>' tags
+	if re.search ('(?i)</body', page):
+		page = re.sub ('(?i)</body>', languages + '</BODY>', page, 1)
+	elif re.search ('(?i)</html', page):		
+		page = re.sub ('(?i)</html>', languages + '</HTML>', page, 1)
+	else:
+		page = page + languages
 
-	return page + languages
+	return page
 	## end i18n
 
 for f in files: