X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=python%2Flangdefs.py;h=37159c519854bbfad079017f4f45ad16fed0bae2;hb=3f6871255e3af968c9924bd2dfe512d94bc43ef7;hp=80a1c7f244e51b9175aced2480c3eda490b31169;hpb=7beeb2c8c3ebefc2d9187dad5888a85c477e1c7d;p=lilypond.git diff --git a/python/langdefs.py b/python/langdefs.py index 80a1c7f244..37159c5198 100644 --- a/python/langdefs.py +++ b/python/langdefs.py @@ -36,17 +36,28 @@ class LanguageDef: site = LanguageDef ('en', 'English', webext='') -html_page_body = re.compile ('', re.M | re.I) +html_body_re = re.compile ('', re.I) +html_end_body_re = re.compile ('', re.I) french_html_typo_rules = ((' :', ' :'), (' ;', ' ;'), - (' ?', ' ?'), - (' !', ' !')) + (' ?', ' ?'), + (' !', ' !')) def french_html_filter (page): - parts = html_page_body.split (page) + m = html_body_re.search (page) + if m: + body_begin = m.end () + else: + body_begin = 0 + m = html_end_body_re.search (page) + if m: + body_end = m.start () + else: + body_end = len (page) + body = page[body_begin:body_end] for r in french_html_typo_rules: - parts[1] = parts[1].replace (r[0], r[1]) - return parts[0] + '' + parts[1] + '' + parts[2] + body = body.replace (r[0], r[1]) + return page[:body_begin] + body + page[body_end:] fr = LanguageDef ('fr', 'franÃ§ais', double_punct_char_sep=' ', html_filter = french_html_filter) es = LanguageDef ('es', 'espaÃ±ol')