X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fmulti-measure-rest.hh;h=554a328b6ef5057fbb0fb7e0cf3c25a9773c6b74;hb=e94840e210c92c650bfa31abf71d4d8cc396a2f2;hp=45fc8dddce74e2697269a2ccca41f5de520a38bd;hpb=74e65211d6cda3818a6d4891f1f1c31f457e94cd;p=lilypond.git

diff --git a/lily/include/multi-measure-rest.hh b/lily/include/multi-measure-rest.hh
index 45fc8dddce..554a328b6e 100644
--- a/lily/include/multi-measure-rest.hh
+++ b/lily/include/multi-measure-rest.hh
@@ -1,36 +1,33 @@
-/*   
+/*
   multi-measure-rest.hh -- declare Multi_measure_rest
-  
+
   source file of the GNU LilyPond music typesetter
-  
-  (c) 1998--1999 Jan Nieuwenhuizen <janneke@gnu.org>
-  
- */
+
+  (c) 1998--2007 Jan Nieuwenhuizen <janneke@gnu.org>
+*/
 
 #ifndef MULTI_MEASURE_REST_HH
 #define MULTI_MEASURE_REST_HH
 
-#include "spanner.hh"
-#include "staff-symbol-referencer.hh"
+#include "grob-interface.hh"
+#include "rod.hh"
 
-class Multi_measure_rest : public Spanner, public Staff_symbol_referencer
+class Multi_measure_rest
 {
 public:
-  Multi_measure_rest ();
-  int measures_i_;
-  void add_column (Item*);
-
-  Link_array<Item> 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 Array<Rod> get_rods () const;
-  virtual void do_substitute_element_pointer (Score_element*,Score_element*);
+  DECLARE_GROB_INTERFACE();
+  DECLARE_SCHEME_CALLBACK (print, (SCM));
+  DECLARE_SCHEME_CALLBACK (percent, (SCM));
+  static void add_column (Grob *, Item *);
+  DECLARE_SCHEME_CALLBACK (set_spacing_rods, (SCM));
+  DECLARE_SCHEME_CALLBACK (set_text_rods, (SCM));
+  DECLARE_SCHEME_CALLBACK (centered_stencil, (SCM));
+
+
+  static void calculate_spacing_rods (Grob *me, Real length);
+  static Stencil big_rest (Grob *, Real);
+  static Stencil symbol_stencil (Grob *, Real);
+  static Stencil church_rest (Grob *, Font_metric *, int, Real);
 };
 
 #endif /* MULTI_MEASURE_REST_HH */