DECLARE_LISTENER (set_busy);
DECLARE_LISTENER (check_new_context);
- bool pending_grace_lyric_;
bool music_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;
- pending_grace_lyric_ = false;
+ pending_grace_moment_.set_infinite (1);
lyric_iter_ = 0;
music_context_ = 0;
lyrics_context_ = 0;
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
-Lyric_combine_music_iterator::process (Moment)
+Lyric_combine_music_iterator::process (Moment when)
{
+ (void) when;
+
/* see if associatedVoice has been changed */
Context *new_voice = find_voice ();
if (new_voice)
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_)
{
- 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"),