Merge branch 'lilypond/translation' of ssh://jomand@git.sv.gnu.org/srv/git/lilypond

[lilypond.git] / buildscripts / makelsr.py

diff --git a/buildscripts/makelsr.py b/buildscripts/makelsr.py
old mode 100755 (executable)
new mode 100644 (file)
index 2c68e8c..cb0619f
--- a/buildscripts/makelsr.py
+++ b/buildscripts/makelsr.py
@@ -57,7 +57,7 @@ notags_files = []
 end_header_re = re.compile ('(\\header {.+?doctitle = ".+?})\n', re.M | re.S)
 
 def mark_verbatim_section (ly_code):
-       return end_header_re.sub ('\\1 % begin verbatim\n', ly_code, 1)
+       return end_header_re.sub ('\\1 % begin verbatim\n\n', ly_code, 1)
 
 # '% LSR' comments are to be stripped
 lsr_comment_re = re.compile (r'\s*%+\s*LSR.*')
@@ -79,6 +79,10 @@ def copy_ly (srcdir, name, tags):
                                                  os.path.splitext (name)[0] + '.texidoc')
        if os.path.exists (texidoc_translations_path):
                texidoc_translations = open (texidoc_translations_path).read ()
+               # Since we want to insert the translations verbatim using a 
+               # regexp, \\ is understood as ONE escaped backslash. So we have
+               # to escape those backslashes once more...
+               texidoc_translations = texidoc_translations.replace ('\\', '\\\\')
                s = begin_header_re.sub ('\\g<0>\n' + texidoc_translations, s, 1)
 
        if in_dir in srcdir:
@@ -151,7 +155,7 @@ for (name, (srcdir, tags)) in snippets.items ():
        copy_ly (srcdir, name, tags)
 
 for (tag, file_set) in tag_lists.items ():
-       dump_file_list (os.path.join (DEST, tag + '.snippet-list'), file_set)
+       dump_file_list (os.path.join (DEST, tag + '.snippet-list'), sorted(file_set))
 
 if unconverted:
        sys.stderr.write ('These files could not be converted successfully by convert-ly:\n')