*** empty log message ***

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

diff --git a/lily/spaceable-grob.cc b/lily/spaceable-grob.cc
index 5477f624ade6ab2a732bff15b9484c1339e5aca5..4661d5512049ee00071c238436ba10d23b6e72f6 100644 (file)
--- a/lily/spaceable-grob.cc
+++ b/lily/spaceable-grob.cc
@@ -3,14 +3,15 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 2000--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 2000--2005 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"
@@ -31,12 +32,12 @@ Spaceable_grob::add_rod (Grob *me , Grob * p, Real d)
   
   SCM mins = get_minimum_distances (me);
   SCM newdist = scm_make_real (d);
-  for (SCM s = mins; ly_c_pair_p (s); s = ly_cdr (s))
+  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 ())
        {
-         scm_set_cdr_x (dist, scm_max (ly_cdr (dist),
+         scm_set_cdr_x (dist, scm_max (scm_cdr (dist),
                                       newdist));
          return ;
        }
@@ -47,7 +48,7 @@ Spaceable_grob::add_rod (Grob *me , Grob * p, Real d)
 }
 
 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)
@@ -70,9 +71,9 @@ Spaceable_grob::add_spring (Grob*me, Grob * p, Real d, Real strength, bool expan
     
 #ifndef NDEBUG
   SCM mins = me->get_property ("ideal-distances");
-  for (SCM s = mins; ly_c_pair_p (s); s = ly_cdr (s))
+  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 ());
@@ -101,9 +101,9 @@ Spaceable_grob::remove_interface (Grob*me)
 
 
 
-ADD_INTERFACE (Spaceable_grob,"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");
+              "allow-outside-line left-neighbors right-neighbors");