add style parameter for autoplace lyrics

musescore · Aug 18, 2016 · 06bd541 · 06bd541
1 parent 61ae4e7
commit 06bd541
Show file tree

Hide file tree

Showing 8 changed files with 264 additions and 146 deletions.
diff --git a/libmscore/chordrest.cpp b/libmscore/chordrest.cpp
@@ -1479,7 +1479,7 @@ Shape ChordRest::shape() const
             x2 = qMax(x2, x1 + l->bbox().width() + margin);
             }
       if (x2 > x1)
-            shape.add(QRectF(x1, 0.0, x2-x1, 2.0));
+            shape.add(QRectF(x1, 0.0, x2-x1, 0.0));
       return shape;
       }
 }

diff --git a/libmscore/hairpin.cpp b/libmscore/hairpin.cpp
@@ -508,7 +508,6 @@ void Hairpin::setHairpinType(Type val)
 
 void Hairpin::layout()
       {
-      printf("Hairpin::layout\n");
       setPos(0.0, 0.0);
       TextLine::layout();
       }

diff --git a/libmscore/layout.cpp b/libmscore/layout.cpp
@@ -3376,7 +3376,9 @@ System* Score::collectSystem(LayoutContext& lc)
       //    vertical align lyrics
       //
 
-      qreal margin = spatium() * .5;
+      qreal lyricsMinTopDistance    = styleP(StyleIdx::lyricsMinTopDistance);
+      qreal lyricsMinBottomDistance = styleP(StyleIdx::lyricsMinBottomDistance);
+
       for (MeasureBase* mb : system->measures()) {
             if (!mb->isMeasure())
                   continue;
@@ -3397,7 +3399,7 @@ System* Score::collectSystem(LayoutContext& lc)
                               for (Lyrics* l : cr->lyrics()) {
                                     if (l) {
                                           l->rUserYoffset() = 0.0;
-                                          sh.add(l->bbox().adjusted(-margin, 0.0, margin, 0.0).translated(l->pos()));
+                                          sh.add(l->bbox().translated(l->pos()));
                                           }
                                     }
                               // lyrics shapes must be moved, so first remove them from segment
@@ -3406,8 +3408,8 @@ System* Score::collectSystem(LayoutContext& lc)
                               for (Lyrics* l : cr->lyrics()) {
                                     if (l && l->autoplace()) {
                                           qreal y = s.staffShape(staffIdx).minVerticalDistance(sh);
-                                          if (y > 0.0)
-                                                yMax = qMax(yMax, y);
+                                          if (y > -lyricsMinTopDistance)
+                                                yMax = qMax(yMax, y + lyricsMinTopDistance);
                                           }
                                     }
                               }
@@ -3424,7 +3426,8 @@ System* Score::collectSystem(LayoutContext& lc)
                               for (Lyrics* l : cr->lyrics()) {
                                     if (l && l->autoplace()) {
                                           l->rUserYoffset() = yMax;
-                                          sh.add(l->bbox().translated(l->pos()));
+                                          sh.add(l->bbox().translated(l->pos())
+                                             .adjusted(0.0, 0.0, 0.0, lyricsMinBottomDistance));
                                           }
                                     }
                               s.staffShape(staffIdx).add(sh);

diff --git a/libmscore/style.cpp b/libmscore/style.cpp
@@ -55,7 +55,8 @@ static const StyleType styleTypes[] {
       { StyleIdx::minSystemDistance,       "minSystemDistance",       Spatium(8.5)  },
       { StyleIdx::maxSystemDistance,       "maxSystemDistance",       Spatium(15.0) },
       { StyleIdx::lyricsDistance,          "lyricsDistance",          Spatium(2.0)  },
-      { StyleIdx::lyricsMinBottomDistance, "lyricsMinBottomDistance", Spatium(4.0)  },
+      { StyleIdx::lyricsMinTopDistance,    "lyricsMinTopDistance",    Spatium(1.0)  },
+      { StyleIdx::lyricsMinBottomDistance, "lyricsMinBottomDistance", Spatium(3.0)  },
       { StyleIdx::lyricsLineHeight,        "lyricsLineHeight",        1.0 },
       { StyleIdx::figuredBassFontFamily,   "figuredBassFontFamily",   QString("MScoreBC") },
 

diff --git a/libmscore/style.h b/libmscore/style.h
@@ -44,6 +44,7 @@ enum class StyleIdx : int {
       maxSystemDistance,
 
       lyricsDistance,
+      lyricsMinTopDistance,
       lyricsMinBottomDistance,
       lyricsLineHeight,
 

diff --git a/mscore/editstyle.cpp b/mscore/editstyle.cpp
@@ -76,8 +76,9 @@ EditStyle::EditStyle(Score* s, QWidget* parent)
       { StyleIdx::akkoladeDistance,        false, akkoladeDistance,        0 },
       { StyleIdx::minSystemDistance,       false, minSystemDistance,       0 },
       { StyleIdx::maxSystemDistance,       false, maxSystemDistance,       0 },
-      { StyleIdx::lyricsDistance,          false, lyricsDistance,          0 },
-      { StyleIdx::lyricsMinBottomDistance, false, lyricsMinBottomDistance, 0 },
+      { StyleIdx::lyricsDistance,          false, lyricsDistance,          resetLyricsDistance },
+      { StyleIdx::lyricsMinTopDistance,    false, lyricsMinTopDistance,    resetLyricsMinTopDistance },
+      { StyleIdx::lyricsMinBottomDistance, false, lyricsMinBottomDistance, resetLyricsMinBottomDistance },
       { StyleIdx::systemFrameDistance,     false, systemFrameDistance,     0 },
       { StyleIdx::frameSystemDistance,     false, frameSystemDistance,     0 },
       { StyleIdx::minMeasureWidth,         false, minMeasureWidth_2,       resetMinMeasureWidth },
@@ -189,7 +190,7 @@ EditStyle::EditStyle(Score* s, QWidget* parent)
       { StyleIdx::tupletMaxSlope,          false, tupletMaxSlope,          resetTupletMaxSlope           },
       { StyleIdx::tupletOufOfStaff,        false, tupletOutOfStaff,        0 },
 
-      { StyleIdx::lyricsLineHeight,        true,  lyricsLineHeight,             0 },
+      { StyleIdx::lyricsLineHeight,        true,  lyricsLineHeight,             resetLyricsLineHeight },
       { StyleIdx::repeatBarTips,           false, showRepeatBarTips,            0 },
       { StyleIdx::startBarlineSingle,      false, showStartBarlineSingle,       0 },
       { StyleIdx::startBarlineMultiple,    false, showStartBarlineMultiple,     0 },