From: David Kastrup <dak@gnu.org>
Date: Wed, 7 Nov 2012 10:15:33 +0000 (+0100)
Subject: Issue 2946: let Lyric_combine_music_iterator only listen to rhythmic events
X-Git-Tag: release/2.17.7-1~12
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=e57aa43dcba4cf876790c1ac8f2ee8ff42522f4b;p=lilypond.git

Issue 2946: let Lyric_combine_music_iterator only listen to rhythmic events

Listening to articulations makes the rhythmic_music_iterator assume it
can just broadcast things like string numbers and right fingerings and
somebody will pick them up and deal with them which is, unfortunately,
not the case.

Listening only to rhythmic events should cure that problem.
---

diff --git a/lily/lyric-combine-music-iterator.cc b/lily/lyric-combine-music-iterator.cc
index 48c8af205e..3c47335b35 100644
--- a/lily/lyric-combine-music-iterator.cc
+++ b/lily/lyric-combine-music-iterator.cc
@@ -110,14 +110,14 @@ Lyric_combine_music_iterator::set_music_context (Context *to)
   if (music_context_)
     {
       music_context_->event_source ()->
-      remove_listener (GET_LISTENER (set_busy), ly_symbol2scm ("music-event"));
+      remove_listener (GET_LISTENER (set_busy), ly_symbol2scm ("rhythmic-event"));
     }
 
   music_context_ = to;
   if (to)
     {
       to->event_source ()->add_listener (GET_LISTENER (set_busy),
-                                         ly_symbol2scm ("music-event"));
+                                         ly_symbol2scm ("rhythmic-event"));
     }
 }