From: John Gourlay <john@weathervanefarm.net>
Date: Wed, 6 Apr 2016 15:11:14 +0000 (-0400)
Subject: In scripts/musicxml2ly.py fix a bug that caused a dynamic on the last note
X-Git-Tag: release/2.19.44-1~24^2~11
X-Git-Url: https://git.donarmstrong.com/?p=lilypond.git;a=commitdiff_plain;h=9b2a61fc68fbe88f71000d7cd7f2f474c047db30

In scripts/musicxml2ly.py fix a bug that caused a dynamic on the last note
of a tuplet to be emitted after the tuplet's braces rather than within them.
---

diff --git a/scripts/musicxml2ly.py b/scripts/musicxml2ly.py
index 172f1a8d3e..7c5297b5ff 100644
--- a/scripts/musicxml2ly.py
+++ b/scripts/musicxml2ly.py
@@ -762,6 +762,14 @@ def group_tuplets(music_list, events):
         new_list.extend(music_list[last:i1])
         seq = musicexp.SequentialMusic()
         last = i2 + 1
+
+        # At this point music_list[i1:last] encompasses all the notes of the
+        # tuplet. There might be dynamics following this range, however, which
+        # apply to the last note of the tuplet. Advance last to include them
+        # in the range.
+        while last < len(music_list) and isinstance(music_list[last], musicexp.DynamicsEvent):
+            last += 1
+
         seq.elements = music_list[i1:last]
 
         tsm.element = seq