X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Flyric-engraver.cc;h=22449890d9aa47f4b87f607726a621e53b67a050;hb=6c34b9f81c0148bf965ce2b2090d75429a3f5b47;hp=c5447ad97ed05200baea881cc766d9d06e0baadf;hpb=afa5829cd270e1b0c616b7ba5c5e6cdc0e920e5f;p=lilypond.git

diff --git a/lily/lyric-engraver.cc b/lily/lyric-engraver.cc
index c5447ad97e..22449890d9 100644
--- a/lily/lyric-engraver.cc
+++ b/lily/lyric-engraver.cc
@@ -3,88 +3,182 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--1998 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
   Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
-#include "musical-request.hh"
-#include "text-item.hh"
-#include "paper-def.hh"
-#include "lookup.hh"
-#include "paper-def.hh"
-#include "main.hh"
-#include "dimensions.hh"
-#include "g-text-item.hh"
-
-
+#include "context.hh"
 #include "engraver.hh"
-#include "array.hh"
-#include "lily-proto.hh"
+#include "item.hh"
+#include "note-head.hh"
+#include "stream-event.hh"
+#include "international.hh"
 
-class Lyric_engraver : public 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
 {
 protected:
-  virtual void do_pre_move_processing();
-  virtual bool do_try_music (Music*);
-  virtual void do_process_requests();
+  void stop_translation_timestep ();
+  void process_music ();
+  DECLARE_TRANSLATOR_LISTENER (lyric);
 
 public:
-  Lyric_engraver();
-  VIRTUAL_COPY_CONS(Translator);
+  TRANSLATOR_DECLARATIONS (Lyric_engraver);
 
 private:
-  Link_array<Lyric_req> lyric_req_l_arr_;
-  Link_array<Item> text_p_arr_;
-};
-
+  Stream_event *event_;
+  Item *text_;
+  Item *last_text_;
 
-ADD_THIS_TRANSLATOR(Lyric_engraver);
+  Context *get_voice_context ();
+};
 
+Lyric_engraver::Lyric_engraver ()
+{
+  text_ = 0;
+  last_text_ = 0;
+  event_ = 0;
+}
 
-Lyric_engraver::Lyric_engraver()
+IMPLEMENT_TRANSLATOR_LISTENER (Lyric_engraver, lyric);
+void
+Lyric_engraver::listen_lyric (Stream_event *ev)
 {
+  ASSIGN_EVENT_ONCE (event_, ev);
 }
 
-bool
-Lyric_engraver::do_try_music (Music*r)
+void
+Lyric_engraver::process_music ()
 {
-  if (Lyric_req* l = dynamic_cast <Lyric_req *> (r))
+  if (event_)
     {
-      lyric_req_l_arr_.push (l);
-      return true;
+      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 ());
+	}
     }
-  return false;
 }
 
-void
-Lyric_engraver::do_process_requests()
+Context *
+get_voice_to_lyrics (Context *lyrics)
 {
-  if (text_p_arr_.size ())
-    return;
+  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 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 ();
+    }
 
-  for (int i=0; i < lyric_req_l_arr_.size (); i++)
+  if (voice)
+    return voice;
+
+  parent = lyrics;
+  voice = 0;
+  while (parent && !voice)
     {
-      Lyric_req* request_l = lyric_req_l_arr_[i];
-      G_text_item* item_p =  new G_text_item;
-      item_p->text_str_ = request_l->text_str_;
+      voice = find_context_below (parent, ly_symbol2scm ("Voice"), "");
+      parent = parent->get_parent_context ();
+    }
 
-      Scalar style = get_property ("textstyle", 0);
-      if (style.length_i ())
-	item_p->style_str_ = style;
+  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;
+	}
       
-      text_p_arr_.push (item_p);
-      announce_element (Score_element_info (item_p, request_l));
+      if (end_mom->main_part_ > now.main_part_
+	  && dynamic_cast<Item *> (g)
+	  && Note_head::has_interface (g))
+	return g;
     }
+
+  return 0;
 }
 
 void
-Lyric_engraver::do_pre_move_processing()
+Lyric_engraver::stop_translation_timestep ()
 {
-  for (int i=0; i < text_p_arr_.size (); i++)
+  if (text_)
     {
-      typeset_element (text_p_arr_[i]);
+      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;
     }
-  text_p_arr_.clear ();
-  lyric_req_l_arr_.clear ();
+  event_ = 0;
 }
 
+ADD_TRANSLATOR (Lyric_engraver,
+		/* doc */
+		"Engrave text for lyrics.",
+
+		/* create */
+		"LyricText ",
+		/* read */
+		"lyricMelismaAlignment ",
+
+		/* write */
+		""
+		);