From: Erlend Aasland <erlend.aasland@mac.com>
Date: Mon, 4 Feb 2008 09:35:01 +0000 (+0100)
Subject: MusicXML: Only print tremolos once.
X-Git-Tag: release/2.11.39-1~1^2~24
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=bfda8de0877891229b8366b56add7ec67cf37dc1;p=lilypond.git

MusicXML: Only print tremolos once.
Also default to three tremolo marks if none is specified.
---

diff --git a/scripts/musicxml2ly.py b/scripts/musicxml2ly.py
index bf41a46779..45e6334420 100644
--- a/scripts/musicxml2ly.py
+++ b/scripts/musicxml2ly.py
@@ -767,16 +767,18 @@ def musicxml_fermata_to_lily_event (mxl_event):
         ev.force_direction = dir
     return ev
 
-
 def musicxml_arpeggiate_to_lily_event (mxl_event):
     ev = musicexp.ArpeggioEvent ()
     ev.direction = musicxml_direction_to_indicator (getattr (mxl_event, 'direction', None))
     return ev
 
-
 def musicxml_tremolo_to_lily_event (mxl_event):
     ev = musicexp.TremoloEvent ()
-    ev.bars = mxl_event.get_text ()
+    txt = mxl_event.get_text ()
+    if txt:
+	ev.bars = mxl_event.get_text ()
+    else:
+	ev.bars = "3"
     return ev
 
 def musicxml_bend_to_lily_event (mxl_event):
@@ -784,7 +786,6 @@ def musicxml_bend_to_lily_event (mxl_event):
     ev.alter = mxl_event.bend_alter ()
     return ev
 
-
 def musicxml_fingering_event (mxl_event):
     ev = musicexp.ShortArticulationEvent ()
     ev.type = mxl_event.get_text ()
@@ -1480,12 +1481,6 @@ def musicxml_voice_to_lily_voice (voice):
             #         shake | wavy-line | mordent | inverted-mordent | 
             #         schleifer | tremolo | other-ornament, accidental-mark
             ornaments = notations.get_named_children ('ornaments')
-            for a in ornaments:
-                for ch in a.get_named_children ('tremolo'):
-                    ev = musicxml_tremolo_to_lily_event (ch)
-                    if ev: 
-                        ev_chord.append (ev)
-
             ornaments += notations.get_named_children ('articulations')
             ornaments += notations.get_named_children ('technical')