*** empty log message ***

[lilypond.git] / lily / lyric-engraver.cc

diff --git a/lily/lyric-engraver.cc b/lily/lyric-engraver.cc
index 20cf201bdcd04126e63b0d2f0a6c60d5ff85c589..552d46151fbc3fbc634d7cd4818ad7c0b3a3ff70 100644 (file)
--- a/lily/lyric-engraver.cc
+++ b/lily/lyric-engraver.cc
@@ -7,47 +7,48 @@
   Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
+#include "context.hh"
 #include "engraver.hh"
 #include "event.hh"
-#include "item.hh"
-#include "context.hh"
 #include "font-metric.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);
+  TRANSLATOR_DECLARATIONS (Lyric_engraver);
+
 private:
-  Music * event_;
-  Item* text_;
+  Music *event_;
+  Item *text_;
 
-  Context* get_voice_context ();
+  Context *get_voice_context ();
 };
 
 Lyric_engraver::Lyric_engraver ()
 {
-  text_ =0;
-  event_ =0;
+  text_ = 0;
+  event_ = 0;
 }
 
 bool
 Lyric_engraver::try_music (Music*r)
 {
-  if (r->is_mus_type ("lyric-event"))
+  if (!event_)
     {
-      if (event_)
-       return false;
-      event_ =r;
+      event_ = r;
       return true;
     }
   return false;
@@ -58,10 +59,8 @@ Lyric_engraver::process_music ()
 {
   if (event_)
     {
-      text_=  make_item ("LyricText");
-      
+      text_ = make_item ("LyricText", event_->self_scm ());
       text_->set_property ("text", event_->get_property ("text"));
-      announce_grob (text_, event_->self_scm());
     }
 }
 
@@ -73,11 +72,11 @@ get_voice_to_lyrics (Context *lyrics)
   if  (Context *c = unsmob_context (avc))
     return c;
 
-  SCM voice = lyrics->get_property ("associatedVoice");
-  String nm = lyrics->id_string_;
+  SCM voice_name = lyrics->get_property ("associatedVoice");
+  String nm = lyrics->id_string ();
 
-  if (gh_string_p (voice))
-    nm = ly_scm2string (voice);
+  if (scm_is_string (voice_name))
+    nm = ly_scm2string (voice_name);
   else
     {
       int idx = nm.index_last ('-');
@@ -85,28 +84,42 @@ get_voice_to_lyrics (Context *lyrics)
        nm = nm.left_string (idx);
     }
 
-  Context *c =  lyrics->find_existing_context (ly_symbol2scm ("Voice"), nm);
+  Context *parent = lyrics;
+  Context *voice = 0;
+  while (parent && !voice)
+    {
+      voice = find_context_below (parent, ly_symbol2scm ("Voice"), nm);
+      parent = parent->get_parent_context ();
+    }
 
-  if (c)
-    return c;
+  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 lyrics->find_existing_context (ly_symbol2scm ("Voice"), "");
+  return voice;
 }
 
 Grob *
-get_current_note_head (Context * voice)
+get_current_note_head (Context *voice)
 {
   for (SCM s = voice->get_property ("busyGrobs");
-       gh_pair_p (s); s = gh_cdr (s))
+       scm_is_pair (s); s = scm_cdr (s))
     {
-      Item*g = dynamic_cast<Item*> (unsmob_grob (gh_cdar (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;  
+       
+  return 0;
 }
 
 void
@@ -114,7 +127,7 @@ Lyric_engraver::stop_translation_timestep ()
 {
   if (text_)
     {
-      Context * voice = get_voice_to_lyrics (daddy_context_);
+      Context *voice = get_voice_to_lyrics (context ());
 
       if (voice)
        {
@@ -124,20 +137,19 @@ Lyric_engraver::stop_translation_timestep ()
            {
              text_->set_parent (head, X_AXIS);
              if (melisma_busy (voice))
-               text_->set_property ("self-alignment-X", gh_int2scm (LEFT)); 
+               text_->set_property ("self-alignment-X", scm_int2num (LEFT));
            }
        }
-      
-      typeset_grob (text_);
-      text_ =0;
+
+      text_ = 0;
     }
-  event_ =0;
+  event_ = 0;
 }
 
 
-ENTER_DESCRIPTION(Lyric_engraver,
+ENTER_DESCRIPTION (Lyric_engraver,
 /* descr */       "",
-/* creats*/       "",
+/* creats*/       "LyricText",
 /* accepts */     "lyric-event",
 /* acks  */      "",
 /* reads */       "",