Merge branch 'master' of ssh+git://hanwen@git.sv.gnu.org/srv/git/lilypond

[lilypond.git] / scripts / lilypond-book.py

diff --git a/scripts/lilypond-book.py b/scripts/lilypond-book.py
index cf51582dd58ac952d6200f986059799cc3677d88..ebe2efd1dd1797665f3bc8d18aab37f004234ddf 100644 (file)
--- a/scripts/lilypond-book.py
+++ b/scripts/lilypond-book.py
@@ -676,17 +676,14 @@ if 0:
 PREAMBLE_LY = '''%%%% Generated by %(program_name)s
 %%%% Options: [%(option_string)s]
 \\include "lilypond-book-preamble.ly"
-%(preamble_string)s
-
-
-
-
 
 
 %% ****************************************************************
 %% Start cut-&-pastable-section 
 %% ****************************************************************
 
+%(preamble_string)s
+
 \paper {
   #(define dump-extents #t)
   %(font_dump_setting)s
@@ -1078,7 +1075,7 @@ class Lilypond_snippet (Snippet):
         open (self.basename () + '.txt', 'w').write ('image of music')
 
     def relevant_contents (self, ly):
-        return re.sub (r'\\(version|sourcefileline)[^\n]*\n', '', ly)
+        return re.sub (r'\\(version|sourcefileline|sourcefilename)[^\n]*\n', '', ly)
              
     def ly_is_outdated (self):
         base = self.basename ()