Merge branch 'jneeman' of git+ssh://jneem@git.sv.gnu.org/srv/git/lilypond into jneeman

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

diff --git a/lily/include/rest.hh b/lily/include/rest.hh
index 3e7c4e8e4fad694d98fc6f6e30b8ce3e9cb3c8e2..20107120b7c411bef2f4fa8bbbb4441cf04140db 100644 (file)
--- a/lily/include/rest.hh
+++ b/lily/include/rest.hh
@@ -3,26 +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
+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_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