patch::: 1.1.19.jcn5: isb

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

diff --git a/lily/include/rest-collision.hh b/lily/include/rest-collision.hh
index d470e4178e265bdbfdbb0c0d7a2d37b933a95732..cfb1518093eefd2837e4136d8ed1f700da67d3a3 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 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 
@@ -14,14 +14,16 @@
 #include "item.hh"
 
 class Rest_collision : public Item {
-    Link_array<Rest_column> rest_l_arr_;
+    Link_array<Note_column> rest_l_arr_;
     Link_array<Note_column> ncol_l_arr_;
 public:
-    void add(Rest_column*);
-    void add(Collision*);
-    NAME_MEMBERS(Rest_collision);
+    void add_column (Note_column*);
+    
+    Rest_collision();
 protected:
     virtual void do_post_processing();
-    virtual void do_substitute_dependency(Score_elem*,Score_elem*);
+    virtual void do_pre_processing();
+    virtual void do_print() const;
+    virtual void do_substitute_dependency (Score_element*,Score_element*);
 };
 #endif // REST_COLLISION_HH