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

[lilypond.git] / lily / include / staff-symbol.hh

diff --git a/lily/include/staff-symbol.hh b/lily/include/staff-symbol.hh
index 18d6f496801ab23a33f4fe67bbf62f9075f9bb37..4dacde8b5353d4c6f49a3ef046b8351aead4e1f4 100644 (file)
--- a/lily/include/staff-symbol.hh
+++ b/lily/include/staff-symbol.hh
@@ -3,14 +3,14 @@
 
   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 STAFF_SYMBOL_HH
 #define STAFF_SYMBOL_HH
 
-#include "lily-guile.hh"
 #include "lily-proto.hh"
+#include "grob-interface.hh"
 
 /**
    TODO: add linethickness as parameter.
@@ -21,10 +21,11 @@ public:
   static Real staff_space (Grob *);
   static Real get_line_thickness (Grob *);
   static Real get_ledger_line_thickness (Grob *);
-
+  
   static int get_steps (Grob *);
   static int line_count (Grob *);
   DECLARE_SCHEME_CALLBACK (print, (SCM));
-  static bool has_interface (Grob *);
+  DECLARE_SCHEME_CALLBACK (height, (SCM));  
+  DECLARE_GROB_INTERFACE();
 };
 #endif // STAFF_SYMBOL_HH