X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Frest.hh;h=357b76bcb22c84a6903a323790d16d9417b29c77;hb=459d4d5eaa90373349eb0461af7b6e3cdfd56981;hp=591c9eb81b04e28ae2259a5459773c78cc62caa1;hpb=163503e56aa0c03d41d37fd083bdb96a6a473a11;p=lilypond.git

diff --git a/lily/include/rest.hh b/lily/include/rest.hh
index 591c9eb81b..357b76bcb2 100644
--- a/lily/include/rest.hh
+++ b/lily/include/rest.hh
@@ -3,19 +3,27 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
-
 #ifndef REST_HH
 #define REST_HH
 
-#include "rhythmic-head.hh"
+#include "lily-guile.hh"
+
+class Grob;
 
-class  Rest : public Rhythmic_head
+class Rest
 {
-protected:
-  virtual void do_post_processing ();
-  virtual Molecule * do_brew_molecule_p () const;
+public:
+  DECLARE_SCHEME_CALLBACK (y_offset_callback, (SCM));
+  static bool has_interface (Grob *);
+  static string glyph_name (Grob *, int, string, bool);
+  static SCM brew_internal_stencil (Grob*, bool);
+  static SCM generic_extent_callback (Grob*, Axis);
+  DECLARE_SCHEME_CALLBACK (polyphonic_offset_callback, (SCM));
+  DECLARE_SCHEME_CALLBACK (print, (SCM));
+  DECLARE_SCHEME_CALLBACK (width, (SCM));
+  DECLARE_SCHEME_CALLBACK (height, (SCM));
 };
 #endif // REST_HH