Merge branch 'master' 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
index 8ef81972a3520b81a082fd8c4025995f2ae6e41f..05ed101fd4df577754fcbb268c080295fe369229 100755 (executable)
--- a/buildscripts/makelsr.py
+++ b/buildscripts/makelsr.py
@@ -10,12 +10,12 @@ This script must be run from top of the source tree;
 it updates snippets input/lsr with snippets in input/new or LSR_SNIPPETS_DIR.
 '''
 
-LY_HEADER_LSR = '''%%%% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
-%%%% This file is in the public domain.
-%%%% Tags: %(tags)s
+LY_HEADER_LSR = '''%% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
+%% This file is in the public domain.
 '''
 
-LY_HEADER_NEW = '''%%%% Do not edit this file; it is auto-generated from input/new
+LY_HEADER_NEW = '''%% Do not edit this file; it is auto-generated from input/new
+%% This file is in the public domain.
 '''
 
 DEST = os.path.join ('input', 'lsr')
@@ -51,23 +51,29 @@ unconverted = []
 notags_files = []
 
 # mark the section that will be printed verbatim by lilypond-book
-end_header_re = re.compile ('(\\header {.*?}\n)\n', re.M | re.S)
+end_header_re = re.compile ('(\\header {.+?(?:"\\s*|\\s+)}\n)\n', re.M | re.S)
 
 def mark_verbatim_section (ly_code):
        return end_header_re.sub ('\\1% begin verbatim\n', ly_code)
 
+# add tags to ly files from LSR
+add_tags_re = re.compile ('\\header\\s*{', re.M)
+
+def add_tags (ly_code, tags):
+       return add_tags_re.sub ('\\g<0>\n  lsrtags = "' + tags + '"\n', ly_code, 1)
+
 def copy_ly (srcdir, name, tags):
        global unsafe
        global unconverted
        dest = os.path.join (DEST, name)
-       f = open (dest, 'w')
+       tags = ', '.join (tags)
+       s = open (os.path.join (srcdir, name)).read ()
        if in_dir in srcdir:
-               h = LY_HEADER_LSR
+               s = LY_HEADER_LSR + add_tags (s, tags)
        else:
-               h = LY_HEADER_NEW
-       f.write (h % ', '.join (tags))
-       f.write (mark_verbatim_section (open (os.path.join (srcdir, name)).read ()))
-       f.close ()
+               s = LY_HEADER_NEW + s
+       s = mark_verbatim_section (s)
+       open (dest, 'w').write (s)
        e = os.system('convert-ly -e ' + dest)
        if e:
                unconverted.append (dest)
@@ -98,11 +104,12 @@ def read_source (src):
        s = {}
        l = dict ([(tag, set()) for tag in TAGS])
        for f in glob.glob (os.path.join (src, '*.ly')):
+               basename = os.path.basename (f)
                m = tags_re.search (open (f, 'r').read ())
                if m:
                        file_tags = [tag.strip() for tag in m.group (1). split(',')]
-                       s[f] = (src, file_tags)
-                       [l[tag].add (f) for tag in file_tags if tag in TAGS]
+                       s[basename] = (src, file_tags)
+                       [l[tag].add (basename) for tag in file_tags if tag in TAGS]
                else:
                        notags_files.append (f)
        return s, l
@@ -142,7 +149,8 @@ dump_file_list ('lsr-unsafe.txt', unsafe)
 sys.stderr.write ('''
 
 Unsafe files printed in lsr-unsafe.txt: CHECK MANUALLY!
-  xargs git-diff < lsr-unsafe.txt
+  git add input/lsr
+  xargs git-diff HEAD < lsr-unsafe.txt
 
 ''')