X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Flyric-engraver.cc;h=af566aac552909e21b0c839f8a70d5fc1d15c145;hb=4b975f3177880e16e759f67be4517f67109c2633;hp=c0cc8a25fb8da8aa2042215228fcbee9a36abee6;hpb=8aad615ea7bb31f49a0c2afc21eea5ff5de20437;p=lilypond.git

diff --git a/lily/lyric-engraver.cc b/lily/lyric-engraver.cc
index c0cc8a25fb..af566aac55 100644
--- a/lily/lyric-engraver.cc
+++ b/lily/lyric-engraver.cc
@@ -3,70 +3,165 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
-#include "lyric-engraver.hh"
-#include "musical-request.hh"
-#include "g-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_ = 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_)
     {
-      lyric_req_l_arr_.push (l);
+      event_ = r;
       return true;
     }
   return false;
 }
 
 void
-Lyric_engraver::do_process_requests()
+Lyric_engraver::process_music ()
 {
-  if (text_p_arr_.size ())
-    return;
-
-  for (int i=0; i < lyric_req_l_arr_.size (); i++)
+  if (event_)
     {
-      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_;
-
-      Scalar style = get_property ("textstyle", 0);
-      if (style.length_i ())
-	item_p->style_str_ = style;
-      if (i)
+      SCM text = event_->get_property ("text");
+      
+      if (ly_is_equal (text, scm_makfrom0str (" ")))
 	{
-	  Real dy = paper ()->lookup_l (0)-> text
-	    (item_p->style_str_, String ("Cg")).dim_. y ().length ();
-	  dy *= 1.1;
-	  item_p->translate_axis (-i * dy, Y_AXIS);
+	  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);
 	}
-      
-      text_p_arr_.push (item_p);
-      announce_element (Score_element_info (item_p, request_l));
     }
 }
 
+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
+    {
+      int idx = nm.index_last ('-');
+      if (idx >= 0)
+	nm = nm.left_string (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)
+{
+  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 ()
 {
-  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", scm_from_int (LEFT));
+	    }
+	}
+	  
+      last_text_ = text_;
+      text_ = 0;
     }
-  text_p_arr_.clear ();
-  lyric_req_l_arr_.clear ();
+  event_ = 0;
 }
 
+#include "translator.icc"
+
+ADD_TRANSLATOR (Lyric_engraver,
+		/* descr */ "",
+		/* creats*/ "LyricText",
+		/* accepts */ "lyric-event",
+		/* reads */ "",
+		/* write */ "");