release: 1.2.14

[lilypond.git] / lily / include / multi-measure-rest.hh

diff --git a/lily/include/multi-measure-rest.hh b/lily/include/multi-measure-rest.hh
index 8be84d3002352cb7328669b23166237054011179..45fc8dddce74e2697269a2ccca41f5de520a38bd 100644 (file)
--- a/lily/include/multi-measure-rest.hh
+++ b/lily/include/multi-measure-rest.hh
@@ -3,26 +3,34 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1998 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1998--1999 Jan Nieuwenhuizen <janneke@gnu.org>
   
  */
 
 #ifndef MULTI_MEASURE_REST_HH
 #define MULTI_MEASURE_REST_HH
 
-#include "item.hh"
+#include "spanner.hh"
+#include "staff-symbol-referencer.hh"
 
-class Multi_measure_rest : public Item 
+class Multi_measure_rest : public Spanner, public Staff_symbol_referencer
 {
 public:
   Multi_measure_rest ();
   int measures_i_;
+  void add_column (Item*);
 
-  
+  Link_array<Item> column_arr_;
 
 protected:
-  virtual void do_print () const;
   virtual Molecule *do_brew_molecule_p () const;
+  VIRTUAL_COPY_CONS (Score_element);
+
+  virtual void do_add_processing ();
+  virtual void do_post_processing ();
+  virtual void do_print () const;
+  virtual Array<Rod> get_rods () const;
+  virtual void do_substitute_element_pointer (Score_element*,Score_element*);
 };
 
 #endif /* MULTI_MEASURE_REST_HH */