Alignment of lyrics to manual melismata now honours ignoreMelismata

[lilypond.git] / lily / lyric-engraver.cc

diff --git a/lily/lyric-engraver.cc b/lily/lyric-engraver.cc
index 3bc2c121bf961fb59f909dbeff0b8c99f26bf28b..eafde88b33c6792e83bf304ddc6a0daab5c2dfc8 100644 (file)
--- a/lily/lyric-engraver.cc
+++ b/lily/lyric-engraver.cc
@@ -81,8 +81,10 @@ Lyric_engraver::process_music ()
     }
 
     Context *voice = get_voice_to_lyrics (context ());
-    if (last_text_ && voice &&
-        to_boolean (voice->get_property ("melismaBusy")))
+    if (last_text_
+        && voice
+        && to_boolean (voice->get_property ("melismaBusy"))
+        && !to_boolean (context ()->get_property ("ignoreMelismata")))
       last_text_->set_property ("self-alignment-X",
                                get_property ("lyricMelismaAlignment"));
 }