/*
- 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 <hanwen@xs4all.nl>
- (c) 2004--2007 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
+ 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 <http://www.gnu.org/licenses/>.
*/
#include "dispatcher.hh"
DECLARE_LISTENER (check_new_context);
bool music_found_;
+ bool lyrics_found_;
Context *lyrics_context_;
Context *music_context_;
SCM lyricsto_voice_name_;
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;
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 ;
-
+ // 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);
}
void
-Lyric_combine_music_iterator::process (Moment when)
+Lyric_combine_music_iterator::process (Moment /* when */)
{
- (void) 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;
set_music_context (0);
}
-
if (music_context_
&& (start_new_syllable () ||
(busy_moment_ >= pending_grace_moment_))
&& lyric_iter_->ok ())
{
Moment now = music_context_->now_mom ();
- if (now.grace_part_)
+ if (now.grace_part_ && !to_boolean (lyrics_context_->get_property ("includeGraceNotes")))
{
pending_grace_moment_ = now;
pending_grace_moment_.grace_part_ = Rational (0);
{
pending_grace_moment_.set_infinite (1);
}
-
+
Moment m = lyric_iter_->pending_moment ();
lyrics_context_->set_property (ly_symbol2scm ("associatedVoiceContext"),
music_context_->self_scm ());
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_)