From 8968e0c58f4b859c390db77ecf1f3d3f1703df40 Mon Sep 17 00:00:00 2001 From: Leon Vinken Date: Mon, 25 Dec 2017 09:32:07 +0100 Subject: [PATCH] fix #267131 - [MusicXML export] print new-system missing in multi-measure rests --- mscore/exportxml.cpp | 15 +- mtest/musicxml/io/testMultiMeasureRest4.pdf | Bin 0 -> 13077 bytes mtest/musicxml/io/testMultiMeasureRest4.xml | 410 ++++++++++++++++++ .../musicxml/io/testMultiMeasureRest4_ref.xml | 403 +++++++++++++++++ mtest/musicxml/io/tst_mxml_io.cpp | 1 + 5 files changed, 824 insertions(+), 5 deletions(-) create mode 100644 mtest/musicxml/io/testMultiMeasureRest4.pdf create mode 100644 mtest/musicxml/io/testMultiMeasureRest4.xml create mode 100644 mtest/musicxml/io/testMultiMeasureRest4_ref.xml diff --git a/mscore/exportxml.cpp b/mscore/exportxml.cpp index 8742f144513a..e53916d84b38 100644 --- a/mscore/exportxml.cpp +++ b/mscore/exportxml.cpp @@ -4439,12 +4439,17 @@ void ExportMusicXml::print(Measure* m, int idx, int staffCount, int staves) if (!previousMeasure) currentSystem = TopSystem; - else if (m->parent() && previousMeasure->parent()) { - if (m->parent()->parent() != previousMeasure->parent()->parent()) - currentSystem = NewPage; - else if (m->parent() != previousMeasure->parent()) - currentSystem = NewSystem; + else { + const auto mSystem = m->mmRest1()->system(); + const auto previousMeasureSystem = previousMeasure->mmRest1()->system(); + + if (mSystem && previousMeasureSystem) { + if (mSystem->page() != previousMeasureSystem->page()) + currentSystem = NewPage; + else if (mSystem != previousMeasureSystem) + currentSystem = NewSystem; } + } bool prevMeasLineBreak = false; bool prevMeasPageBreak = false; diff --git a/mtest/musicxml/io/testMultiMeasureRest4.pdf b/mtest/musicxml/io/testMultiMeasureRest4.pdf new file mode 100644 index 0000000000000000000000000000000000000000..4e8673ed3473ab9dc3333cda39d57c7773c8d7d8 GIT binary patch literal 13077 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 literal 0 HcmV?d00001 diff --git a/mtest/musicxml/io/testMultiMeasureRest4.xml b/mtest/musicxml/io/testMultiMeasureRest4.xml new file mode 100644 index 000000000000..36fedc0e2b4b --- /dev/null +++ b/mtest/musicxml/io/testMultiMeasureRest4.xml @@ -0,0 +1,410 @@ + + + + + MuseScore testfile + Multi-Measure Rests 4 + + + Andrew S + + MuseScore 0.7.0 + 2007-09-10 + + + + + + + + + Test multi-measure rest handling with line breaks. With MuseScore 2.1 and older + the print new-system at the start of the second and third system will be missing. + Test file provided by Andrew S in https://musescore.org/en/node/265490. + + + + + + Flute + Fl. + + Flute + + + + 1 + 74 + 78.7402 + 0 + + + + + + + 1 + + 0 + + + + G + 2 + + + + + C + 5 + + 4 + 1 + whole + + + + + + D + 5 + + 4 + 1 + whole + + + + + + E + 5 + + 4 + 1 + whole + + + + + + F + 5 + + 4 + 1 + whole + + + + + + G + 5 + + 4 + 1 + whole + + + + + + 4 + + + + + 4 + 1 + + + + + + 4 + 1 + + + + + + 4 + 1 + + + + + + 4 + 1 + + + + + + + C + 5 + + 4 + 1 + whole + + + + + + 3 + + + + + 4 + 1 + + + + + + 4 + 1 + + + + + + 4 + 1 + + + + + + C + 5 + + 4 + 1 + whole + + + + + + D + 5 + + 4 + 1 + whole + + + + + + E + 5 + + 4 + 1 + whole + + + + + + F + 5 + + 4 + 1 + whole + + + + + + G + 5 + + 4 + 1 + whole + + + + + + + 4 + + + + + 4 + 1 + + + + + + 4 + 1 + + + + + + 4 + 1 + + + + + + 4 + 1 + + + + + + C + 5 + + 4 + 1 + whole + + + + + + D + 5 + + 4 + 1 + whole + + + + + + E + 5 + + 4 + 1 + whole + + + + + + F + 5 + + 4 + 1 + whole + + + + + + G + 5 + + 4 + 1 + whole + + + + + + + F + 5 + + 4 + 1 + whole + + + + + + E + 5 + + 4 + 1 + whole + + + + + + D + 5 + + 4 + 1 + whole + + + + + + C + 5 + + 4 + 1 + whole + + + + + + 4 + + + + + 4 + 1 + + + + + + 4 + 1 + + + + + + 4 + 1 + + + + + + 4 + 1 + + + light-heavy + + + + diff --git a/mtest/musicxml/io/testMultiMeasureRest4_ref.xml b/mtest/musicxml/io/testMultiMeasureRest4_ref.xml new file mode 100644 index 000000000000..d21ef88bf765 --- /dev/null +++ b/mtest/musicxml/io/testMultiMeasureRest4_ref.xml @@ -0,0 +1,403 @@ + + + + + MuseScore testfile + Multi-Measure Rests 4 + + + Andrew S + + MuseScore 0.7.0 + 2007-09-10 + + + + + + + + + + Flute + Fl. + + Flute + + + + 1 + 74 + 78.7402 + 0 + + + + + + + 1 + + 0 + + + + G + 2 + + + + + C + 5 + + 4 + 1 + whole + + + + + + D + 5 + + 4 + 1 + whole + + + + + + E + 5 + + 4 + 1 + whole + + + + + + F + 5 + + 4 + 1 + whole + + + + + + G + 5 + + 4 + 1 + whole + + + + + + 4 + + + + + 4 + 1 + + + + + + 4 + 1 + + + + + + 4 + 1 + + + + + + 4 + 1 + + + + + + + C + 5 + + 4 + 1 + whole + + + + + + 3 + + + + + 4 + 1 + + + + + + 4 + 1 + + + + + + 4 + 1 + + + + + + C + 5 + + 4 + 1 + whole + + + + + + D + 5 + + 4 + 1 + whole + + + + + + E + 5 + + 4 + 1 + whole + + + + + + F + 5 + + 4 + 1 + whole + + + + + + G + 5 + + 4 + 1 + whole + + + + + + + 4 + + + + + 4 + 1 + + + + + + 4 + 1 + + + + + + 4 + 1 + + + + + + 4 + 1 + + + + + + C + 5 + + 4 + 1 + whole + + + + + + D + 5 + + 4 + 1 + whole + + + + + + E + 5 + + 4 + 1 + whole + + + + + + F + 5 + + 4 + 1 + whole + + + + + + G + 5 + + 4 + 1 + whole + + + + + + + F + 5 + + 4 + 1 + whole + + + + + + E + 5 + + 4 + 1 + whole + + + + + + D + 5 + + 4 + 1 + whole + + + + + + C + 5 + + 4 + 1 + whole + + + + + + 4 + + + + + 4 + 1 + + + + + + 4 + 1 + + + + + + 4 + 1 + + + + + + 4 + 1 + + + light-heavy + + + + diff --git a/mtest/musicxml/io/tst_mxml_io.cpp b/mtest/musicxml/io/tst_mxml_io.cpp index 0b568d542e04..602a4c70fb2e 100644 --- a/mtest/musicxml/io/tst_mxml_io.cpp +++ b/mtest/musicxml/io/tst_mxml_io.cpp @@ -115,6 +115,7 @@ private slots: void multiMeasureRest1() { mxmlIoTestRef("testMultiMeasureRest1"); } void multiMeasureRest2() { mxmlIoTestRef("testMultiMeasureRest2"); } void multiMeasureRest3() { mxmlIoTestRef("testMultiMeasureRest3"); } + void multiMeasureRest4() { mxmlIoTestRef("testMultiMeasureRest4"); } void multipleNotations() { mxmlIoTestRef("testMultipleNotations"); } void nonStandardKeySig1() { mxmlIoTest("testNonStandardKeySig1"); } void nonStandardKeySig2() { mxmlIoTest("testNonStandardKeySig2"); }