X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Frest.hh;h=96c2b44cc71a915d8c0eff57b6b6139e3621c4cf;hb=75cb539581ca2dd6f92e51a8d0d76b9eec5afd2c;hp=de9f3122f7f68f8a144b5d68802e2158a02a7678;hpb=54feef141b22b56abf5e4a47c05bf8bbf99d4930;p=lilypond.git

diff --git a/lily/include/rest.hh b/lily/include/rest.hh
index de9f3122f7..96c2b44cc7 100644
--- a/lily/include/rest.hh
+++ b/lily/include/rest.hh
@@ -3,25 +3,29 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2007 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 (y_offset_callback, (SCM, 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_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