fix #44956: staves with text are not empty

musescore · Feb 19, 2016 · ffb2559 · ffb2559
1 parent 1d7f1af
commit ffb2559
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 2 deletions.
diff --git a/libmscore/measure.cpp b/libmscore/measure.cpp
@@ -2907,6 +2907,13 @@ bool Measure::isMeasureRest(int staffIdx) const
                   if (e && e->type() != Element::Type::REST)
                         return false;
                   }
+            for (Element* a : s->annotations()) {
+                  if (!a || a->systemFlag())
+                        continue;
+                  int atrack = a->track();
+                  if (atrack >= strack && atrack < etrack)
+                        return false;
+                  }
             }
       return true;
       }

diff --git a/vtest/gen b/vtest/gen
@@ -51,7 +51,7 @@ else
        beams-11 beams-12 beams-13 beams-14 beams-15 beams-16 beams-17\
        user-offset-1 user-offset-2 chord-space-1 chord-space-2 tablature-1 image-1\
        lyrics-1 lyrics-2 lyrics-3 lyrics-4 lyrics-5 lyrics-6 lyrics-7 voice-1 voice-2 slash-1 slash-2\
-       system-1 system-2 system-3 system-4 system-5 hide-1 small-1 tremolo-1\
+       system-1 system-2 system-3 system-4 system-5 system-6 hide-1 small-1 tremolo-1\
        staff-1 staff-2"
 fi
 

diff --git a/vtest/gen.bat b/vtest/gen.bat
@@ -26,7 +26,7 @@ set SRC=mmrest-1,bravura-mmrest,gonville-mmrest,mmrest-2,mmrest-4,mmrest-5,mmres
  beams-11,beams-12,beams-13,beams-14,beams-15,beams-16,beams-17, ^
  user-offset-1,user-offset-2,chord-space-1,chord-space-2,tablature-1,image-1, ^
  lyrics-1,lyrics-2,lyrics-3,lyrics-4,lyrics-5,lyrics-6,lyrics-7,voice-1,voice-2,slash-1,slash-2, ^
- system-1,system-2,system-3,system-4,system-5,hide-1,small-1,tremolo-1, ^
+ system-1,system-2,system-3,system-4,system-5,system-6,hide-1,small-1,tremolo-1, ^
  staff-1,staff-2
 
 set MSCORE=..\win32install\bin\musescore.exe

diff --git a/vtest/system-6-ref.png b/vtest/system-6-ref.png
diff --git a/vtest/system-6.mscz b/vtest/system-6.mscz