X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fprob-scheme.cc;h=8c5d640ad0d3b5d9501c57c8f800d723504df8b3;hb=5bd2d1080a904b9171ccf67520f5a172a8c3014b;hp=dc53e51d3387e1bdae82b12774a3a6c08be4fcbe;hpb=2819ba86363def7f615b7fbbf03aecef761296c6;p=lilypond.git

diff --git a/lily/prob-scheme.cc b/lily/prob-scheme.cc
index dc53e51d33..8c5d640ad0 100644
--- a/lily/prob-scheme.cc
+++ b/lily/prob-scheme.cc
@@ -11,11 +11,11 @@
 
 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_SMOB (Prob, obj, 1);
   Prob *ps = unsmob_prob (obj);
-  SCM_ASSERT_TYPE (ps, obj, SCM_ARG1, __FUNCTION__, "Prob");
-  SCM_ASSERT_TYPE (scm_is_symbol (sym), sym, SCM_ARG2, __FUNCTION__, "symbol");
+  LY_ASSERT_TYPE (ly_is_symbol, sym, 2);
 
   ps->set_property (sym, value);
   return SCM_UNSPECIFIED;
@@ -23,7 +23,7 @@ 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?")
@@ -35,9 +35,9 @@ LY_DEFINE (ly_prob_property, "ly:prob-property",
 	   2, 1, 0, (SCM obj, SCM sym, SCM dfault),
 	   "Return the value for @var{sym}.")
 {
+  LY_ASSERT_SMOB (Prob, obj, 1);
   Prob *ps = unsmob_prob (obj);
-  SCM_ASSERT_TYPE (ps, obj, SCM_ARG1, __FUNCTION__, "Prob");
-  SCM_ASSERT_TYPE (scm_is_symbol (sym), sym, SCM_ARG2, __FUNCTION__, "symbol");
+  LY_ASSERT_TYPE (ly_is_symbol, sym, 2);
 
   if (dfault == SCM_UNDEFINED)
     dfault = SCM_EOL;
@@ -52,16 +52,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);
 
@@ -78,7 +78,7 @@ LY_DEFINE (ly_make_prob, "ly:make-prob",
 }
 
   
-LY_DEFINE(ly_paper_system_p, "ly:paper-system?",
+LY_DEFINE (ly_paper_system_p, "ly:paper-system?",
 	  1, 0, 0, (SCM obj),
 	  "Type predicate.")
 {
@@ -87,15 +87,15 @@ LY_DEFINE(ly_paper_system_p, "ly:paper-system?",
 
 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.")
+	   "Measure the minimum distance between these two paper-systems,"
+	   " using their stored skylines if possible and falling back to"
+	   " their extents otherwise.")
 {
   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"));
+  Skyline_pair *sky1 = Skyline_pair::unsmob (p1->get_property ("vertical-skylines"));
+  Skyline_pair *sky2 = Skyline_pair::unsmob (p2->get_property ("vertical-skylines"));
 
   if (sky1 && sky2)
     ret = (*sky1)[DOWN].distance ((*sky2)[UP]);