Merge with master

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

diff --git a/lily/include/spaceable-grob.hh b/lily/include/spaceable-grob.hh
index aaedd8a68903f6348c28d72e2cad0e56329f0011..5625bfd61e7e66d2d7319aba512b79eef813c999 100644 (file)
--- a/lily/include/spaceable-grob.hh
+++ b/lily/include/spaceable-grob.hh
@@ -3,14 +3,14 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2000--2005 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2000--2007 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"
 
 struct Spaceable_grob
 {
@@ -19,8 +19,7 @@ struct Spaceable_grob
   static void add_spring (Grob *me, Grob *to, Real dist, Real strength);
   static void get_spring (Grob *me, Grob *other, Real *dist, Real *inv_strength);
 
-  static bool has_interface (Grob *);
-  static void remove_interface (Grob *);
+  DECLARE_GROB_INTERFACE();
   static SCM get_minimum_distances (Grob *);
   static SCM get_ideal_distances (Grob *);
 };