X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scripts%2Fmidi2ly.py;h=3a29f9aaa1cebe66db1b3c16b770dd7a866b9b58;hb=912d8cf5e3c04f89af05c71441760a9b864e5924;hp=5358fc46984ad6e8a49e363c2aaf622f816c18b9;hpb=720bdb29cfac44d9469a54d44bb002e1ccab15f9;p=lilypond.git diff --git a/scripts/midi2ly.py b/scripts/midi2ly.py index 5358fc4698..3a29f9aaa1 100644 --- a/scripts/midi2ly.py +++ b/scripts/midi2ly.py @@ -267,11 +267,13 @@ class Note: elif commas < 0: s = s + "," * -commas - if ((dump_dur - and self.duration.compare (reference_note.duration)) - or global_options.explicit_durations): + if (dump_dur + and (self.duration.compare (reference_note.duration) + or global_options.explicit_durations)): s = s + self.duration.dump () + # Chords need to handle their reference duration themselves + reference_note = self # TODO: move space @@ -653,13 +655,17 @@ def dump_chord (ch): s = s + dump (notes[0]) elif len (notes) > 1: global reference_note + reference_dur = reference_note.duration s = s + '<' s = s + notes[0].dump (dump_dur=False) r = reference_note for i in notes[1:]: s = s + i.dump (dump_dur=False) s = s + '>' - s = s + notes[0].duration.dump () + ' ' + if (r.duration.compare (reference_dur) + or global_options.explicit_durations): + s = s + r.duration.dump () + s = s + ' ' reference_note = r return s