From 6676553f94d1224a9956a43b4b5a3e4777bb47ce Mon Sep 17 00:00:00 2001 From: John Gourlay Date: Tue, 15 Mar 2016 16:41:26 -0400 Subject: [PATCH] In musicexp.py generate "Staff.keyAlterations" rather than "Staff.keySignature". In musicxml2ly.py store the LilyPond version in one variable, lilypond_version. --- python/musicexp.py | 2 +- scripts/musicxml2ly.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/python/musicexp.py b/python/musicexp.py index c2c2b1b60d..e32c4895e6 100644 --- 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 7c5dc69c1a..a1faae56ce 100644 --- 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 -- 2.39.2