unsmob_pitch -> Pitch::unsmob and related

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

diff --git a/lily/spaceable-grob.cc b/lily/spaceable-grob.cc
index 464e0d3b1c1ddc50b6ec591c82110fa403cfda69..0153e6d804009f4972e772d921df7b87bfb5a960 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--2014 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"
@@ -41,11 +52,11 @@ Spaceable_grob::add_rod (Grob *me, Grob *p, Real d)
     {
       SCM dist = scm_car (s);
       if (scm_car (dist) == p->self_scm ())
-       {
-         scm_set_cdr_x (dist, scm_max (scm_cdr (dist),
-                                       newdist));
-         return;
-       }
+        {
+          scm_set_cdr_x (dist, scm_max (scm_cdr (dist),
+                                        newdist));
+          return;
+        }
     }
 
   if (Paper_column::get_rank (p) < Paper_column::get_rank (me))
@@ -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,30 @@ 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))
+          && Grob::unsmob (scm_cdar (s)) == next_col
+          && Spring::unsmob (scm_caar (s)))
+        spring = Spring::unsmob (scm_caar (s));
     }
 
   if (!spring)
-    programming_error (_f ("No spring between column %d and next one",
-                          Paper_column::get_rank (this_col)));
+    programming_error (to_string ("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. ",
-              
-
-              /* properties */
-              "allow-loose-spacing "
-              "ideal-distances "
-              "keep-inside-line "
-              "left-neighbors "
-              "measure-length "
-              "minimum-distances "
-              "right-neighbors "
-              "spacing-wishes "
-
-              );
+               "A layout object that takes part in the spacing problem.",
+
+               /* properties */
+               "allow-loose-spacing "
+               "ideal-distances "
+               "keep-inside-line "
+               "left-neighbor "
+               "measure-length "
+               "minimum-distances "
+               "right-neighbor "
+               "spacing-wishes "
+              );