Run `make grand-replace'.

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

diff --git a/lily/include/rest-collision.hh b/lily/include/rest-collision.hh
index a2a39754be60780727dc5242e416819bfaabe43d..ce3765e65525af9bb1049249b8383a48d3a8479d 100644 (file)
--- a/lily/include/rest-collision.hh
+++ b/lily/include/rest-collision.hh
@@ -3,29 +3,24 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c) 1997--2008 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<Rest_column> rest_l_arr_;
-    Link_array<Note_column> ncol_l_arr_;
+class Rest_collision
+{
 public:
-    void add(Note_column*);
-    void add(Rest_column*);
-    void add(Collision*);
-    NAME_MEMBERS();
-    Rest_collision();
-protected:
-    virtual void do_post_processing();
-    virtual void do_pre_processing();
-    virtual void do_print() const;
-    virtual void do_substitute_dependency(Score_elem*,Score_elem*);
+  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