2003 -> 2004

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

diff --git a/lily/include/rest-collision.hh b/lily/include/rest-collision.hh
index 4d39f54347ef0166e644704d124661ff9843fc8a..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--1998 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 
@@ -11,19 +11,18 @@
 #define REST_COLLISION_HH
 
 #include "lily-proto.hh"
-#include "item.hh"
+#include "lily-guile.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 (Note_column*);
-    DECLARE_MY_RUNTIME_TYPEINFO;
-    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*);
+  
+  static bool has_interface (Grob*);
+  DECLARE_SCHEME_CALLBACK (force_shift_callback, (SCM element, SCM axis));
+  static SCM do_shift (Grob*);
 };
 #endif // REST_COLLISION_HH