X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Flyric-engraver.cc;h=74d15e4df1faedef65fddc857260b3fe33c46c5e;hb=66f7048060d9e7c3f273ddfcdd850d522957d6d6;hp=06ffce0d50ad4cc354015a88e4e623beb2d1da53;hpb=0b14e8b2e122df7adf340cc85e92ffd9b184098a;p=lilypond.git

diff --git a/lily/lyric-engraver.cc b/lily/lyric-engraver.cc
index 06ffce0d50..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--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1997--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
   Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
@@ -59,15 +59,13 @@ Lyric_engraver::process_music ()
     {
       SCM text = event_->get_property ("text");
 
-      if (ly_is_equal (text, scm_makfrom0str (" ")))
+      if (ly_is_equal (text, scm_from_locale_string (" ")))
 	{
 	  if (last_text_)
 	    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 ('-');
@@ -115,12 +115,20 @@ get_voice_to_lyrics (Context *lyrics)
 Grob *
 get_current_note_head (Context *voice)
 {
+  Moment now = voice->now_mom ();
   for (SCM s = voice->get_property ("busyGrobs");
        scm_is_pair (s); s = scm_cdr (s))
     {
-      Item *g = dynamic_cast<Item *> (unsmob_grob (scm_cdar (s)));
+      Grob *g = unsmob_grob (scm_cdar (s));;
+      Moment *end_mom = unsmob_moment (scm_caar (s));
+      if (!end_mom || !g)
+	{
+	  programming_error ("busyGrobs invalid");
+	  continue;
+	}
 
-      if (g && !g->get_column ()
+      if (end_mom->main_part_ > now.main_part_
+	  && dynamic_cast<Item *> (g)
 	  && Note_head::has_interface (g))
 	return g;
     }
@@ -142,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
 	    {
@@ -159,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 */
+		""
+		);