diff --git a/src/importexport/musicxml/internal/musicxml/export/exportmusicxml.cpp b/src/importexport/musicxml/internal/musicxml/export/exportmusicxml.cpp index d52de9f72fec1..add537094a6e4 100644 --- a/src/importexport/musicxml/internal/musicxml/export/exportmusicxml.cpp +++ b/src/importexport/musicxml/internal/musicxml/export/exportmusicxml.cpp @@ -349,6 +349,7 @@ struct MeasurePrintContext final bool scoreStart = true; bool pageStart = true; bool systemStart = true; + size_t pageNumber = 0; const Measure* prevMeasure = nullptr; const System* prevSystem = nullptr; const System* lastSystemPrevPage = nullptr; @@ -7281,33 +7282,39 @@ void ExportMusicXml::print(const Measure* const m, const int partNr, const int f const bool prevMeasSectionBreak = prevSysMB ? prevSysMB->sectionBreak() : false; const bool prevPageBreak = hasPageBreak(mpc.lastSystemPrevPage); - String newSystemOrPage; // new-[system|page]="yes" or empty - if (!mpc.scoreStart) { - IMusicXmlConfiguration::MusicXmlExportBreaksType exportBreaksType = configuration()->exportBreaksType(); + XmlWriter::Attributes attributes; + IMusicXmlConfiguration::MusicXmlExportBreaksType exportBreaksType = configuration()->exportBreaksType(); + if (!mpc.scoreStart) { if (exportBreaksType == IMusicXmlConfiguration::MusicXmlExportBreaksType::All) { if (mpc.pageStart) { - newSystemOrPage = u" new-page=\"yes\""; + attributes.push_back({ "new-page", "yes" }); } else if (mpc.systemStart) { - newSystemOrPage = u" new-system=\"yes\""; + attributes.push_back({ "new-system", "yes" }); } } else if (exportBreaksType == IMusicXmlConfiguration::MusicXmlExportBreaksType::Manual) { if (mpc.pageStart && prevPageBreak) { - newSystemOrPage = u" new-page=\"yes\""; + attributes.push_back({ "new-page", "yes" }); } else if (mpc.systemStart && (prevMeasLineBreak || prevMeasSectionBreak)) { - newSystemOrPage = u" new-system=\"yes\""; + attributes.push_back({ "new-system", "yes" }); } } } - bool doBreak = mpc.scoreStart || (!newSystemOrPage.empty()); + if (mpc.pageStart) { + if (exportBreaksType != IMusicXmlConfiguration::MusicXmlExportBreaksType::No) { + attributes.push_back({ "page-number", mpc.pageNumber }); + } + } + + bool doBreak = mpc.scoreStart || !attributes.empty(); bool doLayout = configuration()->exportLayout(); if (doBreak) { if (doLayout) { - m_xml.startElementRaw(String(u"print%1").arg(newSystemOrPage)); + m_xml.startElement("print", attributes); const MStyle& style = score()->style(); - const double pageWidth = getTenthsFromInches(style.styleD(Sid::pageWidth)); + const double pageWidth = getTenthsFromInches(style.styleD(Sid::pageWidth)); const double lm = getTenthsFromInches(style.styleD(Sid::pageOddLeftMargin)); const double rm = getTenthsFromInches(style.styleD(Sid::pageWidth) - style.styleD(Sid::pagePrintableWidth) @@ -7355,7 +7362,7 @@ void ExportMusicXml::print(const Measure* const m, const int partNr, const int f } // Staff layout elements. - for (staff_idx_t staffIdx = (firstStaffOfPart == 0) ? 1 : 0; staffIdx < nrStavesInPart; staffIdx++) { + for (size_t staffIdx = (firstStaffOfPart == 0) ? 1 : 0; staffIdx < nrStavesInPart; ++staffIdx) { // calculate distance between this and previous staff using the bounding boxes const staff_idx_t staffNr = firstStaffOfPart + staffIdx; const staff_idx_t prevStaffNr = system->prevVisibleStaff(staffNr); @@ -7384,8 +7391,8 @@ void ExportMusicXml::print(const Measure* const m, const int partNr, const int f } m_xml.endElement(); - } else if (!newSystemOrPage.empty()) { - m_xml.tagRaw(String(u"print%1").arg(newSystemOrPage)); + } else if (!attributes.empty()) { + m_xml.tag("print", attributes); } } else if (m->prev() && m->prev()->isHBox()) { m_xml.startElement("print"); @@ -8525,6 +8532,7 @@ void ExportMusicXml::writeParts() for (size_t pageIndex = 0; pageIndex < pages.size(); ++pageIndex) { const Page* page = pages.at(pageIndex); mpc.pageStart = true; + mpc.pageNumber = page->no() + 1 + m_score->pageNumberOffset(); const auto& systems = page->systems(); for (int systemIndex = 0; systemIndex < static_cast(systems.size()); ++systemIndex) { diff --git a/src/importexport/musicxml/tests/data/importTie5.xml b/src/importexport/musicxml/tests/data/importTie5.xml index 4d5598bb2fdd3..dfb9f831f23b5 100644 --- a/src/importexport/musicxml/tests/data/importTie5.xml +++ b/src/importexport/musicxml/tests/data/importTie5.xml @@ -34,6 +34,7 @@ + 1 diff --git a/src/importexport/musicxml/tests/data/testAccidentals1.xml b/src/importexport/musicxml/tests/data/testAccidentals1.xml index 98b70d9ecb39d..fcf6e3dc0ab2d 100644 --- a/src/importexport/musicxml/tests/data/testAccidentals1.xml +++ b/src/importexport/musicxml/tests/data/testAccidentals1.xml @@ -34,6 +34,7 @@ + 1 diff --git a/src/importexport/musicxml/tests/data/testAccidentals2.xml b/src/importexport/musicxml/tests/data/testAccidentals2.xml index ece0fa2d0b509..a28a2c03c018a 100644 --- a/src/importexport/musicxml/tests/data/testAccidentals2.xml +++ b/src/importexport/musicxml/tests/data/testAccidentals2.xml @@ -34,6 +34,7 @@ + 1 diff --git a/src/importexport/musicxml/tests/data/testAccidentals3.xml b/src/importexport/musicxml/tests/data/testAccidentals3.xml index 208473124a42d..5a39ee9a69f90 100644 --- a/src/importexport/musicxml/tests/data/testAccidentals3.xml +++ b/src/importexport/musicxml/tests/data/testAccidentals3.xml @@ -32,6 +32,7 @@ + 1 diff --git a/src/importexport/musicxml/tests/data/testArpGliss1.xml b/src/importexport/musicxml/tests/data/testArpGliss1.xml index befa8c7e7fada..39837047055b0 100644 --- a/src/importexport/musicxml/tests/data/testArpGliss1.xml +++ b/src/importexport/musicxml/tests/data/testArpGliss1.xml @@ -34,6 +34,7 @@ + 1 diff --git a/src/importexport/musicxml/tests/data/testArpGliss2.xml b/src/importexport/musicxml/tests/data/testArpGliss2.xml index f90cfd68b1fed..b40f05d6695db 100644 --- a/src/importexport/musicxml/tests/data/testArpGliss2.xml +++ b/src/importexport/musicxml/tests/data/testArpGliss2.xml @@ -34,6 +34,7 @@ + 1 diff --git a/src/importexport/musicxml/tests/data/testArpGliss3.xml b/src/importexport/musicxml/tests/data/testArpGliss3.xml index d214841cb20df..d9f8b267c2309 100644 --- a/src/importexport/musicxml/tests/data/testArpGliss3.xml +++ b/src/importexport/musicxml/tests/data/testArpGliss3.xml @@ -34,6 +34,7 @@ + 1 diff --git a/src/importexport/musicxml/tests/data/testArticulationCombination_ref.xml b/src/importexport/musicxml/tests/data/testArticulationCombination_ref.xml index 0a13b6adec4e9..4b0abf0703603 100644 --- a/src/importexport/musicxml/tests/data/testArticulationCombination_ref.xml +++ b/src/importexport/musicxml/tests/data/testArticulationCombination_ref.xml @@ -34,6 +34,7 @@ + 1 diff --git a/src/importexport/musicxml/tests/data/testBarStyles.xml b/src/importexport/musicxml/tests/data/testBarStyles.xml index a37f35d0b1b78..14aef44f27086 100644 --- a/src/importexport/musicxml/tests/data/testBarStyles.xml +++ b/src/importexport/musicxml/tests/data/testBarStyles.xml @@ -34,6 +34,7 @@ + 1 diff --git a/src/importexport/musicxml/tests/data/testBarStyles2.xml b/src/importexport/musicxml/tests/data/testBarStyles2.xml index 1b333637fdfbc..9da7345279859 100644 --- a/src/importexport/musicxml/tests/data/testBarStyles2.xml +++ b/src/importexport/musicxml/tests/data/testBarStyles2.xml @@ -29,6 +29,7 @@ + 1 diff --git a/src/importexport/musicxml/tests/data/testBarStyles2_ref.xml b/src/importexport/musicxml/tests/data/testBarStyles2_ref.xml index 1b333637fdfbc..9da7345279859 100644 --- a/src/importexport/musicxml/tests/data/testBarStyles2_ref.xml +++ b/src/importexport/musicxml/tests/data/testBarStyles2_ref.xml @@ -29,6 +29,7 @@ + 1 diff --git a/src/importexport/musicxml/tests/data/testBarStyles3.xml b/src/importexport/musicxml/tests/data/testBarStyles3.xml index 586238a3b5abb..62297fc3b9f78 100644 --- a/src/importexport/musicxml/tests/data/testBarStyles3.xml +++ b/src/importexport/musicxml/tests/data/testBarStyles3.xml @@ -30,6 +30,7 @@ + 1 diff --git a/src/importexport/musicxml/tests/data/testBarStyles4.xml b/src/importexport/musicxml/tests/data/testBarStyles4.xml index f5c03fb956c61..986b6a476778f 100644 --- a/src/importexport/musicxml/tests/data/testBarStyles4.xml +++ b/src/importexport/musicxml/tests/data/testBarStyles4.xml @@ -33,6 +33,7 @@ + 1 diff --git a/src/importexport/musicxml/tests/data/testBarlineFermatas.xml b/src/importexport/musicxml/tests/data/testBarlineFermatas.xml index bf9b99b8b7250..3ee83e7a7ce61 100644 --- a/src/importexport/musicxml/tests/data/testBarlineFermatas.xml +++ b/src/importexport/musicxml/tests/data/testBarlineFermatas.xml @@ -33,6 +33,7 @@ + 1 diff --git a/src/importexport/musicxml/tests/data/testBarlineSpan.xml b/src/importexport/musicxml/tests/data/testBarlineSpan.xml index 8e01980926892..57efc4d4623c2 100644 --- a/src/importexport/musicxml/tests/data/testBarlineSpan.xml +++ b/src/importexport/musicxml/tests/data/testBarlineSpan.xml @@ -89,6 +89,7 @@ + 1 @@ -230,6 +231,7 @@ + 1 @@ -496,6 +498,7 @@ + 1 @@ -637,6 +640,7 @@ + 1 diff --git a/src/importexport/musicxml/tests/data/testBeamEnd.xml b/src/importexport/musicxml/tests/data/testBeamEnd.xml index 0bda1b40abe57..48ae61383a76d 100644 --- a/src/importexport/musicxml/tests/data/testBeamEnd.xml +++ b/src/importexport/musicxml/tests/data/testBeamEnd.xml @@ -33,6 +33,7 @@ + 2 diff --git a/src/importexport/musicxml/tests/data/testBeams1.xml b/src/importexport/musicxml/tests/data/testBeams1.xml index dfdce6e38c7eb..9fdae61290b23 100644 --- a/src/importexport/musicxml/tests/data/testBeams1.xml +++ b/src/importexport/musicxml/tests/data/testBeams1.xml @@ -33,6 +33,7 @@ + 2 diff --git a/src/importexport/musicxml/tests/data/testBeams2.xml b/src/importexport/musicxml/tests/data/testBeams2.xml index 5bd066847cb40..59f8716819f4f 100644 --- a/src/importexport/musicxml/tests/data/testBeams2.xml +++ b/src/importexport/musicxml/tests/data/testBeams2.xml @@ -33,6 +33,7 @@ + 2 diff --git a/src/importexport/musicxml/tests/data/testBeams3_ref.xml b/src/importexport/musicxml/tests/data/testBeams3_ref.xml index eb5d7de1a2210..8f6d493c5147c 100644 --- a/src/importexport/musicxml/tests/data/testBeams3_ref.xml +++ b/src/importexport/musicxml/tests/data/testBeams3_ref.xml @@ -33,6 +33,7 @@ + 2 diff --git a/src/importexport/musicxml/tests/data/testBeams4.xml b/src/importexport/musicxml/tests/data/testBeams4.xml index bd0288083fea4..4949add49013f 100644 --- a/src/importexport/musicxml/tests/data/testBeams4.xml +++ b/src/importexport/musicxml/tests/data/testBeams4.xml @@ -34,6 +34,7 @@ + 8 diff --git a/src/importexport/musicxml/tests/data/testBreaksImplExpl_all_ref.xml b/src/importexport/musicxml/tests/data/testBreaksImplExpl_all_ref.xml index a300219a11589..dde193d341d19 100644 --- a/src/importexport/musicxml/tests/data/testBreaksImplExpl_all_ref.xml +++ b/src/importexport/musicxml/tests/data/testBreaksImplExpl_all_ref.xml @@ -30,6 +30,7 @@ + 1 @@ -131,7 +132,7 @@ - + After system break diff --git a/src/importexport/musicxml/tests/data/testBreaksImplExpl_manual_ref.xml b/src/importexport/musicxml/tests/data/testBreaksImplExpl_manual_ref.xml index dbff7cd6d0338..6a3115abd7a60 100644 --- a/src/importexport/musicxml/tests/data/testBreaksImplExpl_manual_ref.xml +++ b/src/importexport/musicxml/tests/data/testBreaksImplExpl_manual_ref.xml @@ -30,6 +30,7 @@ + 1 @@ -131,7 +132,7 @@ - + After system break diff --git a/src/importexport/musicxml/tests/data/testBreaksMMRest_all_ref.xml b/src/importexport/musicxml/tests/data/testBreaksMMRest_all_ref.xml index cea70d5f5e83d..7f7d00bb72f3b 100644 --- a/src/importexport/musicxml/tests/data/testBreaksMMRest_all_ref.xml +++ b/src/importexport/musicxml/tests/data/testBreaksMMRest_all_ref.xml @@ -30,6 +30,7 @@ + 1 @@ -134,7 +135,7 @@ - + G diff --git a/src/importexport/musicxml/tests/data/testBreaksMMRest_manual_ref.xml b/src/importexport/musicxml/tests/data/testBreaksMMRest_manual_ref.xml index cea70d5f5e83d..7f7d00bb72f3b 100644 --- a/src/importexport/musicxml/tests/data/testBreaksMMRest_manual_ref.xml +++ b/src/importexport/musicxml/tests/data/testBreaksMMRest_manual_ref.xml @@ -30,6 +30,7 @@ + 1 @@ -134,7 +135,7 @@ - + G diff --git a/src/importexport/musicxml/tests/data/testBreaksManual.xml b/src/importexport/musicxml/tests/data/testBreaksManual.xml index 1fd2ea01d40e8..3dbd825e50240 100644 --- a/src/importexport/musicxml/tests/data/testBreaksManual.xml +++ b/src/importexport/musicxml/tests/data/testBreaksManual.xml @@ -35,6 +35,7 @@ + 1 diff --git a/src/importexport/musicxml/tests/data/testBreaksManual_all_ref.xml b/src/importexport/musicxml/tests/data/testBreaksManual_all_ref.xml index 0c261f206dc56..5220a2a223823 100644 --- a/src/importexport/musicxml/tests/data/testBreaksManual_all_ref.xml +++ b/src/importexport/musicxml/tests/data/testBreaksManual_all_ref.xml @@ -35,6 +35,7 @@ + 1 @@ -240,7 +241,7 @@ - + C @@ -1305,7 +1306,7 @@ - + 4 diff --git a/src/importexport/musicxml/tests/data/testBreaksManual_manual_ref.xml b/src/importexport/musicxml/tests/data/testBreaksManual_manual_ref.xml index 1fd2ea01d40e8..2b2a5f2a5ce42 100644 --- a/src/importexport/musicxml/tests/data/testBreaksManual_manual_ref.xml +++ b/src/importexport/musicxml/tests/data/testBreaksManual_manual_ref.xml @@ -35,6 +35,7 @@ + 1 @@ -239,7 +240,7 @@ - + C @@ -1294,6 +1295,7 @@ + 4 diff --git a/src/importexport/musicxml/tests/data/testBreaksPage_all_ref.xml b/src/importexport/musicxml/tests/data/testBreaksPage_all_ref.xml index ac3ff30056a18..97c3307065d91 100644 --- a/src/importexport/musicxml/tests/data/testBreaksPage_all_ref.xml +++ b/src/importexport/musicxml/tests/data/testBreaksPage_all_ref.xml @@ -30,6 +30,7 @@ + 1 @@ -56,7 +57,7 @@ - + After page break @@ -69,7 +70,7 @@ - + Tframe @@ -87,7 +88,7 @@ - + After page break in tframe @@ -100,7 +101,7 @@ - + After page break in hframe diff --git a/src/importexport/musicxml/tests/data/testBreaksPage_manual_ref.xml b/src/importexport/musicxml/tests/data/testBreaksPage_manual_ref.xml index ac3ff30056a18..97c3307065d91 100644 --- a/src/importexport/musicxml/tests/data/testBreaksPage_manual_ref.xml +++ b/src/importexport/musicxml/tests/data/testBreaksPage_manual_ref.xml @@ -30,6 +30,7 @@ + 1 @@ -56,7 +57,7 @@ - + After page break @@ -69,7 +70,7 @@ - + Tframe @@ -87,7 +88,7 @@ - + After page break in tframe @@ -100,7 +101,7 @@ - + After page break in hframe diff --git a/src/importexport/musicxml/tests/data/testBreaksSystem_all_ref.xml b/src/importexport/musicxml/tests/data/testBreaksSystem_all_ref.xml index 354a39212baf9..94a36929b2118 100644 --- a/src/importexport/musicxml/tests/data/testBreaksSystem_all_ref.xml +++ b/src/importexport/musicxml/tests/data/testBreaksSystem_all_ref.xml @@ -30,6 +30,7 @@ + 1 @@ -101,7 +102,7 @@ - + After page break in horizontal frame diff --git a/src/importexport/musicxml/tests/data/testBreaksSystem_manual_ref.xml b/src/importexport/musicxml/tests/data/testBreaksSystem_manual_ref.xml index 354a39212baf9..94a36929b2118 100644 --- a/src/importexport/musicxml/tests/data/testBreaksSystem_manual_ref.xml +++ b/src/importexport/musicxml/tests/data/testBreaksSystem_manual_ref.xml @@ -30,6 +30,7 @@ + 1 @@ -101,7 +102,7 @@ - + After page break in horizontal frame diff --git a/src/importexport/musicxml/tests/data/testBreathMarks.xml b/src/importexport/musicxml/tests/data/testBreathMarks.xml index 52d3ef4c5058c..b8b66db3acf65 100644 --- a/src/importexport/musicxml/tests/data/testBreathMarks.xml +++ b/src/importexport/musicxml/tests/data/testBreathMarks.xml @@ -34,6 +34,7 @@ + 1 diff --git a/src/importexport/musicxml/tests/data/testBuzzRoll2.xml b/src/importexport/musicxml/tests/data/testBuzzRoll2.xml index 67f96f7d4a43b..bfbf8b66d849a 100644 --- a/src/importexport/musicxml/tests/data/testBuzzRoll2.xml +++ b/src/importexport/musicxml/tests/data/testBuzzRoll2.xml @@ -34,6 +34,7 @@ + 1 diff --git a/src/importexport/musicxml/tests/data/testChangeTranspose-no-diatonic_ref.xml b/src/importexport/musicxml/tests/data/testChangeTranspose-no-diatonic_ref.xml index 3a1951910a203..163f4c54a0358 100644 --- a/src/importexport/musicxml/tests/data/testChangeTranspose-no-diatonic_ref.xml +++ b/src/importexport/musicxml/tests/data/testChangeTranspose-no-diatonic_ref.xml @@ -45,6 +45,7 @@ + 1 diff --git a/src/importexport/musicxml/tests/data/testChangeTranspose.xml b/src/importexport/musicxml/tests/data/testChangeTranspose.xml index d4c72d1a3e1c9..0c1b4d4ee8d3b 100644 --- a/src/importexport/musicxml/tests/data/testChangeTranspose.xml +++ b/src/importexport/musicxml/tests/data/testChangeTranspose.xml @@ -45,6 +45,7 @@ + 1 diff --git a/src/importexport/musicxml/tests/data/testChordDiagrams1.xml b/src/importexport/musicxml/tests/data/testChordDiagrams1.xml index dcc02d815f5eb..276c382c5995f 100644 --- a/src/importexport/musicxml/tests/data/testChordDiagrams1.xml +++ b/src/importexport/musicxml/tests/data/testChordDiagrams1.xml @@ -34,6 +34,7 @@ + 1 diff --git a/src/importexport/musicxml/tests/data/testChordNoVoice_ref.xml b/src/importexport/musicxml/tests/data/testChordNoVoice_ref.xml index 375cc8b3b5fc0..e9f17f8d34bf5 100644 --- a/src/importexport/musicxml/tests/data/testChordNoVoice_ref.xml +++ b/src/importexport/musicxml/tests/data/testChordNoVoice_ref.xml @@ -33,6 +33,7 @@ + 1 diff --git a/src/importexport/musicxml/tests/data/testChordSymbols_ref.xml b/src/importexport/musicxml/tests/data/testChordSymbols_ref.xml index a7fabc76d5003..15b893b97b74e 100644 --- a/src/importexport/musicxml/tests/data/testChordSymbols_ref.xml +++ b/src/importexport/musicxml/tests/data/testChordSymbols_ref.xml @@ -30,6 +30,7 @@ + 2 diff --git a/src/importexport/musicxml/tests/data/testClefs1.xml b/src/importexport/musicxml/tests/data/testClefs1.xml index cf2952e433bcc..6ffbfa6d07446 100644 --- a/src/importexport/musicxml/tests/data/testClefs1.xml +++ b/src/importexport/musicxml/tests/data/testClefs1.xml @@ -33,6 +33,7 @@ + 1 diff --git a/src/importexport/musicxml/tests/data/testClefs2.xml b/src/importexport/musicxml/tests/data/testClefs2.xml index 5e58a3a262dd1..eb9517d39ae22 100644 --- a/src/importexport/musicxml/tests/data/testClefs2.xml +++ b/src/importexport/musicxml/tests/data/testClefs2.xml @@ -30,6 +30,7 @@ + 1 diff --git a/src/importexport/musicxml/tests/data/testColorExport.xml b/src/importexport/musicxml/tests/data/testColorExport.xml index de7973de84bcf..819f545521a46 100644 --- a/src/importexport/musicxml/tests/data/testColorExport.xml +++ b/src/importexport/musicxml/tests/data/testColorExport.xml @@ -30,6 +30,7 @@ + 2 diff --git a/src/importexport/musicxml/tests/data/testColorExport_ref.xml b/src/importexport/musicxml/tests/data/testColorExport_ref.xml index 7711c3191edeb..692b8c7bf969e 100644 --- a/src/importexport/musicxml/tests/data/testColorExport_ref.xml +++ b/src/importexport/musicxml/tests/data/testColorExport_ref.xml @@ -30,6 +30,7 @@ + 2 diff --git a/src/importexport/musicxml/tests/data/testColors.xml b/src/importexport/musicxml/tests/data/testColors.xml index e83f9269405e7..1fc29c5c6e96a 100644 --- a/src/importexport/musicxml/tests/data/testColors.xml +++ b/src/importexport/musicxml/tests/data/testColors.xml @@ -34,6 +34,7 @@ + 4 diff --git a/src/importexport/musicxml/tests/data/testCompleteMeasureRests.xml b/src/importexport/musicxml/tests/data/testCompleteMeasureRests.xml index a5d7a9814ce22..9710b749cc878 100644 --- a/src/importexport/musicxml/tests/data/testCompleteMeasureRests.xml +++ b/src/importexport/musicxml/tests/data/testCompleteMeasureRests.xml @@ -33,6 +33,7 @@ + 1 diff --git a/src/importexport/musicxml/tests/data/testCueGraceNotes_ref.xml b/src/importexport/musicxml/tests/data/testCueGraceNotes_ref.xml index a3d9826b23a89..b41fe138222f0 100644 --- a/src/importexport/musicxml/tests/data/testCueGraceNotes_ref.xml +++ b/src/importexport/musicxml/tests/data/testCueGraceNotes_ref.xml @@ -34,6 +34,7 @@ + 2 diff --git a/src/importexport/musicxml/tests/data/testCueNotes.xml b/src/importexport/musicxml/tests/data/testCueNotes.xml index e25b875a7b821..1edd91e31d49a 100644 --- a/src/importexport/musicxml/tests/data/testCueNotes.xml +++ b/src/importexport/musicxml/tests/data/testCueNotes.xml @@ -35,6 +35,7 @@ + 1 diff --git a/src/importexport/musicxml/tests/data/testCueNotes2_ref.xml b/src/importexport/musicxml/tests/data/testCueNotes2_ref.xml index fee2a7fc64352..05f2a7871df06 100644 --- a/src/importexport/musicxml/tests/data/testCueNotes2_ref.xml +++ b/src/importexport/musicxml/tests/data/testCueNotes2_ref.xml @@ -35,6 +35,7 @@ + 2 diff --git a/src/importexport/musicxml/tests/data/testDCalCoda.xml b/src/importexport/musicxml/tests/data/testDCalCoda.xml index 8e9923e3e5fac..72cc8901bdd37 100644 --- a/src/importexport/musicxml/tests/data/testDCalCoda.xml +++ b/src/importexport/musicxml/tests/data/testDCalCoda.xml @@ -34,6 +34,7 @@ + 1 diff --git a/src/importexport/musicxml/tests/data/testDCalFine.xml b/src/importexport/musicxml/tests/data/testDCalFine.xml index 1a25748e6e17b..7a0799c26ad5b 100644 --- a/src/importexport/musicxml/tests/data/testDCalFine.xml +++ b/src/importexport/musicxml/tests/data/testDCalFine.xml @@ -34,6 +34,7 @@ + 1 diff --git a/src/importexport/musicxml/tests/data/testDalSegno.xml b/src/importexport/musicxml/tests/data/testDalSegno.xml index 602160e1bdd96..37c7ee4cf616a 100644 --- a/src/importexport/musicxml/tests/data/testDalSegno.xml +++ b/src/importexport/musicxml/tests/data/testDalSegno.xml @@ -34,6 +34,7 @@ + 1 diff --git a/src/importexport/musicxml/tests/data/testDirections1.xml b/src/importexport/musicxml/tests/data/testDirections1.xml index 41bd54d0ddb18..0f7554b32d839 100644 --- a/src/importexport/musicxml/tests/data/testDirections1.xml +++ b/src/importexport/musicxml/tests/data/testDirections1.xml @@ -34,6 +34,7 @@ + 1 diff --git a/src/importexport/musicxml/tests/data/testDirections1_ref.xml b/src/importexport/musicxml/tests/data/testDirections1_ref.xml index c9bdb0e01a7ca..fb6565c4b0389 100644 --- a/src/importexport/musicxml/tests/data/testDirections1_ref.xml +++ b/src/importexport/musicxml/tests/data/testDirections1_ref.xml @@ -34,6 +34,7 @@ + 1 diff --git a/src/importexport/musicxml/tests/data/testDirections2.xml b/src/importexport/musicxml/tests/data/testDirections2.xml index dd768a79ae9b9..e8dfc48ed7339 100644 --- a/src/importexport/musicxml/tests/data/testDirections2.xml +++ b/src/importexport/musicxml/tests/data/testDirections2.xml @@ -63,6 +63,7 @@ + 1 @@ -122,6 +123,7 @@ + 1 @@ -197,6 +199,7 @@ + 1 diff --git a/src/importexport/musicxml/tests/data/testDisplayStepOctave_ref.xml b/src/importexport/musicxml/tests/data/testDisplayStepOctave_ref.xml index 04bed956ba8f9..c56f922f9ef3e 100644 --- a/src/importexport/musicxml/tests/data/testDisplayStepOctave_ref.xml +++ b/src/importexport/musicxml/tests/data/testDisplayStepOctave_ref.xml @@ -34,6 +34,7 @@ + 2 diff --git a/src/importexport/musicxml/tests/data/testDivisionsDuration.xml b/src/importexport/musicxml/tests/data/testDivisionsDuration.xml index 36358711478c4..7a7db05850e5d 100644 --- a/src/importexport/musicxml/tests/data/testDivisionsDuration.xml +++ b/src/importexport/musicxml/tests/data/testDivisionsDuration.xml @@ -34,6 +34,7 @@ + 7 diff --git a/src/importexport/musicxml/tests/data/testDivsDefinedTooLate1_ref.xml b/src/importexport/musicxml/tests/data/testDivsDefinedTooLate1_ref.xml index df866643af176..12f1d72456b71 100644 --- a/src/importexport/musicxml/tests/data/testDivsDefinedTooLate1_ref.xml +++ b/src/importexport/musicxml/tests/data/testDivsDefinedTooLate1_ref.xml @@ -35,6 +35,7 @@ + 1 diff --git a/src/importexport/musicxml/tests/data/testDivsDefinedTooLate2.xml b/src/importexport/musicxml/tests/data/testDivsDefinedTooLate2.xml index 9cd99268de363..e9da2a9289fc2 100644 --- a/src/importexport/musicxml/tests/data/testDivsDefinedTooLate2.xml +++ b/src/importexport/musicxml/tests/data/testDivsDefinedTooLate2.xml @@ -97,6 +97,7 @@ + 1 diff --git a/src/importexport/musicxml/tests/data/testDivsDefinedTooLate2_ref.xml b/src/importexport/musicxml/tests/data/testDivsDefinedTooLate2_ref.xml index 0d5e2a227fb27..82872513ce2bb 100644 --- a/src/importexport/musicxml/tests/data/testDivsDefinedTooLate2_ref.xml +++ b/src/importexport/musicxml/tests/data/testDivsDefinedTooLate2_ref.xml @@ -52,6 +52,7 @@ + 1 @@ -93,6 +94,7 @@ + 1 diff --git a/src/importexport/musicxml/tests/data/testDoubleClefError.xml b/src/importexport/musicxml/tests/data/testDoubleClefError.xml index d1362518794fe..07bc56d3a5ed0 100644 --- a/src/importexport/musicxml/tests/data/testDoubleClefError.xml +++ b/src/importexport/musicxml/tests/data/testDoubleClefError.xml @@ -56,6 +56,7 @@ + 1 @@ -103,6 +104,7 @@ + 1 diff --git a/src/importexport/musicxml/tests/data/testDoubleClefError_ref.xml b/src/importexport/musicxml/tests/data/testDoubleClefError_ref.xml index cf41e15a6ea1f..009049ac80cd8 100644 --- a/src/importexport/musicxml/tests/data/testDoubleClefError_ref.xml +++ b/src/importexport/musicxml/tests/data/testDoubleClefError_ref.xml @@ -48,6 +48,7 @@ + 1 @@ -95,6 +96,7 @@ + 1 diff --git a/src/importexport/musicxml/tests/data/testDrumset1.xml b/src/importexport/musicxml/tests/data/testDrumset1.xml index c9101189a6b0c..1878a338bfbc3 100644 --- a/src/importexport/musicxml/tests/data/testDrumset1.xml +++ b/src/importexport/musicxml/tests/data/testDrumset1.xml @@ -106,6 +106,7 @@ + 1 diff --git a/src/importexport/musicxml/tests/data/testDrumset2.xml b/src/importexport/musicxml/tests/data/testDrumset2.xml index b3425f5cc9c6b..77903cd610b8a 100644 --- a/src/importexport/musicxml/tests/data/testDrumset2.xml +++ b/src/importexport/musicxml/tests/data/testDrumset2.xml @@ -96,6 +96,7 @@ + 1 @@ -164,6 +165,7 @@ + 1 @@ -236,6 +238,7 @@ + 1 diff --git a/src/importexport/musicxml/tests/data/testDurationLargeError.xml b/src/importexport/musicxml/tests/data/testDurationLargeError.xml index 9c498d4eccd19..4a3d8acfd7427 100644 --- a/src/importexport/musicxml/tests/data/testDurationLargeError.xml +++ b/src/importexport/musicxml/tests/data/testDurationLargeError.xml @@ -49,6 +49,7 @@ + 100 diff --git a/src/importexport/musicxml/tests/data/testDurationLargeError_ref.xml b/src/importexport/musicxml/tests/data/testDurationLargeError_ref.xml index 473d04498bcb1..d518577497593 100644 --- a/src/importexport/musicxml/tests/data/testDurationLargeError_ref.xml +++ b/src/importexport/musicxml/tests/data/testDurationLargeError_ref.xml @@ -35,6 +35,7 @@ + 1 diff --git a/src/importexport/musicxml/tests/data/testDurationRoundingError.xml b/src/importexport/musicxml/tests/data/testDurationRoundingError.xml index 02194d84f4556..e2828c4056bef 100644 --- a/src/importexport/musicxml/tests/data/testDurationRoundingError.xml +++ b/src/importexport/musicxml/tests/data/testDurationRoundingError.xml @@ -41,6 +41,7 @@ + 256 diff --git a/src/importexport/musicxml/tests/data/testDurationRoundingError_ref.xml b/src/importexport/musicxml/tests/data/testDurationRoundingError_ref.xml index b4625fee73144..bd363eff29974 100644 --- a/src/importexport/musicxml/tests/data/testDurationRoundingError_ref.xml +++ b/src/importexport/musicxml/tests/data/testDurationRoundingError_ref.xml @@ -34,6 +34,7 @@ + 3 diff --git a/src/importexport/musicxml/tests/data/testDynamics1.xml b/src/importexport/musicxml/tests/data/testDynamics1.xml index f5e586617bf73..3971661c809f8 100644 --- a/src/importexport/musicxml/tests/data/testDynamics1.xml +++ b/src/importexport/musicxml/tests/data/testDynamics1.xml @@ -34,6 +34,7 @@ + 1 diff --git a/src/importexport/musicxml/tests/data/testDynamics2.xml b/src/importexport/musicxml/tests/data/testDynamics2.xml index 856b446a10d9a..1221306747044 100644 --- a/src/importexport/musicxml/tests/data/testDynamics2.xml +++ b/src/importexport/musicxml/tests/data/testDynamics2.xml @@ -47,6 +47,7 @@ + 1 @@ -112,6 +113,7 @@ + 1 diff --git a/src/importexport/musicxml/tests/data/testDynamics3.xml b/src/importexport/musicxml/tests/data/testDynamics3.xml index 4a4c643a0f886..64ac3d546dad9 100644 --- a/src/importexport/musicxml/tests/data/testDynamics3.xml +++ b/src/importexport/musicxml/tests/data/testDynamics3.xml @@ -47,6 +47,7 @@ + 1 @@ -153,6 +154,7 @@ + 1 diff --git a/src/importexport/musicxml/tests/data/testDynamics3_ref.xml b/src/importexport/musicxml/tests/data/testDynamics3_ref.xml index 1d84e65429f10..1ef5f98e7fc8e 100644 --- a/src/importexport/musicxml/tests/data/testDynamics3_ref.xml +++ b/src/importexport/musicxml/tests/data/testDynamics3_ref.xml @@ -47,6 +47,7 @@ + 1 @@ -161,6 +162,7 @@ + 1 diff --git a/src/importexport/musicxml/tests/data/testEmptyMeasure.xml b/src/importexport/musicxml/tests/data/testEmptyMeasure.xml index 296b0701d04f2..41dc79033ec7e 100644 --- a/src/importexport/musicxml/tests/data/testEmptyMeasure.xml +++ b/src/importexport/musicxml/tests/data/testEmptyMeasure.xml @@ -48,6 +48,7 @@ + 1 diff --git a/src/importexport/musicxml/tests/data/testEmptyMeasure_ref.xml b/src/importexport/musicxml/tests/data/testEmptyMeasure_ref.xml index 91f825e4022d8..74a2e4b65b5eb 100644 --- a/src/importexport/musicxml/tests/data/testEmptyMeasure_ref.xml +++ b/src/importexport/musicxml/tests/data/testEmptyMeasure_ref.xml @@ -34,6 +34,7 @@ + 1 diff --git a/src/importexport/musicxml/tests/data/testEmptyVoice1.xml b/src/importexport/musicxml/tests/data/testEmptyVoice1.xml index ec45c9d7b2d4b..b79d5ef79a544 100644 --- a/src/importexport/musicxml/tests/data/testEmptyVoice1.xml +++ b/src/importexport/musicxml/tests/data/testEmptyVoice1.xml @@ -66,6 +66,7 @@ + 1 @@ -159,6 +160,7 @@ + 1 diff --git a/src/importexport/musicxml/tests/data/testEmptyVoice1_ref.xml b/src/importexport/musicxml/tests/data/testEmptyVoice1_ref.xml index f18db46a6d49f..7780ba0a97b82 100644 --- a/src/importexport/musicxml/tests/data/testEmptyVoice1_ref.xml +++ b/src/importexport/musicxml/tests/data/testEmptyVoice1_ref.xml @@ -47,6 +47,7 @@ + 1 @@ -146,6 +147,7 @@ + 1 diff --git a/src/importexport/musicxml/tests/data/testExcludeInvisibleElements_invisible_ref.xml b/src/importexport/musicxml/tests/data/testExcludeInvisibleElements_invisible_ref.xml index 0dfaeec764161..43cc58470fa9a 100644 --- a/src/importexport/musicxml/tests/data/testExcludeInvisibleElements_invisible_ref.xml +++ b/src/importexport/musicxml/tests/data/testExcludeInvisibleElements_invisible_ref.xml @@ -33,6 +33,7 @@ + 1 diff --git a/src/importexport/musicxml/tests/data/testExcludeInvisibleElements_noinvisible_ref.xml b/src/importexport/musicxml/tests/data/testExcludeInvisibleElements_noinvisible_ref.xml index 97b84cf438a1e..b0006029587c9 100644 --- a/src/importexport/musicxml/tests/data/testExcludeInvisibleElements_noinvisible_ref.xml +++ b/src/importexport/musicxml/tests/data/testExcludeInvisibleElements_noinvisible_ref.xml @@ -33,6 +33,7 @@ + 1 diff --git a/src/importexport/musicxml/tests/data/testExtendedLyrics.xml b/src/importexport/musicxml/tests/data/testExtendedLyrics.xml index 9c82f3ccca89a..81f45f7e081a8 100644 --- a/src/importexport/musicxml/tests/data/testExtendedLyrics.xml +++ b/src/importexport/musicxml/tests/data/testExtendedLyrics.xml @@ -42,6 +42,7 @@ + 2 diff --git a/src/importexport/musicxml/tests/data/testExtendedLyrics_ref.xml b/src/importexport/musicxml/tests/data/testExtendedLyrics_ref.xml index 02407a0ca2193..f375f133c0ecf 100644 --- a/src/importexport/musicxml/tests/data/testExtendedLyrics_ref.xml +++ b/src/importexport/musicxml/tests/data/testExtendedLyrics_ref.xml @@ -35,6 +35,7 @@ + 2 diff --git a/src/importexport/musicxml/tests/data/testFiguredBass1.xml b/src/importexport/musicxml/tests/data/testFiguredBass1.xml index 53c40d87489d8..72774ca756917 100644 --- a/src/importexport/musicxml/tests/data/testFiguredBass1.xml +++ b/src/importexport/musicxml/tests/data/testFiguredBass1.xml @@ -35,6 +35,7 @@ + 1 diff --git a/src/importexport/musicxml/tests/data/testFiguredBass2.xml b/src/importexport/musicxml/tests/data/testFiguredBass2.xml index f12b87e37677b..abb91fc57af9d 100644 --- a/src/importexport/musicxml/tests/data/testFiguredBass2.xml +++ b/src/importexport/musicxml/tests/data/testFiguredBass2.xml @@ -49,6 +49,7 @@ + 1 @@ -188,6 +189,7 @@ + 1 diff --git a/src/importexport/musicxml/tests/data/testFiguredBass3.xml b/src/importexport/musicxml/tests/data/testFiguredBass3.xml index 3e95ec1170424..e962d61d7eea1 100644 --- a/src/importexport/musicxml/tests/data/testFiguredBass3.xml +++ b/src/importexport/musicxml/tests/data/testFiguredBass3.xml @@ -35,6 +35,7 @@ + 2 diff --git a/src/importexport/musicxml/tests/data/testFiguredBassDivisions.xml b/src/importexport/musicxml/tests/data/testFiguredBassDivisions.xml index 46594ea99e3bc..44797bf0c1ee5 100644 --- a/src/importexport/musicxml/tests/data/testFiguredBassDivisions.xml +++ b/src/importexport/musicxml/tests/data/testFiguredBassDivisions.xml @@ -35,6 +35,7 @@ + 2 diff --git a/src/importexport/musicxml/tests/data/testFormattedThings.xml b/src/importexport/musicxml/tests/data/testFormattedThings.xml index cb7a6d6ea233b..58c41e2b076a7 100644 --- a/src/importexport/musicxml/tests/data/testFormattedThings.xml +++ b/src/importexport/musicxml/tests/data/testFormattedThings.xml @@ -34,6 +34,7 @@ + 1 diff --git a/src/importexport/musicxml/tests/data/testFractionMinus.xml b/src/importexport/musicxml/tests/data/testFractionMinus.xml index 4f3bd51227f29..b31ee27bace21 100644 --- a/src/importexport/musicxml/tests/data/testFractionMinus.xml +++ b/src/importexport/musicxml/tests/data/testFractionMinus.xml @@ -42,6 +42,7 @@ + 11586 diff --git a/src/importexport/musicxml/tests/data/testFractionMinus_ref.xml b/src/importexport/musicxml/tests/data/testFractionMinus_ref.xml index d2caa8060ec99..3b5fdc7cb34bd 100644 --- a/src/importexport/musicxml/tests/data/testFractionMinus_ref.xml +++ b/src/importexport/musicxml/tests/data/testFractionMinus_ref.xml @@ -33,6 +33,7 @@ + 1 diff --git a/src/importexport/musicxml/tests/data/testFractionPlus.xml b/src/importexport/musicxml/tests/data/testFractionPlus.xml index c46205b0916dc..ef63a68598408 100644 --- a/src/importexport/musicxml/tests/data/testFractionPlus.xml +++ b/src/importexport/musicxml/tests/data/testFractionPlus.xml @@ -42,6 +42,7 @@ + 11586 diff --git a/src/importexport/musicxml/tests/data/testFractionPlus_ref.xml b/src/importexport/musicxml/tests/data/testFractionPlus_ref.xml index def8e2d4823b3..01407b64fc2d9 100644 --- a/src/importexport/musicxml/tests/data/testFractionPlus_ref.xml +++ b/src/importexport/musicxml/tests/data/testFractionPlus_ref.xml @@ -33,6 +33,7 @@ + 1 diff --git a/src/importexport/musicxml/tests/data/testFractionTicks.xml b/src/importexport/musicxml/tests/data/testFractionTicks.xml index 97dc4847f98a2..d307da54081db 100644 --- a/src/importexport/musicxml/tests/data/testFractionTicks.xml +++ b/src/importexport/musicxml/tests/data/testFractionTicks.xml @@ -42,6 +42,7 @@ + 9240 diff --git a/src/importexport/musicxml/tests/data/testFractionTicks_ref.xml b/src/importexport/musicxml/tests/data/testFractionTicks_ref.xml index 8722658249963..96079a44b335b 100644 --- a/src/importexport/musicxml/tests/data/testFractionTicks_ref.xml +++ b/src/importexport/musicxml/tests/data/testFractionTicks_ref.xml @@ -33,6 +33,7 @@ + 1 diff --git a/src/importexport/musicxml/tests/data/testGlissandoLines.xml b/src/importexport/musicxml/tests/data/testGlissandoLines.xml index 21934de3ae4b4..810cbdac33d5f 100644 --- a/src/importexport/musicxml/tests/data/testGlissandoLines.xml +++ b/src/importexport/musicxml/tests/data/testGlissandoLines.xml @@ -35,6 +35,7 @@ + 1 diff --git a/src/importexport/musicxml/tests/data/testGrace1.xml b/src/importexport/musicxml/tests/data/testGrace1.xml index 45e3c11dcbb62..4bba8a11d621d 100644 --- a/src/importexport/musicxml/tests/data/testGrace1.xml +++ b/src/importexport/musicxml/tests/data/testGrace1.xml @@ -34,6 +34,7 @@ + 1 diff --git a/src/importexport/musicxml/tests/data/testGrace2.xml b/src/importexport/musicxml/tests/data/testGrace2.xml index de1ffba20a7d8..572b99694f95b 100644 --- a/src/importexport/musicxml/tests/data/testGrace2.xml +++ b/src/importexport/musicxml/tests/data/testGrace2.xml @@ -34,6 +34,7 @@ + 1 diff --git a/src/importexport/musicxml/tests/data/testGrace3.xml b/src/importexport/musicxml/tests/data/testGrace3.xml index 2a492db9cf9b5..fc2114b6fc4c6 100644 --- a/src/importexport/musicxml/tests/data/testGrace3.xml +++ b/src/importexport/musicxml/tests/data/testGrace3.xml @@ -35,6 +35,7 @@ + 1 diff --git a/src/importexport/musicxml/tests/data/testGraceAfter1.xml b/src/importexport/musicxml/tests/data/testGraceAfter1.xml index d04da6ddc51f9..d6cbc631af9e0 100644 --- a/src/importexport/musicxml/tests/data/testGraceAfter1.xml +++ b/src/importexport/musicxml/tests/data/testGraceAfter1.xml @@ -35,6 +35,7 @@ + 1 diff --git a/src/importexport/musicxml/tests/data/testGraceAfter2.xml b/src/importexport/musicxml/tests/data/testGraceAfter2.xml index 2925fe8b6a86f..a80204f01e586 100644 --- a/src/importexport/musicxml/tests/data/testGraceAfter2.xml +++ b/src/importexport/musicxml/tests/data/testGraceAfter2.xml @@ -35,6 +35,7 @@ + 1 diff --git a/src/importexport/musicxml/tests/data/testGraceAfter3.xml b/src/importexport/musicxml/tests/data/testGraceAfter3.xml index 1e93cccb7c771..209b866c67421 100644 --- a/src/importexport/musicxml/tests/data/testGraceAfter3.xml +++ b/src/importexport/musicxml/tests/data/testGraceAfter3.xml @@ -35,6 +35,7 @@ + 1 diff --git a/src/importexport/musicxml/tests/data/testGraceAfter4.xml b/src/importexport/musicxml/tests/data/testGraceAfter4.xml index b2dce1e1a4c44..2ff05079c44da 100644 --- a/src/importexport/musicxml/tests/data/testGraceAfter4.xml +++ b/src/importexport/musicxml/tests/data/testGraceAfter4.xml @@ -35,6 +35,7 @@ + 1 diff --git a/src/importexport/musicxml/tests/data/testGraceFermata.xml b/src/importexport/musicxml/tests/data/testGraceFermata.xml index 7deb267e95623..6610d9a81d3a9 100644 --- a/src/importexport/musicxml/tests/data/testGraceFermata.xml +++ b/src/importexport/musicxml/tests/data/testGraceFermata.xml @@ -34,6 +34,7 @@ + 1 diff --git a/src/importexport/musicxml/tests/data/testGuitarBends_ref.xml b/src/importexport/musicxml/tests/data/testGuitarBends_ref.xml index 9ff695888dee0..834f2f186fc09 100644 --- a/src/importexport/musicxml/tests/data/testGuitarBends_ref.xml +++ b/src/importexport/musicxml/tests/data/testGuitarBends_ref.xml @@ -34,6 +34,7 @@ + 1 diff --git a/src/importexport/musicxml/tests/data/testHairpinDynamics_ref.xml b/src/importexport/musicxml/tests/data/testHairpinDynamics_ref.xml index 3eb62dfc0df7a..ff9ed5497762e 100644 --- a/src/importexport/musicxml/tests/data/testHairpinDynamics_ref.xml +++ b/src/importexport/musicxml/tests/data/testHairpinDynamics_ref.xml @@ -35,6 +35,7 @@ + 1 diff --git a/src/importexport/musicxml/tests/data/testHandbells.xml b/src/importexport/musicxml/tests/data/testHandbells.xml index 65297cb864ffd..33dbf37d8b2aa 100644 --- a/src/importexport/musicxml/tests/data/testHandbells.xml +++ b/src/importexport/musicxml/tests/data/testHandbells.xml @@ -34,6 +34,7 @@ + 1 diff --git a/src/importexport/musicxml/tests/data/testHarmonMutes.xml b/src/importexport/musicxml/tests/data/testHarmonMutes.xml index df750c3c59c1c..4a604846c1e23 100644 --- a/src/importexport/musicxml/tests/data/testHarmonMutes.xml +++ b/src/importexport/musicxml/tests/data/testHarmonMutes.xml @@ -34,6 +34,7 @@ + 1 diff --git a/src/importexport/musicxml/tests/data/testHarmony1.xml b/src/importexport/musicxml/tests/data/testHarmony1.xml index e6c2dedb06ab6..6756ae96e2f3f 100644 --- a/src/importexport/musicxml/tests/data/testHarmony1.xml +++ b/src/importexport/musicxml/tests/data/testHarmony1.xml @@ -33,6 +33,7 @@ + 1 diff --git a/src/importexport/musicxml/tests/data/testHarmony2.xml b/src/importexport/musicxml/tests/data/testHarmony2.xml index 0a52d0b9e859a..16182cf7888da 100644 --- a/src/importexport/musicxml/tests/data/testHarmony2.xml +++ b/src/importexport/musicxml/tests/data/testHarmony2.xml @@ -33,6 +33,7 @@ + 1 diff --git a/src/importexport/musicxml/tests/data/testHarmony3.xml b/src/importexport/musicxml/tests/data/testHarmony3.xml index af6e28c0bfcb8..e081870a64104 100644 --- a/src/importexport/musicxml/tests/data/testHarmony3.xml +++ b/src/importexport/musicxml/tests/data/testHarmony3.xml @@ -35,6 +35,7 @@ + 1 diff --git a/src/importexport/musicxml/tests/data/testHarmony4.xml b/src/importexport/musicxml/tests/data/testHarmony4.xml index 67ebec8db2ec3..0f912fbf291f5 100644 --- a/src/importexport/musicxml/tests/data/testHarmony4.xml +++ b/src/importexport/musicxml/tests/data/testHarmony4.xml @@ -33,6 +33,7 @@ + 1 diff --git a/src/importexport/musicxml/tests/data/testHarmony5.xml b/src/importexport/musicxml/tests/data/testHarmony5.xml index 3cca93bd0fc27..b6a42792c74b5 100644 --- a/src/importexport/musicxml/tests/data/testHarmony5.xml +++ b/src/importexport/musicxml/tests/data/testHarmony5.xml @@ -29,6 +29,7 @@ + 1 diff --git a/src/importexport/musicxml/tests/data/testHarmony6_ref.xml b/src/importexport/musicxml/tests/data/testHarmony6_ref.xml index c20825af11ac7..d4edce499fa58 100644 --- a/src/importexport/musicxml/tests/data/testHarmony6_ref.xml +++ b/src/importexport/musicxml/tests/data/testHarmony6_ref.xml @@ -38,6 +38,7 @@ containing recognized text, unrecognized plaintext and unrecognized text requiri + 1 diff --git a/src/importexport/musicxml/tests/data/testHarmony7_ref.xml b/src/importexport/musicxml/tests/data/testHarmony7_ref.xml index aa858e837dc2b..f51bd09aef2b6 100644 --- a/src/importexport/musicxml/tests/data/testHarmony7_ref.xml +++ b/src/importexport/musicxml/tests/data/testHarmony7_ref.xml @@ -34,6 +34,7 @@ + 1 diff --git a/src/importexport/musicxml/tests/data/testHarmony8.xml b/src/importexport/musicxml/tests/data/testHarmony8.xml index 9292539f7a0d7..c6f88da31787b 100644 --- a/src/importexport/musicxml/tests/data/testHarmony8.xml +++ b/src/importexport/musicxml/tests/data/testHarmony8.xml @@ -33,6 +33,7 @@ + 1 diff --git a/src/importexport/musicxml/tests/data/testHarmony9.xml b/src/importexport/musicxml/tests/data/testHarmony9.xml index 07b49df3bebcf..37dfa1c5e15bb 100644 --- a/src/importexport/musicxml/tests/data/testHarmony9.xml +++ b/src/importexport/musicxml/tests/data/testHarmony9.xml @@ -34,6 +34,7 @@ + 1 diff --git a/src/importexport/musicxml/tests/data/testHarpPedals_ref.xml b/src/importexport/musicxml/tests/data/testHarpPedals_ref.xml index 6cb4a7c872bc2..914bd261ee93f 100644 --- a/src/importexport/musicxml/tests/data/testHarpPedals_ref.xml +++ b/src/importexport/musicxml/tests/data/testHarpPedals_ref.xml @@ -34,6 +34,7 @@ + 1 diff --git a/src/importexport/musicxml/tests/data/testHello.xml b/src/importexport/musicxml/tests/data/testHello.xml index 62829316d4179..a658ca9344c0b 100644 --- a/src/importexport/musicxml/tests/data/testHello.xml +++ b/src/importexport/musicxml/tests/data/testHello.xml @@ -29,6 +29,7 @@ + 1 diff --git a/src/importexport/musicxml/tests/data/testHiddenStaves.xml b/src/importexport/musicxml/tests/data/testHiddenStaves.xml index 9a6cee7344272..f3de299a9156d 100644 --- a/src/importexport/musicxml/tests/data/testHiddenStaves.xml +++ b/src/importexport/musicxml/tests/data/testHiddenStaves.xml @@ -80,6 +80,7 @@ + 1 @@ -113,6 +114,7 @@ + 1 @@ -149,6 +151,7 @@ + 1 @@ -213,6 +216,7 @@ + 1 diff --git a/src/importexport/musicxml/tests/data/testHoles.xml b/src/importexport/musicxml/tests/data/testHoles.xml index 92459968952c9..fc36816413624 100644 --- a/src/importexport/musicxml/tests/data/testHoles.xml +++ b/src/importexport/musicxml/tests/data/testHoles.xml @@ -34,6 +34,7 @@ + 1 diff --git a/src/importexport/musicxml/tests/data/testImplicitMeasure1.xml b/src/importexport/musicxml/tests/data/testImplicitMeasure1.xml index 27917e2fd0942..29182aa2699d9 100644 --- a/src/importexport/musicxml/tests/data/testImplicitMeasure1.xml +++ b/src/importexport/musicxml/tests/data/testImplicitMeasure1.xml @@ -34,6 +34,7 @@ + 1 diff --git a/src/importexport/musicxml/tests/data/testImportDrums.xml b/src/importexport/musicxml/tests/data/testImportDrums.xml index cff81dbf47a4d..24cf0a31d3a13 100644 --- a/src/importexport/musicxml/tests/data/testImportDrums.xml +++ b/src/importexport/musicxml/tests/data/testImportDrums.xml @@ -63,6 +63,7 @@ + 64