X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Flyric-engraver.cc;h=d9e68dbf6a2c6a036a58ccf69868f3c18b028698;hb=2be67678488b5829a52acdf36ab4278477375b6d;hp=5c1117637ccff19369c6279a3ba2d63aa532a98d;hpb=df4a7c4a55148e065d878dcc2f7e09ac27ea9c32;p=lilypond.git

diff --git a/lily/lyric-engraver.cc b/lily/lyric-engraver.cc
index 5c1117637c..d9e68dbf6a 100644
--- a/lily/lyric-engraver.cc
+++ b/lily/lyric-engraver.cc
@@ -3,76 +3,154 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
-#include "lyric-engraver.hh"
-#include "musical-request.hh"
+#include "engraver.hh"
+#include "event.hh"
 #include "item.hh"
-#include "paper-def.hh"
+#include "context.hh"
 #include "font-metric.hh"
-#include "side-position-interface.hh"
+#include "note-head.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:
+  virtual void stop_translation_timestep ();
+  virtual bool try_music (Music *);
+  virtual void process_music ();
+  
+public:
+  TRANSLATOR_DECLARATIONS (Lyric_engraver);
+private:
+  Music * event_;
+  Item* text_;
 
+  Context* get_voice_context ();
+};
 
-Lyric_engraver::Lyric_engraver()
+Lyric_engraver::Lyric_engraver ()
 {
-  text_p_ =0;
-  req_l_ =0;
+  text_ =0;
+  event_ =0;
 }
 
 bool
 Lyric_engraver::try_music (Music*r)
 {
-  if (Lyric_req* l = dynamic_cast <Lyric_req *> (r))
+  if (r->is_mus_type ("lyric-event"))
     {
-      if (req_l_)
+      if (event_)
 	return false;
-      req_l_ =l;
+      event_ =r;
       return true;
     }
   return false;
 }
 
 void
-Lyric_engraver::deprecated_process_music()
+Lyric_engraver::process_music ()
 {
-  if (req_l_)
+  if (event_)
     {
-      text_p_=  new Item (get_property ("LyricText"));
+      text_=  make_item ("LyricText",event_->self_scm ());
       
-      text_p_->set_grob_property ("text", req_l_->get_mus_property ("text"));
+      text_->set_property ("text", event_->get_property ("text"));
+    }
+}
 
-      /*
-	We can't reach the notehead where we're centered from here. So
-	we kludge.
 
-	(UGH UGH, pulled amount of space out of thin air)
-      */
-      
-      text_p_->translate_axis (0.66, X_AXIS);
-      
-      announce_grob (text_p_, req_l_);
-      req_l_ = 0;
+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 (ly_c_string_p (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;
 }
 
-void
-Lyric_engraver::stop_translation_timestep()
+Grob *
+get_current_note_head (Context * voice)
 {
-  if (text_p_)
+  for (SCM s = voice->get_property ("busyGrobs");
+       ly_c_pair_p (s); s = ly_cdr (s))
     {
-      typeset_grob (text_p_);
-      text_p_ =0;
+      Item*g = dynamic_cast<Item*> (unsmob_grob (ly_cdar (s)));
+	  
+      if (g && !g->get_column ()
+	  && Note_head::has_interface (g))
+	return g;
     }
+	  
+  return 0;  
 }
 
 void
-Lyric_engraver::start_translation_timestep ()
+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_int2num (LEFT)); 
+	    }
+	}
+      
+      text_ =0;
+    }
+  event_ =0;
 }
 
 
+ENTER_DESCRIPTION (Lyric_engraver,
+/* descr */       "",
+/* creats*/       "",
+/* accepts */     "lyric-event",
+/* acks  */      "",
+/* reads */       "",
+/* write */       "");