From 9e05a37eca6a41fead1a7de331e16b683671661d Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Sat, 3 Dec 2005 12:02:58 +0000 Subject: [PATCH] *** empty log message *** --- python/musicxml.py | 9 +++------ scripts/musicxml2ly.py | 4 +++- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/python/musicxml.py b/python/musicxml.py index 9537f9a753..87240cbb16 100644 --- a/python/musicxml.py +++ b/python/musicxml.py @@ -230,9 +230,10 @@ class Part (Music_xml_node): class Chord (Music_xml_node): pass - class Dot (Music_xml_node): pass +class Alter (Music_xml_node): + pass class Rest (Music_xml_node): pass @@ -243,6 +244,7 @@ class Grace (Music_xml_node): pass class_dict = { + 'alter': Alter, 'grace': Grace, 'rest':Rest, 'dot': Dot, @@ -332,11 +334,6 @@ def read_musicxml (name): strip_white_space (tree) return tree - - - - - if __name__ == '__main__': tree = read_musicxml ('BeetAnGeSample.xml') test_musicxml (tree) diff --git a/scripts/musicxml2ly.py b/scripts/musicxml2ly.py index ee8f84d1b6..a1a1def9b0 100644 --- a/scripts/musicxml2ly.py +++ b/scripts/musicxml2ly.py @@ -12,6 +12,8 @@ if os.environ.has_key ('LILYPONDPREFIX'): if os.path.exists (os.path.join (datadir, 'share/lilypond/@TOPLEVEL_VERSION@/')): datadir = os.path.join (datadir, 'share/lilypond/@TOPLEVEL_VERSION@/') +elif os.path.exists (os.path.join (datadir, 'share/lilypond/current/')): + datadir = os.path.join (datadir, 'share/lilypond/current/') sys.path.insert (0, os.path.join (datadir, 'python')) @@ -87,7 +89,7 @@ def musicxml_voice_to_lily_voice (voice): seq_music = musicexp.SequentialMusic() - seq_musicexp.elements = ly_voice + seq_music.elements = ly_voice return seq_music -- 2.39.5