* scripts/lilypond-book.py: Backport bugfix by Mats Bengtsson.

diff --git a/ChangeLog b/ChangeLog
index d73042d2393e3806b672374cacf1639c75cf4cb2..94ddca93ad0b164c5bb5b6092d5d200df2c6c8d0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2005-10-23  Erik Sandberg  <mandolaerik@gmail.com>
+
+       * scripts/lilypond-book.py: Backport bugfix by Mats Bengtsson.
+
 2005-10-11  Jan Nieuwenhuizen  <janneke@gnu.org>
 
        * cygwin/postinstall-lilypond.sh: Remove cruft.

diff --git a/THANKS b/THANKS
index aef612c9ec38949c57fa1eabcd3d8bbb23cc278e..e82db8871194bd4fb86409aecaa715242ca21b81 100644 (file)
--- a/THANKS
+++ b/THANKS
@@ -80,6 +80,7 @@ Ed Jackson
 Erik Ronström
 Fernando Pablo Lopez-Lezcano
 Gilles Sadowski
+Pothárn Imre
 Jack O'Quin
 Jeff Smith
 Johannes Schindelin

diff --git a/scripts/lilypond-book.py b/scripts/lilypond-book.py
index e8cebdd43adeb6e6f90b8fda9a5e369a643f9cbb..9618c066b6d5e19f75c0f05953f460a210909391 100644 (file)
--- a/scripts/lilypond-book.py
+++ b/scripts/lilypond-book.py
@@ -561,9 +561,13 @@ PREAMBLE_LY = r'''%%%% Generated by %(program_name)s
 %(preamble_string)s
 
 
-%% ********************************
+
+
+
+
+%% ****************************************************************
 %% Start cut-&-pastable-section 
-%% ********************************
+%% ****************************************************************
 
 \paper {
   #(define dump-extents #t)
@@ -579,16 +583,32 @@ PREAMBLE_LY = r'''%%%% Generated by %(program_name)s
 FRAGMENT_LY = r'''
 %(notes_string)s
 {
+
+
+%% ****************************************************************
 %% ly snippet contents follows:
+%% ****************************************************************
 %(code)s
+
+
+%% ****************************************************************
 %% end ly snippet
+%% ****************************************************************
 }
 '''
 
 FULL_LY = '''
+
+
+%% ****************************************************************
 %% ly snippet:
+%% ****************************************************************
 %(code)s
+
+
+%% ****************************************************************
 %% end ly snippet
+%% ****************************************************************
 '''
 
 texinfo_linewidths = {
@@ -1034,10 +1054,10 @@ class Lilypond_snippet (Snippet):
                        if VERBATIM in self.option_dict:
                                verb = self.substring ('code')
                                str += (output[LATEX][VERBATIM] % vars ())
-                       if QUOTE in self.option_dict:
-                               str = output[LATEX][QUOTE] % vars ()
 
                str += (output[LATEX][OUTPUT] % vars ())
+               if QUOTE in self.option_dict:
+                       str = output[LATEX][QUOTE] % vars ()
                return str
 
        def output_print_filename (self, format):