X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fspaceable-grob.cc;h=fa597a6e1f7cb3db021a3af9fe8bde4fe7c56b1a;hb=874fecc2e70c51d2ad34f1677496292a5c56e63d;hp=8aa3209f28e3c269ee3a3cf17c3431208b6308e5;hpb=4995fea559cd5399b4f462de546a15195d76f4c3;p=lilypond.git

diff --git a/lily/spaceable-grob.cc b/lily/spaceable-grob.cc
index 8aa3209f28..fa597a6e1f 100644
--- a/lily/spaceable-grob.cc
+++ b/lily/spaceable-grob.cc
@@ -3,18 +3,22 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 2000--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 2000--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
+#include <stdio.h> 
+#include <math.h>
 
 #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)
 {
-  return me->get_grob_property ("minimum-distances");
+  return me->get_property ("minimum-distances");
 }
 
 /*todo: merge code of spring & rod?
@@ -22,56 +26,84 @@ Spaceable_grob::get_minimum_distances (Grob*me)
 void
 Spaceable_grob::add_rod (Grob *me , Grob * p, Real d)
 {
+  //  printf ("rod %lf\n", 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 ;
 	}
     }
 
   mins = gh_cons (gh_cons (p->self_scm (), newdist), mins);
-  me->set_grob_property ("minimum-distances", mins);
+  me->set_property ("minimum-distances", mins);
 }
 
 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");
-  SCM newdist= gh_double2scm (d);
-  for (SCM s = mins; gh_pair_p (s); s = gh_cdr (s))
+  //  printf ("dist %lf, str %lf\n", d, strength); 
+  if (d <= 0.0 || strength <= 0.0)
+    {
+      programming_error ("Adding reverse spring! Setting to unit spring");
+      d = 1.0;
+      strength = 1.0;
+    }
+  
+  if (isinf (d) || isnan(d)
+      || isnan (strength))
+    {
+      /*
+	strength == INF is possible. It means fixed distance.
+       */
+      programming_error ("Insane distance found.");
+      d = 1.0;
+      strength = 1.0;
+    }
+    
+#ifndef NDEBUG
+  SCM mins = me->get_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_ = 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 ());
 }
 
 
-
 void
 Spaceable_grob::remove_interface (Grob*me)
 {
-  me->remove_grob_property ("minimum-distances");
-  me->remove_grob_property ("ideal-distances");
-  me->remove_grob_property ("dir-list");
+  me->set_property ("minimum-distances" , SCM_EOL);
+  me->set_property ("spacing-wishes", SCM_EOL);
+  me->set_property ("ideal-distances", SCM_EOL);
 }
 
 
-void
-Spaceable_grob::set_interface (Grob*me)
-{
-  me->set_interface (ly_symbol2scm ("spaceable-grob-interface"));
-}
+
+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");
+