From: Chris C. <ca...@us...> - 2005-07-31 14:27:38
|
Update of /cvsroot/rosegarden/gui In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13889/gui Modified Files: Tag: stg_1_0 lilypondio.cpp Log Message: * Hans's fix from HEAD Index: lilypondio.cpp =================================================================== RCS file: /cvsroot/rosegarden/gui/lilypondio.cpp,v retrieving revision 1.82.4.6 retrieving revision 1.82.4.7 diff -C2 -d -r1.82.4.6 -r1.82.4.7 *** lilypondio.cpp 31 Jul 2005 13:30:34 -0000 1.82.4.6 --- lilypondio.cpp 31 Jul 2005 14:27:30 -0000 1.82.4.7 *************** *** 844,849 **** std::string lilyLyrics = ""; // lyric events std::string prevStyle = ""; // track note styles ! bool note_ended_with_a_lyric = true; ! Rosegarden::Key key; --- 844,854 ---- std::string lilyLyrics = ""; // lyric events std::string prevStyle = ""; // track note styles ! // bool note_ended_with_a_lyric = true; ! // ! // old pre-1.0 patch by Hans from bug #773371 ! // ! bool note_ended_with_a_lyric = false; ! // ! Rosegarden::Key key; *************** *** 1077,1080 **** --- 1082,1089 ---- } + // old pre-1.0 patch by Hans from bug #773371 + // + std::string prevType = Note::EventType; + // timeT prevDuration = -1; eventstartlist eventsToStart; *************** *** 1250,1254 **** str << " "; - } else if ((*i)->isa(Indication::EventType)) { eventsToStart.insert(*i); --- 1259,1262 ---- *************** *** 1300,1304 **** if (tiedForward) str << "~ "; ! } else if ((*i)->isa(Note::EventRestType)) { --- 1308,1315 ---- if (tiedForward) str << "~ "; ! // old pre-1.0 patch by Hans from bug #773371 ! // ! prevType = Note::EventType; ! // } else if ((*i)->isa(Note::EventRestType)) { *************** *** 1318,1321 **** --- 1329,1343 ---- str << " "; + + // old pre-1.0 patch by Hans from bug #773371 + // + // Lilypond treats consecutive rests as one lyric + if (prevType != Note::EventRestType) { + lilyLyrics += "_ "; + note_ended_with_a_lyric = false; + } + prevType = Note::EventRestType; + // + if (languageLevel >= 1) handleEndingEvents(eventsInProgress, i, str); handleStartingEvents(eventsToStart, str); |