X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Flyric-combine-music-iterator.cc;h=336b167f2e98cdf2d4179b687330d1913b6d21b9;hb=5d84bfad4626892bcffd05adcced53c8a2329047;hp=a6de96f5d3b8020981bf869962d6a6414e2865ea;hpb=bb8a0a5387af94dd2702877256334b160575a730;p=lilypond.git diff --git a/lily/lyric-combine-music-iterator.cc b/lily/lyric-combine-music-iterator.cc index a6de96f5d3..336b167f2e 100644 --- a/lily/lyric-combine-music-iterator.cc +++ b/lily/lyric-combine-music-iterator.cc @@ -1,7 +1,7 @@ /* This file is part of LilyPond, the GNU music typesetter. - Copyright (C) 2004--2011 Han-Wen Nienhuys + Copyright (C) 2004--2015 Han-Wen Nienhuys LilyPond is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -59,14 +59,15 @@ protected: private: bool start_new_syllable () const; Context *find_voice (); - DECLARE_LISTENER (set_busy); - DECLARE_LISTENER (check_new_context); + void set_busy (SCM); + void check_new_context (SCM); bool music_found_; bool lyrics_found_; Context *lyrics_context_; Context *music_context_; SCM lyricsto_voice_name_; + SCM lyricsto_voice_type_; Moment busy_moment_; Moment pending_grace_moment_; @@ -83,6 +84,8 @@ Lyric_combine_music_iterator::Lyric_combine_music_iterator () music_context_ = 0; lyrics_context_ = 0; busy_moment_.set_infinite (-1); + lyricsto_voice_name_ = SCM_UNDEFINED; + lyricsto_voice_type_ = SCM_UNDEFINED; } /* @@ -90,11 +93,10 @@ Lyric_combine_music_iterator::Lyric_combine_music_iterator () associatedVoice switching, this routine may be triggered for the wrong music_context_ */ -IMPLEMENT_LISTENER (Lyric_combine_music_iterator, set_busy) void Lyric_combine_music_iterator::set_busy (SCM se) { - Stream_event *e = unsmob_stream_event (se); + Stream_event *e = unsmob (se); if ((e->in_event_class ("note-event") || e->in_event_class ("cluster-note-event")) && music_context_) @@ -109,15 +111,15 @@ 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")); + music_context_->events_below ()-> + remove_listener (GET_LISTENER (Lyric_combine_music_iterator, set_busy), ly_symbol2scm ("rhythmic-event")); } music_context_ = to; if (to) { - to->event_source ()->add_listener (GET_LISTENER (set_busy), - ly_symbol2scm ("music-event")); + to->events_below ()->add_listener (GET_LISTENER (Lyric_combine_music_iterator, set_busy), + ly_symbol2scm ("rhythmic-event")); } } @@ -159,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 @@ -171,6 +174,8 @@ Lyric_combine_music_iterator::derived_mark ()const scm_gc_mark (lyrics_context_->self_scm ()); if (music_context_) scm_gc_mark (music_context_->self_scm ()); + scm_gc_mark (lyricsto_voice_name_); + scm_gc_mark (lyricsto_voice_type_); } void @@ -187,8 +192,8 @@ Lyric_combine_music_iterator::derived_substitute (Context *f, Context *t) void Lyric_combine_music_iterator::construct_children () { - Music *m = unsmob_music (get_music ()->get_property ("element")); - lyric_iter_ = unsmob_iterator (get_iterator (m)); + Music *m = unsmob (get_music ()->get_property ("element")); + lyric_iter_ = unsmob (get_iterator (m)); if (!lyric_iter_) return; lyrics_context_ = find_context_below (lyric_iter_->get_outlet (), @@ -196,10 +201,13 @@ 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"); + lyricsto_voice_type_ = get_music ()->get_property ("associated-context-type"); + if (!scm_is_symbol (lyricsto_voice_type_)) + lyricsto_voice_type_ = ly_symbol2scm ("Voice"); Context *voice = find_voice (); if (voice) @@ -210,7 +218,7 @@ Lyric_combine_music_iterator::construct_children () delayed when voices are created implicitly. */ Global_context *g = get_outlet ()->get_global_context (); - g->events_below ()->add_listener (GET_LISTENER (check_new_context), ly_symbol2scm ("CreateContext")); + g->events_below ()->add_listener (GET_LISTENER (Lyric_combine_music_iterator, check_new_context), ly_symbol2scm ("CreateContext")); /* We do not create a Lyrics context, because the user might @@ -219,9 +227,8 @@ Lyric_combine_music_iterator::construct_children () */ } -IMPLEMENT_LISTENER (Lyric_combine_music_iterator, check_new_context) void -Lyric_combine_music_iterator::check_new_context (SCM sev) +Lyric_combine_music_iterator::check_new_context (SCM /*sev*/) { if (!ok ()) return; @@ -249,19 +256,18 @@ Lyric_combine_music_iterator::find_voice () SCM running = lyrics_context_ ? lyrics_context_->get_property ("associatedVoice") : SCM_EOL; - - if (scm_is_string (running)) + SCM voice_type = lyricsto_voice_type_; + if (scm_is_string (running)) { voice_name = running; + voice_type = lyrics_context_->get_property ("associatedVoiceType"); + } if (scm_is_string (voice_name) - && (!music_context_ || ly_scm2string (voice_name) != music_context_->id_string ())) + && (!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, ly_symbol2scm ("Voice"), name); + return find_context_below (find_top_context (get_outlet ()), + voice_type, ly_scm2string (voice_name)); } return 0; @@ -327,15 +333,16 @@ Lyric_combine_music_iterator::do_quit () if (!music_found_) { SCM voice_name = get_music ()->get_property ("associated-context"); - - string name; + SCM voice_type = get_music ()->get_property ("associated-context-type"); + string name, type; if (scm_is_string (voice_name)) name = ly_scm2string (voice_name); + type = robust_symbol2string (voice_type, "Voice"); /* Don't print a warning for empty lyrics (in which case we don't try to find the proper voice, so it will not be found) */ if (lyrics_found_) - get_music ()->origin ()->warning (_f ("cannot find Voice `%s'", - name.c_str ()) + "\n"); + get_music ()->origin ()->warning (_f ("cannot find %s `%s'", + type.c_str (), name.c_str ()) + "\n"); } if (lyric_iter_)