X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fcontext-scheme.cc;h=96193f65e7ccbe05eec5d147c876ee4036334557;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=a4570cd86ed9f7f9bff7e729c4992c8b91f87398;hpb=545092a25d8ca41dc90b87482474b3719f7130a9;p=lilypond.git diff --git a/lily/context-scheme.cc b/lily/context-scheme.cc index a4570cd86e..96193f65e7 100644 --- a/lily/context-scheme.cc +++ b/lily/context-scheme.cc @@ -3,59 +3,65 @@ source file of the GNU LilyPond music typesetter - (c) 1998--2005 Jan Nieuwenhuizen + (c) 1998--2008 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}, " - "i.e. for @code{\\context Voice = one .. } " - "return the string @code{one}.") + "Return the ID string of @var{context}," + " i.e., for @code{\\context Voice = one @dots{}}" + " 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 ()); + LY_ASSERT_SMOB (Context, context, 1); + + return ly_string2scm (tr->id_string ()); } LY_DEFINE (ly_context_name, "ly:context-name", 1, 0, 0, (SCM context), - "Return the name of @var{context}, " - "i.e. for @code{\\context Voice = one .. } " - "return the symbol @code{Voice}.") + "Return the name of @var{context}," + " i.e., for @code{\\context Voice = one @dots{}}" + " return the symbol @code{Voice}.") { + LY_ASSERT_SMOB (Context, context, 1); + Context *tr = unsmob_context (context); - SCM_ASSERT_TYPE (tr, context, SCM_ARG1, __FUNCTION__, "Context"); - return ly_symbol2scm (tr->context_name ().to_str0 ()); + + 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") + "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"); + + LY_ASSERT_SMOB (Context, context, 1); + LY_ASSERT_TYPE (ly_is_symbol, name, 2); 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 " - "with @code{eltprop} (if @var{val} is specified) " - "or reverted (if unspecified).") + "Do a single @code{\\override} or @code{\\revert} operation" + " in @var{context}. The grob definition @var{grob} is extended" + " with @var{eltprop} (if @var{val} is specified) or reverted" + " (if unspecified).") { Context *tg = unsmob_context (context); - SCM_ASSERT_TYPE (tg, context, SCM_ARG1, __FUNCTION__, "context"); - SCM_ASSERT_TYPE (scm_is_symbol (grob), grob, SCM_ARG2, __FUNCTION__, "symbol"); - SCM_ASSERT_TYPE (scm_is_symbol (eltprop), eltprop, SCM_ARG3, __FUNCTION__, "symbol"); + + LY_ASSERT_SMOB (Context, context, 1); + LY_ASSERT_TYPE (ly_is_symbol, grob, 2); + LY_ASSERT_TYPE (ly_is_symbol, eltprop, 3); execute_pushpop_property (tg, grob, eltprop, val); @@ -64,38 +70,39 @@ LY_DEFINE (ly_context_pushpop_property, "ly:context-pushpop-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}") + "Return the value of @var{name} from context @var{c}.") { - Context *t = unsmob_context (c); - Context *tr = (t); - SCM_ASSERT_TYPE (tr, c, SCM_ARG1, __FUNCTION__, "Translator group"); - SCM_ASSERT_TYPE (scm_is_symbol (name), name, SCM_ARG2, __FUNCTION__, "symbol"); + LY_ASSERT_SMOB (Context, c, 1); + LY_ASSERT_TYPE (ly_is_symbol, name, 2); - return tr->internal_get_property (name); + Context *t = unsmob_context (c); + return t->internal_get_property (name); } -LY_DEFINE (ly_context_set_property, "ly:context-set-property!", +LY_DEFINE (ly_context_set_property_x, "ly:context-set-property!", 3, 0, 0, (SCM context, SCM name, SCM val), - "Set value of property @var{name} in context @var{context} " - "to @var{val}.") + "Set value of property @var{name} in context @var{context}" + " to @var{val}.") { + LY_ASSERT_SMOB (Context, context, 1); + LY_ASSERT_TYPE (ly_is_symbol, name, 2); + 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"); - tr->internal_set_property (name, val); + tr->set_property (name, val); return SCM_UNSPECIFIED; } 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.") + "Return the context above @var{context}" + " where @var{name} is defined.") { + LY_ASSERT_SMOB (Context, context, 1); + LY_ASSERT_TYPE (ly_is_symbol, name, 2); + 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"); SCM val; tr = tr->where_defined (name, &val); @@ -105,14 +112,14 @@ LY_DEFINE (ly_context_property_where_defined, "ly:context-property-where-defined return SCM_EOL; } -LY_DEFINE (ly_unset_context_property, "ly:context-unset-property", 2, 0, 0, +LY_DEFINE (ly_context_unset_property, "ly:context-unset-property", 2, 0, 0, (SCM context, SCM name), "Unset value of property @var{name} in context @var{context}.") { + LY_ASSERT_SMOB (Context, context, 1); + LY_ASSERT_TYPE (ly_is_symbol, name, 2); 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"); - + tr->unset_property (name); return SCM_UNSPECIFIED; } @@ -121,8 +128,8 @@ LY_DEFINE (ly_context_parent, "ly:context-parent", 1, 0, 0, (SCM context), "Return the parent of @var{context}, @code{#f} if none.") { + LY_ASSERT_SMOB (Context, context, 1); Context *tr = unsmob_context (context); - SCM_ASSERT_TYPE (tr, context, SCM_ARG1, __FUNCTION__, "Context"); tr = tr->get_parent_context (); if (tr) @@ -134,12 +141,12 @@ LY_DEFINE (ly_context_parent, "ly:context-parent", /* FIXME: todo: should support translator IDs, and creation? */ LY_DEFINE (ly_context_find, "ly:context-find", 2, 0, 0, (SCM context, SCM name), - "Find a parent of @var{context} that has name or alias @var{name}. " - "Return @code{#f} if not found.") + "Find a parent of @var{context} that has name or alias @var{name}." + " Return @code{#f} if not found.") { + LY_ASSERT_SMOB (Context, context, 1); + LY_ASSERT_TYPE (ly_is_symbol, name, 2); 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"); while (tr) { @@ -153,9 +160,28 @@ LY_DEFINE (ly_context_find, "ly:context-find", LY_DEFINE (ly_context_now, "ly:context-now", 1, 0, 0, (SCM context), - "Return now-moment of context CONTEXT") + "Return @code{now-moment} of context @var{context}.") { + LY_ASSERT_SMOB (Context, context, 1); 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 @code{event-source} of context @var{context}.") +{ + LY_ASSERT_SMOB (Context, context, 1); + Context *ctx = unsmob_context (context); + return ctx->event_source ()->self_scm (); +} + +LY_DEFINE (ly_context_events_below, "ly:context-events-below", + 1, 0, 0, (SCM context), + "Return a @code{stream-distributor} that distributes all events" + " from @var{context} and all its subcontexts.") +{ + LY_ASSERT_SMOB (Context, context, 1); + Context *ctx = unsmob_context (context); + return ctx->events_below ()->self_scm (); +}