Run `make grand-replace'.

[lilypond.git] / lily / include / rest.hh

diff --git a/lily/include/rest.hh b/lily/include/rest.hh
index 9513d8c82ad0fa4fd25fb9ff73b2a083e65ef93a..138d34af2dcd4644b9557ad7ea349acce1b51aad 100644 (file)
--- a/lily/include/rest.hh
+++ b/lily/include/rest.hh
@@ -3,26 +3,29 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
-
 #ifndef REST_HH
 #define REST_HH
 
-#include "lily-guile.hh"
+#include "grob-interface.hh"
 
 class Grob;
 
-class  Rest
+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 (print, (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