-/*
- 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--2005 Han-Wen Nienhuys <hanwen@xs4all.nl>
*/
#include "context.hh"
-#include "lyric-combine-music.hh"
#include "event.hh"
#include "grob.hh"
#include "music-iterator.hh"
-
class New_lyric_combine_music_iterator : public Music_iterator
{
public:
bool music_found_;
bool made_association_;
- Context * lyrics_context_;
- Context * music_context_;
+ Context *lyrics_context_;
+ Context *music_context_;
SCM lyricsto_voice_name_;
Music_iterator * lyric_iter_;
{
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;
SCM voice_name = lyricsto_voice_name_;
SCM running = lyrics_context_ ? lyrics_context_->get_property ("associatedVoice") : SCM_EOL;
- if (ly_c_string_p (running))
+ if (scm_is_string (running))
voice_name = running;
- if (ly_c_string_p (voice_name)
+ if (scm_is_string (voice_name)
&& (!music_context_ || ly_scm2string (voice_name) != music_context_->id_string ()))
{
/*
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;
SCM voice_name = get_music ()->get_property ("associated-context");
String name;
- if (ly_c_string_p (voice_name))
+ if (scm_is_string (voice_name))
name = ly_scm2string (voice_name);
- get_music ()->origin ()->warning (_f ("Haven't found Voice `%s'.",
+ get_music ()->origin ()->warning (_f ("cannot find Voice `%s'",
name.to_str0 ()) + "\n");
}