fix #88061: bad staff spacing with lyrics in multiple voices

musescore · Feb 17, 2016 · acf6580 · acf6580
1 parent ac03441
commit acf6580
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 3 deletions.
diff --git a/libmscore/measure.cpp b/libmscore/measure.cpp
@@ -3351,7 +3351,8 @@ void Measure::layoutX(qreal stretch)
                                     Lyrics* l = cr->lyricsList().at(i);
                                     if (!l || l->isEmpty())
                                           continue;
-                                    lyrics = l;
+                                    if (!lyrics || l->no() > lyrics->no())
+                                          lyrics = l;
                                     QRectF b(l->bbox().translated(l->pos()));
                                     llw = qMax(llw, -(b.left()+lx+cx));
                                     rrw = qMax(rrw, b.right()+rx+cx);

diff --git a/vtest/gen b/vtest/gen
@@ -50,7 +50,7 @@ else
        beams-1 beams-2 beams-3 beams-4 beams-5 beams-6 beams-7 beams-8 beams-9 beams-10\
        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 voice-1 voice-2 slash-1 slash-2\
+       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 small-1 tremolo-1"
 fi
 

diff --git a/vtest/gen.bat b/vtest/gen.bat
@@ -25,7 +25,7 @@ set SRC=mmrest-1,bravura-mmrest,gonville-mmrest,mmrest-2,mmrest-4,mmrest-5,mmres
  beams-1,beams-2,beams-3,beams-4,beams-5,beams-6,beams-7,beams-8,beams-9,beams-10, ^
  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,voice-1,voice-2,slash-1,slash-2, ^
+ 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,small-1,system-5,tremolo-1
 
 set MSCORE=..\win32install\bin\musescore.exe

diff --git a/vtest/lyrics-7-ref.png b/vtest/lyrics-7-ref.png
diff --git a/vtest/lyrics-7.mscz b/vtest/lyrics-7.mscz