''

[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 ba805eadd06e3c76926760eb2686ef6ac5fe8b9b..3ba796c515131eba49b518ccfbadc2075f7b0de8 100644 (file)
--- a/lily/include/multi-measure-rest.hh
+++ b/lily/include/multi-measure-rest.hh
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1998--2000 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1998--2002 Jan Nieuwenhuizen <janneke@gnu.org>
   
  */
 
@@ -13,25 +13,20 @@
 #include "lily-proto.hh"
 #include "lily-guile.hh"
 #include "rod.hh"
-/*
-  properties:
 
-  columns -- list of paper-columns
-
- expand-limit -- int : max number of measures expanded in church rests
-
- minimum-width -- Real in staffspace
-
- padding -- staffspace
-*/
 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 void set_interface (Grob*);
+  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 ));
+
+  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 */