fix #267131 - [MusicXML export] print new-system missing in multi-mea…

…sure rests
musescore · Dec 26, 2017 · 8968e0c · 8968e0c
1 parent 47d361b
commit 8968e0c
Show file tree

Hide file tree

Showing 5 changed files with 824 additions and 5 deletions.
diff --git 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