release: 1.5.29

[lilypond.git] / lily / include / rest-collision.hh

diff --git a/lily/include/rest-collision.hh b/lily/include/rest-collision.hh
index 4eaddd45d73e1a52b23a112f79983b63c5b9b535..343c0e1cdd697ca316a5ac8f84f75be389aea33e 100644 (file)
--- a/lily/include/rest-collision.hh
+++ b/lily/include/rest-collision.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 
@@ -13,16 +13,16 @@
 #include "lily-proto.hh"
 #include "lily-guile.hh"
 
-class Rest_collision           // interface
+
+
+
+class Rest_collision
 {
 public:
-  Score_element *elt_l_;
-  
-  void add_column (Note_column*);
-  Rest_collision(Score_element*);
-  void set_interface ();
-
-  static Real force_shift_callback (Score_element const*, Axis);
-  static SCM do_shift (Score_element*,SCM);
+  static void add_column (Grob*me,Grob*);
+  static void set_interface (Grob*me);
+  static bool has_interface (Grob*);
+  DECLARE_SCHEME_CALLBACK (force_shift_callback, (SCM element, SCM axis));
+  static SCM do_shift (Grob*,SCM);
 };
 #endif // REST_COLLISION_HH