Lilypond-book: rename variable in MusicXML snippets

[lilypond.git] / python / book_snippets.py

diff --git a/python/book_snippets.py b/python/book_snippets.py
index 5d6600691312bcb72e9d1fc5da328679a81e7352..0ecc5356dee930f0f1146cc2989b64668a8728a9 100644 (file)
--- a/python/book_snippets.py
+++ b/python/book_snippets.py
@@ -38,7 +38,6 @@ EXAMPLEINDENT = 'exampleindent'
 FILENAME = 'filename'
 FILTER = 'filter'
 FRAGMENT = 'fragment'
-LANG = 'lang'    ## TODO: This is handled nowhere!
 LAYOUT = 'layout'
 LILYQUOTE = 'lilyquote'
 LINE_WIDTH = 'line-width'
@@ -92,7 +91,6 @@ simple_options = [
     PRINTFILENAME,
     DOCTITLE,
     TEXIDOC,
-    LANG,
     VERBATIM,
     FILENAME,
     ALT,
@@ -145,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)
@@ -196,7 +177,6 @@ PREAMBLE_LY = '''%%%% Generated by %(program_name)s
 
 \paper {
   %(paper_string)s
-  force-assignment = #""
   line-width = #(- line-width (* mm  %(padding_mm)f))
 }
 
@@ -222,9 +202,22 @@ FULL_LY = '''
 %% ****************************************************************
 '''
 
+FRAGMENT_LY = r'''
+%(notes_string)s
+{
 
 
+%% ****************************************************************
+%% ly snippet contents follows:
+%% ****************************************************************
+%(code)s
+
 
+%% ****************************************************************
+%% end ly snippet
+%% ****************************************************************
+}
+'''
 
 
 
@@ -460,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
@@ -574,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):
@@ -868,19 +861,19 @@ class MusicXMLFileSnippet (LilypondFileSnippet):
 
     def convert_from_musicxml (self):
         name = self.filename
-        option_list = []
+        xml2ly_option_list = []
         for (key, value) in self.option_dict.items ():
             cmd_key = self.musicxml_options_dict.get (key, None)
             if cmd_key == None:
                 continue
             if value == None:
-                option_list.append (cmd_key)
+                xml2ly_option_list.append (cmd_key)
             else:
-                option_list.append (cmd_key + '=' + value)
-        if ('.mxl' in name) and ('--compressed' not in option_list):
-            option_list.append ('--compressed')
+                xml2ly_option_list.append (cmd_key + '=' + value)
+        if ('.mxl' in name) and ('--compressed' not in xml2ly_option_list):
+            xml2ly_option_list.append ('--compressed')
             self.compressed = True
-        opts = " ".join (option_list)
+        opts = " ".join (xml2ly_option_list)
         progress (_ ("Converting MusicXML file `%s'...\n") % self.filename)
 
         ly_code = self.filter_pipe (self.contents, 'musicxml2ly %s --out=- - ' % opts)