X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fprob-scheme.cc;h=30704f5fc6f1c1ab427673bfaf5950d46e9cdfd3;hb=6a00fa3d4001d7d9e759a83b1fc210e4e74915de;hp=119688e1570712696fc2a9746d0696366104fd96;hpb=bc95f4434f760d41191341ab4508b2064eb19025;p=lilypond.git diff --git a/lily/prob-scheme.cc b/lily/prob-scheme.cc index 119688e157..30704f5fc6 100644 --- a/lily/prob-scheme.cc +++ b/lily/prob-scheme.cc @@ -1,7 +1,7 @@ /* This file is part of LilyPond, the GNU music typesetter. - Copyright (C) 2005--2010 Han-Wen Nienhuys + Copyright (C) 2005--2012 Han-Wen Nienhuys 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,8 +20,8 @@ #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}.") + 2, 1, 0, (SCM obj, SCM sym, SCM value), + "Set property @var{sym} of @var{obj} to @var{value}.") { LY_ASSERT_SMOB (Prob, obj, 1); Prob *ps = unsmob_prob (obj); @@ -35,17 +35,17 @@ LY_DEFINE (ly_prob_set_property_x, "ly:prob-set-property!", Hmm, this is not orthogonal. */ LY_DEFINE (ly_prob_property_p, "ly:prob-property?", - 2, 1, 0, (SCM obj, SCM sym), - "Is boolean prop @var{sym} set?") + 2, 1, 0, (SCM obj, SCM sym), + "Is boolean prop @var{sym} of @var{sym} set?") { return scm_equal_p (SCM_BOOL_T, ly_prob_property (obj, sym, SCM_BOOL_F)); } LY_DEFINE (ly_prob_property, "ly:prob-property", - 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.") + 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, prob, 1); Prob *ps = unsmob_prob (prob); @@ -62,18 +62,18 @@ LY_DEFINE (ly_prob_property, "ly:prob-property", } LY_DEFINE (ly_prob_type_p, "ly:prob-type?", - 2, 0, 0, - (SCM obj, SCM type), - "Is @var{obj} the specified prob-type?") + 2, 0, 0, + (SCM obj, SCM type), + "Is @var{obj} the specified prob-type?") { - Prob*prob = unsmob_prob (obj); + Prob *prob = unsmob_prob (obj); 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 @code{Prob} object.") + 2, 0, 1, + (SCM type, SCM init, SCM rest), + "Create a @code{Prob} object.") { Prob *pr = new Prob (type, init); @@ -85,15 +85,14 @@ LY_DEFINE (ly_make_prob, "ly:make-prob", pr->set_property (sym, val); } - + return pr->unprotect (); } - LY_DEFINE (ly_prob_mutable_properties, "ly:prob-mutable-properties", - 1, 0, 0, - (SCM prob), - "Retrieve an alist of mutable properties.") + 1, 0, 0, + (SCM prob), + "Retrieve an alist of mutable properties.") { LY_ASSERT_SMOB (Prob, prob, 1); Prob *ps = unsmob_prob (prob); @@ -101,9 +100,9 @@ LY_DEFINE (ly_prob_mutable_properties, "ly:prob-mutable-properties", } LY_DEFINE (ly_prob_immutable_properties, "ly:prob-immutable-properties", - 1, 0, 0, - (SCM prob), - "Retrieve an alist of mutable properties.") + 1, 0, 0, + (SCM prob), + "Retrieve an alist of immutable properties.") { LY_ASSERT_SMOB (Prob, prob, 1); Prob *ps = unsmob_prob (prob);