X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fcontext-scheme.cc;h=92240a9b1d8dc1636d4cce9e89538eeda7a6ce95;hb=5e08569186d16ee6f01ea4495fe3a1510eb3cee7;hp=b7af85dd28587b5b77f2845dacc02f18bc3e89c4;hpb=e24df7c27635dc996c466295eacf2981bddccaf7;p=lilypond.git

diff --git a/lily/context-scheme.cc b/lily/context-scheme.cc
index b7af85dd28..92240a9b1d 100644
--- a/lily/context-scheme.cc
+++ b/lily/context-scheme.cc
@@ -3,23 +3,24 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1998--2005 Jan Nieuwenhuizen <janneke@gnu.org>
-                 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1998--2006 Jan Nieuwenhuizen <janneke@gnu.org>
+  Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #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,7 @@ LY_DEFINE (ly_context_name, "ly:context-name",
 {
   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",
@@ -42,11 +43,9 @@ LY_DEFINE (ly_context_grob_definition, "ly:context-grob-definition",
   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 "
@@ -66,10 +65,10 @@ 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);
+  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");
 
@@ -99,7 +98,8 @@ LY_DEFINE (ly_context_property_where_defined, "ly:context-property-where-defined
   SCM_ASSERT_TYPE (tr, context, SCM_ARG1, __FUNCTION__, "Context");
   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 ();
 
@@ -125,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->get_parent_context () ;
+  tr = tr->get_parent_context ();
   if (tr)
     return tr->self_scm ();
   else
@@ -141,15 +141,41 @@ 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 (scm_is_symbol (name), name, SCM_ARG2, __FUNCTION__, "symbol");
-  
+
   while (tr)
     {
       if (tr->is_alias (name))
 	return tr->self_scm ();
-      tr =  tr->get_parent_context () ;
+      tr = tr->get_parent_context ();
     }
-  
+
   return SCM_BOOL_F;
 }
 
+LY_DEFINE (ly_context_now, "ly:context-now",
+	   1, 0, 0, (SCM context),
+	   "Return now-moment of context CONTEXT")
+{
+  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 ();
+}