* configure.in: Test for and accept lmodern if EC fonts not found.

[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 4b57a9662c37ada2054729331612a3f97d2c156d..c23cb9cc4297adaab0c9ab753144d5abd5fa8343 100644 (file)
--- a/lily/include/multi-measure-rest.hh
+++ b/lily/include/multi-measure-rest.hh
@@ -3,25 +3,29 @@
   
   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 "lily-proto.hh"
 #include "lily-guile.hh"
 #include "rod.hh"
 
 class Multi_measure_rest
 {
 public:
-  static void set_interface (Score_element*);
-  static bool has_interface (Score_element*);
-  static SCM brew_molecule (SCM);
-  static  void add_column (Score_element*,Item*);
-  static SCM set_spacing_rods (SCM);
+  static bool has_interface (Grob*);
+  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 (centered_stencil, (SCM ));
+  
+  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 */