Fix some bugs in the dynamic engraver and PostScript backend

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

diff --git a/lily/lyric-combine-music-iterator.cc b/lily/lyric-combine-music-iterator.cc
index 8501d3f5b26e1d3f622b60f76d825cc5ed9accf2..14d3959cee5ceaae5b0b461cb5d9a14f48653865 100644 (file)
--- a/lily/lyric-combine-music-iterator.cc
+++ b/lily/lyric-combine-music-iterator.cc
@@ -202,11 +202,7 @@ Lyric_combine_music_iterator::check_new_context (SCM sev)
 }
 
 /*
-  Look for a suitable voice to align lyrics to.
-
-  Returns 0 if nothing should change; i.e., if we already listen to the
-  right voice, or if we don't yet listen to a voice but no appropriate
-  voice could be found.
+Look for a suitable voice to align lyrics to.
 */
 Context *
 Lyric_combine_music_iterator::find_voice ()
@@ -236,11 +232,7 @@ Lyric_combine_music_iterator::find_voice ()
 void
 Lyric_combine_music_iterator::process (Moment)
 {
-  /* see if associatedVoice has been changed */
-  Context *new_voice = find_voice ();
-  if (new_voice)
-    set_music_context (new_voice);
-
+  find_voice ();
   if (!music_context_)
     return;