(Lilypond_snippet.compose_ly): don't

use __main__

diff --git a/ChangeLog b/ChangeLog
index 7ec53b95b14fa4f99727a4281e8ccb016c81f787..6050eb70f1d7ab82ec8338ccce07f9a9ca674240 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2006-03-02  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
+       * scripts/lilypond-book.py (Lilypond_snippet.compose_ly): don't
+       use __main__
+
        * lily/accidental-engraver.cc (make_standard_accidental): only add
        support for side-axis is X_AXIS. Fixes text-spacing-accidental.ly
 

diff --git a/scripts/lilypond-book.py b/scripts/lilypond-book.py
index 8e9bb407e3d0b2372fadbabdf23fae15641d72ad..48a16f49c365d36f8b52067e561d9b97d49e95b8 100644 (file)
--- a/scripts/lilypond-book.py
+++ b/scripts/lilypond-book.py
@@ -991,12 +991,14 @@ class Lilypond_snippet (Snippet):
                                            '\n  ') % vars ()
                preamble_string = string.join (compose_dict[PREAMBLE],
                                               '\n  ') % override
-
+               
                font_dump_setting = ''
                if FONTLOAD in self.option_dict:
                        font_dump_setting = '#(define-public force-eps-font-include #t)\n'
 
-               return (PREAMBLE_LY + body) % vars ()
+               d = globals().copy()
+               d.update (locals())
+               return (PREAMBLE_LY + body) % d
 
        # TODO: Use md5?
        def get_hash (self):