Run `make grand-replace'.

[lilypond.git] / lily / include / spaceable-grob.hh

diff --git a/lily/include/spaceable-grob.hh b/lily/include/spaceable-grob.hh
index 0fa6356cd0e7faa4100f71d44f98bb3a53a874a2..6a039bd8330855696d76c6edd76e36d07343c0d2 100644 (file)
--- a/lily/include/spaceable-grob.hh
+++ b/lily/include/spaceable-grob.hh
@@ -3,22 +3,24 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2000--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 2000--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef SPACEABLE_GROB_HH
 #define SPACEABLE_GROB_HH
 
-#include "lily-guile.hh"
 #include "lily-proto.hh"
+#include "grob-interface.hh"
+#include "spring.hh"
 
 struct Spaceable_grob
 {
   /// set a minimum distance
   static void add_rod (Grob *me, Grob *to, Real distance);
-  static void add_spring (Grob *me, Grob *to, Real dist, Real strength);
-  static bool has_interface (Grob *);
-  static void remove_interface (Grob *);
+  static void add_spring (Grob *me, Grob *to, Spring sp);
+  static Spring get_spring (Grob *me, Grob *other);
+
+  DECLARE_GROB_INTERFACE();
   static SCM get_minimum_distances (Grob *);
   static SCM get_ideal_distances (Grob *);
 };