Context *tr = unsmob_context (context);
SCM_ASSERT_TYPE (tr, context, SCM_ARG1, __FUNCTION__, "Context");
- return scm_makfrom0str (tr->id_string_. to_str0 ());
+ return scm_makfrom0str (tr->id_string (). to_str0 ());
}
LY_DEFINE (ly_context_name, "ly:context-name",
{
Context *tr = unsmob_context (context);
SCM_ASSERT_TYPE (tr, context, SCM_ARG1, __FUNCTION__, "Context");
- return unsmob_context_def (tr->definition_)->get_context_name ();
+ return ly_symbol2scm (tr->context_name ().to_str0 ());
}
-LY_DEFINE (is_contextushpop_property, "ly:context-pushpop-property",
+LY_DEFINE (ly_context_grob_definition, "ly:context-grob-definition",
+ 2, 0, 0, (SCM context, SCM name),
+ "Return the definition of @var{name} (a symbol) within @var{context} "
+ "as an alist")
+{
+ Context *tr = unsmob_context (context);
+ SCM_ASSERT_TYPE (tr, context, SCM_ARG1, __FUNCTION__, "Context");
+ SCM_ASSERT_TYPE (scm_is_symbol (name), name, SCM_ARG2, __FUNCTION__, "symbol");
+
+
+ return updated_grob_properties (tr, name);
+}
+
+
+LY_DEFINE (ly_context_pushpop_property, "ly:context-pushpop-property",
3, 1, 0, (SCM context, SCM grob, SCM eltprop, SCM val),
"Do a single @code{\\override} or @code{\\revert} operation "
"in @var{context}. The grob definition @code{grob} is extended "
{
Context *tg = unsmob_context (context);
SCM_ASSERT_TYPE (tg, context, SCM_ARG1, __FUNCTION__, "context");
- SCM_ASSERT_TYPE (is_symbol (grob), grob, SCM_ARG2, __FUNCTION__, "symbol");
- SCM_ASSERT_TYPE (is_symbol (eltprop), eltprop, SCM_ARG3, __FUNCTION__, "symbol");
+ SCM_ASSERT_TYPE (scm_is_symbol (grob), grob, SCM_ARG2, __FUNCTION__, "symbol");
+ SCM_ASSERT_TYPE (scm_is_symbol (eltprop), eltprop, SCM_ARG3, __FUNCTION__, "symbol");
execute_pushpop_property (tg, grob, eltprop, val);
- return SCM_UNDEFINED;
+ return SCM_UNSPECIFIED;
}
-LY_DEFINE (is_contextroperty, "ly:context-property",
+LY_DEFINE (ly_context_property, "ly:context-property",
2, 0, 0, (SCM c, SCM name),
"Return the value of @var{name} from context @var{c}")
{
Context *t = unsmob_context (c);
- Context * tr= (t);
+ Context * tr = (t);
SCM_ASSERT_TYPE (tr, c, SCM_ARG1, __FUNCTION__, "Translator group");
- SCM_ASSERT_TYPE (is_symbol (name), name, SCM_ARG2, __FUNCTION__, "symbol");
+ SCM_ASSERT_TYPE (scm_is_symbol (name), name, SCM_ARG2, __FUNCTION__, "symbol");
return tr->internal_get_property (name);
}
{
Context *tr = unsmob_context (context);
SCM_ASSERT_TYPE (tr, context, SCM_ARG1, __FUNCTION__, "Context");
- SCM_ASSERT_TYPE (is_symbol (name), name, SCM_ARG2, __FUNCTION__, "symbol");
+ SCM_ASSERT_TYPE (scm_is_symbol (name), name, SCM_ARG2, __FUNCTION__, "symbol");
tr->internal_set_property (name, val);
return SCM_UNSPECIFIED;
}
-LY_DEFINE (is_contextroperty_where_defined, "ly:context-property-where-defined",
+LY_DEFINE (ly_context_property_where_defined, "ly:context-property-where-defined",
2, 0, 0, (SCM context, SCM name),
"Return the context above @var{context} "
"where @var{name} is defined.")
{
Context *tr = unsmob_context (context);
SCM_ASSERT_TYPE (tr, context, SCM_ARG1, __FUNCTION__, "Context");
- SCM_ASSERT_TYPE (is_symbol (name), name, SCM_ARG2, __FUNCTION__, "symbol");
+ SCM_ASSERT_TYPE (scm_is_symbol (name), name, SCM_ARG2, __FUNCTION__, "symbol");
tr = tr->where_defined (name);
if (tr)
{
Context *tr = unsmob_context (context);
SCM_ASSERT_TYPE (tr, context, SCM_ARG1, __FUNCTION__, "Context");
- SCM_ASSERT_TYPE (is_symbol (name), name, SCM_ARG2, __FUNCTION__, "symbol");
+ SCM_ASSERT_TYPE (scm_is_symbol (name), name, SCM_ARG2, __FUNCTION__, "symbol");
tr->unset_property (name);
return SCM_UNSPECIFIED;
}
-LY_DEFINE (is_contextarent, "ly:context-parent",
+LY_DEFINE (ly_context_parent, "ly:context-parent",
1, 0, 0, (SCM context),
"Return the parent of @var{context}, @code{#f} if none.")
{
Context *tr = unsmob_context (context);
SCM_ASSERT_TYPE (tr, context, SCM_ARG1, __FUNCTION__, "Context");
- tr = tr->daddy_context_ ;
+ tr = tr->get_parent_context () ;
if (tr)
return tr->self_scm ();
else
{
Context *tr = unsmob_context (context);
SCM_ASSERT_TYPE (tr, context, SCM_ARG1, __FUNCTION__, "context");
- SCM_ASSERT_TYPE (is_symbol (name), name, SCM_ARG2, __FUNCTION__, "symbol");
+ SCM_ASSERT_TYPE (scm_is_symbol (name), name, SCM_ARG2, __FUNCTION__, "symbol");
while (tr)
{
if (tr->is_alias (name))
return tr->self_scm ();
- tr = tr->daddy_context_ ;
+ tr = tr->get_parent_context () ;
}
return SCM_BOOL_F;
}
-
-#if 0
-/*
- What is this used for? Should remove? --hwn
- */
-LY_DEFINE (is_contextroperties, "ly:context-properties",
- 1, 0, 0, (SCM context),
- "Return all properties of @var{context} in an alist.")
-{
- Context *tr = unsmob_context (context);
- SCM_ASSERT_TYPE (tr, context, SCM_ARG1, __FUNCTION__, "Context");
- return tr->properties_as_alist ();
-}
-#endif