X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Flyric-combine-music-iterator.cc;h=9db7b0a1157dae3574df3683b9aec1419747d015;hb=5bbfc22fce036b9b69df5e420de93e11da23c05e;hp=7b4732ebf57c9acbbbc1430aaada69b16ebc458b;hpb=655ff5747c4103f55db501725c7bab381b42a94b;p=lilypond.git diff --git a/lily/lyric-combine-music-iterator.cc b/lily/lyric-combine-music-iterator.cc index 7b4732ebf5..9db7b0a115 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--2010 Han-Wen Nienhuys + Copyright (C) 2004--2014 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 @@ -63,19 +63,21 @@ private: DECLARE_LISTENER (check_new_context); bool music_found_; + bool lyrics_found_; Context *lyrics_context_; Context *music_context_; SCM lyricsto_voice_name_; Moment busy_moment_; Moment pending_grace_moment_; - + Music_iterator *lyric_iter_; }; Lyric_combine_music_iterator::Lyric_combine_music_iterator () { music_found_ = false; + lyrics_found_ = false; pending_grace_moment_.set_infinite (1); lyric_iter_ = 0; music_context_ = 0; @@ -83,11 +85,10 @@ Lyric_combine_music_iterator::Lyric_combine_music_iterator () busy_moment_.set_infinite (-1); } - /* It's dubious whether we can ever make this fully work. Due to - associatedVoice switching, this routine may be triggered for - the wrong music_context_ + associatedVoice switching, this routine may be triggered for + the wrong music_context_ */ IMPLEMENT_LISTENER (Lyric_combine_music_iterator, set_busy) void @@ -97,10 +98,10 @@ Lyric_combine_music_iterator::set_busy (SCM se) if ((e->in_event_class ("note-event") || e->in_event_class ("cluster-note-event")) && music_context_) - + busy_moment_ = max (music_context_->now_mom (), - busy_moment_); - + busy_moment_); + } void @@ -109,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")); } } @@ -133,7 +134,7 @@ Lyric_combine_music_iterator::start_new_syllable () const { bool m = melisma_busy (music_context_); if (m) - return false; + return false; } return true; @@ -187,17 +188,17 @@ void Lyric_combine_music_iterator::construct_children () { Music *m = unsmob_music (get_music ()->get_property ("element")); - lyric_iter_ = unsmob_iterator (get_iterator (m)); + lyric_iter_ = Music_iterator::unsmob (get_iterator (m)); if (!lyric_iter_) return; lyrics_context_ = find_context_below (lyric_iter_->get_outlet (), - ly_symbol2scm ("Lyrics"), ""); + ly_symbol2scm ("Lyrics"), ""); 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"); Context *voice = find_voice (); @@ -205,7 +206,7 @@ Lyric_combine_music_iterator::construct_children () set_music_context (voice); /* - Wait for a Create_context event. If this isn't done, lyrics can be + Wait for a Create_context event. If this isn't done, lyrics can be delayed when voices are created implicitly. */ Global_context *g = get_outlet ()->get_global_context (); @@ -220,18 +221,14 @@ 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 ; - - // TODO: Check first if type=Voice and if id matches - Stream_event * ev = unsmob_stream_event (sev); - if (ev->get_property ("type") != ly_symbol2scm ("Voice")) - return ; - - Context *voice = find_voice (); + return; + // Search for a possible candidate voice to attach the lyrics to. If none + // is found, we'll try next time again. + Context *voice = find_voice (); if (voice) { set_music_context (voice); @@ -250,8 +247,8 @@ Lyric_combine_music_iterator::find_voice () { SCM voice_name = lyricsto_voice_name_; SCM running = lyrics_context_ - ? lyrics_context_->get_property ("associatedVoice") - : SCM_EOL; + ? lyrics_context_->get_property ("associatedVoice") + : SCM_EOL; if (scm_is_string (running)) voice_name = running; @@ -261,7 +258,7 @@ Lyric_combine_music_iterator::find_voice () { Context *t = get_outlet (); while (t && t->get_parent_context ()) - 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); @@ -278,41 +275,42 @@ Lyric_combine_music_iterator::process (Moment /* when */) if (new_voice) set_music_context (new_voice); + lyrics_found_ = true; if (!music_context_) return; if (!music_context_->get_parent_context ()) { /* - The melody has died. - We die too. + The melody has died. + We die too. */ if (lyrics_context_) - lyrics_context_->unset_property (ly_symbol2scm ("associatedVoiceContext")); + lyrics_context_->unset_property (ly_symbol2scm ("associatedVoiceContext")); lyric_iter_ = 0; set_music_context (0); } if (music_context_ - && (start_new_syllable () || - (busy_moment_ >= pending_grace_moment_)) + && (start_new_syllable () + || (busy_moment_ >= pending_grace_moment_)) && lyric_iter_->ok ()) { Moment now = music_context_->now_mom (); if (now.grace_part_ && !to_boolean (lyrics_context_->get_property ("includeGraceNotes"))) - { - pending_grace_moment_ = now; - pending_grace_moment_.grace_part_ = Rational (0); - return; - } + { + pending_grace_moment_ = now; + pending_grace_moment_.grace_part_ = Rational (0); + return; + } else - { - pending_grace_moment_.set_infinite (1); - } + { + pending_grace_moment_.set_infinite (1); + } Moment m = lyric_iter_->pending_moment (); lyrics_context_->set_property (ly_symbol2scm ("associatedVoiceContext"), - music_context_->self_scm ()); + music_context_->self_scm ()); lyric_iter_->process (m); music_found_ = true; @@ -332,10 +330,12 @@ Lyric_combine_music_iterator::do_quit () string name; if (scm_is_string (voice_name)) - name = ly_scm2string (voice_name); - - get_music ()->origin ()->warning (_f ("cannot find Voice `%s'", - name.c_str ()) + "\n"); + name = ly_scm2string (voice_name); + /* 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"); } if (lyric_iter_)