From 9db3336ca6e9c1761b18230e7fd96a37a3ea99a4 Mon Sep 17 00:00:00 2001
From: Matthias Neeracher <neeri@users.sourceforge.net>
Date: Sat, 14 Mar 2009 23:04:25 +0000
Subject: [PATCH] Further improvements in decomposition

---
 Sources/VLModel.cpp | 20 +++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/Sources/VLModel.cpp b/Sources/VLModel.cpp
index a7f2ee4..1af0863 100644
--- a/Sources/VLModel.cpp
+++ b/Sources/VLModel.cpp
@@ -437,6 +437,7 @@ void VLMeasure::DecomposeNotes(const VLProperties & prop, VLNoteList & decompose
 	const VLFraction kQuarterDur(1,4);
 	const VLFraction kEighthLoc(1,8);
 	const VLFraction kQuarTripLoc(1,6);
+	const VLFraction kMinDuration(1,4*prop.fDivisions);
 
 	VLFraction 	at(0);
 	VLNoteList::const_iterator 	i 	= fMelody.begin();
@@ -451,18 +452,31 @@ void VLMeasure::DecomposeNotes(const VLProperties & prop, VLNoteList & decompose
 		
 		VLLyricsNote c	= *i;	// Current note, remaining duration
 		VLLyricsNote p  = c;	// Next partial note
+		VLFraction   r(0);
 		do {
 			//
 			// Start with longest possible note
 			//
 			p.MakeRepresentable(); 
 			//
+			// Don't paint ourselves into a corner by leaving a non-representable
+			// remainder.
+			//
+			if (p.fDuration != c.fDuration && (c.fDuration-p.fDuration) % kMinDuration != 0) {
+				r          += kMinDuration;
+				p.fDuration = c.fDuration-r;
+				continue;
+			}
+			//
+			// Don't try to further shrink a minimal note
+			//
+			if (p.fDuration == kMinDuration)
+				goto haveDuration;
+			//
 			// Prefer further triplets
 			//
 			if (prevTriplets) {
-				if (p.fDuration > 3*prevTripDur) {
-					; // Not part of triplets
-				} else if (p.fDuration >= 2*prevTripDur) {
+				if (p.fDuration >= 2*prevTripDur) {
 					p.fDuration = 2*prevTripDur;
 					if (prevTriplets == 1) {
 						p.fVisual   = prevVisual-1;