X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fcontext-scheme.cc;h=9827c8bd417161bb65539c9ec46b249a35598e5b;hb=5383cafcc75ae088f833df0081e2b2a73a5442a1;hp=aa914c68a4311ccc1c5b425d3a6669fdf64691f4;hpb=94a1966c72301b8bd1d8bb3b8628c3f089d007cf;p=lilypond.git diff --git a/lily/context-scheme.cc b/lily/context-scheme.cc index aa914c68a4..9827c8bd41 100644 --- a/lily/context-scheme.cc +++ b/lily/context-scheme.cc @@ -1,25 +1,26 @@ /* - context-scheme.cc -- + context-scheme.cc -- Context bindings source file of the GNU LilyPond music typesetter - (c) 1998--2004 Jan Nieuwenhuizen - Han-Wen Nienhuys + (c) 1998--2006 Jan Nieuwenhuizen + Han-Wen Nienhuys */ #include "context.hh" #include "context-def.hh" +#include "dispatcher.hh" LY_DEFINE (ly_context_id, "ly:context-id", 1, 0, 0, (SCM context), - "Return the id string of @var{context}, " + "Return the id string of @var{context}, " "i.e. for @code{\\context Voice = one .. } " "return the string @code{one}.") { 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 ().c_str ()); } LY_DEFINE (ly_context_name, "ly:context-name", @@ -30,7 +31,19 @@ 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 ().c_str ()); +} + +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", @@ -42,22 +55,22 @@ LY_DEFINE (ly_context_pushpop_property, "ly:context-pushpop-property", { Context *tg = unsmob_context (context); SCM_ASSERT_TYPE (tg, context, SCM_ARG1, __FUNCTION__, "context"); - SCM_ASSERT_TYPE (ly_symbol_p (grob), grob, SCM_ARG2, __FUNCTION__, "symbol"); - SCM_ASSERT_TYPE (ly_symbol_p (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 (ly_context_property, "ly:context-property", 2, 0, 0, (SCM c, SCM name), - "Return the value of @var{name} from context @var{c}") + "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 (ly_symbol_p (name), name, SCM_ARG2, __FUNCTION__, "symbol"); + SCM_ASSERT_TYPE (scm_is_symbol (name), name, SCM_ARG2, __FUNCTION__, "symbol"); return tr->internal_get_property (name); } @@ -69,9 +82,9 @@ LY_DEFINE (ly_context_set_property, "ly:context-set-property!", { Context *tr = unsmob_context (context); SCM_ASSERT_TYPE (tr, context, SCM_ARG1, __FUNCTION__, "Context"); - SCM_ASSERT_TYPE (ly_symbol_p (name), name, SCM_ARG2, __FUNCTION__, "symbol"); + SCM_ASSERT_TYPE (scm_is_symbol (name), name, SCM_ARG2, __FUNCTION__, "symbol"); - tr->internal_set_property (name, val); + tr->set_property (name, val); return SCM_UNSPECIFIED; } @@ -83,9 +96,10 @@ LY_DEFINE (ly_context_property_where_defined, "ly:context-property-where-defined { Context *tr = unsmob_context (context); SCM_ASSERT_TYPE (tr, context, SCM_ARG1, __FUNCTION__, "Context"); - SCM_ASSERT_TYPE (ly_symbol_p (name), name, SCM_ARG2, __FUNCTION__, "symbol"); + SCM_ASSERT_TYPE (scm_is_symbol (name), name, SCM_ARG2, __FUNCTION__, "symbol"); - tr = tr->where_defined (name); + SCM val; + tr = tr->where_defined (name, &val); if (tr) return tr->self_scm (); @@ -98,7 +112,7 @@ LY_DEFINE (ly_unset_context_property, "ly:context-unset-property", 2, 0, 0, { Context *tr = unsmob_context (context); SCM_ASSERT_TYPE (tr, context, SCM_ARG1, __FUNCTION__, "Context"); - SCM_ASSERT_TYPE (ly_symbol_p (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; @@ -111,7 +125,7 @@ LY_DEFINE (ly_context_parent, "ly:context-parent", 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 @@ -126,28 +140,42 @@ LY_DEFINE (ly_context_find, "ly:context-find", { Context *tr = unsmob_context (context); SCM_ASSERT_TYPE (tr, context, SCM_ARG1, __FUNCTION__, "context"); - SCM_ASSERT_TYPE (ly_symbol_p (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 (ly_context_properties, "ly:context-properties", +LY_DEFINE (ly_context_now, "ly:context-now", 1, 0, 0, (SCM context), - "Return all properties of @var{context} in an alist.") + "Return now-moment of context CONTEXT") { - Context *tr = unsmob_context (context); - SCM_ASSERT_TYPE (tr, context, SCM_ARG1, __FUNCTION__, "Context"); - return tr->properties_as_alist (); + Context *ctx = unsmob_context (context); + SCM_ASSERT_TYPE (ctx, context, SCM_ARG1, __FUNCTION__, "Context"); + return ctx->now_mom ().smobbed_copy (); +} + +LY_DEFINE (ly_context_event_source, "ly:context-event-source", + 1, 0, 0, (SCM context), + "Return event-source of context CONTEXT") +{ + Context *ctx = unsmob_context (context); + SCM_ASSERT_TYPE (ctx, context, SCM_ARG1, __FUNCTION__, "Context"); + return ctx->event_source ()->self_scm (); +} + +LY_DEFINE (ly_context_events_below, "ly:context-events-below", + 1, 0, 0, (SCM context), + "Return a stream-distributor that distributes all events\n" + " from @var{context} and all its subcontexts.") +{ + Context *ctx = unsmob_context (context); + SCM_ASSERT_TYPE (ctx, context, SCM_ARG1, __FUNCTION__, "Context"); + return ctx->events_below ()->self_scm (); } -#endif