source file of the GNU LilyPond music typesetter
- (c) 1997--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
/*
#include "warn.hh"
#include "music-iterator.hh"
-#include "translator-group.hh"
+#include "context.hh"
#include "music-wrapper.hh"
#include "music-wrapper-iterator.hh"
#include "simple-music-iterator.hh"
smobify_self ();
}
-Music_iterator::Music_iterator (Music_iterator const& src)
+Music_iterator::Music_iterator (Music_iterator const& )
{
- handle_ = *src.handle_.clone ();
- music_ = src.music_;
- music_length_ = src.music_length_;
- start_mom_ = src.start_mom_;
- smobify_self ();
+ assert (false);
}
Music_iterator::~Music_iterator ()
{
}
-Translator_group*
+Context *
Music_iterator::get_outlet () const
{
return handle_.get_outlet ();
}
void
-Music_iterator::set_translator (Translator_group *trans)
+Music_iterator::set_translator (Context *trans)
{
handle_.set_translator (trans);
}
{
Music_iterator * p =0;
- SCM ctor = m->get_mus_property ("iterator-ctor") ;
+ SCM ctor = m->get_property ("iterator-ctor") ;
SCM iter = SCM_EOL;
- if (gh_procedure_p (ctor))
+ if (ly_c_procedure_p (ctor))
{
- iter = gh_call0 (ctor);
+ iter = scm_call_0 (ctor);
p = unsmob_iterator (iter);
}
else
else
p = new Simple_music_iterator;
- iter = p->self_scm();
+ iter = p->self_scm ();
scm_gc_unprotect_object (iter);
}
assert (m);
p->music_length_ = m->get_length ();
p->start_mom_ = m->start_mom ();
+
return iter;
}
}
void
-Music_iterator::init_translator (Music *m, Translator_group *report)
+Music_iterator::init_translator (Music *m, Context *report)
{
music_ = m;
assert (m);
}
void
-Music_iterator::substitute_outlet (Translator_group*f, Translator_group *t)
+Music_iterator::substitute_outlet (Context *f, Context *t)
{
if (get_outlet () == f)
set_translator (t);
}
void
-Music_iterator::derived_substitute (Translator_group*,Translator_group*)
+Music_iterator::derived_substitute (Context *,Context *)
{
}
}
/*
- TODO: rename to prevent confusion between Translator::try_music and
+ TODO: rename to prevent confusion between Context::try_music and
Iterator::try_music
*/
/****************************************************************/
IMPLEMENT_TYPE_P (Music_iterator, "ly:iterator?");
-IMPLEMENT_SMOBS(Music_iterator);
-IMPLEMENT_DEFAULT_EQUAL_P(Music_iterator);
+IMPLEMENT_SMOBS (Music_iterator);
+IMPLEMENT_DEFAULT_EQUAL_P (Music_iterator);
SCM
Music_iterator::mark_smob (SCM smob)
only, we _must_ mark them.
*/
if (mus->get_outlet ())
- scm_gc_mark (mus->get_outlet ()->self_scm());
+ scm_gc_mark (mus->get_outlet ()->self_scm ());
if (mus->music_)
- scm_gc_mark (mus->music_->self_scm());
+ scm_gc_mark (mus->music_->self_scm ());
return SCM_EOL;
}
void
-Music_iterator::derived_mark()const
+Music_iterator::derived_mark ()const
{
}
}
void
-Music_iterator::do_quit()
+Music_iterator::do_quit ()
{
}
{
return false;
}
+
+
+bool
+is_child_context (Context *me, Context *child)
+{
+ while (child && child != me)
+ {
+ child = child->get_parent_context ();
+ }
+
+ return child == me;
+}
+
+/*
+ move to context of child iterator if it is deeper down in the
+ hierarchy.
+ */
+void
+Music_iterator::descend_to_child (Context * child_report)
+{
+ Context * me_report = get_outlet ();
+ if (is_child_context (me_report, child_report))
+ set_translator (child_report);
+}