Merge branch 'master' into dev/texi2html

[lilypond.git] / buildscripts / makelsr.py

diff --git a/buildscripts/makelsr.py b/buildscripts/makelsr.py
index f3f91a0c0261e342b0a343fa99fa9591865e0496..2c68e8c94fb67f49f872e850332191debf300094 100755 (executable)
--- a/buildscripts/makelsr.py
+++ b/buildscripts/makelsr.py
@@ -26,10 +26,12 @@ 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',
@@ -57,7 +59,10 @@ 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)
 
-begin_header_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):
@@ -82,6 +87,7 @@ def copy_ly (srcdir, name, tags):
                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 '%s'" % dest)
@@ -101,7 +107,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])