X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Flyric-engraver.cc;h=e11f4ec222156d18672805fa1338aabbf36d97c6;hb=5c6c8edb1c4997bd3db10d3fd1d79bca2abe3d7e;hp=da7102b1f7212bfef8c534b2158823c42db4ee96;hpb=9efbad2d9487a05b04423e7e9f062968e8f8eaf4;p=lilypond.git

diff --git a/lily/lyric-engraver.cc b/lily/lyric-engraver.cc
index da7102b1f7..e11f4ec222 100644
--- a/lily/lyric-engraver.cc
+++ b/lily/lyric-engraver.cc
@@ -3,77 +3,162 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--1998 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 "paper-def.hh"
-#include "main.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"
+#include "stream-event.hh"
 
-Lyric_engraver::Lyric_engraver()
+#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
 {
-  lreq_l_ =0;
-  lyric_item_p_ =0;
-}
+protected:
+  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_;
 
-bool
-Lyric_engraver::do_try_request (Request*r)
+  Context *get_voice_context ();
+};
+
+Lyric_engraver::Lyric_engraver ()
 {
-  Musical_req * m =dynamic_cast <Musical_req *> (r);
-  if (!m || ! dynamic_cast <Lyric_req *> (m)) 
-    return false;
-  lreq_l_ = dynamic_cast <Lyric_req *> (m);
+  text_ = 0;
+  last_text_ = 0;
+  event_ = 0;
+}
 
-  return true;
+IMPLEMENT_TRANSLATOR_LISTENER (Lyric_engraver, lyric);
+void
+Lyric_engraver::listen_lyric (Stream_event *ev)
+{
+  ASSIGN_EVENT_ONCE (event_, ev);
 }
 
 void
-Lyric_engraver::do_process_requests()
+Lyric_engraver::process_music ()
 {
-  if (lreq_l_) 
+  if (event_)
     {
-      Text_def *td_p = new Text_def;
-      td_p->text_str_ = lreq_l_->text_str_;
-      td_p->align_dir_ = LEFT;
-      Scalar style = get_property ("textstyle");
-      if (style.length_i ())
+      SCM text = event_->get_property ("text");
+
+      if (ly_is_equal (text, scm_makfrom0str (" ")))
 	{
-	  td_p->style_str_ = style;
+	  if (last_text_)
+	    last_text_->set_property ("self-alignment-X", scm_from_int (LEFT));
 	}
-      Scalar alignment = get_property ("textalignment");
-      if (alignment.isnum_b())
+      else
 	{
-	  td_p->align_dir_= (Direction)(int)alignment;
+	  text_ = make_item ("LyricText", event_->self_scm ());
+	  text_->set_property ("text", text);
 	}
-      
-      lyric_item_p_ =  new Text_item (td_p);
+    }
+}
+
+Context *
+get_voice_to_lyrics (Context *lyrics)
+{
+  SCM avc = lyrics->get_property ("associatedVoiceContext");
+  if (Context *c = unsmob_context (avc))
+    return c;
 
-      lyric_item_p_->dir_ = DOWN;
-      lyric_item_p_->fat_b_ = true;
-      announce_element (Score_element_info (lyric_item_p_, lreq_l_));
+  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;
 }
 
-void
-Lyric_engraver::do_post_move_processing()
+Grob *
+get_current_note_head (Context *voice)
 {
-  lreq_l_ =0;
+  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 ()
+	  && Note_head::has_interface (g))
+	return g;
+    }
+
+  return 0;
 }
 
 void
-Lyric_engraver::do_pre_move_processing()
+Lyric_engraver::stop_translation_timestep ()
 {
-  if (lyric_item_p_)
+  if (text_)
     {
-      typeset_element (lyric_item_p_);
-      lyric_item_p_ =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", scm_from_int (LEFT));
+	    }
+	}
+
+      last_text_ = text_;
+      text_ = 0;
     }
+  event_ = 0;
 }
 
-
-IMPLEMENT_IS_TYPE_B1(Lyric_engraver,Engraver);
-ADD_THIS_TRANSLATOR(Lyric_engraver);
+ADD_TRANSLATOR (Lyric_engraver,
+		/* doc */ "",
+		/* create */ "LyricText",
+		/* accept */ "lyric-event",
+		/* read */ "",
+		/* write */ "");