X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Flyric-engraver.cc;h=176c9b7166157228e5eb82571d6685a5236bd671;hb=d929a664c85112ffecaa16c5e114d6f75cf002e2;hp=f6b61316fa50995b51fa8a8ec7f5bceb09d39d99;hpb=685452c8675e89a84692420fb9891756d318e771;p=lilypond.git

diff --git a/lily/lyric-engraver.cc b/lily/lyric-engraver.cc
index f6b61316fa..176c9b7166 100644
--- a/lily/lyric-engraver.cc
+++ b/lily/lyric-engraver.cc
@@ -3,66 +3,165 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
   Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
-#include "lyric-engraver.hh"
-#include "musical-request.hh"
-#include "text-item.hh"
-#include "paper-def.hh"
-#include "lookup.hh"
+#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"
 
-ADD_THIS_TRANSLATOR (Lyric_engraver);
+/**
+   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:
+  void stop_translation_timestep ();
+  virtual bool try_music (Music *);
+  void process_music ();
+
+public:
+  TRANSLATOR_DECLARATIONS (Lyric_engraver);
+
+private:
+  Music *event_;
+  Item *text_;
+  Item *last_text_;
 
+  Context *get_voice_context ();
+};
 
-Lyric_engraver::Lyric_engraver()
+Lyric_engraver::Lyric_engraver ()
 {
-  text_p_ =0;
-  req_l_ =0;
+  text_ = 0;
+  last_text_ = 0;
+  event_ = 0;
 }
 
 bool
-Lyric_engraver::do_try_music (Music*r)
+Lyric_engraver::try_music (Music *r)
 {
-  if (Lyric_req* l = dynamic_cast <Lyric_req *> (r))
+  if (!event_)
     {
-      if (req_l_)
-	return false;
-      req_l_ =l;
+      event_ = r;
       return true;
     }
   return false;
 }
 
 void
-Lyric_engraver::do_process_requests()
+Lyric_engraver::process_music ()
 {
-  if (req_l_)
+  if (event_)
     {
-      text_p_=  new Text_item;
-      text_p_->text_str_ = req_l_->text_str_;
-      text_p_->text_str_ += " ";	// ugh.
+      SCM text = event_->get_property ("text");
 
-      text_p_->set_elt_property (non_rhythmic_scm_sym, SCM_BOOL_T);
-      
-      announce_element (Score_element_info (text_p_, req_l_));
+      if (ly_is_equal (text, scm_makfrom0str (" ")))
+	{
+	  if (last_text_)
+	    last_text_->set_property ("self-alignment-X", scm_from_int (LEFT));
+	}
+      else
+	{
+	  text_ = make_item ("LyricText", event_->self_scm ());
+	  text_->set_property ("text", text);
+	}
     }
 }
 
-void
-Lyric_engraver::do_pre_move_processing()
+Context *
+get_voice_to_lyrics (Context *lyrics)
+{
+  SCM avc = lyrics->get_property ("associatedVoiceContext");
+  if (Context *c = unsmob_context (avc))
+    return c;
+
+  SCM voice_name = lyrics->get_property ("associatedVoice");
+  string nm = lyrics->id_string ();
+
+  if (scm_is_string (voice_name))
+    nm = ly_scm2string (voice_name);
+  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)
 {
-  if (text_p_)
+  for (SCM s = voice->get_property ("busyGrobs");
+       scm_is_pair (s); s = scm_cdr (s))
     {
-      typeset_element (text_p_);
-      text_p_ =0;
+      Item *g = dynamic_cast<Item *> (unsmob_grob (scm_cdar (s)));
+
+      if (g && !g->get_column ()
+	  && Note_head::has_interface (g))
+	return g;
     }
+
+  return 0;
 }
 
 void
-Lyric_engraver::do_post_move_processing ()
+Lyric_engraver::stop_translation_timestep ()
 {
-  req_l_ =0;
+  if (text_)
+    {
+      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", scm_from_int (LEFT));
+	    }
+	}
+
+      last_text_ = text_;
+      text_ = 0;
+    }
+  event_ = 0;
 }
 
+#include "translator.icc"
+
+ADD_TRANSLATOR (Lyric_engraver,
+		/* doc */ "",
+		/* create */ "LyricText",
+		/* accept */ "lyric-event",
+		/* read */ "",
+		/* write */ "");