Improve auxiliar/doc-section.sh

[lilypond.git] / scripts / auxiliar / makelsr.py

diff --git a/scripts/auxiliar/makelsr.py b/scripts/auxiliar/makelsr.py
index be4e7daff3a2bfd15b16aef6d6c5d69e737110a6..a03466310b36cf47d7e91f12c7e6f79422a680d3 100755 (executable)
--- a/scripts/auxiliar/makelsr.py
+++ b/scripts/auxiliar/makelsr.py
@@ -21,13 +21,19 @@ If a snippet is present in both directories, the one
 from %(NEW_LYS)s is preferred.
 ''' % vars ()
 
-LY_HEADER_LSR = '''%% Do not edit this file; it is automatically
+LY_HEADER_LSR = '''%% DO NOT EDIT this file manually; it is automatically
 %% generated from LSR http://lsr.dsi.unimi.it
+%% Make any changes in LSR itself, or in Documentation/snippets/new/ ,
+%% and then run scripts/auxiliar/makelsr.py
+%%
 %% This file is in the public domain.
 '''
 
-LY_HEADER_NEW = '''%% Do not edit this file; it is automatically
+LY_HEADER_NEW = '''%% DO NOT EDIT this file manually; it is automatically
 %% generated from %s
+%% Make any changes in Documentation/snippets/new/
+%% and then run scripts/auxiliar/makelsr.py
+%%
 %% This file is in the public domain.
 ''' % NEW_LYS
 
@@ -62,9 +68,13 @@ else:
 # which convert-ly to use
 if os.path.isfile("out/bin/convert-ly"):
     conv_path='out/bin/'
+elif os.path.isfile("build/out/bin/convert-ly"):
+    conv_path='build/out/bin/'
 else:
     conv_path=''
 convert_ly=conv_path+'convert-ly'
+lilypond_bin=conv_path+'lilypond'
+
 print 'using '+convert_ly
 
 unsafe = []
@@ -130,7 +140,7 @@ def escape_backslashes_in_header(snippet):
     # one backreference to group 1 (that's two 2\ ).
     new_header = re.sub("@code\{\\\\([a-zA-Z])", "@code{\\\\\\\\\\1", header)
     escaped_snippet = (snippet[:header_char_number_start] +
-       new_header + snippet[header_char_number_end:])
+        new_header + snippet[header_char_number_end:])
     return escaped_snippet
 
 def copy_ly (srcdir, name, tags):
@@ -163,15 +173,14 @@ def copy_ly (srcdir, name, tags):
     s = escape_backslashes_in_header (s)
     open (dest, 'w').write (s)
 
-    e = os.system (convert_ly+(" -e '%s'" % dest))
+    e = os.system (convert_ly+(" -d -e '%s'" % dest))
     if e:
         unconverted.append (dest)
     if os.path.exists (dest + '~'):
         os.remove (dest + '~')
     # no need to check snippets from input/new
     if in_dir and in_dir in srcdir:
-        # -V seems to make unsafe snippets fail nicer/sooner
-        e = os.system ("lilypond -V -dno-print-pages -dsafe -o /tmp/lsrtest '%s'" % dest)
+        e = os.system ("%s -dno-print-pages -dsafe -o /tmp/lsrtest '%s'" %(lilypond_bin, dest))
         if e:
             unsafe.append (dest)