Fix GH#141: Hide staff with subsequent empty measures after crescendo…

… line in measure before
Jojo-Schmitz · Nov 14, 2023 · 65778f6 · 65778f6
1 parent 37a778a
commit 65778f6
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 92 deletions.
diff --git a/libmscore/layout.cpp b/libmscore/layout.cpp
@@ -1406,7 +1406,8 @@ void Score::hideEmptyStaves(System* system, bool isFirstSystem)
                   bool hideStaff = true;
                   for (auto spanner : spanners) {
                         if (spanner.value->staff() == staff
-                         && !spanner.value->systemFlag()) {
+                         && !spanner.value->systemFlag()
+                         && !spanner.value->isHairpin()) {
                               hideStaff = false;
                               break;
                               }

diff --git a/vtest/gen b/vtest/gen
@@ -72,7 +72,7 @@ else
        voice-1 voice-2 slash-1 slash-2\
        system-1 system-2 system-3 system-4 system-5 system-6 system-7 system-8 system-9 system-10 system-11\
        hide-1 small-1 tremolo-1\
-       staff-1 staff-2 staff-3 staff-4 layout-1 layout-2 layout-3 layout-4 layout-5 layout-6 layout-7 layout-8 layout-9 layout-10\
+       staff-1 staff-2 staff-3 staff-4 staffEmptiness layout-1 layout-2 layout-3 layout-4 layout-5 layout-6 layout-7 layout-8 layout-9 layout-10\
        articulation-1 percussion-grace\
        drumset-1 drumset-2 drumset-3 drumset-4 drumset-5 drumset-6 drumset-7 drumset-8 \
        slashed_chord-layout-12 slashed_chord-layout-7 slashed_grace-3 slashed_noteheadposition-1\

diff --git a/vtest/gen.bat b/vtest/gen.bat
@@ -47,7 +47,7 @@ set SRC=bravura-mmrest,gonville-mmrest, ^
  voice-1,voice-2,slash-1,slash-2, ^
  system-1,system-2,system-3,system-4,system-5,system-6,system-7,system-8,system-9,system-10,system-11, ^
  hide-1,small-1,tremolo-1, ^
- staff-1,staff-2,staff-3,staff-4,layout-1,layout-2,layout-3,layout-4,layout-5,layout-6,layout-7,layout-8,layout-9,layout-10, ^
+ staff-1,staff-2,staff-3,staff-4,staffEmptiness,layout-1,layout-2,layout-3,layout-4,layout-5,layout-6,layout-7,layout-8,layout-9,layout-10, ^
  articulation-1, percussion-grace, ^
  drumset-1, drumset-2, drumset-3, drumset-4, drumset-5, drumset-6, drumset-7, drumset-8, ^
  slashed_chord-layout-12, slashed_chord-layout-7, slashed_grace-3, slashed_noteheadposition-1, ^