From 1b473723a8acf07a58f44561068fed212e5bcd98 Mon Sep 17 00:00:00 2001
From: Phil Holmes <mail@philholmes.net>
Date: Sun, 8 Apr 2012 14:54:37 +0100
Subject: [PATCH] makelsr updates

Adds minor progress messages (easier to track what's going on)
and uses directory list rather than explicit list of tags.
---
 scripts/auxiliar/makelsr.py | 22 +++++++---------------
 1 file changed, 7 insertions(+), 15 deletions(-)

diff --git a/scripts/auxiliar/makelsr.py b/scripts/auxiliar/makelsr.py
index a03466310b..3d088b5269 100755
--- a/scripts/auxiliar/makelsr.py
+++ b/scripts/auxiliar/makelsr.py
@@ -37,27 +37,15 @@ LY_HEADER_NEW = '''%% DO NOT EDIT this file manually; it is automatically
 %% This file is in the public domain.
 ''' % NEW_LYS
 
-TAGS = []
-# NR 1
-TAGS.extend (['pitches', 'rhythms', 'expressive-marks',
-'repeats', 'simultaneous-notes', 'staff-notation',
-'editorial-annotations', 'text'])
-# NR 2
-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',
-'paper-and-layout', 'breaks', 'spacing', 'midi', 'titles', 'template'])
-
 def exit_with_usage (n=0):
     sys.stderr.write (USAGE)
     sys.exit (n)
 
 if len (sys.argv) >= 2:
     in_dir = sys.argv[1]
+    if not (os.path.isdir (in_dir)):
+        sys.stderr.write (in_dir + ' is not a directory.\n')
+        exit (2)
     if len (sys.argv) >= 3:
         exit_with_usage (2)
     if not (os.path.isdir (DEST) and os.path.isdir (NEW_LYS)):
@@ -65,6 +53,8 @@ if len (sys.argv) >= 2:
 else:
     in_dir = ''
 
+TAGS = os.listdir (in_dir)
+
 # which convert-ly to use
 if os.path.isfile("out/bin/convert-ly"):
     conv_path='out/bin/'
@@ -149,6 +139,7 @@ def copy_ly (srcdir, name, tags):
     dest = os.path.join (DEST, name)
     tags = ', '.join (tags)
     s = open (os.path.join (srcdir, name)).read ()
+    sys.stderr.write ('\nmakelsr.py: reading ' + os.path.join (srcdir, name) + '\n')
 
     for path in TEXIDOCS:
         texidoc_translation_path = \
@@ -172,6 +163,7 @@ def copy_ly (srcdir, name, tags):
     s = strip_white_spaces_re.sub ('', s)
     s = escape_backslashes_in_header (s)
     open (dest, 'w').write (s)
+    sys.stderr.write ('makelsr.py: writing ' + dest + '\n')
 
     e = os.system (convert_ly+(" -d -e '%s'" % dest))
     if e:
-- 
2.39.2