Run `make grand-replace'.

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

diff --git a/lily/lyric-engraver.cc b/lily/lyric-engraver.cc
index 3005760765b00c0cb5f4febb34fe1d1ba679df86..1c206a81fd9fc9b16b24652f2aa03a98ed1d5d46 100644 (file)
--- 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--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
   Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
@@ -83,6 +83,10 @@ 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 +119,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)));
-
-      if (g && !g->get_column ()
+      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 (end_mom->main_part_ > now.main_part_
+         && dynamic_cast<Item *> (g)
          && Note_head::has_interface (g))
        return g;
     }
@@ -134,7 +146,7 @@ Lyric_engraver::stop_translation_timestep ()
   if (text_)
     {
       Context *voice = get_voice_to_lyrics (context ());
-
+ 
       if (voice)
        {
          Grob *head = get_current_note_head (voice);
@@ -143,7 +155,7 @@ Lyric_engraver::stop_translation_timestep ()
            {
              text_->set_parent (head, X_AXIS);
              if (melisma_busy (voice))
-               text_->set_property ("self-alignment-X", scm_from_int (LEFT));
+               text_->set_property ("self-alignment-X", get_property("lyricMelismaAlignment"));
            }
          else
            {
@@ -159,7 +171,14 @@ Lyric_engraver::stop_translation_timestep ()
 }
 
 ADD_TRANSLATOR (Lyric_engraver,
-               /* doc */ "",
-               /* create */ "LyricText",
-               /* read */ "",
-               /* write */ "");
+               /* doc */
+               "Engrave text for lyrics.",
+
+               /* create */
+               "LyricText ",
+               /* read */
+               "lyricMelismaAlignment ",
+
+               /* write */
+               ""
+               );