X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Flyric-engraver.cc;h=22449890d9aa47f4b87f607726a621e53b67a050;hb=333128cf1f0f657692e90b2dffc852147b2528b1;hp=bbaa005cdffd9176f13adfc78d676a777c17e8f0;hpb=15e565fef41ab50d140c3028bc6d9cff1a43a56a;p=lilypond.git

diff --git a/lily/lyric-engraver.cc b/lily/lyric-engraver.cc
index bbaa005cdf..22449890d9 100644
--- a/lily/lyric-engraver.cc
+++ b/lily/lyric-engraver.cc
@@ -3,78 +3,141 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
   Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
+#include "context.hh"
 #include "engraver.hh"
-#include "event.hh"
 #include "item.hh"
-#include "paper-def.hh"
-#include "font-metric.hh"
-#include "side-position-interface.hh"
+#include "note-head.hh"
+#include "stream-event.hh"
+#include "international.hh"
+
+#include "translator.icc"
 
 /**
-   Generate texts for lyric syllables.  We only do one lyric at a time.  
+   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 
+*/
+class Lyric_engraver : public Engraver
 {
 protected:
-  virtual void stop_translation_timestep ();
-  virtual bool try_music (Music *);
-  virtual void process_music ();
-  virtual void start_translation_timestep ();
-  
-public:
-  TRANSLATOR_DECLARATIONS(Lyric_engraver);
-private:
-  Music * req_;
-  Item* text_;
-};
+  void stop_translation_timestep ();
+  void process_music ();
+  DECLARE_TRANSLATOR_LISTENER (lyric);
 
+public:
+  TRANSLATOR_DECLARATIONS (Lyric_engraver);
 
+private:
+  Stream_event *event_;
+  Item *text_;
+  Item *last_text_;
 
+  Context *get_voice_context ();
+};
 
 Lyric_engraver::Lyric_engraver ()
 {
-  text_ =0;
-  req_ =0;
+  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 (r->is_mus_type ("lyric-event"))
-    {
-      if (req_)
-	return false;
-      req_ =r;
-      return true;
-    }
-  return false;
+  ASSIGN_EVENT_ONCE (event_, ev);
 }
 
 void
 Lyric_engraver::process_music ()
 {
-  if (req_)
+  if (event_)
     {
-      text_=  new Item (get_property ("LyricText"));
-      
-      text_->set_grob_property ("text", req_->get_mus_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 ());
+	}
+    }
+}
 
-      /*
-	We can't reach the notehead where we're centered from here. So
-	we kludge.
+Context *
+get_voice_to_lyrics (Context *lyrics)
+{
+  SCM avc = lyrics->get_property ("associatedVoiceContext");
+  if (Context *c = unsmob_context (avc))
+    return c;
 
-	(UGH UGH, pulled amount of space out of thin air)
-      */
-      
-      text_->translate_axis (0.66, X_AXIS);
+  SCM voice_name = lyrics->get_property ("associatedVoice");
+  string nm = lyrics->id_string ();
+
+  if (scm_is_string (voice_name))
+    nm = ly_scm2string (voice_name);
+  else if (nm == "")
+    {
+      return 0;
+    }
+  else
+    {
+      ssize idx = nm.rfind ('-');
+      if (idx != NPOS)
+	nm = nm.substr (0, idx);
+    }
+
+  Context *parent = lyrics;
+  Context *voice = 0;
+  while (parent && !voice)
+    {
+      voice = find_context_below (parent, ly_symbol2scm ("Voice"), nm);
+      parent = parent->get_parent_context ();
+    }
+
+  if (voice)
+    return voice;
+
+  parent = lyrics;
+  voice = 0;
+  while (parent && !voice)
+    {
+      voice = find_context_below (parent, ly_symbol2scm ("Voice"), "");
+      parent = parent->get_parent_context ();
+    }
+
+  return voice;
+}
+
+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))
+    {
+      Grob *g = unsmob_grob (scm_cdar (s));;
+      Moment *end_mom = unsmob_moment (scm_caar (s));
+      if (!end_mom || !g)
+	{
+	  programming_error ("busyGrobs invalid");
+	  continue;
+	}
       
-      announce_grob (text_, req_->self_scm());
+      if (end_mom->main_part_ > now.main_part_
+	  && dynamic_cast<Item *> (g)
+	  && Note_head::has_interface (g))
+	return g;
     }
+
+  return 0;
 }
 
 void
@@ -82,22 +145,40 @@ Lyric_engraver::stop_translation_timestep ()
 {
   if (text_)
     {
-      typeset_grob (text_);
-      text_ =0;
+      Context *voice = get_voice_to_lyrics (context ());
+ 
+      if (voice)
+	{
+	  Grob *head = get_current_note_head (voice);
+
+	  if (head)
+	    {
+	      text_->set_parent (head, X_AXIS);
+	      if (melisma_busy (voice))
+		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;
 }
 
-void
-Lyric_engraver::start_translation_timestep ()
-{
-  req_ =0;
-}
+ADD_TRANSLATOR (Lyric_engraver,
+		/* doc */
+		"Engrave text for lyrics.",
 
+		/* create */
+		"LyricText ",
+		/* read */
+		"lyricMelismaAlignment ",
 
-ENTER_DESCRIPTION(Lyric_engraver,
-/* descr */       "",
-/* creats*/       "",
-/* accepts */     "lyric-event",
-/* acks  */      "",
-/* reads */       "",
-/* write */       "");
+		/* write */
+		""
+		);