X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Flyric-combine-music-iterator.cc;h=3c47335b3572f8deebbcae629d13b6a6cbcf43b2;hb=1759b13a95aea208761c6651d760a967da3d44c3;hp=061148d976723ea04debbfd45f26e0ea54e1c9b7;hpb=08560a1b8076630c4fc6cb9b902614d8b74fd6fc;p=lilypond.git diff --git a/lily/lyric-combine-music-iterator.cc b/lily/lyric-combine-music-iterator.cc index 061148d976..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")); } } @@ -196,7 +196,7 @@ Lyric_combine_music_iterator::construct_children () if (!lyrics_context_) { - m->origin ()->warning ("argument of \\lyricsto should contain Lyrics context"); + m->origin ()->warning (_ ("argument of \\lyricsto should contain Lyrics context")); } lyricsto_voice_name_ = get_music ()->get_property ("associated-context");