X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fmulti-measure-rest.hh;h=dd0d4054ae1c4ca0c5d2e545f888133a821ec2f2;hb=9e69cb84d6ee5b0a861cd97869b10e3bdf0c833c;hp=2682d500a07f76c1dd88c82c72a1dfd8b0e15148;hpb=5f42fe18c41237a73d99fd76b34e434a33598704;p=lilypond.git

diff --git a/lily/include/multi-measure-rest.hh b/lily/include/multi-measure-rest.hh
index 2682d500a0..dd0d4054ae 100644
--- a/lily/include/multi-measure-rest.hh
+++ b/lily/include/multi-measure-rest.hh
@@ -1,35 +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--2006 Jan Nieuwenhuizen <janneke@gnu.org>
+*/
 
 #ifndef MULTI_MEASURE_REST_HH
 #define MULTI_MEASURE_REST_HH
 
-#include "spanner.hh"
+#include "grob-interface.hh"
+#include "rod.hh"
 
-class Multi_measure_rest : public Spanner
+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 */