Issue 2608: Lyrics iteration can't handle some unusual setups

This avoids continued use of an associated Voice context that is no
longer associated with any iterators.

diff --git a/lily/lyric-combine-music-iterator.cc b/lily/lyric-combine-music-iterator.cc
index b64251beeda3ec2a78df26f47ca288fdd68c25fb..336b167f2e98cdf2d4179b687330d1913b6d21b9 100644 (file)
--- a/lily/lyric-combine-music-iterator.cc
+++ b/lily/lyric-combine-music-iterator.cc
@@ -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

diff --git a/lily/lyric-engraver.cc b/lily/lyric-engraver.cc
index fadb35d6b4c8dd3d10e7a541b5bdabc80da2d1b7..bc576bf3ccc669f23fbea53df01ce072c069549b 100644 (file)
--- a/lily/lyric-engraver.cc
+++ b/lily/lyric-engraver.cc
@@ -96,7 +96,10 @@ get_voice_to_lyrics (Context *lyrics)
 
   SCM avc = lyrics->get_property ("associatedVoiceContext");
   if (Context *c = unsmob<Context> (avc))
-    return c;
+    {
+      if (!c->is_removable ())
+        return c;
+    }
 
   SCM voice_name = lyrics->get_property ("associatedVoice");
   string nm = lyrics->id_string ();