X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fmulti-measure-rest.hh;h=3ba796c515131eba49b518ccfbadc2075f7b0de8;hb=f05cfd7757b31723fe6af2f5c0e2fdbaebea3b85;hp=7a62fcdc05affeac73c8d6d4859d5f948efe0238;hpb=8aad615ea7bb31f49a0c2afc21eea5ff5de20437;p=lilypond.git

diff --git a/lily/include/multi-measure-rest.hh b/lily/include/multi-measure-rest.hh
index 7a62fcdc05..3ba796c515 100644
--- a/lily/include/multi-measure-rest.hh
+++ b/lily/include/multi-measure-rest.hh
@@ -3,32 +3,30 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1998--1999 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1998--2002 Jan Nieuwenhuizen <janneke@gnu.org>
   
  */
 
 #ifndef MULTI_MEASURE_REST_HH
 #define MULTI_MEASURE_REST_HH
 
-#include "spanner.hh"
+#include "lily-proto.hh"
+#include "lily-guile.hh"
+#include "rod.hh"
 
-class Multi_measure_rest : public Spanner
+class Multi_measure_rest
 {
 public:
-  Multi_measure_rest ();
-  int measures_i_;
-  void add_column (Bar*);
-
-  Link_array<Bar> column_arr_;
-
-protected:
-  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 void do_substitute_dependency (Score_element*,Score_element*);
+  static void set_interface (Grob*);
+  static bool has_interface (Grob*);
+  DECLARE_SCHEME_CALLBACK (brew_molecule, (SCM ));
+  DECLARE_SCHEME_CALLBACK (percent, (SCM));
+  static  void add_column (Grob*,Item*);
+  DECLARE_SCHEME_CALLBACK (set_spacing_rods, (SCM ));
+
+  static Molecule big_rest (Grob*,Real);
+  static Molecule symbol_molecule (Grob*,Real);  
+  static Molecule church_rest (Grob*, Font_metric*, int,Real);
 };
 
 #endif /* MULTI_MEASURE_REST_HH */