Doc-de: updates from master

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

diff --git a/lily/lyric-engraver.cc b/lily/lyric-engraver.cc
index 136a50135866ec92cd7f44445b71fb54e0b2bed4..eafde88b33c6792e83bf304ddc6a0daab5c2dfc8 100644 (file)
--- a/lily/lyric-engraver.cc
+++ b/lily/lyric-engraver.cc
@@ -73,11 +73,20 @@ Lyric_engraver::process_music ()
       if (ly_is_equal (text, scm_from_locale_string (" ")))
        {
          if (last_text_)
-           last_text_->set_property ("self-alignment-X", scm_from_int (LEFT));
+           last_text_->set_property ("self-alignment-X",
+                                     get_property ("lyricMelismaAlignment"));
        }
       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"))
+        && !to_boolean (context ()->get_property ("ignoreMelismata")))
+      last_text_->set_property ("self-alignment-X",
+                               get_property ("lyricMelismaAlignment"));
 }
 
 Context *