Merge pull request #23650 from XiaoMigros/harp-mmr

Fix #23645 Don't break MMRs for harp or fret diagrams at start
musescore · Jul 18, 2024 · ef55c94 · ef55c94
2 parents 8e3b4f2 + c4afc30
commit ef55c94
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/src/engraving/rendering/dev/measurelayout.cpp b/src/engraving/rendering/dev/measurelayout.cpp
@@ -146,7 +146,9 @@ static const std::unordered_set<ElementType> BREAK_TYPES {
     ElementType::CAPO,
     ElementType::INSTRUMENT_CHANGE,
     ElementType::STRING_TUNINGS,
-    ElementType::SYMBOL
+    ElementType::SYMBOL,
+    ElementType::FRET_DIAGRAM,
+    ElementType::HARP_DIAGRAM,
 };
 
 static const std::unordered_set<ElementType> ALWAYS_BREAK_TYPES {
@@ -164,7 +166,9 @@ static const std::unordered_set<ElementType> CONDITIONAL_BREAK_TYPES {
     ElementType::CAPO,
     ElementType::INSTRUMENT_CHANGE,
     ElementType::STRING_TUNINGS,
-    ElementType::SYMBOL
+    ElementType::SYMBOL,
+    ElementType::FRET_DIAGRAM,
+    ElementType::HARP_DIAGRAM,
 };
 
 //---------------------------------------------------------

diff --git a/vtest/scores/mmrest-18.mscz b/vtest/scores/mmrest-18.mscz