Merge master into nested-bookparts

[lilypond.git] / buildscripts / makelsr.py

diff --git a/buildscripts/makelsr.py b/buildscripts/makelsr.py
index 265bbb6b839964d3c4b11491b6ae182b9d94d49b..65f06d60ab6a573a750b34b8c6c26348871a5b77 100755 (executable)
--- a/buildscripts/makelsr.py
+++ b/buildscripts/makelsr.py
@@ -20,15 +20,18 @@ LY_HEADER_NEW = '''%% Do not edit this file; it is auto-generated from input/new
 
 DEST = os.path.join ('input', 'lsr')
 NEW_LYS = os.path.join ('input', 'new')
+TEXIDOCS = os.path.join ('input', 'texidocs')
 
 TAGS = []
 # NR 1
 TAGS.extend (['pitches', 'rhythms', 'expressive-marks',
 'repeats', 'simultaneous-notes', 'staff-notation',
-'editorial-and-educational-use', 'text'])
+'editorial-annotations', 'text'])
 # NR 2
-TAGS.extend (['vocal-music', 'chords', 'piano-music',
-'percussion', 'guitar', 'strings', 'bagpipes', 'ancient-notation'])
+TAGS.extend (['vocal-music', 'chords', 'keyboards',
+'percussion', 'fretted-strings', 'unfretted-strings',
+'ancient-notation', 'winds', 'world-music'
+])
 
 # other
 TAGS.extend (['contexts-and-engravers', 'tweaks-and-overrides',
@@ -51,16 +54,19 @@ unconverted = []
 notags_files = []
 
 # mark the section that will be printed verbatim by lilypond-book
-end_header_re = re.compile ('(\\header {.+?(?:"\\s*|\\s+)}\n)\n', re.M | re.S)
+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', ly_code, 1)
 
-# add tags to ly files from LSR
-add_tags_re = re.compile ('\\header\\s*{', re.M)
+# '% LSR' comments are to be stripped
+lsr_comment_re = re.compile (r'\s*%+\s*LSR.*')
+
+begin_header_re = re.compile (r'\\header\s*{', re.M)
 
+# add tags to ly files from LSR
 def add_tags (ly_code, tags):
-       return add_tags_re.sub ('\\g<0>\n  lsrtags = "' + tags + '"\n', ly_code, 1)
+       return begin_header_re.sub ('\\g<0>\n  lsrtags = "' + tags + '"\n', ly_code, 1)
 
 def copy_ly (srcdir, name, tags):
        global unsafe
@@ -68,19 +74,33 @@ def copy_ly (srcdir, name, tags):
        dest = os.path.join (DEST, name)
        tags = ', '.join (tags)
        s = open (os.path.join (srcdir, name)).read ()
+
+       texidoc_translations_path = os.path.join (TEXIDOCS,
+                                                 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:
                s = LY_HEADER_LSR + add_tags (s, tags)
        else:
                s = LY_HEADER_NEW + s
+
        s = mark_verbatim_section (s)
+       s = lsr_comment_re.sub ('', s)
        open (dest, 'w').write (s)
-       e = os.system('convert-ly -e ' + dest)
+
+       e = os.system ("convert-ly -e '%s'" % dest)
        if e:
                unconverted.append (dest)
        if os.path.exists (dest + '~'):
                os.remove (dest + '~')
        # -V seems to make unsafe snippets fail nicer/sooner
-       e = os.system ('nice lilypond -V -dno-print-pages -dsafe -o /tmp/lsrtest ' + dest)
+       e = os.system ("lilypond -V -dno-print-pages -dsafe -o /tmp/lsrtest '%s'" % dest)
        if e:
                unsafe.append (dest)
 
@@ -91,7 +111,7 @@ def read_source_with_dirs (src):
                srcdir = os.path.join (src, tag)
                l[tag] = set (map (os.path.basename, glob.glob (os.path.join (srcdir, '*.ly'))))
                for f in l[tag]:
-                       if f in s.keys ():
+                       if f in s:
                                s[f][1].append (tag)
                        else:
                                s[f] = (srcdir, [tag])
@@ -149,7 +169,7 @@ dump_file_list ('lsr-unsafe.txt', unsafe)
 sys.stderr.write ('''
 
 Unsafe files printed in lsr-unsafe.txt: CHECK MANUALLY!
-  git add input/lsr
+  git add input/lsr/*.ly
   xargs git-diff HEAD < lsr-unsafe.txt
 
 ''')