X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fprob-scheme.cc;h=0f8c0f6baeb01ab2076a2bb4a721b4aa2cdb6975;hb=731d3cb1ef66145c13864a4cfc762e8245d60fab;hp=acaf22a53692de10508ae804c9ef390b1db02e0a;hpb=92918346012f79ef9109ef0c391947af2d3165ca;p=lilypond.git

diff --git a/lily/prob-scheme.cc b/lily/prob-scheme.cc
index acaf22a536..0f8c0f6bae 100644
--- a/lily/prob-scheme.cc
+++ b/lily/prob-scheme.cc
@@ -3,18 +3,18 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2005--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2005--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "prob.hh"
 
 LY_DEFINE (ly_prob_set_property_x, "ly:prob-set-property!",
 	   2, 1, 0, (SCM obj, SCM sym, SCM value),
-	   "Set property @var{sym} of @var{obj} to @var{value}")
+	   "Set property @var{sym} of @var{obj} to @var{value}.")
 {
-  LY_ASSERT_FIRST_SMOB (Prob, obj);
+  LY_ASSERT_SMOB (Prob, obj, 1);
   Prob *ps = unsmob_prob (obj);
-  LY_ASSERT_TYPE (ly_is_symbol, 2);
+  LY_ASSERT_TYPE (ly_is_symbol, sym, 2);
 
   ps->set_property (sym, value);
   return SCM_UNSPECIFIED;
@@ -31,19 +31,21 @@ LY_DEFINE (ly_prob_property_p, "ly:prob-property?",
 }
 
 LY_DEFINE (ly_prob_property, "ly:prob-property",
-	   2, 1, 0, (SCM obj, SCM sym, SCM dfault),
-	   "Return the value for @var{sym}.")
+	   2, 1, 0, (SCM prob, SCM sym, SCM val),
+	   "Return the value for property @var{sym} of Prob object"
+	   " @var{prob}.  If no value is found, return @var{val} or"
+	   " @code{'()} if @var{val} is not specified.")
 {
-  LY_ASSERT_FIRST_SMOB (Prob, obj);
-  Prob *ps = unsmob_prob (obj);
-  LY_ASSERT_TYPE (ly_is_symbol, 2);
+  LY_ASSERT_SMOB (Prob, prob, 1);
+  Prob *ps = unsmob_prob (prob);
+  LY_ASSERT_TYPE (ly_is_symbol, sym, 2);
 
-  if (dfault == SCM_UNDEFINED)
-    dfault = SCM_EOL;
+  if (val == SCM_UNDEFINED)
+    val = SCM_EOL;
 
   SCM retval = ps->internal_get_property (sym);
   if (retval == SCM_EOL)
-    return dfault;
+    return val;
   else
     return retval;
 }
@@ -51,16 +53,16 @@ LY_DEFINE (ly_prob_property, "ly:prob-property",
 LY_DEFINE (ly_prob_type_p, "ly:prob-type?",
 	   2, 0, 0,
 	   (SCM obj, SCM type),
-	   "If obj the specified prob-type?")
+	   "Is @var{obj} the specified prob-type?")
 {
   Prob*prob = unsmob_prob (obj);
-  return scm_from_bool (prob && prob->type() == type);
+  return scm_from_bool (prob && prob->type () == type);
 }
 
 LY_DEFINE (ly_make_prob, "ly:make-prob",
 	   2, 0, 1,
 	   (SCM type, SCM init, SCM rest),
-	   "Create a Prob.")
+	   "Create a @code{Prob} object.")
 {
   Prob *pr = new Prob (type, init);
 
@@ -76,10 +78,24 @@ LY_DEFINE (ly_make_prob, "ly:make-prob",
   return pr->unprotect ();
 }
 
-  
-LY_DEFINE(ly_paper_system_p, "ly:paper-system?",
-	  1, 0, 0, (SCM obj),
-	  "Type predicate.")
+
+LY_DEFINE (ly_prob_mutable_properties, "ly:prob-mutable-properties",
+	   1, 0, 0,
+	   (SCM prob),
+	   "Retrieve an alist of mutable properties.")
 {
-  return ly_prob_type_p (obj, ly_symbol2scm ("paper-system"));
+  LY_ASSERT_SMOB (Prob, prob, 1);
+  Prob *ps = unsmob_prob (prob);
+  return ps->get_property_alist (true);
 }
+
+LY_DEFINE (ly_prob_immutable_properties, "ly:prob-immutable-properties",
+	   1, 0, 0,
+	   (SCM prob),
+	   "Retrieve an alist of mutable properties.")
+{
+  LY_ASSERT_SMOB (Prob, prob, 1);
+  Prob *ps = unsmob_prob (prob);
+  return ps->get_property_alist (false);
+}
+