X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Flyric-engraver.cc;h=88b954f4fac2b299b0e94f4936300c299f057681;hb=1925ac1b4c79c3f1eb97c633f9a259648802220e;hp=e11f4ec222156d18672805fa1338aabbf36d97c6;hpb=c4c0ba811cd526f047de3f4d3c77abcc32a3e076;p=lilypond.git

diff --git a/lily/lyric-engraver.cc b/lily/lyric-engraver.cc
index e11f4ec222..88b954f4fa 100644
--- a/lily/lyric-engraver.cc
+++ b/lily/lyric-engraver.cc
@@ -3,18 +3,16 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1997--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
   Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #include "context.hh"
 #include "engraver.hh"
-#include "font-metric.hh"
 #include "item.hh"
-#include "multi-measure-rest.hh"
 #include "note-head.hh"
-#include "rest.hh"
 #include "stream-event.hh"
+#include "international.hh"
 
 #include "translator.icc"
 
@@ -61,7 +59,7 @@ 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));
@@ -69,7 +67,6 @@ Lyric_engraver::process_music ()
       else
 	{
 	  text_ = make_item ("LyricText", event_->self_scm ());
-	  text_->set_property ("text", text);
 	}
     }
 }
@@ -118,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)));
-
-      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;
     }
@@ -146,7 +151,12 @@ 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
+	    {
+	      text_->warning (_ ("Lyric syllable does not have note. Use \\lyricsto or associatedVoice."));
+	      text_->set_property ("X-offset", scm_from_int (0));
 	    }
 	}
 
@@ -159,6 +169,5 @@ Lyric_engraver::stop_translation_timestep ()
 ADD_TRANSLATOR (Lyric_engraver,
 		/* doc */ "",
 		/* create */ "LyricText",
-		/* accept */ "lyric-event",
-		/* read */ "",
+		/* read */ "lyricMelismaAlignment",
 		/* write */ "");