2003 -> 2004

[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 8dfbba2f5f7b2c4cd3c92f01785dc46dc96ea95c..7aeb7681e26b45ce7aa606731b6aa2a1f18bff2d 100644 (file)
--- a/lily/include/multi-measure-rest.hh
+++ b/lily/include/multi-measure-rest.hh
@@ -3,30 +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 ();
-
-  void add_column (Item*);
-  Molecule compound_rest (int)const;
-protected:
-  virtual Molecule do_brew_molecule () const;
-  VIRTUAL_COPY_CONS (Score_element);
-
-  virtual void do_add_processing ();
-  virtual void after_line_breaking ();
-  virtual Array<Rod> get_rods () const;
+  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 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 */