Merge branch 'dev/texi2html' of ssh://jomand@git.sv.gnu.org/srv/git/lilypond into...

[lilypond.git] / buildscripts / makelsr.py

diff --git a/buildscripts/makelsr.py b/buildscripts/makelsr.py
index a5fd48013e4e6f12af5c15dcb6c4d6c0616ba745..f3f91a0c0261e342b0a343fa99fa9591865e0496 100755 (executable)
--- a/buildscripts/makelsr.py
+++ b/buildscripts/makelsr.py
@@ -52,10 +52,10 @@ unconverted = []
 notags_files = []
 
 # mark the section that will be printed verbatim by lilypond-book
-end_header_re = re.compile ('(\\header {.+?(?:"\\s*|\\s+)}\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, 1)
+       return end_header_re.sub ('\\1 % begin verbatim\n', ly_code, 1)
 
 begin_header_re = re.compile ('\\header\\s*{', re.M)
 
@@ -159,7 +159,7 @@ dump_file_list ('lsr-unsafe.txt', unsafe)
 sys.stderr.write ('''
 
 Unsafe files printed in lsr-unsafe.txt: CHECK MANUALLY!
-  git add input/lsr
+  git add input/lsr/*.ly
   xargs git-diff HEAD < lsr-unsafe.txt
 
 ''')