update lyrics style settings (position/margins)

chenlung · Aug 4, 2014 · 0164e65 · 0164e65
1 parent 25addca
commit 0164e65
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/libmscore/read114.cpp b/libmscore/read114.cpp
@@ -682,8 +682,8 @@ Score::FileError Score::read114(XmlReader& e)
             }
 
       // adjust some styles
-      if (style(StyleIdx::lyricsDistance) == MScore::baseStyle()->value(StyleIdx::lyricsDistance))
-            style()->set(StyleIdx::lyricsDistance, 2.0f);
+      qreal lmbd = styleD(StyleIdx::lyricsMinBottomDistance);
+      style()->set(StyleIdx::lyricsMinBottomDistance, lmbd + 4.0);
       if (style(StyleIdx::voltaY) == MScore::baseStyle()->value(StyleIdx::voltaY))
             style()->set(StyleIdx::voltaY, -2.0f);
       if (style(StyleIdx::hideEmptyStaves).toBool()) // http://musescore.org/en/node/16228

diff --git a/libmscore/style.cpp b/libmscore/style.cpp
@@ -260,8 +260,8 @@ void initStyle(MStyle* s)
       AS("Composer", ff, 12, false, false, false, AlignmentFlags::RIGHT   | AlignmentFlags::BOTTOM, QPointF(), OA);
       AS("Lyricist", ff, 12, false, false, false, AlignmentFlags::LEFT    | AlignmentFlags::BOTTOM, QPointF(), OA);
 
-      AS("Lyrics Odd Lines", ff, 11, false, false, false, AlignmentFlags::HCENTER | AlignmentFlags::BASELINE, QPointF(0, 7), OS, true);
-      AS("Lyrics Even Lines", ff, 11, false, false, false, AlignmentFlags::HCENTER | AlignmentFlags::BASELINE, QPointF(0, 7), OS, true);
+      AS("Lyrics Odd Lines", ff, 11, false, false, false, AlignmentFlags::HCENTER | AlignmentFlags::BASELINE, QPointF(0, 6), OS, true);
+      AS("Lyrics Even Lines", ff, 11, false, false, false, AlignmentFlags::HCENTER | AlignmentFlags::BASELINE, QPointF(0, 6), OS, true);
       AS("Fingering", ff,  8, false, false, false, AlignmentFlags::CENTER, QPointF(), OA, true);
       AS("Instrument Name (Long)",   ff, 12, false, false, false, AlignmentFlags::RIGHT | AlignmentFlags::VCENTER, QPointF(), OA, true);
       AS("Instrument Name (Short)",   ff, 12, false, false, false, AlignmentFlags::RIGHT | AlignmentFlags::VCENTER, QPointF(), OA, true);
@@ -351,8 +351,8 @@ StyleData::StyleData()
             { StyleIdx::akkoladeDistance,            6.5  },
             { StyleIdx::minSystemDistance,           8.5  },
             { StyleIdx::maxSystemDistance,           15.0 },
-            { StyleIdx::lyricsDistance,              3.5  },
-            { StyleIdx::lyricsMinBottomDistance,     2    },
+            { StyleIdx::lyricsDistance,              2.0  },
+            { StyleIdx::lyricsMinBottomDistance,     4.0  },
             { StyleIdx::lyricsLineHeight,            QVariant(1.0) },
             { StyleIdx::figuredBassFontFamily,       QVariant(QString("MuseScore Figured Bass")) },
             { StyleIdx::figuredBassFontSize,         QVariant(8.0) },

diff --git a/vtest/chord-layout-12-ref.png b/vtest/chord-layout-12-ref.png
diff --git a/vtest/chord-layout-12.mscz b/vtest/chord-layout-12.mscz