X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Frest-collision.hh;h=f37fc1e97f88cbf6090fe201679053ba762b844d;hb=c2b0bbf77c6702079acdaa20e54e819728140899;hp=eac7a48a0ffe938e3636c073aa0e456812f1ddb4;hpb=fbb6d20e9f58d691ffe845284cbb4d8bacf9ca60;p=lilypond.git

diff --git a/lily/include/rest-collision.hh b/lily/include/rest-collision.hh
index eac7a48a0f..f37fc1e97f 100644
--- a/lily/include/rest-collision.hh
+++ b/lily/include/rest-collision.hh
@@ -3,23 +3,23 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
-
 #ifndef REST_COLLISION_HH
 #define REST_COLLISION_HH
 
 #include "lily-proto.hh"
-#include "item.hh"
+#include "lily-guile.hh"
 
-class Rest_collision : public Item {
+class Rest_collision
+{
 public:
-  void add_column (Note_column*);
-  Interval rest_dim () const;
-    
-  Rest_collision();
-protected:
-  virtual void before_line_breaking ();
+  static void add_column (Grob *me, Grob *);
+
+  static bool has_interface (Grob *);
+  DECLARE_SCHEME_CALLBACK (force_shift_callback, (SCM element, SCM axis));
+  DECLARE_SCHEME_CALLBACK (force_shift_callback_rest, (SCM element, SCM axis));
+  static SCM do_shift (Grob *);
 };
 #endif // REST_COLLISION_HH