* scm/lily.scm (ly:all-stencil-expressions):

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

diff --git a/lily/lyric-engraver.cc b/lily/lyric-engraver.cc
index dbb159b8afa7bf07bcd61f3875b3d275adb5dfc5..d9e68dbf6a2c6a036a58ccf69868f3c18b028698 100644 (file)
--- a/lily/lyric-engraver.cc
+++ b/lily/lyric-engraver.cc
@@ -58,10 +58,9 @@ 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 (ly_c_string_p (voice_name))
+    nm = ly_scm2string (voice_name);
   else
     {
       int idx = nm.index_last ('-');
@@ -85,21 +84,35 @@ get_voice_to_lyrics (Context *lyrics)
        nm = nm.left_string (idx);
     }
 
-  Context *c =  lyrics->find_context_below (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_context_below (ly_symbol2scm ("Voice"), "");
+  return voice;
 }
 
 Grob *
 get_current_note_head (Context * voice)
 {
   for (SCM s = voice->get_property ("busyGrobs");
-       gh_pair_p (s); s = gh_cdr (s))
+       ly_c_pair_p (s); s = ly_cdr (s))
     {
-      Item*g = dynamic_cast<Item*> (unsmob_grob (gh_cdar (s)));
+      Item*g = dynamic_cast<Item*> (unsmob_grob (ly_cdar (s)));
          
       if (g && !g->get_column ()
          && Note_head::has_interface (g))
@@ -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,11 +137,10 @@ 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;
     }
   event_ =0;