From: hanwen <hanwen>
Date: Thu, 2 Mar 2006 19:30:47 +0000 (+0000)
Subject: (Lilypond_snippet.compose_ly): don't
X-Git-Tag: release/2.7.38^2~9
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=c7f592ddf2d47b6222b0fa6b6052e84ca50c067d;p=lilypond.git

(Lilypond_snippet.compose_ly): don't
use __main__
---

diff --git a/ChangeLog b/ChangeLog
index 7ec53b95b1..6050eb70f1 100644
--- 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 8e9bb407e3..48a16f49c3 100644
--- 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):