X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmusic-scheme.cc;h=b18aae42da06a64807208f0a9c3ea616de7ae153;hb=e240ae00f172f63596dd3ad0b9b66bb5ae739ce1;hp=9508c4d66158aba138c709cd9ca876052d79e69a;hpb=cfbe7661413b152a10293f3da7fb412e325254f9;p=lilypond.git

diff --git a/lily/music-scheme.cc b/lily/music-scheme.cc
index 9508c4d661..b18aae42da 100644
--- a/lily/music-scheme.cc
+++ b/lily/music-scheme.cc
@@ -3,12 +3,13 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2005 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2005--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
+#include "music.hh"
+
 #include "duration.hh"
 #include "warn.hh"
-#include "music.hh"
 #include "pitch.hh"
 
 LY_DEFINE (ly_music_length, "ly:music-length",
@@ -21,15 +22,13 @@ LY_DEFINE (ly_music_length, "ly:music-length",
 }
 
 LY_DEFINE (ly_music_property,
-	   "ly:music-property", 2, 0, 0, (SCM mus, SCM sym),
+	   "ly:music-property", 2, 1, 0, (SCM mus, SCM sym, SCM dfault),
 	   "Get the property @var{sym} of music expression @var{mus}.\n"
-	   "If @var{sym} is undefined, return @code{' ()}.\n")
+	   "If @var{sym} is undefined, return @code{'()}.\n")
 {
   Music *sc = unsmob_music (mus);
   SCM_ASSERT_TYPE (sc, mus, SCM_ARG1, __FUNCTION__, "music");
-  SCM_ASSERT_TYPE (scm_is_symbol (sym), sym, SCM_ARG2, __FUNCTION__, "symbol");
-
-  return sc->internal_get_property (sym);
+  return ly_prob_property (mus,sym,dfault);
 }
 
 LY_DEFINE (ly_music_set_property, "ly:music-set-property!",
@@ -38,13 +37,7 @@ LY_DEFINE (ly_music_set_property, "ly:music-set-property!",
 {
   Music *sc = unsmob_music (mus);
   SCM_ASSERT_TYPE (sc, mus, SCM_ARG1, __FUNCTION__, "music");
-  SCM_ASSERT_TYPE (scm_is_symbol (sym), sym, SCM_ARG2, __FUNCTION__, "symbol");
-
-  bool ok = type_check_assignment (sym, val, ly_symbol2scm ("music-type?"));
-  if (ok)
-    sc->internal_set_property (sym, val);
-
-  return SCM_UNSPECIFIED;
+  return ly_prob_set_property_x (mus, sym, val);
 }
 
 
@@ -62,6 +55,13 @@ LY_DEFINE (ly_make_music, "ly:make-music",
   return ms->unprotect ();
 }
 
+LY_DEFINE (ly_music_p, "ly:music?",
+	   1, 0, 0, (SCM obj),
+	   "Type predicate")
+{
+  return scm_from_bool (unsmob_music (obj));
+}
+
 /* todo: property args */
 LY_DEFINE (ly_music_mutable_properties, "ly:music-mutable-properties",
 	   1, 0, 0, (SCM mus),
@@ -214,3 +214,4 @@ LY_DEFINE (ly_transpose_key_alist, "ly:transpose-key-alist",
     }
   return scm_reverse_x (newlist, SCM_EOL);
 }
+