-/*
-new-lyric-combine-iterator.cc -- implement New_lyric_combine_music_iterator
-
-source file of the GNU LilyPond music typesetter
-
-(c) 2004 Han-Wen Nienhuys <hanwen@xs4all.nl>
-
- */
+/*
+ new-lyric-combine-iterator.cc -- implement New_lyric_combine_music_iterator
+
+ source file of the GNU LilyPond music typesetter
+
+ (c) 2004 Han-Wen Nienhuys <hanwen@xs4all.nl>
+*/
#include "context.hh"
#include "lyric-combine-music.hh"
#include "grob.hh"
#include "music-iterator.hh"
-
class New_lyric_combine_music_iterator : public Music_iterator
{
public:
bool start_new_syllable () ;
void find_voice ();
+ bool music_found_;
bool made_association_;
Context * lyrics_context_;
Context * music_context_;
+ SCM lyricsto_voice_name_;
+
Music_iterator * lyric_iter_;
};
New_lyric_combine_music_iterator::New_lyric_combine_music_iterator ()
{
+ music_found_ = false;
made_association_ = false;
- lyric_iter_ =0;
- music_context_ =0;
+ lyric_iter_ = 0;
+ music_context_ = 0;
lyrics_context_ = 0;
/*
{
if (lyric_iter_)
lyric_iter_->substitute_outlet (f,t);
- if (lyrics_context_ && lyrics_context_==f)
+ if (lyrics_context_ && lyrics_context_ == f)
lyrics_context_ = t;
if (music_context_ && music_context_ == f)
music_context_ = t;
Music *m = unsmob_music (get_music ()->get_property ("element"));
lyric_iter_ = unsmob_iterator (get_iterator (m));
+ lyricsto_voice_name_ = get_music ()->get_property ("associated-context");
+
+
find_voice ();
if (lyric_iter_)
lyrics_context_ = find_context_below (lyric_iter_->get_outlet (),
- "Lyrics", "");
+ ly_symbol2scm ("Lyrics"), "");
/*
We do not create a Lyrics context, because the user might
void
New_lyric_combine_music_iterator::find_voice ()
{
- if (!music_context_)
+ SCM voice_name = lyricsto_voice_name_;
+ SCM running = lyrics_context_ ? lyrics_context_->get_property ("associatedVoice") : SCM_EOL;
+
+ if (scm_is_string (running))
+ voice_name = running;
+
+ if (scm_is_string (voice_name)
+ && (!music_context_ || ly_scm2string (voice_name) != music_context_->id_string ()))
{
- SCM voice_name = get_music ()->get_property ("associated-context");
-
- if (ly_string_p (voice_name))
- {
- Context *t = get_outlet ();
- while (t && t->daddy_context_)
- t = t->daddy_context_;
-
- String name = ly_scm2string (voice_name);
- Context *voice = find_context_below (t, "Voice", name);
- if (!voice)
- get_music ()->origin ()->warning (_f ("cannot find Voice: %s",
- name.to_str0 ()) + "\n");
- else
- music_context_ = voice;
-
- }
+ /*
+ (spaghettini).
+
+ Need to set associatedVoiceContext again
+ */
+ if (music_context_)
+ made_association_ = false;
+
+ Context *t = get_outlet ();
+ while (t && t->get_parent_context ())
+ t = t->get_parent_context ();
+
+ String name = ly_scm2string (voice_name);
+ Context *voice = find_context_below (t, ly_symbol2scm ("Voice"), name);
+
+
+ if (voice)
+ music_context_ = voice;
}
if (lyrics_context_ && music_context_)
if (!music_context_)
return ;
- if (!music_context_->daddy_context_)
+ if (!music_context_->get_parent_context ())
{
/*
The melody has died.
if (music_context_
&& start_new_syllable () && lyric_iter_->ok ())
{
- Moment m= lyric_iter_->pending_moment ();
+ Moment m = lyric_iter_->pending_moment ();
lyric_iter_->process (m);
+
+ music_found_ = true;
}
}
void
New_lyric_combine_music_iterator::do_quit ()
{
+ if (!music_found_)
+ {
+ SCM voice_name = get_music ()->get_property ("associated-context");
+
+ String name;
+ if (scm_is_string (voice_name))
+ name = ly_scm2string (voice_name);
+
+ get_music ()->origin ()->warning (_f ("cannot find Voice `%s'",
+ name.to_str0 ()) + "\n");
+ }
+
if (lyric_iter_)
lyric_iter_->quit ();
}