class Context_specced_music_iterator : public Music_wrapper_iterator
{
public:
- DECLARE_SCHEME_CALLBACK(constructor,());
+ DECLARE_SCHEME_CALLBACK (constructor,());
virtual void construct_children ();
};
void
Context_specced_music_iterator::construct_children ()
{
- SCM ct = get_music ()->get_mus_property ("context-type");
+ SCM ct = get_music ()->get_property ("context-type");
String c_id;
- SCM ci = get_music ()->get_mus_property ("context-id");
- if (gh_string_p (ci))
+ SCM ci = get_music ()->get_property ("context-id");
+ if (ly_c_string_p (ci))
c_id = ly_scm2string (ci);
- SCM ops = get_music ()->get_mus_property ("property-operations");
+ SCM ops = get_music ()->get_property ("property-operations");
Context * a
= get_outlet ()->find_create_context (ct, c_id, ops);
+ if (a
+ && to_boolean (get_music ()->get_property ("descend-only"))
+ && !is_child_context (get_outlet (), a))
+ a = 0;
+
if (a)
set_translator (a);
- Music_wrapper_iterator::construct_children();
+ Music_wrapper_iterator::construct_children ();
}
-IMPLEMENT_CTOR_CALLBACK(Context_specced_music_iterator);
+
+IMPLEMENT_CTOR_CALLBACK (Context_specced_music_iterator);