]> git.donarmstrong.com Git - lilypond.git/commitdiff
Syllable when using \melisma should be left-aligned
authorTrevor Daniels <t.daniels@treda.co.uk>
Fri, 18 Mar 2011 09:24:34 +0000 (09:24 +0000)
committerTrevor Daniels <t.daniels@treda.co.uk>
Fri, 18 Mar 2011 09:29:10 +0000 (09:29 +0000)
 - fix issue 773

input/regression/lyric-melisma-melisma.ly [new file with mode: 0644]
lily/lyric-engraver.cc

diff --git a/input/regression/lyric-melisma-melisma.ly b/input/regression/lyric-melisma-melisma.ly
new file mode 100644 (file)
index 0000000..a951678
--- /dev/null
@@ -0,0 +1,11 @@
+\version "2.13.55"
+\header {
+  texidoc = "A syllable aligned with a melisma delimited with
+@code{\melisma} and @code{\melismaEnd} should be left-aligned.
+"
+}
+
+\relative c' {
+  c4 c c16\melisma d e f \melismaEnd g4
+}
+\addlyrics { ha ha looong __ ho }
index ffae2783ba2d409ea3b6ccf445ef6a3476feff72..3bc2c121bf961fb59f909dbeff0b8c99f26bf28b 100644 (file)
@@ -79,6 +79,12 @@ Lyric_engraver::process_music ()
       else
        text_ = make_item ("LyricText", event_->self_scm ());
     }
+
+    Context *voice = get_voice_to_lyrics (context ());
+    if (last_text_ && voice &&
+        to_boolean (voice->get_property ("melismaBusy")))
+      last_text_->set_property ("self-alignment-X",
+                               get_property ("lyricMelismaAlignment"));
 }
 
 Context *