resolve merge

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

diff --git a/lily/spaceable-grob.cc b/lily/spaceable-grob.cc
index 638a4fa83bbc258654386729e4c3b87778de7bfc..268259b0882b4976c3d51bba77c07ea4c39b1483 100644 (file)
--- a/lily/spaceable-grob.cc
+++ b/lily/spaceable-grob.cc
@@ -1,9 +1,20 @@
 /*
-  spaceable-grob.cc -- implement Spaceable_grob
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 2000--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c) 2000--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  LilyPond is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "spaceable-grob.hh"
@@ -59,8 +70,8 @@ void
 Spaceable_grob::add_spring (Grob *me, Grob *other, Spring sp)
 {
   SCM ideal = me->get_object ("ideal-distances");
-  sp.other_ = other;
-  ideal = scm_cons (sp.smobbed_copy (), ideal);
+
+  ideal = scm_cons (scm_cons (sp.smobbed_copy (), other->self_scm ()), ideal);
   me->set_object ("ideal-distances", ideal);
 }
 
@@ -73,10 +84,10 @@ Spaceable_grob::get_spring (Grob *this_col, Grob *next_col)
        !spring && scm_is_pair (s);
        s = scm_cdr (s))
     {
-      Spring *sp = unsmob_spring (scm_car (s));
-
-      if (sp && sp->other_ == next_col)
-       spring = sp;
+      if (scm_is_pair (scm_car (s))
+         && unsmob_grob (scm_cdar (s)) == next_col
+         && unsmob_spring (scm_caar (s)))
+       spring = unsmob_spring (scm_caar (s));
     }
 
   if (!spring)
@@ -89,18 +100,16 @@ Spaceable_grob::get_spring (Grob *this_col, Grob *next_col)
 
 
 ADD_INTERFACE (Spaceable_grob,
-              "A layout object that takes part in the spacing problem. ",
-              
+              "A layout object that takes part in the spacing problem.",
 
               /* properties */
               "allow-loose-spacing "
               "ideal-distances "
               "keep-inside-line "
-              "left-neighbors "
+              "left-neighbor "
               "measure-length "
               "minimum-distances "
-              "right-neighbors "
+              "right-neighbor "
               "spacing-wishes "
-
               );