Merge branch 'master' into nested-bookparts

[lilypond.git] / buildscripts / texi-langutils.py

diff --git a/buildscripts/texi-langutils.py b/buildscripts/texi-langutils.py
index 37de5cc4193475aafdba0c6396e8ac1e30e7ed04..720b520a2e8aa8e33c647c6909d86e0723cec170 100644 (file)
--- a/buildscripts/texi-langutils.py
+++ b/buildscripts/texi-langutils.py
@@ -62,7 +62,8 @@ texinfo_with_menus_re = re.compile (r"^(\*) +([^:\n]+)::.*?$|^@(include|menu|end
 texinfo_re = re.compile (r"^@(include|node|(?:unnumbered|appendix)(?:(?:sub){0,2}sec)?|top|chapter|(?:sub){0,2}section|(?:major|chap|(?:sub){0,2})heading) *(.+?)$|@(rglos){(.+?)}", re.M)
 
 ly_string_re = re.compile (r'^([a-zA-Z]+)[\t ]*=|%+[\t ]*(.*)$|\\(?:new|context)\s+(?:[a-zA-Z]*?(?:Staff(?:Group)?|Voice|FiguredBass|FretBoards|Names|Devnull))\s+=\s+"?([a-zA-Z]+)"?\s+')
-verbatim_ly_re = re.compile (r'@lilypond\[.*?verbatim')
+lsr_verbatim_ly_re = re.compile (r'% begin verbatim$')
+texinfo_verbatim_ly_re = re.compile (r'^@lilypond\[.*?verbatim')
 
 def process_texi (texifilename, i_blurb, n_blurb, write_skeleton, topfile, output_file=None, scan_ly=False):
     try:
@@ -73,12 +74,16 @@ def process_texi (texifilename, i_blurb, n_blurb, write_skeleton, topfile, outpu
         includes = []
 
         # process ly var names and comments
-        if output_file and scan_ly:
+        if output_file and (scan_ly or texifilename.endswith ('.ly')):
             lines = texifile.splitlines ()
             i = 0
             in_verb_ly_block = False
+            if texifilename.endswith ('.ly'):
+                verbatim_ly_re = lsr_verbatim_ly_re
+            else:
+                verbatim_ly_re = texinfo_verbatim_ly_re
             for i in range (len (lines)):
-                if verbatim_ly_re.match (lines[i]):
+                if verbatim_ly_re.search (lines[i]):
                     in_verb_ly_block = True
                 elif lines[i].startswith ('@end lilypond'):
                     in_verb_ly_block = False