Fix GH#17796: Export correct system-distance

Backport of musescore#19512
Jojo-Schmitz · Oct 2, 2023 · bfdbcf3 · bfdbcf3
1 parent 363640d
commit bfdbcf3
Show file tree

Hide file tree

Showing 4 changed files with 3,119 additions and 5 deletions.
diff --git a/importexport/musicxml/exportxml.cpp b/importexport/musicxml/exportxml.cpp
@@ -5994,9 +5994,10 @@ void ExportMusicXml::print(const Measure* const m, const int partNr, const int f
 
                         if (mpc.systemStart && !mpc.pageStart) {
                               // see System::layout2() for the factor 2 * score()->spatium()
+                              const Measure* prevSystem = mpc.prevMeasure->coveringMMRestOrThis();
                               const double sysDist = getTenthsFromDots(mmR1->pagePos().y()
-                                                                       - mpc.prevMeasure->pagePos().y()
-                                                                       - mpc.prevMeasure->bbox().height()
+                                                                       - prevSystem->pagePos().y()
+                                                                       - prevSystem->bbox().height()
                                                                        + 2 * score()->spatium()
                                                                        );
                               _xml.tag("system-distance",