X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Flyric-combine-music-iterator.cc;h=336b167f2e98cdf2d4179b687330d1913b6d21b9;hb=14f464d957b6a68710f0364fc7507b63eb0fcee6;hp=d0b31c4963ee94986fb09021f758d409d13babbc;hpb=6f16c7184dd33fc91b381bb659e9d2f6001f76c7;p=lilypond.git

diff --git a/lily/lyric-combine-music-iterator.cc b/lily/lyric-combine-music-iterator.cc
index d0b31c4963..336b167f2e 100644
--- a/lily/lyric-combine-music-iterator.cc
+++ b/lily/lyric-combine-music-iterator.cc
@@ -96,7 +96,7 @@ Lyric_combine_music_iterator::Lyric_combine_music_iterator ()
 void
 Lyric_combine_music_iterator::set_busy (SCM se)
 {
-  Stream_event *e = Stream_event::unsmob (se);
+  Stream_event *e = unsmob<Stream_event> (se);
 
   if ((e->in_event_class ("note-event") || e->in_event_class ("cluster-note-event"))
       && music_context_)
@@ -161,7 +161,8 @@ Lyric_combine_music_iterator::run_always () const
 bool
 Lyric_combine_music_iterator::ok () const
 {
-  return lyric_iter_ && lyric_iter_->ok ();
+  return lyric_iter_ && lyric_iter_->ok ()
+    && !(music_context_ && music_context_->is_removable ());
 }
 
 void
@@ -191,8 +192,8 @@ Lyric_combine_music_iterator::derived_substitute (Context *f, Context *t)
 void
 Lyric_combine_music_iterator::construct_children ()
 {
-  Music *m = Music::unsmob (get_music ()->get_property ("element"));
-  lyric_iter_ = Music_iterator::unsmob (get_iterator (m));
+  Music *m = unsmob<Music> (get_music ()->get_property ("element"));
+  lyric_iter_ = unsmob<Music_iterator> (get_iterator (m));
   if (!lyric_iter_)
     return;
   lyrics_context_ = find_context_below (lyric_iter_->get_outlet (),
@@ -265,12 +266,8 @@ Lyric_combine_music_iterator::find_voice ()
       && (!music_context_ || ly_scm2string (voice_name) != music_context_->id_string ())
       && scm_is_symbol (voice_type))
     {
-      Context *t = get_outlet ();
-      while (t && t->get_parent_context ())
-        t = t->get_parent_context ();
-
-      string name = ly_scm2string (voice_name);
-      return find_context_below (t, voice_type, name);
+      return find_context_below (find_top_context (get_outlet ()),
+                                 voice_type, ly_scm2string (voice_name));
     }
 
   return 0;