Change Info docs setup and clean up Documentation/user/GNUmakefile

[lilypond.git] / buildscripts / makelsr.py

diff --git a/buildscripts/makelsr.py b/buildscripts/makelsr.py
index 61317729cb0ff16d4d0caa1889fcef91ddd6e350..05ed101fd4df577754fcbb268c080295fe369229 100755 (executable)
--- a/buildscripts/makelsr.py
+++ b/buildscripts/makelsr.py
@@ -10,13 +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: %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
-%%%% Tags: %s
+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')
@@ -33,7 +32,7 @@ TAGS.extend (['vocal-music', 'chords', 'piano-music',
 
 # other
 TAGS.extend (['contexts-and-engravers', 'tweaks-and-overrides',
-'paper-and-layout', 'breaks', 'spacing', 'midi', 'titles', 'template', 'other'])
+'paper-and-layout', 'breaks', 'spacing', 'midi', 'titles', 'template'])
 
 def exit_with_usage (n=0):
        sys.stderr.write (USAGE)
@@ -49,25 +48,32 @@ if not (os.path.isdir (DEST) and os.path.isdir (NEW_LYS)):
 
 unsafe = []
 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)
@@ -78,7 +84,7 @@ def copy_ly (srcdir, name, tags):
        if e:
                unsafe.append (dest)
 
-def read_source (src):
+def read_source_with_dirs (src):
        s = {}
        l = {}
        for tag in TAGS:
@@ -91,6 +97,24 @@ def read_source (src):
                                s[f] = (srcdir, [tag])
        return s, l
 
+
+tags_re = re.compile ('lsrtags\\s*=\\s*"(.+?)"')
+
+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[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
+
+
 def dump_file_list (file, list):
        f = open (file, 'w')
        f.write ('\n'.join (list) + '\n')
@@ -99,9 +123,9 @@ def dump_file_list (file, list):
 map (os.remove, glob.glob (os.path.join (DEST, '*.ly')) +
      glob.glob (os.path.join (DEST, '*.snippet-list')))
 
-# read LSR source
-snippets, tag_lists = read_source (in_dir)
-# read input/new
+# read LSR source where tags are defined by subdirs
+snippets, tag_lists = read_source_with_dirs (in_dir)
+# read input/new where tags are directly
 s, l = read_source (NEW_LYS)
 snippets.update (s)
 for t in TAGS:
@@ -115,13 +139,18 @@ for (tag, file_set) in tag_lists.items ():
 
 if unconverted:
        sys.stderr.write ('These files could not be converted successfully by convert-ly:\n')
-       sys.stderr.write ('\n'.join (unconverted))
+       sys.stderr.write ('\n'.join (unconverted) + '\n\n')
+
+if notags_files:
+       sys.stderr.write ('No tags could be found in these files:\n')
+       sys.stderr.write ('\n'.join (notags_files) + '\n\n')
 
 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
 
 ''')