X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Flyric-engraver.cc;h=74d15e4df1faedef65fddc857260b3fe33c46c5e;hb=6a18123d7fcd2f4ee57835c5ea70835ceabb5c39;hp=ae0464f97dd29fea92496270596ac2914c2473ee;hpb=87eedcd59f4082cb0841528ad5bc82cb1d1191e3;p=lilypond.git

diff --git a/lily/lyric-engraver.cc b/lily/lyric-engraver.cc
index ae0464f97d..74d15e4df1 100644
--- a/lily/lyric-engraver.cc
+++ b/lily/lyric-engraver.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1997--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
   Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
@@ -65,9 +65,7 @@ Lyric_engraver::process_music ()
 	    last_text_->set_property ("self-alignment-X", scm_from_int (LEFT));
 	}
       else
-	{
-	  text_ = make_item ("LyricText", event_->self_scm ());
-	}
+	text_ = make_item ("LyricText", event_->self_scm ());
     }
 }
 
@@ -83,6 +81,8 @@ get_voice_to_lyrics (Context *lyrics)
 
   if (scm_is_string (voice_name))
     nm = ly_scm2string (voice_name);
+  else if (nm == "")
+    return 0;
   else
     {
       ssize idx = nm.rfind ('-');
@@ -126,7 +126,7 @@ get_current_note_head (Context *voice)
 	  programming_error ("busyGrobs invalid");
 	  continue;
 	}
-      
+
       if (end_mom->main_part_ > now.main_part_
 	  && dynamic_cast<Item *> (g)
 	  && Note_head::has_interface (g))
@@ -150,8 +150,10 @@ Lyric_engraver::stop_translation_timestep ()
 	  if (head)
 	    {
 	      text_->set_parent (head, X_AXIS);
-	      if (melisma_busy (voice))
-		text_->set_property ("self-alignment-X", scm_from_int (LEFT));
+	      if (melisma_busy (voice)
+		  && !to_boolean (get_property ("ignoreMelismata")))
+		text_->set_property ("self-alignment-X",
+				     get_property("lyricMelismaAlignment"));
 	    }
 	  else
 	    {
@@ -167,7 +169,16 @@ Lyric_engraver::stop_translation_timestep ()
 }
 
 ADD_TRANSLATOR (Lyric_engraver,
-		/* doc */ "",
-		/* create */ "LyricText",
-		/* read */ "",
-		/* write */ "");
+		/* doc */
+		"Engrave text for lyrics.",
+
+		/* create */
+		"LyricText ",
+
+		/* read */
+		"ignoreMelismata "
+		"lyricMelismaAlignment ",
+
+		/* write */
+		""
+		);