From 2fdd04ac45bbc4d24a95616a7cc5e2239714ae5c Mon Sep 17 00:00:00 2001 From: Matthias Neeracher Date: Tue, 29 May 2007 07:53:57 +0000 Subject: [PATCH] Be more conservative about triplets --- Sources/VLModel.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Sources/VLModel.cpp b/Sources/VLModel.cpp index 152c921..8d93805 100644 --- a/Sources/VLModel.cpp +++ b/Sources/VLModel.cpp @@ -477,8 +477,7 @@ void VLMeasure::DecomposeNotes(const VLProperties & prop, VLNoteList & decompose VLFraction grid(2*swung); if (p.fDuration == 4*swung/3 && (at % grid == 0)) { if (p.fDuration == c.fDuration && n!=e - && (n->fDuration == p.fDuration - || (n->fDuration == 2*p.fDuration)) + && n->fDuration == p.fDuration ) { ; // Triplet, not swing note } else { @@ -494,8 +493,9 @@ void VLMeasure::DecomposeNotes(const VLProperties & prop, VLNoteList & decompose // Second swing note (8th triplet -> 8th) // p.fVisual &= VLNote::kNoteHead; - } else if (p.fDuration != c.fDuration - && 2*p.fDuration != c.fDuration + } else if ((at % p.fDuration != 0) + || (p.fDuration != c.fDuration + && 2*p.fDuration != c.fDuration) ) { // // Get rid of awkward triplets