X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Frest-collision.hh;h=5f2e165765aeb1eec429d7069b3b0b4040f38bc5;hb=9e69cb84d6ee5b0a861cd97869b10e3bdf0c833c;hp=f380032604d9d5e123c1ecf5b6e3f85ab8c27433;hpb=8aad615ea7bb31f49a0c2afc21eea5ff5de20437;p=lilypond.git

diff --git a/lily/include/rest-collision.hh b/lily/include/rest-collision.hh
index f380032604..5f2e165765 100644
--- a/lily/include/rest-collision.hh
+++ b/lily/include/rest-collision.hh
@@ -3,27 +3,24 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2006 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 {
-    Link_array<Note_column> rest_l_arr_;
-    Link_array<Note_column> ncol_l_arr_;
+class Rest_collision
+{
 public:
-    void add_column (Note_column*);
-    
-    Rest_collision();
-protected:
-    virtual void do_post_processing();
-    virtual void do_pre_processing();
-    virtual void do_print() const;
-    virtual void do_substitute_dependency (Score_element*,Score_element*);
+  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