X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=buildscripts%2Fmakelsr.py;h=2c68e8c94fb67f49f872e850332191debf300094;hb=edf17353d89f4f6bd831466262402bb9151a26ca;hp=8ef81972a3520b81a082fd8c4025995f2ae6e41f;hpb=b27a0707cf55f60e68edfded6dea54a7bf046126;p=lilypond.git

diff --git a/buildscripts/makelsr.py b/buildscripts/makelsr.py
index 8ef81972a3..2c68e8c94f 100755
--- a/buildscripts/makelsr.py
+++ b/buildscripts/makelsr.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 
 import sys
 import os
@@ -10,25 +10,28 @@ 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')
 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'])
+'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',
@@ -51,30 +54,49 @@ 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 {.+?doctitle = ".+?})\n', re.M | re.S)
 
 def mark_verbatim_section (ly_code):
-	return end_header_re.sub ('\\1% begin verbatim\n', 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')
+	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:
-		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 ()
-	e = os.system('convert-ly -e ' + dest)
+		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)
 
@@ -85,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])
@@ -98,11 +120,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 +165,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/*.ly
+  xargs git-diff HEAD < lsr-unsafe.txt
 
 ''')