X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scripts%2Fauxiliar%2Fmakelsr.py;h=6927476be928b4c249761300bc550b3959751a1e;hb=b5a72fde8d11be3bbcf2b78d98ece9e513c0de57;hp=d012f1faca4a1e9b4460036cea3909771dbf78d7;hpb=9158bc17904d4dd930a1f776cfe3226f1ad84092;p=lilypond.git

diff --git a/scripts/auxiliar/makelsr.py b/scripts/auxiliar/makelsr.py
index d012f1faca..6927476be9 100755
--- a/scripts/auxiliar/makelsr.py
+++ b/scripts/auxiliar/makelsr.py
@@ -21,50 +21,51 @@ 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
 
-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)
 
+TAGS = []
+
 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)):
         exit_with_usage (3)
+    TAGS = os.listdir (in_dir)
 else:
     in_dir = ''
 
 # 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 = []
@@ -119,12 +120,27 @@ def update_translated_texidoc (m, snippet_path, visited_languages):
     else:
         return m.group (0)
 
+def escape_backslashes_in_header(snippet):
+    # ASSUME: the \header exists.
+    header_char_number_start = snippet.find('\header {')
+    header_char_number_end = snippet.find('} % begin verbatim')
+
+    header = snippet[header_char_number_start:header_char_number_end]
+    # two levels of escaping happening here -- 4\ means 1\
+    # and the 10\ means two \ backslashes (that's 8\ ), and
+    # 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:])
+    return escaped_snippet
+
 def copy_ly (srcdir, name, tags):
     global unsafe
     global unconverted
     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 = \
@@ -146,17 +162,18 @@ def copy_ly (srcdir, name, tags):
     s = mark_verbatim_section (s)
     s = lsr_comment_re.sub ('', s)
     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+(" -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)
 
@@ -223,6 +240,8 @@ def update_ly_in_place (snippet_path):
         else:
             need_line_break_workaround = True
     contents = doctitle_re.sub (doctitle_sub, contents)
+    contents = escape_backslashes_in_header (contents)
+
     # workaround for a bug in the regex's that I'm not smart
     # enough to figure out.  -gp
     if need_line_break_workaround: