X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Flyric-combine-music-iterator.cc;h=5327ff9ced501a554bef91887bd11ef04d55357d;hb=refs%2Fheads%2Fbugs%2F567849;hp=88ef1d18e61388e789c0112271bd297cf036ea56;hpb=8d355f7ee39a14052533e7f5927422fbca471f8d;p=lilypond.git diff --git a/lily/lyric-combine-music-iterator.cc b/lily/lyric-combine-music-iterator.cc index 88ef1d18e6..5327ff9ced 100644 --- a/lily/lyric-combine-music-iterator.cc +++ b/lily/lyric-combine-music-iterator.cc @@ -1,9 +1,20 @@ /* - new-lyric-combine-iterator.cc -- implement Lyric_combine_music_iterator + This file is part of LilyPond, the GNU music typesetter. - source file of the GNU LilyPond music typesetter + Copyright (C) 2004--2011 Han-Wen Nienhuys - (c) 2004--2006 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 + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + LilyPond is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with LilyPond. If not, see . */ #include "dispatcher.hh" @@ -51,34 +62,47 @@ private: DECLARE_LISTENER (set_busy); DECLARE_LISTENER (check_new_context); - bool pending_grace_lyric_; bool music_found_; + bool lyrics_found_; Context *lyrics_context_; Context *music_context_; SCM lyricsto_voice_name_; - bool busy_; + Moment busy_moment_; + Moment pending_grace_moment_; + Music_iterator *lyric_iter_; }; Lyric_combine_music_iterator::Lyric_combine_music_iterator () { music_found_ = false; - pending_grace_lyric_ = false; + lyrics_found_ = false; + pending_grace_moment_.set_infinite (1); lyric_iter_ = 0; music_context_ = 0; lyrics_context_ = 0; - busy_ = false; + 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_ + */ IMPLEMENT_LISTENER (Lyric_combine_music_iterator, set_busy) void Lyric_combine_music_iterator::set_busy (SCM se) { Stream_event *e = unsmob_stream_event (se); - if (e->in_event_class ("note-event") || e->in_event_class ("cluster-note-event")) - busy_ = true; + 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_); + } void @@ -86,23 +110,22 @@ 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")); - lyrics_context_->unset_property (ly_symbol2scm ("associatedVoiceContext")); + music_context_->event_source ()-> + remove_listener (GET_LISTENER (set_busy), ly_symbol2scm ("music-event")); } music_context_ = to; if (to) { - to->event_source()->add_listener (GET_LISTENER (set_busy), ly_symbol2scm ("music-event")); - if (lyrics_context_) - lyrics_context_->set_property ("associatedVoiceContext", to->self_scm ()); + to->event_source ()->add_listener (GET_LISTENER (set_busy), + ly_symbol2scm ("music-event")); } } bool Lyric_combine_music_iterator::start_new_syllable () const { - if (!busy_) + if (busy_moment_ < music_context_->now_mom ()) return false; if (!lyrics_context_) @@ -201,6 +224,9 @@ IMPLEMENT_LISTENER (Lyric_combine_music_iterator, check_new_context) void 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")) @@ -247,13 +273,14 @@ Lyric_combine_music_iterator::find_voice () } void -Lyric_combine_music_iterator::process (Moment) +Lyric_combine_music_iterator::process (Moment /* when */) { /* see if associatedVoice has been changed */ Context *new_voice = find_voice (); if (new_voice) set_music_context (new_voice); + lyrics_found_ = true; if (!music_context_) return; @@ -269,26 +296,34 @@ Lyric_combine_music_iterator::process (Moment) set_music_context (0); } - if (music_context_ - && (start_new_syllable () || pending_grace_lyric_) + && (start_new_syllable () || + (busy_moment_ >= pending_grace_moment_)) && lyric_iter_->ok ()) { - if (music_context_->now_mom ().grace_part_) + Moment now = music_context_->now_mom (); + if (now.grace_part_ && !to_boolean (lyrics_context_->get_property ("includeGraceNotes"))) { - pending_grace_lyric_ = true; + pending_grace_moment_ = now; + pending_grace_moment_.grace_part_ = Rational (0); return; } else - pending_grace_lyric_ = false; - + { + pending_grace_moment_.set_infinite (1); + } + Moment m = lyric_iter_->pending_moment (); + lyrics_context_->set_property (ly_symbol2scm ("associatedVoiceContext"), + music_context_->self_scm ()); lyric_iter_->process (m); music_found_ = true; } - busy_ = false; + new_voice = find_voice (); + if (new_voice) + set_music_context (new_voice); } void @@ -300,10 +335,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_)