/*
This file is part of LilyPond, the GNU music typesetter.
- Copyright (C) 2004--2010 Han-Wen Nienhuys <hanwen@xs4all.nl>
+ Copyright (C) 2004--2014 Han-Wen Nienhuys <hanwen@xs4all.nl>
LilyPond is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
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;
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
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
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"));
}
}
{
bool m = melisma_busy (music_context_);
if (m)
- return false;
+ return false;
}
return true;
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 ();
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 ();
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);
{
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;
{
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);
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;
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_)
projects / lilypond.git / blobdiff