# 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', 'keyboards',
-'percussion', 'fretted-strings', 'unfretted-strings', 'ancient-notation' # ,'winds'
+'percussion', 'fretted-strings', 'unfretted-strings',
+'ancient-notation', 'winds', 'world-music'
])
# other
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):
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)
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])