new file, move from

[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 4977c0019f26d6fc0f29f2924b490b864679dd5a..8613ee2c10e5643a451d84e8eaf8823206607126 100644 (file)
--- a/lily/new-lyric-combine-music-iterator.cc
+++ b/lily/new-lyric-combine-music-iterator.cc
@@ -144,7 +144,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,17 +160,17 @@ New_lyric_combine_music_iterator::find_voice ()
     {
       SCM voice_name = get_music ()->get_property ("associated-context");
   
-      if (gh_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);
+         Context *voice = find_context_below (t, ly_symbol2scm ("Voice"), name);
          if (!voice)
-           get_music ()->origin ()->warning (_f ("cannot find Voice: %s\n",
-                                                 name.to_str0 ())); 
+           get_music ()->origin ()->warning (_f ("cannot find Voice: %s",
+                                                 name.to_str0 ()) + "\n");
          else
            music_context_ = voice;
            
@@ -195,7 +195,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.