X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Frest.hh;h=138d34af2dcd4644b9557ad7ea349acce1b51aad;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=dcd6b81628d2999e4fec1c232e10f5bfddb33866;hpb=51e7345f199657c7b868d5653f209703e897fca8;p=lilypond.git

diff --git a/lily/include/rest.hh b/lily/include/rest.hh
index dcd6b81628..138d34af2d 100644
--- a/lily/include/rest.hh
+++ b/lily/include/rest.hh
@@ -3,26 +3,29 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
-
 #ifndef REST_HH
 #define REST_HH
 
-#include "rhythmic-head.hh"
+#include "grob-interface.hh"
 
-/**
-   A pause.
-   
-   Properties
+class Grob;
 
-   style -- string specifying glyph style
- */
-class  Rest : public Rhythmic_head
+class Rest
 {
-protected:
-  virtual void after_line_breaking ();
-  virtual Molecule do_brew_molecule () const;
+public:
+  DECLARE_SCHEME_CALLBACK (y_offset_callback, (SCM));
+  DECLARE_SCHEME_CALLBACK (calc_cross_staff, (SCM));
+  DECLARE_GROB_INTERFACE();
+  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));
+  DECLARE_SCHEME_CALLBACK (pure_height, (SCM, SCM, SCM));
 };
 #endif // REST_HH