Merge pull request #1322 from Jojo-Schmitz/lyrics

fix #33626: lyrics verse numbers don't line up with lyrics
musescore · Oct 11, 2014 · 316d71d · 316d71d
2 parents 7ff5507 + e4ec8be
commit 316d71d
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 9 deletions.
diff --git a/libmscore/lyrics.cpp b/libmscore/lyrics.cpp
@@ -340,7 +340,7 @@ bool Lyrics::acceptDrop(const DropData& data) const
 Element* Lyrics::drop(const DropData& data)
       {
       Text* e = static_cast<Text*>(data.element);
-      if (!(e->type() == Element::Type::TEXT && e->textStyle().name() == "Lyrics Verse")) {
+      if (!(e->type() == Element::Type::TEXT && e->textStyle().name() == "Lyrics Verse Number")) {
             delete e;
             return 0;
             }

diff --git a/libmscore/style.cpp b/libmscore/style.cpp
@@ -343,8 +343,8 @@ void initStyle(MStyle* s)
          AlignmentFlags::HCENTER | AlignmentFlags::BOTTOM, QPointF(0.0, MM(5)), OffsetType::ABS));
       s->addTextStyle(TextStyle(QT_TRANSLATE_NOOP ("TextStyle", "Instrument Change"), ff,  12, true, false, false,
          AlignmentFlags::LEFT | AlignmentFlags::BOTTOM, QPointF(0, -3.0), OffsetType::SPATIUM, true));
-      s->addTextStyle(TextStyle(QT_TRANSLATE_NOOP ("TextStyle", "Lyrics Verse"),      ff, 11, false, false, false,
-         AlignmentFlags::RIGHT | AlignmentFlags::TOP, QPointF(), OffsetType::SPATIUM, true));
+      s->addTextStyle(TextStyle(QT_TRANSLATE_NOOP ("TextStyle", "Lyrics Verse Number"),ff, 11, false, false, false,
+         AlignmentFlags::RIGHT | AlignmentFlags::BASELINE, QPointF(), OffsetType::SPATIUM, true));
 
       s->addTextStyle(TextStyle(QT_TRANSLATE_NOOP ("TextStyle", "Figured Bass"), "MScoreBC", 8, false, false, false,
          AlignmentFlags::LEFT | AlignmentFlags::TOP, QPointF(0, 6), OffsetType::SPATIUM, true,

diff --git a/mscore/menus.cpp b/mscore/menus.cpp
@@ -941,12 +941,6 @@ Palette* MuseScore::newTextPalette()
       is->setText(tr("Instrument"));
       sp->append(is, tr("Instrument Change"));
 
-      Text* text = new Text(gscore);
-      text->setTrack(0);
-      text->setTextStyleType(TextStyleType::LYRICS_VERSE_NUMBER);
-      text->setText(tr("1."));
-      sp->append(text, tr("Lyrics Verse Number"));
-
       return sp;
       }