Merge branch 'master' of ssh+git://hanwen@git.sv.gnu.org/srv/git/lilypond

[lilypond.git] / lily / prob-scheme.cc

diff --git a/lily/prob-scheme.cc b/lily/prob-scheme.cc
index 3d847543e73957c4e9d951c92b00062d9df07dc0..3f729e4894c4407d89536817efffa23eb31e4609 100644 (file)
--- a/lily/prob-scheme.cc
+++ b/lily/prob-scheme.cc
@@ -3,30 +3,41 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2005--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2005--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "prob.hh"
+#include "skyline.hh"
 
 LY_DEFINE (ly_prob_set_property_x, "ly:prob-set-property!",
-          2, 1, 0, (SCM system, SCM sym, SCM value),
-          "Set property @var{sym} of @var{system} to @var{value}")
+          2, 1, 0, (SCM obj, SCM sym, SCM value),
+          "Set property @var{sym} of @var{obj} to @var{value}")
 {
-  Prob *ps = unsmob_prob (system);
-  SCM_ASSERT_TYPE (ps, system, SCM_ARG1, __FUNCTION__, "Prob");
-  SCM_ASSERT_TYPE (scm_is_symbol (sym), sym, SCM_ARG2, __FUNCTION__, "symbol");
+  LY_ASSERT_SMOB (Prob, obj, 1);
+  Prob *ps = unsmob_prob (obj);
+  LY_ASSERT_TYPE (ly_is_symbol, sym, 2);
 
-  ps->internal_set_property (sym, value);
+  ps->set_property (sym, value);
   return SCM_UNSPECIFIED;
 }
 
+/*
+  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?")
+{
+  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 system, SCM sym, SCM dfault),
+          2, 1, 0, (SCM obj, SCM sym, SCM dfault),
           "Return the value for @var{sym}.")
 {
-  Prob *ps = unsmob_prob (system);
-  SCM_ASSERT_TYPE (ps, system, SCM_ARG1, __FUNCTION__, "Prob");
-  SCM_ASSERT_TYPE (scm_is_symbol (sym), sym, SCM_ARG2, __FUNCTION__, "symbol");
+  LY_ASSERT_SMOB (Prob, obj, 1);
+  Prob *ps = unsmob_prob (obj);
+  LY_ASSERT_TYPE (ly_is_symbol, sym, 2);
 
   if (dfault == SCM_UNDEFINED)
     dfault = SCM_EOL;
@@ -39,28 +50,62 @@ LY_DEFINE (ly_prob_property, "ly:prob-property",
 }
 
 LY_DEFINE (ly_prob_type_p, "ly:prob-type?",
-          1, 0, 0,
+          2, 0, 0,
           (SCM obj, SCM type),
           "If 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, 0,
-          (SCM type, SCM init),
+          2, 0, 1,
+          (SCM type, SCM init, SCM rest),
           "Create a Prob.")
 {
   Prob *pr = new Prob (type, init);
-  SCM x = pr->self_scm () ;
-  return scm_gc_unprotect_object (x);
+
+  for (SCM s = rest;
+       scm_is_pair (s) && scm_is_pair (scm_cdr (s)); s = scm_cddr (s))
+    {
+      SCM sym = scm_car (s);
+      SCM val = scm_cadr (s);
+
+      pr->set_property (sym, val);
+    }
+  
+  return pr->unprotect ();
 }
 
   
-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.")
 {
   return ly_prob_type_p (obj, ly_symbol2scm ("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.")
+{
+  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);
+}