From 0edecd72ebc5761efb97efaf380681a3d5d5bee6 Mon Sep 17 00:00:00 2001 From: Matthias Neeracher Date: Wed, 30 Jan 2008 00:37:30 +0000 Subject: [PATCH] Accept chord/root, not just chord/+root --- BUGS | 12 ++++++------ Filters/VLLilypondType.reader | 2 +- Sources/VLModel.cpp | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/BUGS b/BUGS index 47cc718..03e3015 100644 --- a/BUGS +++ b/BUGS @@ -1,14 +1,14 @@ -27Jan08 +30Jan08 * Afro Blue: Timings all messed up * Autumn Leaves: Support subtitles etc. * Bare Necessities: Lyrics messed up (nonstandard structure) -* Blue Bossa: Need to deal with broken .vlsong (Syllable backlinks) -* Chocolate Jesus: Misaligned lyrics -* Estate: Did not import -* Green Dolphin Street: Lilypond & MMA generation problems -* Prefer flats in C major +* Chocolate Jesus: Misaligned lyrics, slurs +* Green Dolphin Street: Dotted notes when duration order reversed * I'm Hip: Misaligned lyrics +* Prefer flats in C major +* Walking syllables is not accurate + diff --git a/Filters/VLLilypondType.reader b/Filters/VLLilypondType.reader index 5cc89f1..d189c15 100755 --- a/Filters/VLLilypondType.reader +++ b/Filters/VLLilypondType.reader @@ -238,7 +238,7 @@ def parseLilypond \.*(?:\*\d+/\d+)? # ., *3/4 )? (?:\:([-+^:.a-z\d]+)?)? # :maj9.7-^2 - (?:/\+( # /+ + (?:/\+?( # /+ [a-g](?:[ei]?s)? # Root: a, bes, fis, as ))? $}x diff --git a/Sources/VLModel.cpp b/Sources/VLModel.cpp index f28b480..42814fd 100644 --- a/Sources/VLModel.cpp +++ b/Sources/VLModel.cpp @@ -449,7 +449,7 @@ void VLMeasure::DecomposeNotes(const VLProperties & prop, VLNoteList & decompose } prevTriplets = 0; } - if (at.fDenom > 4) { + if (at.fDenom == 3 || at.fDenom > 4) { // // Break up notes not starting on quarter beat // - Never cross middle of measure