X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=inline;f=buildscripts%2Fhtml-gettext.py;h=7b381349b56fc4cd8a59b66b714382e9c5713ecd;hb=f96e38fbbbfba9cf4729323beb518a65ae77d562;hp=1aebf6ca34eba02f92f837a2df039afb96bfa594;hpb=57ee28fbd1fcf79f19a550bea64ab88ab3c60e1d;p=lilypond.git

diff --git a/buildscripts/html-gettext.py b/buildscripts/html-gettext.py
index 1aebf6ca34..7b381349b5 100644
--- a/buildscripts/html-gettext.py
+++ b/buildscripts/html-gettext.py
@@ -25,8 +25,6 @@ sys.path.append (buildscript_dir)
 import langdefs
 
 double_punct_char_separator = langdefs.LANGDICT[lang].double_punct_char_sep
-print localedir
-print lang
 t = gettext.translation('lilypond-doc', localedir, [lang])
 my_gettext = t.gettext
 
@@ -38,10 +36,13 @@ html2texi = {'command': (re.compile (r'<samp><span class="command">(.*?)</span><
 texi2html = {'command': (re.compile (r'@command{(.*?)}'), r'<samp><span class="command">\1</span></samp>'),
 	     'code': (re.compile (r'@code{(.*?)}'), r'<code>\1</code>')
 	     }
+whitespaces = re.compile (r'\s+')
+
 
 def _ (s):
 	if not s:
 		return ''
+	s = whitespaces.sub (' ', s)
 	for c in html_codes:
 		s = s.replace (c[1], c[0])
 	for u in html2texi.values():
@@ -76,8 +77,8 @@ def h_gettext (m):
 	return '<h' + m.group(1) + m.group(2) + '>' + s +\
 	       m.group(4) + _(m.group(5)) + '</h' + m.group(1) + '>'
 
-def rglos_gettext (m):
-	return '<a href="../music-glossary/' + m.group(1) + '">' + _(m.group(2)) + '</a>'
+def crossmanual_ref_gettext (m):
+	return '<a href="' + m.group(1) + '">' + _(m.group(2)) + '</a>'
 
 for filename in args[3:]:
 	f = open (filename, 'r')
@@ -86,9 +87,11 @@ for filename in args[3:]:
 	page = re.sub (r'<link rel="(up|prev|next)" (.*?) title="([^"]*?)">', link_gettext, page)
 	page = re.sub (r'<title>([^<]*?) - ([^<]*?)</title>', title_gettext, page)
 	# ugh
-	page = re.sub (r'<a ((?:rel="\w+")? ?(?:accesskey="[^"]+?")? ?(?:name=".*?")? ?)(href="[^"]+?">)(<code>)?(Appendix )?([A-Z\d.]+ |)(.+?)(?(3)</code>)</a>:?', a_href_gettext, page)
-	page = re.sub (r'<h(\d)( class="\w+"|)>(Appendix |)([A-Z\d.]+ |)?([^<]+)</h\1>', h_gettext, page)
-	page = re.sub (r'<a href="../music-glossary/(.+?)">(.+?)</a>', rglos_gettext, page)
+	page = re.sub (r'(?ms)<a ((?:rel="\w+")? ?(?:accesskey="[^"]+?")? ?(?:name=".*?")? ?)(href=".+?">)(<code>)?(Appendix )?([A-Z\d.]+ |)(.+?)(?(3)</code>)</a>:?', a_href_gettext, page)
+	page = re.sub (r'<h(\d)( class="\w+"|)>\s*(Appendix |)([A-Z\d.]+ |)?([^<]*[^< ])\s*</h\1>', h_gettext, page)
+	page = re.sub (r'<a href="(\.\./(?:music-glossary|lilypond-program/)?(?:.+?))">(.+?)</a>', crossmanual_ref_gettext, page)
+	# this is necessary for entries not translated by a_href_gettext
+	page = re.sub (r'<a href="(.+?)">(.+?)</a>', crossmanual_ref_gettext, page)
 	for w in ('Next:', 'Previous:', 'Up:'):
 		page = re.sub (w, _(w), page)
 	page = langdefs.LANGDICT[lang].html_filter (page)