X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Flyric-engraver.cc;h=1c206a81fd9fc9b16b24652f2aa03a98ed1d5d46;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=b2ca4c1f5d68dfc02eb0110ed388aac83caad09c;hpb=81f1a254d08cbde22d0bac2b366e199a3efebd30;p=lilypond.git

diff --git a/lily/lyric-engraver.cc b/lily/lyric-engraver.cc
index b2ca4c1f5d..1c206a81fd 100644
--- a/lily/lyric-engraver.cc
+++ b/lily/lyric-engraver.cc
@@ -3,36 +3,37 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
   Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #include "context.hh"
 #include "engraver.hh"
-#include "event.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"
 
 /**
    Generate texts for lyric syllables.  We only do one lyric at a time.
    Multiple copies of this engraver should be used to do multiple voices.
- */
+*/
 class Lyric_engraver : public Engraver
 {
 protected:
-  virtual void stop_translation_timestep ();
-  virtual bool try_music (Music *);
-  virtual void process_music ();
+  void stop_translation_timestep ();
+  void process_music ();
+  DECLARE_TRANSLATOR_LISTENER (lyric);
 
 public:
   TRANSLATOR_DECLARATIONS (Lyric_engraver);
 
 private:
-  Music *event_;
+  Stream_event *event_;
   Item *text_;
+  Item *last_text_;
 
   Context *get_voice_context ();
 };
@@ -40,18 +41,15 @@ private:
 Lyric_engraver::Lyric_engraver ()
 {
   text_ = 0;
+  last_text_ = 0;
   event_ = 0;
 }
 
-bool
-Lyric_engraver::try_music (Music*r)
+IMPLEMENT_TRANSLATOR_LISTENER (Lyric_engraver, lyric);
+void
+Lyric_engraver::listen_lyric (Stream_event *ev)
 {
-  if (!event_)
-    {
-      event_ = r;
-      return true;
-    }
-  return false;
+  ASSIGN_EVENT_ONCE (event_, ev);
 }
 
 void
@@ -59,29 +57,41 @@ Lyric_engraver::process_music ()
 {
   if (event_)
     {
-      text_ = make_item ("LyricText", event_->self_scm ());
-      text_->set_property ("text", event_->get_property ("text"));
+      SCM text = event_->get_property ("text");
+
+      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 ());
+	}
     }
 }
 
-
-Context*
+Context *
 get_voice_to_lyrics (Context *lyrics)
 {
   SCM avc = lyrics->get_property ("associatedVoiceContext");
-  if  (Context *c = unsmob_context (avc))
+  if (Context *c = unsmob_context (avc))
     return c;
 
   SCM voice_name = lyrics->get_property ("associatedVoice");
-  String nm = lyrics->id_string ();
+  string nm = lyrics->id_string ();
 
   if (scm_is_string (voice_name))
     nm = ly_scm2string (voice_name);
+  else if (nm == "")
+    {
+      return 0;
+    }
   else
     {
-      int idx = nm.index_last ('-');
-      if (idx >= 0)
-	nm = nm.left_string (idx);
+      ssize idx = nm.rfind ('-');
+      if (idx != NPOS)
+	nm = nm.substr (0, idx);
     }
 
   Context *parent = lyrics;
@@ -109,32 +119,23 @@ 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");
-       ly_c_pair_p (s); s = ly_cdr (s))
+       scm_is_pair (s); s = scm_cdr (s))
     {
-      Item *g = dynamic_cast<Item*> (unsmob_grob (ly_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;
     }
-	
-  return 0;
-}
-
-Grob *
-get_current_rest (Context *voice)
-{
-  for (SCM s = voice->get_property ("busyGrobs"); ly_c_pair_p (s);
-       s = ly_cdr (s))
-    {
-      Item *g = dynamic_cast<Item*> (unsmob_grob (ly_cdar (s)));
-	
-      if (g && !g->get_column ()
-	  && (Rest::has_interface (g)
-	      || Multi_measure_rest::has_interface (g)))
-	return g;
-    }
 
   return 0;
 }
@@ -145,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);
@@ -154,20 +155,30 @@ Lyric_engraver::stop_translation_timestep ()
 	    {
 	      text_->set_parent (head, X_AXIS);
 	      if (melisma_busy (voice))
-		text_->set_property ("self-alignment-X", scm_int2num (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));
 	    }
 	}
 
+      last_text_ = text_;
       text_ = 0;
     }
   event_ = 0;
 }
 
+ADD_TRANSLATOR (Lyric_engraver,
+		/* doc */
+		"Engrave text for lyrics.",
+
+		/* create */
+		"LyricText ",
+		/* read */
+		"lyricMelismaAlignment ",
 
-ENTER_DESCRIPTION (Lyric_engraver,
-/* descr */       "",
-/* creats*/       "LyricText",
-/* accepts */     "lyric-event",
-/* acks  */      "",
-/* reads */       "",
-/* write */       "");
+		/* write */
+		""
+		);