X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fspaceable-grob.cc;h=268259b0882b4976c3d51bba77c07ea4c39b1483;hb=5e14d063f5098df2977dfb5fc9cadd281f800958;hp=464e0d3b1c1ddc50b6ec591c82110fa403cfda69;hpb=8a1a5b054688384ead32745e7f48f7f072fabeb6;p=lilypond.git

diff --git a/lily/spaceable-grob.cc b/lily/spaceable-grob.cc
index 464e0d3b1c..268259b088 100644
--- 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"
@@ -55,45 +66,17 @@ Spaceable_grob::add_rod (Grob *me, Grob *p, Real d)
   me->set_object ("minimum-distances", mins);
 }
 
-void
-Spaceable_grob::add_spring (Grob *me, Grob *other,
-			    Real distance, Real inverse_strength)
-{
-#ifndef NDEBUG
-  SCM mins = me->get_object ("ideal-distances");
-  for (SCM s = mins; scm_is_pair (s); s = scm_cdr (s))
-    {
-      Spring *sp = unsmob_spring (scm_car (s));
-      if (sp->other_ == other)
-	{
-	  programming_error ("already have that spring");
-	  return;
-	}
-    }
-#endif
-
-  Spring spring;
-  spring.set_inverse_stretch_strength (inverse_strength);
-  spring.set_inverse_compress_strength (inverse_strength);
-  spring.set_distance (distance);
-  spring.other_ = other;
-
-  SCM ideal = me->get_object ("ideal-distances");
-  ideal = scm_cons (spring.smobbed_copy (), ideal);
-  me->set_object ("ideal-distances", ideal);
-}
-
 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);
 }
 
-void
-Spaceable_grob::get_spring (Grob *this_col, Grob *next_col, Real *dist, Real *inv_strength)
+Spring
+Spaceable_grob::get_spring (Grob *this_col, Grob *next_col)
 {
   Spring *spring = 0;
 
@@ -101,35 +84,32 @@ Spaceable_grob::get_spring (Grob *this_col, Grob *next_col, Real *dist, Real *in
        !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)
     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_stretch_strength () : 1.0;
+  return spring ? *spring : Spring ();
 }
 
 
 
 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 "
-
 	       );