X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Frest.hh;h=20107120b7c411bef2f4fa8bbbb4441cf04140db;hb=9e69cb84d6ee5b0a861cd97869b10e3bdf0c833c;hp=22be2d4b5b7c53628a8932c5748e3b8f38d0dd64;hpb=58bcc84c9480dae1b21bc24d8396b91fe19e0131;p=lilypond.git

diff --git a/lily/include/rest.hh b/lily/include/rest.hh
index 22be2d4b5b..20107120b7 100644
--- a/lily/include/rest.hh
+++ b/lily/include/rest.hh
@@ -3,25 +3,27 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef REST_HH
 #define REST_HH
 
-#include "lily-guile.hh"
+#include "grob-interface.hh"
 
 class Grob;
 
 class Rest
 {
 public:
-  DECLARE_SCHEME_CALLBACK (after_line_breaking, (SCM));
-  static bool has_interface (Grob *);
-  static String glyph_name (Grob *, int, String, bool);
-  static SCM brew_internal_stencil (SCM, bool);
-  DECLARE_SCHEME_CALLBACK (extent_callback, (SCM, SCM));
-  DECLARE_SCHEME_CALLBACK (polyphonic_offset_callback, (SCM, SCM));
+  DECLARE_SCHEME_CALLBACK (y_offset_callback, (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));
 };
 #endif // REST_HH