''

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

diff --git a/lily/spaceable-grob.cc b/lily/spaceable-grob.cc
index 26bf4e8066b9165b7c54c81f05605dd298bd0141..e19252783ed0a87935df56d22b1da1eb82bef565 100644 (file)
--- a/lily/spaceable-grob.cc
+++ b/lily/spaceable-grob.cc
@@ -3,13 +3,15 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 2000--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 2000--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
 #include "spaceable-grob.hh"
 #include "grob.hh"
 #include "warn.hh"
+#include "spring.hh"
+#include "group-interface.hh"
 
 SCM
 Spaceable_grob::get_minimum_distances (Grob*me)
@@ -24,12 +26,12 @@ 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 = gh_cdr (s))
+  for (SCM s = mins; gh_pair_p (s); s = ly_cdr (s))
     {
-      SCM dist = gh_car (s);
-      if (gh_car (dist) == p->self_scm ())
+      SCM dist = ly_car (s);
+      if (ly_car (dist) == p->self_scm ())
        {
-         gh_set_cdr_x (dist, scm_max (gh_cdr (dist),
+         gh_set_cdr_x (dist, scm_max (ly_cdr (dist),
                                       newdist));
          return ;
        }
@@ -40,25 +42,33 @@ Spaceable_grob::add_rod (Grob *me , Grob * p, Real d)
 }
 
 void
-Spaceable_grob::add_spring (Grob*me, Grob * p, Real d, Real strength)
+Spaceable_grob::add_spring (Grob*me, Grob * p, Real d, Real strength, bool expand_only)
 {
-  SCM mins = me->get_grob_property ("ideal-distances");
-  
+  if (d < 0.0 || strength <= 0.0)
+    {
+      programming_error ("Adding reverse spring!");
+    }
   
-  SCM newdist= gh_double2scm (d);
-  for (SCM s = mins; gh_pair_p (s); s = gh_cdr (s))
+#ifndef NDEBUG
+  SCM mins = me->get_grob_property ("ideal-distances");
+  for (SCM s = mins; gh_pair_p (s); s = ly_cdr (s))
     {
-      SCM dist = gh_car (s);
-      if (gh_car (dist) == p->self_scm ())
+      Spring_smob * sp = unsmob_spring(ly_car (s));
+      if (sp->other_ == p)
        {
          programming_error ("already have that spring");
          return ;
        }
     }
-  SCM newstrength= gh_double2scm (strength);  
+#endif
   
-  mins = gh_cons (gh_cons (p->self_scm (), gh_cons (newdist, newstrength)), mins);
-  me->set_grob_property ("ideal-distances", mins);
+  Spring_smob spring;
+  spring.strength_f_ = strength;
+  spring.distance_f_ = d;
+  spring.expand_only_b_ = expand_only;
+  spring.other_ = p;
+  
+  Group_interface::add_thing (me, ly_symbol2scm ("ideal-distances"), spring.smobbed_copy ());
 }
 
 
@@ -67,12 +77,12 @@ Spaceable_grob::remove_interface (Grob*me)
 {
   me->remove_grob_property ("minimum-distances");
   me->remove_grob_property ("ideal-distances");
-  me->remove_grob_property ("dir-list");
 }
 
 
-void
-Spaceable_grob::set_interface (Grob*me)
-{
-  me->set_interface (ly_symbol2scm ("spaceable-grob-interface"));
-}
+ADD_INTERFACE (Spaceable,"spaceable-grob-interface",
+  "An grob (a Paper_column) that takes part in the
+spacing problem. ",
+  "measure-length penalty minimum-distances ideal-distances
+left-neighbors right-neighbors");
+