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

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

diff --git a/lily/include/clef.hh b/lily/include/clef.hh
index 1f3146aea9e147068566b4c63197384fa9dedc59..bc6550fe4e92b9129fc3c61313de2cbd93f5b80a 100644 (file)
--- a/lily/include/clef.hh
+++ b/lily/include/clef.hh
@@ -3,20 +3,20 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2000--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 2000--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef CLEF_HH
 #define CLEF_HH
 
-#include "lily-guile.hh"
 #include "lily-proto.hh"
+#include "grob-interface.hh"
 
 struct Clef
 {
-  DECLARE_SCHEME_CALLBACK (before_line_breaking, (SCM));
+  DECLARE_SCHEME_CALLBACK (calc_glyph_name, (SCM));
   DECLARE_SCHEME_CALLBACK (print, (SCM));
-  static bool has_interface (Grob *);
+  DECLARE_GROB_INTERFACE();
 };
 
 #endif /* CLEF_HH */