2003 -> 2004

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

diff --git a/lily/include/rest-collision.hh b/lily/include/rest-collision.hh
index 10b8ac01c17aef4f625e4cfd733e602539550b5e..bf14845c4dc0310d3a8a4c5332e3db7cc865531f 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--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 
@@ -11,16 +11,18 @@
 #define REST_COLLISION_HH
 
 #include "lily-proto.hh"
-#include "item.hh"
+#include "lily-guile.hh"
+
 
-class Rest_collision : public Item {
-public:
-  void add_column (Note_column*);
-  Interval rest_dim () const;
-    
-  Rest_collision(SCM);
 
-  SCM member_after_line_breaking ();
-  static SCM after_line_breaking (SCM);
+
+class Rest_collision
+{
+public:
+  static void add_column (Grob*me,Grob*);
+  
+  static bool has_interface (Grob*);
+  DECLARE_SCHEME_CALLBACK (force_shift_callback, (SCM element, SCM axis));
+  static SCM do_shift (Grob*);
 };
 #endif // REST_COLLISION_HH