X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Flyric-engraver.cc;h=340a5d914cdff0e1cab9149d9b53ccc57e2d908a;hb=e1b465ac050fed8f3957c999ec469fda0b66d351;hp=ff3ce86c3aa607a4e8cbf6ba8aeae09600331a2f;hpb=7aabfb20c46e0a1de41698ddc6859ccd3a6dea85;p=lilypond.git

diff --git a/lily/lyric-engraver.cc b/lily/lyric-engraver.cc
index ff3ce86c3a..340a5d914c 100644
--- a/lily/lyric-engraver.cc
+++ b/lily/lyric-engraver.cc
@@ -3,102 +3,151 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2005 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_acknowledged_grobs ();
-  virtual void start_translation_timestep ();
-  
-public:
-  TRANSLATOR_DECLARATIONS(Lyric_engraver);
-private:
-  Music * req_;
-  Item* text_;
-};
+  virtual void process_music ();
 
+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)
+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;
 }
 
 void
-Lyric_engraver::process_acknowledged_grobs ()
+Lyric_engraver::process_music ()
 {
-  if (req_)
+  if (event_)
     {
-      text_=  new Item (get_property ("LyricText"));
-      
-      text_->set_grob_property ("text", req_->get_mus_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_->translate_axis (0.66, X_AXIS);
-      
-      announce_grob(text_, req_->self_scm());
-      req_ = 0;
+      text_ = make_item ("LyricText", event_->self_scm ());
+      text_->set_property ("text", event_->get_property ("text"));
     }
 }
 
-void
-Lyric_engraver::stop_translation_timestep ()
+Context *
+get_voice_to_lyrics (Context *lyrics)
 {
-  if (text_)
+  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
     {
-      typeset_grob (text_);
-      text_ =0;
+      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::start_translation_timestep ()
+Grob *
+get_current_note_head (Context *voice)
 {
-  req_ =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::stop_translation_timestep ()
+{
+  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 */       "");
+ADD_TRANSLATOR (Lyric_engraver,
+		/* descr */ "",
+		/* creats*/ "LyricText",
+		/* accepts */ "lyric-event",
+		/* acks  */ "",
+		/* reads */ "",
+		/* write */ "");