Merge branch 'jneeman' of git+ssh://jneem@git.sv.gnu.org/srv/git/lilypond into jneeman

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

diff --git a/lily/spaceable-grob.cc b/lily/spaceable-grob.cc
index f3a48914837853d155e8338cf3cfd7d10ae39cb5..679c2bcb195651dc1954d371c59830d7d447b887 100644 (file)
--- a/lily/spaceable-grob.cc
+++ b/lily/spaceable-grob.cc
@@ -3,13 +3,12 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2000--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 2000--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "spaceable-grob.hh"
 
 #include <cstdio>
-#include <math.h>
 
 #include "warn.hh"
 #include "spring.hh"
@@ -49,30 +48,29 @@ 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");
-    }
+    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;
     }
 
@@ -81,7 +79,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;
@@ -91,8 +89,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);
@@ -122,8 +120,17 @@ Spaceable_grob::remove_interface (Grob *me)
   me->set_object ("ideal-distances", SCM_EOL);
 }
 
-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 "
-              "keep-inside-line left-neighbors right-neighbors");
+              
+
+              /* properties */
+              "allow-loose-spacing "
+              "ideal-distances "
+              "keep-inside-line "
+              "left-neighbors "
+              "measure-length "
+              "minimum-distances "
+              "right-neighbors "
+              "spacing-wishes");