X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fmulti-measure-rest.hh;h=7aeb7681e26b45ce7aa606731b6aa2a1f18bff2d;hb=7e72a1e50e94a7f9738d62599de79fe7745f600c;hp=71353da3b1b7c026e50f8360e88ab70972f905f5;hpb=0af2486a28f1c60b9de929a9101964d880927e54;p=lilypond.git

diff --git a/lily/include/multi-measure-rest.hh b/lily/include/multi-measure-rest.hh
index 71353da3b1..7aeb7681e2 100644
--- a/lily/include/multi-measure-rest.hh
+++ b/lily/include/multi-measure-rest.hh
@@ -3,27 +3,30 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1998--2000 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1998--2004 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 (SCM);
+  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 ));
+  DECLARE_SCHEME_CALLBACK (centered_molecule, (SCM ));
   
-  static void set_interface (Score_element*);
-  static bool has_interface (Score_element*);
-  static SCM brew_molecule (SCM);
-  static  void add_column (Score_element*,Item*);
-  VIRTUAL_COPY_CONS (Score_element);
-  virtual Array<Rod> get_rods () const;
+  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 */