From 437001d2b1dc2cfe49c4e58f997dc45aa02ba697 Mon Sep 17 00:00:00 2001 From: Leon Vinken Date: Tue, 15 Aug 2017 07:17:21 +0200 Subject: [PATCH] fix #239826 by ignoring lyrics on grace notes --- mscore/importmxmlpass2.cpp | 11 +- mtest/musicxml/io/testLyrics1.pdf | Bin 0 -> 11798 bytes mtest/musicxml/io/testLyrics1.xml | 175 ++++++++++++++++++++++++++ mtest/musicxml/io/testLyrics1_ref.xml | 157 +++++++++++++++++++++++ mtest/musicxml/io/tst_mxml_io.cpp | 1 + 5 files changed, 342 insertions(+), 2 deletions(-) create mode 100644 mtest/musicxml/io/testLyrics1.pdf create mode 100644 mtest/musicxml/io/testLyrics1.xml create mode 100644 mtest/musicxml/io/testLyrics1_ref.xml diff --git a/mscore/importmxmlpass2.cpp b/mscore/importmxmlpass2.cpp index 461d76d8460f..253a484a3a50 100644 --- a/mscore/importmxmlpass2.cpp +++ b/mscore/importmxmlpass2.cpp @@ -4503,8 +4503,15 @@ Note* MusicXMLParserPass2::note(const QString& partId, while (_e.tokenType() == QXmlStreamReader::StartElement) { //qDebug("in second loop element '%s'", qPrintable(_e.name().toString())); - if (_e.name() == "lyric") - lyric(numberedLyrics, defaultyLyrics, unNumberedLyrics, extendedLyrics); // TODO: move track handling to addlyric + if (_e.name() == "lyric") { + // lyrics on grace notes not (yet) supported by MuseScore + if (!grace) + lyric(numberedLyrics, defaultyLyrics, unNumberedLyrics, extendedLyrics); // TODO: move track handling to addlyric + else { + logDebugInfo("ignoring lyrics on grace notes"); + skipLogCurrElem(); + } + } else if (_e.name() == "notations") notations(note, cr, noteStartTime.ticks(), tupletDesc, lastGraceAFter); else diff --git a/mtest/musicxml/io/testLyrics1.pdf b/mtest/musicxml/io/testLyrics1.pdf new file mode 100644 index 0000000000000000000000000000000000000000..c8760d846620237d123c33a5f6b95d0a69f14c23 GIT binary patch literal 11798 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 SN`S%OND*ot9ytwp>i+<$+nBZh literal 0 HcmV?d00001 diff --git a/mtest/musicxml/io/testLyrics1.xml b/mtest/musicxml/io/testLyrics1.xml new file mode 100644 index 000000000000..83679ccdb4c4 --- /dev/null +++ b/mtest/musicxml/io/testLyrics1.xml @@ -0,0 +1,175 @@ + + + + + MuseScore testfile + Lyrics 1 + + + Leon Vinken + + MuseScore 0.7.0 + 2007-09-10 + + + + + + + + + Test lyrics on normal and grace notes, with and without extension line. + As MuseScore does not support lyrics on grace notes, lyrics number three + and five will be missing. + Furthermore, this file crashes some MuseScore versions (2.1, master + of about July 2017). + + + + + + Music + + Music + + + + 1 + 1 + 78.7402 + 0 + + + + + + + 1 + + 0 + + + + G + 2 + + + + + C + 4 + + 4 + 1 + whole + + single + Lyr1 + + + + + + + C + 4 + + 2 + 1 + half + up + + single + lyr2 + + + + + + C + 4 + + 2 + 1 + half + up + + + + + + + D + 4 + + 1 + eighth + up + + single + lyr3 + + + + + C + 4 + + 4 + 1 + whole + + single + lyr4 + + + + + + + + D + 4 + + 1 + eighth + up + + single + lyr5 + + + + + + C + 4 + + 4 + 1 + whole + + + + + + C + 4 + + 4 + 1 + whole + + single + lyr6 + + + + light-heavy + + + + diff --git a/mtest/musicxml/io/testLyrics1_ref.xml b/mtest/musicxml/io/testLyrics1_ref.xml new file mode 100644 index 000000000000..b3db1e50f27c --- /dev/null +++ b/mtest/musicxml/io/testLyrics1_ref.xml @@ -0,0 +1,157 @@ + + + + + MuseScore testfile + Lyrics 1 + + + Leon Vinken + + MuseScore 0.7.0 + 2007-09-10 + + + + + + + + + + Music + + Music + + + + 1 + 1 + 78.7402 + 0 + + + + + + + 1 + + 0 + + + + G + 2 + + + + + C + 4 + + 4 + 1 + whole + + single + Lyr1 + + + + + + + C + 4 + + 2 + 1 + half + up + + single + lyr2 + + + + + + C + 4 + + 2 + 1 + half + up + + + + + + + D + 4 + + 1 + eighth + up + + + + C + 4 + + 4 + 1 + whole + + single + lyr4 + + + + + + + + D + 4 + + 1 + eighth + up + + + + C + 4 + + 4 + 1 + whole + + + + + + C + 4 + + 4 + 1 + whole + + single + lyr6 + + + + light-heavy + + + + diff --git a/mtest/musicxml/io/tst_mxml_io.cpp b/mtest/musicxml/io/tst_mxml_io.cpp index e796115cc737..d8d5604b23cc 100644 --- a/mtest/musicxml/io/tst_mxml_io.cpp +++ b/mtest/musicxml/io/tst_mxml_io.cpp @@ -104,6 +104,7 @@ private slots: void keysig2() { mxmlIoTest("testKeysig2"); } void lines1() { mxmlIoTest("testLines1"); } void lines2() { mxmlIoTest("testLines2"); } + void lyrics1() { mxmlIoTestRef("testLyrics1"); } void lyricsVoice2a() { mxmlIoTest("testLyricsVoice2a"); } void lyricsVoice2b() { mxmlIoTestRef("testLyricsVoice2b"); } void manualBreaks() { mxmlIoTest("testManualBreaks"); }