From: Reinhold Kainhofer <reinhold@kainhofer.com>
Date: Sun, 21 Aug 2011 14:35:01 +0000 (+0200)
Subject: Lilypond-book: Move code around, no real changes
X-Git-Tag: release/2.15.9-1~9^2~18
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=2e64d8a758a2fc90734568e79303dc92950000bc;p=lilypond.git

Lilypond-book: Move code around, no real changes
---

diff --git a/python/book_snippets.py b/python/book_snippets.py
index a7f99f875f..f5ce34d3b9 100644
--- a/python/book_snippets.py
+++ b/python/book_snippets.py
@@ -143,23 +143,6 @@ snippet_options = {
 
 
 
-FRAGMENT_LY = r'''
-%(notes_string)s
-{
-
-
-%% ****************************************************************
-%% ly snippet contents follows:
-%% ****************************************************************
-%(code)s
-
-
-%% ****************************************************************
-%% end ly snippet
-%% ****************************************************************
-}
-'''
-
 def classic_lilypond_book_compatibility (key, value):
     if key == 'singleline' and value == None:
         return (RAGGED_RIGHT, None)
@@ -219,9 +202,22 @@ FULL_LY = '''
 %% ****************************************************************
 '''
 
+FRAGMENT_LY = r'''
+%(notes_string)s
+{
+
 
+%% ****************************************************************
+%% ly snippet contents follows:
+%% ****************************************************************
+%(code)s
 
 
+%% ****************************************************************
+%% end ly snippet
+%% ****************************************************************
+}
+'''
 
 
 
@@ -457,10 +453,6 @@ left-margin-default right-margin-default)"
         return self.option_list
 
     def compose_ly (self, code):
-        if FRAGMENT in self.option_dict:
-            body = FRAGMENT_LY
-        else:
-            body = FULL_LY
 
         # Defaults.
         relative = 1
@@ -571,6 +563,10 @@ left-margin-default right-margin-default)"
         d = globals().copy()
         d.update (locals())
         d.update (self.global_options.information)
+        if FRAGMENT in self.option_dict:
+            body = FRAGMENT_LY
+        else:
+            body = FULL_LY
         return (PREAMBLE_LY + body) % d
 
     def get_checksum (self):