X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Frest-collision.hh;h=1d25a2cda56a3c7726dffc33f3247274559bbc99;hb=0e5d83a9ceb4a143f83d22406d7eb816314ff9f7;hp=31a1c8504ba7401b2ed0d4747571250b997a47d4;hpb=c4621aa165c30daf7f893148628d747ca2b7fd7e;p=lilypond.git

diff --git a/lily/include/rest-collision.hh b/lily/include/rest-collision.hh
index 31a1c8504b..1d25a2cda5 100644
--- a/lily/include/rest-collision.hh
+++ b/lily/include/rest-collision.hh
@@ -1,26 +1,26 @@
 /*
   rest-collision.hh -- declare Rest_collision
 
-  source file of the LilyPond music typesetter
+  source file of the GNU LilyPond music typesetter
 
-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c) 1997--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
-
 #ifndef REST_COLLISION_HH
 #define REST_COLLISION_HH
 
+#include "grob-interface.hh"
 #include "lily-proto.hh"
-#include "item.hh"
 
-class Rest_collision : public Item {
-    Array<Rest_column *> rest_l_arr_;
-    Array<Note_column *> ncol_l_arr_;
+class Rest_collision
+{
 public:
-    void add(Rest_column*);
-    void add(Collision*);
-    NAME_MEMBERS(Rest_collision);
-protected:
-    virtual void do_post_processing();
+  static void add_column (Grob *me, Grob *);
+
+  DECLARE_GROB_INTERFACE();
+  DECLARE_SCHEME_CALLBACK (force_shift_callback, (SCM element));
+  DECLARE_SCHEME_CALLBACK (calc_positioning_done, (SCM element));
+  DECLARE_SCHEME_CALLBACK (force_shift_callback_rest, (SCM element, SCM off));
+  static SCM do_shift (Grob *);
 };
 #endif // REST_COLLISION_HH