release: 1.3.48

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

diff --git a/lily/include/rest-collision.hh b/lily/include/rest-collision.hh
index 8482d66882d15900bd1f6490bb6e4dd27920d33f..eac7a48a0ffe938e3636c073aa0e456812f1ddb4 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--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 
@@ -14,14 +14,12 @@
 #include "item.hh"
 
 class Rest_collision : public Item {
-    Link_array<Rest_column> rest_l_arr_;
-    Link_array<Note_column> ncol_l_arr_;
 public:
-    void add(Rest_column*);
-    void add(Collision*);
-    NAME_MEMBERS();
+  void add_column (Note_column*);
+  Interval rest_dim () const;
+    
+  Rest_collision();
 protected:
-    virtual void do_post_processing();
-    virtual void do_substitute_dependency(Score_elem*,Score_elem*);
+  virtual void before_line_breaking ();
 };
 #endif // REST_COLLISION_HH