Merge branch 'master' of git://git.sv.gnu.org/lilypond

[lilypond.git] / lily / stream-event-scheme.cc

diff --git a/lily/stream-event-scheme.cc b/lily/stream-event-scheme.cc
index ce337d5472a990b8e0b549527e5cb6bdfff31111..46f19b2ee2f31ccc90b5f0951b7fa3000e826790 100644 (file)
--- a/lily/stream-event-scheme.cc
+++ b/lily/stream-event-scheme.cc
@@ -9,18 +9,25 @@
 #include "stream-event.hh"
 
 LY_DEFINE (ly_make_stream_event, "ly:make-stream-event",
-          1, 0, 0, (SCM proplist),
-          "Creates a stream event, with the given property list.\n" )
+          1, 1, 0, (SCM cl, SCM proplist),
+          "Creates a stream event of class @var{cl} with the given mutable property list.\n" )
 {
-  SCM_ASSERT_TYPE (scm_list_p (proplist), proplist, SCM_ARG1, __FUNCTION__, "association list");
-  Stream_event *e = new Stream_event (proplist);
+  SCM_ASSERT_TYPE (scm_is_symbol (cl), cl, SCM_ARG1, __FUNCTION__, "symbol");
+
+  /* should be scm_list_p, but scm_list_p is expensive. */
+  SCM_ASSERT_TYPE (scm_is_pair (proplist), proplist, SCM_ARG2, __FUNCTION__, "association list");
+  
+  if (proplist == SCM_UNDEFINED)
+    proplist = SCM_EOL;
+
+  Stream_event *e = new Stream_event (cl, proplist);
   return e->unprotect ();
 }
 
 LY_DEFINE (ly_event_property, "ly:event-property", 
            2, 0, 0, (SCM sev, SCM sym),
           "Get the property @var{sym} of stream event @var{mus}.\n"
-          "If @var{sym} is undefined, return @code{' ()}.\n")
+          "If @var{sym} is undefined, return @code{'()}.\n")
 {
   Stream_event *e = unsmob_stream_event (sev);
   SCM_ASSERT_TYPE (e, sev, SCM_ARG1, __FUNCTION__, "stream event");
@@ -28,3 +35,28 @@ LY_DEFINE (ly_event_property, "ly:event-property",
 
   return e->internal_get_property (sym);
 }
+
+LY_DEFINE (ly_event_set_property, "ly:event-set-property!",
+           3, 0, 0, (SCM ev, SCM sym, SCM val),
+           "Set property @var{sym} in event @var{ev} to @var{val}."){
+  Stream_event *sc = unsmob_stream_event (ev);
+  SCM_ASSERT_TYPE (sc, ev, SCM_ARG1, __FUNCTION__, "event");
+  return ly_prob_set_property_x (ev, sym, val);
+}
+
+LY_DEFINE (ly_event_deep_copy, "ly:event-deep-copy",
+          1, 0, 0, (SCM m),
+          "Copy @var{m} and all sub expressions of @var{m}")
+{
+  SCM copy = m;
+  if (Stream_event *ev = unsmob_stream_event (m))
+    {
+      ev = ev->clone ();
+      copy = ev->unprotect ();
+    }
+  else if (scm_is_pair (m))
+    copy = scm_cons (ly_event_deep_copy (scm_car (m)),
+                    ly_event_deep_copy (scm_cdr (m)));
+
+  return copy;
+}