X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Flyric-engraver.cc;h=8a187c6af526b1e4e6103d6704eedf967f53ab4d;hb=f817c9010f8016d5e9c19ec3b167e7d485538eb3;hp=6b63b428b6fb510e0150c1f9be4efe0ee073c8d2;hpb=243db47a88df9240a66bde37356b43aaeb41260d;p=lilypond.git

diff --git a/lily/lyric-engraver.cc b/lily/lyric-engraver.cc
index 6b63b428b6..8a187c6af5 100644
--- a/lily/lyric-engraver.cc
+++ b/lily/lyric-engraver.cc
@@ -3,52 +3,51 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
+#include "context.hh"
 #include "engraver.hh"
-#include "event.hh"
-#include "item.hh"
-#include "paper-def.hh"
 #include "font-metric.hh"
-#include "side-position-interface.hh"
+#include "item.hh"
+#include "multi-measure-rest.hh"
+#include "note-head.hh"
+#include "rest.hh"
 
 /**
-   Generate texts for lyric syllables.  We only do one lyric at a time.  
+   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 
+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 * req_;
-  Item* text_;
-};
 
+public:
+  TRANSLATOR_DECLARATIONS (Lyric_engraver);
 
+private:
+  Music *event_;
+  Item *text_;
 
+  Context *get_voice_context ();
+};
 
 Lyric_engraver::Lyric_engraver ()
 {
-  text_ =0;
-  req_ =0;
+  text_ = 0;
+  event_ = 0;
 }
 
 bool
 Lyric_engraver::try_music (Music*r)
 {
-  if (r->is_mus_type ("lyric-event"))
+  if (!event_)
     {
-      if (req_)
-	return false;
-      req_ =r;
+      event_ = r;
       return true;
     }
   return false;
@@ -57,13 +56,69 @@ Lyric_engraver::try_music (Music*r)
 void
 Lyric_engraver::process_music ()
 {
-  if (req_)
+  if (event_)
+    {
+      text_ = make_item ("LyricText", event_->self_scm ());
+      text_->set_property ("text", event_->get_property ("text"));
+    }
+}
+
+
+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))
     {
-      text_=  make_item ("LyricText");
-      
-      text_->set_grob_property ("text", req_->get_mus_property ("text"));
-      announce_grob (text_, req_->self_scm());
+      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
@@ -71,16 +126,29 @@ Lyric_engraver::stop_translation_timestep ()
 {
   if (text_)
     {
-      typeset_grob (text_);
-      text_ =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_int2num (LEFT));
+	    }
+	}
+
+      text_ = 0;
     }
-  req_ =0;
+  event_ = 0;
 }
 
 
-ENTER_DESCRIPTION(Lyric_engraver,
+ADD_TRANSLATOR (Lyric_engraver,
 /* descr */       "",
-/* creats*/       "",
+/* creats*/       "LyricText",
 /* accepts */     "lyric-event",
 /* acks  */      "",
 /* reads */       "",