X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scripts%2Fmusicxml2ly.py;h=307650e2f77c620ac5a358362b9264a4304f6318;hb=ec0da1aa961d2527eeb627e7d3ffca382f9b16f0;hp=172f1a8d3e44b5e36bd07141c6e7db899f9052d4;hpb=1f6e0e7a473c909c5577cba57d93e5a1c6f9f975;p=lilypond.git diff --git a/scripts/musicxml2ly.py b/scripts/musicxml2ly.py index 172f1a8d3e..307650e2f7 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 @@ -1185,7 +1193,7 @@ articulations_dict = { #"shake": "?", "snap-pizzicato": "snappizzicato", #"spiccato": "?", - "staccatissimo": (musicexp.ShortArticulationEvent, "|"), # or "staccatissimo" + "staccatissimo": (musicexp.ShortArticulationEvent, "!"), # or "staccatissimo" "staccato": (musicexp.ShortArticulationEvent, "."), # or "staccato" "stopped": (musicexp.ShortArticulationEvent, "+"), # or "stopped" #"stress": "?",