X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fprob-scheme.cc;h=0f8c0f6baeb01ab2076a2bb4a721b4aa2cdb6975;hb=a04cebcd9706fd5457d250b2d5df2d54dfc1c8cc;hp=717e32a945985358af74ee08f379b372e4363294;hpb=45722b3369bfee22d186fe290bb4a259291204c9;p=lilypond.git diff --git a/lily/prob-scheme.cc b/lily/prob-scheme.cc index 717e32a945..0f8c0f6bae 100644 --- a/lily/prob-scheme.cc +++ b/lily/prob-scheme.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 2005--2007 Han-Wen Nienhuys + (c) 2005--2009 Han-Wen Nienhuys */ #include "prob.hh" @@ -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_SMOB (Prob, obj, 1); - Prob *ps = unsmob_prob (obj); + 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; }