X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Frest.hh;h=96c2b44cc71a915d8c0eff57b6b6139e3621c4cf;hb=37ca1f80bf5401accd17056938f4f7b2c147ddb2;hp=1977bd67388559ed925fc8c9116004d32b163f55;hpb=f5e5c04d731e93b1d8d4cf7e7697f71f6e7c2bdf;p=lilypond.git

diff --git a/lily/include/rest.hh b/lily/include/rest.hh
index 1977bd6738..96c2b44cc7 100644
--- a/lily/include/rest.hh
+++ b/lily/include/rest.hh
@@ -3,30 +3,29 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2007 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 ();
-  Molecule do_brew_molecule () const;
 public:
-   static SCM scheme_molecule (SCM);
-  
-Rest (SCM s);
+  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