X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=buildscripts%2Fmakelsr.py;h=2c68e8c94fb67f49f872e850332191debf300094;hb=edf17353d89f4f6bd831466262402bb9151a26ca;hp=c4f512ae51a344c0a97c8f2cec974ff770266092;hpb=57221c9ee7a758169c9e2fe4805f0ed3598f50d5;p=lilypond.git diff --git a/buildscripts/makelsr.py b/buildscripts/makelsr.py index c4f512ae51..2c68e8c94f 100755 --- a/buildscripts/makelsr.py +++ b/buildscripts/makelsr.py @@ -1,30 +1,41 @@ -#!/usr/bin/python +#!/usr/bin/env python import sys import os import glob +import re USAGE = ''' Usage: makelsr.py LSR_SNIPPETS_DIR 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 = '''%%%% Do not edit this file; it is auto-generated from LSR! -%%%% 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 +%% This file is in the public domain. ''' 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']) +'repeats', 'simultaneous-notes', 'staff-notation', +'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' +]) -TAGS.append ('other') +# other +TAGS.extend (['contexts-and-engravers', 'tweaks-and-overrides', +'paper-and-layout', 'breaks', 'spacing', 'midi', 'titles', 'template']) def exit_with_usage (n=0): sys.stderr.write (USAGE) @@ -40,38 +51,86 @@ 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 {.+?doctitle = ".+?})\n', re.M | re.S) + +def mark_verbatim_section (ly_code): + return end_header_re.sub ('\\1 % begin verbatim\n', ly_code, 1) + +# '% 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 begin_header_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') - f.write (LY_HEADER % ', '.join (tags)) - f.write (open (os.path.join (srcdir, name)).read ()) - f.close () - e = os.system('convert-ly -e ' + dest) + 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 () + 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 '%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) -def read_source (src): +def read_source_with_dirs (src): s = {} l = {} for tag in TAGS: 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]) 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') @@ -80,9 +139,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: @@ -96,13 +155,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/*.ly + xargs git-diff HEAD < lsr-unsafe.txt ''')