Updates.

[lilypond.git] / lily / new-lyric-combine-music-iterator.cc

diff --git a/lily/new-lyric-combine-music-iterator.cc b/lily/new-lyric-combine-music-iterator.cc
index a1a68df85ee37f17181c858a19ebc35f2bb65816..ff658fc8fac039adb3dd52f8bc472313e699429a 100644 (file)
--- a/lily/new-lyric-combine-music-iterator.cc
+++ b/lily/new-lyric-combine-music-iterator.cc
@@ -34,6 +34,7 @@ private:
   bool start_new_syllable () ;
   void find_voice ();
 
+  bool music_found_;
   bool made_association_;
   Context * lyrics_context_;
   Context * music_context_;
@@ -49,6 +50,7 @@ static Music *melisma_playing_ev;
 
 New_lyric_combine_music_iterator::New_lyric_combine_music_iterator ()
 {
+  music_found_ = false;
   made_association_ = false;
   lyric_iter_ =0;
   music_context_ =0;
@@ -144,7 +146,7 @@ New_lyric_combine_music_iterator::construct_children ()
   
   if (lyric_iter_)
     lyrics_context_ = find_context_below (lyric_iter_->get_outlet (),
-                                         "Lyrics", "");
+                                         ly_symbol2scm ("Lyrics"), "");
 
   /*
     We do not create a Lyrics context, because the user might
@@ -160,18 +162,15 @@ New_lyric_combine_music_iterator::find_voice ()
     {
       SCM voice_name = get_music ()->get_property ("associated-context");
   
-      if (ly_string_p (voice_name))
+      if (ly_c_string_p (voice_name))
        {
          Context *t = get_outlet ();
-         while (t && t->daddy_context_)
-           t = t->daddy_context_;
+         while (t && t->get_parent_context ())
+           t = t->get_parent_context ();
 
          String name = ly_scm2string (voice_name);
-         Context *voice = find_context_below (t, "Voice", name);
-         if (!voice)
-           get_music ()->origin ()->warning (_f ("cannot find Voice: %s",
-                                                 name.to_str0 ()) + "\n");
-         else
+         Context *voice = find_context_below (t, ly_symbol2scm ("Voice"), name);
+         if (voice)
            music_context_ = voice;
            
        }
@@ -195,7 +194,7 @@ New_lyric_combine_music_iterator::process (Moment )
   if (!music_context_)
     return ;
   
-  if (!music_context_->daddy_context_)
+  if (!music_context_->get_parent_context ())
     {
       /*
        The melody has died.
@@ -212,12 +211,26 @@ New_lyric_combine_music_iterator::process (Moment )
     {
       Moment m= lyric_iter_->pending_moment ();
       lyric_iter_->process (m);
+
+      music_found_ = true; 
     }
 }
 
 void
 New_lyric_combine_music_iterator::do_quit ()
 {
+  if (!music_found_)
+    {
+      SCM voice_name = get_music ()->get_property ("associated-context");
+
+      String name;
+      if (ly_c_string_p (voice_name))
+       name = ly_scm2string (voice_name);
+
+      get_music ()->origin ()->warning (_f ("Haven't found Voice `%s'.",
+                                           name.to_str0 ()) + "\n");
+    }
+
   if (lyric_iter_)
     lyric_iter_->quit ();
 }