*/
-#include "translator-group.hh"
+#include "context.hh"
#include "lyric-combine-music.hh"
#include "event.hh"
#include "grob.hh"
public:
New_lyric_combine_music_iterator ();
New_lyric_combine_music_iterator (New_lyric_combine_music_iterator const&src);
- DECLARE_SCHEME_CALLBACK(constructor, ());
+ DECLARE_SCHEME_CALLBACK (constructor, ());
protected:
virtual void construct_children ();
virtual Moment pending_moment () const;
- virtual void do_quit();
+ virtual void do_quit ();
virtual void process (Moment);
virtual Music_iterator *try_music_in_children (Music *) const;
virtual bool run_always ()const;
virtual bool ok () const;
virtual void derived_mark () const;
- virtual void derived_substitute (Translator_group*,Translator_group*);
+ virtual void derived_substitute (Context *,Context *);
private:
bool start_new_syllable () ;
void find_voice ();
bool made_association_;
- Translator_group * lyrics_context_;
- Translator_group* music_context_;
+ Context * lyrics_context_;
+ Context * music_context_;
Music_iterator * lyric_iter_;
};
}
void
-New_lyric_combine_music_iterator::derived_mark()const
+New_lyric_combine_music_iterator::derived_mark ()const
{
if (lyric_iter_)
scm_gc_mark (lyric_iter_->self_scm ());
}
void
-New_lyric_combine_music_iterator::derived_substitute (Translator_group*f, Translator_group*t)
+New_lyric_combine_music_iterator::derived_substitute (Context *f, Context *t)
{
if (lyric_iter_)
lyric_iter_->substitute_outlet (f,t);
music_context_ = t;
}
-/*
- ID == "" means accept any ID.
- */
-Translator_group *
-find_context_below (Translator_group * where,
- String type, String id)
-{
- if (where->is_alias (ly_symbol2scm (type.to_str0 ())))
- {
- if (id == "" || where->id_string_ == id)
- return where;
- }
-
- Translator_group * found = 0;
- for (SCM s = where->trans_group_list_;
- !found && gh_pair_p (s); s = gh_cdr (s))
- {
- Translator_group * tr = dynamic_cast<Translator_group*> (unsmob_translator (gh_car (s)));
-
- found = find_context_below (tr, type, id);
- }
-
- return found;
-}
-
-
void
New_lyric_combine_music_iterator::construct_children ()
{
- Music *m = unsmob_music (get_music ()->get_mus_property ("element"));
+ Music *m = unsmob_music (get_music ()->get_property ("element"));
lyric_iter_ = unsmob_iterator (get_iterator (m));
find_voice ();
if (lyric_iter_)
lyrics_context_ = find_context_below (lyric_iter_->get_outlet (),
- "LyricsVoice", "");
+ ly_symbol2scm ("Lyrics"), "");
/*
- We do not create a LyricsVoice context, because the user might
+ We do not create a Lyrics context, because the user might
create one with a different name, and then we will not find that
one.
*/
{
if (!music_context_)
{
- SCM voice_name = get_music ()->get_mus_property ("associated-context");
+ SCM voice_name = get_music ()->get_property ("associated-context");
- if (gh_string_p (voice_name))
+ if (ly_c_string_p (voice_name))
{
- Translator_group *t = get_outlet ();
- while (t && t->daddy_trans_)
- t = t->daddy_trans_;
+ Context *t = get_outlet ();
+ while (t && t->get_parent_context ())
+ t = t->get_parent_context ();
String name = ly_scm2string (voice_name);
- Translator_group *voice = find_context_below (t, "Voice", name);
+ Context *voice = find_context_below (t, ly_symbol2scm ("Voice"), name);
if (!voice)
- get_music ()->origin ()->warning (_f ("cannot find Voice: %s\n",
- name.to_str0 ()));
+ get_music ()->origin ()->warning (_f ("cannot find Voice: %s",
+ name.to_str0 ()) + "\n");
else
music_context_ = voice;
if (!music_context_)
return ;
- if (!music_context_->daddy_trans_)
+ if (!music_context_->get_parent_context ())
{
/*
The melody has died.
New_lyric_combine_music_iterator::do_quit ()
{
if (lyric_iter_)
- lyric_iter_->quit();
+ lyric_iter_->quit ();
}