*** empty log message ***

[lilypond.git] / lily / spaceable-grob.cc

diff --git a/lily/spaceable-grob.cc b/lily/spaceable-grob.cc
index 2c40260f23124d78a56134ba2489ff9688d27bcd..99b87cd24264bd526b7ed3548ffbbe13690ab0cc 100644 (file)
--- a/lily/spaceable-grob.cc
+++ b/lily/spaceable-grob.cc
@@ -6,11 +6,12 @@
   (c) 2000--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
-#include <stdio.h> 
-#include <math.h>
 
 #include "spaceable-grob.hh"
-#include "grob.hh"
+
+#include <cstdio> 
+#include <math.h>
+
 #include "warn.hh"
 #include "spring.hh"
 #include "group-interface.hh"
@@ -18,7 +19,7 @@
 SCM
 Spaceable_grob::get_minimum_distances (Grob*me)
 {
-  return me->get_grob_property ("minimum-distances");
+  return me->get_property ("minimum-distances");
 }
 
 /*todo: merge code of spring & rod?
@@ -30,24 +31,24 @@ Spaceable_grob::add_rod (Grob *me , Grob * p, Real d)
 
   
   SCM mins = get_minimum_distances (me);
-  SCM newdist = gh_double2scm (d);
-  for (SCM s = mins; gh_pair_p (s); s = ly_cdr (s))
+  SCM newdist = scm_make_real (d);
+  for (SCM s = mins; scm_is_pair (s); s = scm_cdr (s))
     {
-      SCM dist = ly_car (s);
-      if (ly_car (dist) == p->self_scm ())
+      SCM dist = scm_car (s);
+      if (scm_car (dist) == p->self_scm ())
        {
-         gh_set_cdr_x (dist, scm_max (ly_cdr (dist),
+         scm_set_cdr_x (dist, scm_max (scm_cdr (dist),
                                       newdist));
          return ;
        }
     }
 
-  mins = gh_cons (gh_cons (p->self_scm (), newdist), mins);
-  me->set_grob_property ("minimum-distances", mins);
+  mins = scm_cons (scm_cons (p->self_scm (), newdist), mins);
+  me->set_property ("minimum-distances", mins);
 }
 
 void
-Spaceable_grob::add_spring (Grob*me, Grob * p, Real d, Real strength, bool expand_only)
+Spaceable_grob::add_spring (Grob*me, Grob * p, Real d, Real strength)
 {
   //  printf ("dist %lf, str %lf\n", d, strength); 
   if (d <= 0.0 || strength <= 0.0)
@@ -69,10 +70,10 @@ Spaceable_grob::add_spring (Grob*me, Grob * p, Real d, Real strength, bool expan
     }
     
 #ifndef NDEBUG
-  SCM mins = me->get_grob_property ("ideal-distances");
-  for (SCM s = mins; gh_pair_p (s); s = ly_cdr (s))
+  SCM mins = me->get_property ("ideal-distances");
+  for (SCM s = mins; scm_is_pair (s); s = scm_cdr (s))
     {
-      Spring_smob * sp = unsmob_spring(ly_car (s));
+      Spring_smob * sp = unsmob_spring(scm_car (s));
       if (sp->other_ == p)
        {
          programming_error ("already have that spring");
@@ -84,7 +85,6 @@ Spaceable_grob::add_spring (Grob*me, Grob * p, Real d, Real strength, bool expan
   Spring_smob spring;
   spring.strength_ = strength;
   spring.distance_ = d;
-  spring.expand_only_b_ = expand_only;
   spring.other_ = p;
   
   Group_interface::add_thing (me, ly_symbol2scm ("ideal-distances"), spring.smobbed_copy ());
@@ -94,9 +94,9 @@ Spaceable_grob::add_spring (Grob*me, Grob * p, Real d, Real strength, bool expan
 void
 Spaceable_grob::remove_interface (Grob*me)
 {
-  me->set_grob_property ("minimum-distances" , SCM_EOL);
-  me->set_grob_property ("spacing-wishes", SCM_EOL);
-  me->set_grob_property ("ideal-distances", SCM_EOL);
+  me->set_property ("minimum-distances" , SCM_EOL);
+  me->set_property ("spacing-wishes", SCM_EOL);
+  me->set_property ("ideal-distances", SCM_EOL);
 }
 
 
@@ -105,5 +105,5 @@ ADD_INTERFACE (Spaceable_grob,"spaceable-grob-interface",
               "A layout object that takes part in the spacing problem. "
               ,
               "measure-length spacing-wishes penalty minimum-distances ideal-distances "
-              "left-neighbors right-neighbors");
+              "allow-outside-line left-neighbors right-neighbors");