X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fprob-scheme.cc;h=a9424da91f5479da82a5c9cf699dec332119e0f5;hb=8e2eaf4959bec63a1128a444591a540f4f1e2937;hp=3f729e4894c4407d89536817efffa23eb31e4609;hpb=3f8485925e8c879fe4c9ae86acef9804126c3b91;p=lilypond.git

diff --git a/lily/prob-scheme.cc b/lily/prob-scheme.cc
index 3f729e4894..a9424da91f 100644
--- a/lily/prob-scheme.cc
+++ b/lily/prob-scheme.cc
@@ -1,20 +1,30 @@
 /*
-  paper-system-scheme.cc -- implement Prob bindings
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 2005--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c) 2005--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  LilyPond is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "prob.hh"
-#include "skyline.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);
+  Prob *ps = unsmob<Prob> (obj);
   LY_ASSERT_TYPE (ly_is_symbol, sym, 2);
 
   ps->set_property (sym, value);
@@ -25,43 +35,45 @@ 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 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 (SCM_UNBNDP (val))
+    val = SCM_EOL;
 
-  SCM retval = ps->internal_get_property (sym);
-  if (retval == SCM_EOL)
-    return dfault;
+  SCM retval = ps->get_property (sym);
+  if (scm_is_null (retval))
+    return val;
   else
     return retval;
 }
 
 LY_DEFINE (ly_prob_type_p, "ly:prob-type?",
-	   2, 0, 0,
-	   (SCM obj, SCM type),
-	   "If obj the specified prob-type?")
+           2, 0, 0,
+           (SCM obj, SCM type),
+           "Is @var{obj} the specified prob-type?")
 {
-  Prob*prob = unsmob_prob (obj);
-  return scm_from_bool (prob && prob->type () == type);
+  Prob *prob = unsmob<Prob> (obj);
+  return scm_from_bool (prob && scm_is_eq (prob->type (), type));
 }
 
 LY_DEFINE (ly_make_prob, "ly:make-prob",
-	   2, 0, 1,
-	   (SCM type, SCM init, SCM rest),
-	   "Create a Prob.")
+           2, 0, 1,
+           (SCM type, SCM init, SCM rest),
+           "Create a @code{Prob} object.")
 {
   Prob *pr = new Prob (type, init);
 
@@ -73,39 +85,27 @@ LY_DEFINE (ly_make_prob, "ly:make-prob",
 
       pr->set_property (sym, val);
     }
-  
+
   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_paper_system_minimum_distance, "ly:paper-system-minimum-distance",
-	   2, 0, 0, (SCM sys1, SCM sys2),
-	   "Measure the minimum distance between these two paper-systems "
-	   "using their stored skylines if possible and falling back to "
-	   "their extents otherwise.")
+LY_DEFINE (ly_prob_immutable_properties, "ly:prob-immutable-properties",
+           1, 0, 0,
+           (SCM prob),
+           "Retrieve an alist of immutable properties.")
 {
-  Real ret = 0;
-  Prob *p1 = unsmob_prob (sys1);
-  Prob *p2 = unsmob_prob (sys2);
-  Skyline_pair *sky1 = Skyline_pair::unsmob (p1->get_property ("skylines"));
-  Skyline_pair *sky2 = Skyline_pair::unsmob (p2->get_property ("skylines"));
-
-  if (sky1 && sky2)
-    ret = (*sky1)[DOWN].distance ((*sky2)[UP]);
-  else
-    {
-      Stencil *s1 = unsmob_stencil (p1->get_property ("stencil"));
-      Stencil *s2 = unsmob_stencil (p2->get_property ("stencil"));
-      Interval iv1 = s1->extent (Y_AXIS);
-      Interval iv2 = s2->extent (Y_AXIS);
-      ret = iv2[UP] - iv1[DOWN];
-    }
-  return scm_from_double (ret);
+  LY_ASSERT_SMOB (Prob, prob, 1);
+  Prob *ps = unsmob<Prob> (prob);
+  return ps->get_property_alist (false);
 }
+