/*
This file is part of LilyPond, the GNU music typesetter.
- Copyright (C) 2004--2012 Han-Wen Nienhuys <hanwen@xs4all.nl>
+ Copyright (C) 2004--2014 Han-Wen Nienhuys <hanwen@xs4all.nl>
LilyPond is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
definition_mods_ = SCM_EOL;
event_source_ = 0;
events_below_ = 0;
- ancestor_lookup_ = SCM_UNDEFINED;
smobify_self ();
/* TODO: this shares code with find_create_context (). */
Context *
-Context::create_unique_context (SCM name, string id, SCM operations)
+Context::create_unique_context (SCM name, const string &id, SCM operations)
{
/*
Don't create multiple score contexts.
}
Context *
-Context::find_create_context (SCM n, string id, SCM operations)
+Context::find_create_context (SCM n, const string &id, SCM operations)
{
/*
Don't create multiple score contexts.
}
bool ok = true;
- if (val != SCM_EOL)
- ok = type_check_assignment (sym, val, ly_symbol2scm ("translation-type?"));
+ ok = type_check_assignment (sym, val, ly_symbol2scm ("translation-type?"));
+
if (ok)
set_property (sym, val);
}
Context *
Context::create_context (Context_def *cdef,
- string id,
+ const string &id,
SCM ops)
{
infant_event_ = 0;
}
Context *
-Context::get_default_interpreter (string context_id)
+Context::get_default_interpreter (const string &context_id)
{
if (!is_bottom_context ())
{
warning (_f ("cannot find or create: `%s'", name.c_str ()));
t = unsmob_context_def (this->definition_);
}
-
- Context *tg = create_context (t, context_id, SCM_EOL);
- return tg->get_default_interpreter (context_id);
+ if (scm_is_symbol (t->get_default_child (SCM_EOL)))
+ {
+ Context *tg = create_context (t, "\\new", SCM_EOL);
+ return tg->get_default_interpreter (context_id);
+ }
+ return create_context (t, context_id, SCM_EOL);
+ }
+ else if (!context_id.empty () && context_id != id_string ())
+ {
+ if (daddy_context_ && !dynamic_cast<Global_context *> (daddy_context_))
+ return daddy_context_->get_default_interpreter (context_id);
+ warning (_f ("cannot find or create new Bottom = \"%s\"",
+ context_id.c_str ()));
}
return this;
}
void
Context::internal_send_stream_event (SCM type, Input *origin, SCM props[])
{
- Stream_event *e = new Stream_event (make_event_class (type), origin);
+ Stream_event *e = new Stream_event
+ (scm_call_1 (ly_lily_module_constant ("ly:make-event-class"), type),
+ origin);
for (int i = 0; props[i]; i += 2)
{
e->set_property (props[i], props[i + 1]);
*/
Context *
find_context_below (Context *where,
- SCM type, string id)
+ SCM type, const string &id)
{
if (where->is_alias (type))
{
return 0;
}
-SCM
-Context::make_event_class (SCM event_type)
-{
- if (SCM_UNBNDP (ancestor_lookup_))
- ancestor_lookup_ = get_global_context ()->ancestor_lookup_;
- return scm_hashq_ref (ancestor_lookup_, event_type, SCM_EOL);
-}
-
Output_def *
Context::get_output_def () const
{
if (me->events_below_)
scm_gc_mark (me->events_below_->self_scm ());
- scm_gc_mark (me->ancestor_lookup_);
-
return me->properties_scm_;
}