In musicexp.py generate "Staff.keyAlterations" rather than "Staff.keySignature".

In musicxml2ly.py store the LilyPond version in one variable, lilypond_version.

diff --git a/python/musicexp.py b/python/musicexp.py
index c2c2b1b60db63100e290aab008f5d4069a069924..e32c4895e60045004fc29ecf148dfb042c86c0a8 100644 (file)
--- a/python/musicexp.py
+++ b/python/musicexp.py
@@ -1817,7 +1817,7 @@ class KeySignatureChange (Music):
         elif self.non_standard_alterations:
             alterations = [self.format_non_standard_alteration (a) for
                                         a in self.non_standard_alterations]
-            return "\\set Staff.keySignature = #`(%s)" % string.join (alterations, " ")
+            return "\\set Staff.keyAlterations = #`(%s)" % string.join (alterations, " ")
         else:
             return ''
 

diff --git a/scripts/musicxml2ly.py b/scripts/musicxml2ly.py
index 7c5dc69c1a749a67531a4df0dfe82d1ca7202429..a1faae56ce04b98bbf980354bef71a83bdb9a222 100644 (file)
--- a/scripts/musicxml2ly.py
+++ b/scripts/musicxml2ly.py
@@ -24,6 +24,8 @@ import musicexp
 
 from rational import Rational
 
+lilypond_version = "@TOPLEVEL_VERSION@"
+
 # Store command-line options in a global variable, so we can access them everywhere
 options = None
 
@@ -3217,8 +3219,6 @@ def get_existing_filename_with_extension(filename, ext):
 
 
 def main():
-    global lilypond_version
-    lilypond_version = "@TOPLEVEL_VERSION@"
     opt_parser = option_parser()
 
     global options