X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fspaceable-grob.cc;h=806e300cfa5ff714b4ffb9c38192ccae35aec3e4;hb=d00966597a77c7f37b67fbecf12150156b483a84;hp=19ad14326c28915999b53c6db24b1a29e9c519a8;hpb=e6caaa132f59006e5c47d0007b24bfedd07ad145;p=lilypond.git

diff --git a/lily/spaceable-grob.cc b/lily/spaceable-grob.cc
index 19ad14326c..806e300cfa 100644
--- a/lily/spaceable-grob.cc
+++ b/lily/spaceable-grob.cc
@@ -3,18 +3,19 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2000--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 2000--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "spaceable-grob.hh"
 
 #include <cstdio>
-#include <math.h>
 
 #include "warn.hh"
 #include "spring.hh"
 #include "pointer-group-interface.hh"
 #include "grob.hh"
+#include "paper-column.hh"
+#include "international.hh"
 
 SCM
 Spaceable_grob::get_minimum_distances (Grob *me)
@@ -30,12 +31,12 @@ Spaceable_grob::add_rod (Grob *me, Grob *p, Real d)
   //  printf ("rod %lf\n", d);
   if (d < 0)
     return;
-  
+
   if (isinf (d))
     programming_error ("infinite rod");
 
   SCM mins = get_minimum_distances (me);
-  SCM newdist = scm_make_real (d);
+  SCM newdist = scm_from_double (d);
   for (SCM s = mins; scm_is_pair (s); s = scm_cdr (s))
     {
       SCM dist = scm_car (s);
@@ -47,26 +48,30 @@ Spaceable_grob::add_rod (Grob *me, Grob *p, Real d)
 	}
     }
 
+  if (Paper_column::get_rank (p) < Paper_column::get_rank (me))
+    programming_error ("Adding reverse rod");
+
   mins = scm_cons (scm_cons (p->self_scm (), newdist), mins);
   me->set_object ("minimum-distances", mins);
 }
 
 void
-Spaceable_grob::add_spring (Grob *me, Grob *p, Real d, Real inverse_strength)
+Spaceable_grob::add_spring (Grob *me, Grob *other,
+			    Real distance, Real inverse_strength)
 {
-  if (d <= 0.0 || inverse_strength < 0.0)
+  if (distance < 0.0 || inverse_strength < 0.0)
     {
       programming_error ("adding reverse spring, setting to unit");
-      d = 1.0;
+      distance = 1.0;
       inverse_strength = 1.0;
     }
 
-  if (isinf (d) || isnan (d)
+  if (isinf (distance) || isnan (distance)
       || isnan (inverse_strength))
     {
       /* strength == INF is possible. It means fixed distance.  */
       programming_error ("insane distance found");
-      d = 1.0;
+      distance = 1.0;
       inverse_strength = 1.0;
     }
 
@@ -75,7 +80,7 @@ Spaceable_grob::add_spring (Grob *me, Grob *p, Real d, Real inverse_strength)
   for (SCM s = mins; scm_is_pair (s); s = scm_cdr (s))
     {
       Spring_smob *sp = unsmob_spring (scm_car (s));
-      if (sp->other_ == p)
+      if (sp->other_ == other)
 	{
 	  programming_error ("already have that spring");
 	  return;
@@ -85,8 +90,8 @@ Spaceable_grob::add_spring (Grob *me, Grob *p, Real d, Real inverse_strength)
 
   Spring_smob spring;
   spring.inverse_strength_ = inverse_strength;
-  spring.distance_ = d;
-  spring.other_ = p;
+  spring.distance_ = distance;
+  spring.other_ = other;
 
   SCM ideal = me->get_object ("ideal-distances");
   ideal = scm_cons (spring.smobbed_copy (), ideal);
@@ -94,15 +99,43 @@ Spaceable_grob::add_spring (Grob *me, Grob *p, Real d, Real inverse_strength)
 }
 
 void
-Spaceable_grob::remove_interface (Grob *me)
+Spaceable_grob::get_spring (Grob *this_col, Grob *next_col, Real *dist, Real *inv_strength)
 {
-  me->set_object ("minimum-distances", SCM_EOL);
-  me->set_object ("spacing-wishes", SCM_EOL);
-  me->set_object ("ideal-distances", SCM_EOL);
+  Spring_smob *spring = 0;
+
+  for (SCM s = this_col->get_object ("ideal-distances");
+       !spring && scm_is_pair (s);
+       s = scm_cdr (s))
+    {
+      Spring_smob *sp = unsmob_spring (scm_car (s));
+
+      if (sp && sp->other_ == next_col)
+	spring = sp;
+    }
+
+  if (!spring)
+    programming_error (_f ("No spring between column %d and next one",
+			   Paper_column::get_rank (this_col)));
+
+  *dist = (spring) ? spring->distance_ : 5.0;
+  *inv_strength = (spring) ? spring->inverse_strength_ : 1.0;
 }
 
-ADD_INTERFACE (Spaceable_grob, "spaceable-grob-interface",
+
+
+ADD_INTERFACE (Spaceable_grob,
 	       "A layout object that takes part in the spacing problem. ",
-	       "measure-length spacing-wishes penalty minimum-distances ideal-distances "
-	       "allow-outside-line left-neighbors right-neighbors");
+	       
+
+	       /* properties */
+	       "allow-loose-spacing "
+	       "ideal-distances "
+	       "keep-inside-line "
+	       "left-neighbors "
+	       "measure-length "
+	       "minimum-distances "
+	       "right-neighbors "
+	       "spacing-wishes "
+
+	       );