X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fstream-event-scheme.cc;h=27f6b811e6157dd1514b883d03ca90edbd0710c6;hb=e7aa6c445f463844dbaa52d38ea4aac2882b5601;hp=99f8a3c83235480f31b8d3116c257674bb1c7ef8;hpb=1c846b2c2348b4e0ca4a3c2e8fb267047ba2d203;p=lilypond.git

diff --git a/lily/stream-event-scheme.cc b/lily/stream-event-scheme.cc
index 99f8a3c832..27f6b811e6 100644
--- a/lily/stream-event-scheme.cc
+++ b/lily/stream-event-scheme.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 2006--2011 Erik Sandberg  <mandolaerik@gmail.com>
+  Copyright (C) 2006--2014 Erik Sandberg  <mandolaerik@gmail.com>
 
   LilyPond is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -20,22 +20,22 @@
 #include "stream-event.hh"
 
 LY_DEFINE (ly_stream_event_p, "ly:stream-event?",
-	   1, 0, 0, (SCM obj),
-	   "Is @code{@var{obj}} a @code{Stream_event} object?")
+           1, 0, 0, (SCM obj),
+           "Is @code{@var{obj}} a @code{Stream_event} object?")
 {
   return scm_from_bool (unsmob_stream_event (obj));
 }
 
 LY_DEFINE (ly_make_stream_event, "ly:make-stream-event",
-	   1, 1, 0, (SCM cl, SCM proplist),
-	   "Create a stream event of class @var{cl} with the given"
-	   " mutable property list.")
+           1, 1, 0, (SCM cl, SCM proplist),
+           "Create a stream event of class @var{cl} with the given"
+           " mutable property list.")
 {
   LY_ASSERT_TYPE (ly_is_symbol, cl, 1);
 
   /* should be scm_list_p, but scm_list_p is expensive. */
   LY_ASSERT_TYPE (scm_is_pair, proplist, 2);
-  
+
   if (proplist == SCM_UNDEFINED)
     proplist = SCM_EOL;
 
@@ -43,17 +43,14 @@ LY_DEFINE (ly_make_stream_event, "ly:make-stream-event",
   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}."
-	   "  If @var{sym} is undefined, return @code{'()}.")
+LY_DEFINE (ly_event_property, "ly:event-property",
+           2, 1, 0, (SCM sev, SCM sym, SCM val),
+           "Get the property @var{sym} of stream event @var{sev}."
+           "  If @var{sym} is undefined, return @var{val} or"
+           " @code{'()} if @var{val} is not specified.")
 {
-  LY_ASSERT_TYPE (unsmob_stream_event, sev, 1);
-  LY_ASSERT_TYPE (ly_is_symbol, sym, 2);
-
-  Stream_event *e = unsmob_stream_event (sev);
-
-  return e->internal_get_property (sym);
+  LY_ASSERT_TYPE (unsmob_stream_event, sev, 1)
+  return ly_prob_property (sev, sym, val);
 }
 
 LY_DEFINE (ly_event_set_property_x, "ly:event-set-property!",
@@ -62,13 +59,13 @@ LY_DEFINE (ly_event_set_property_x, "ly:event-set-property!",
 {
   LY_ASSERT_TYPE (unsmob_stream_event, ev, 1);
   LY_ASSERT_TYPE (ly_is_symbol, sym, 2);
-  
+
   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@tie{}@var{m}.")
+           1, 0, 0, (SCM m),
+           "Copy @var{m} and all sub expressions of@tie{}@var{m}.")
 {
   SCM copy = m;
   if (Stream_event *ev = unsmob_stream_event (m))
@@ -78,7 +75,7 @@ LY_DEFINE (ly_event_deep_copy, "ly:event-deep-copy",
     }
   else if (scm_is_pair (m))
     copy = scm_cons (ly_event_deep_copy (scm_car (m)),
-		     ly_event_deep_copy (scm_cdr (m)));
+                     ly_event_deep_copy (scm_cdr (m)));
 
   return copy;
 }