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

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

diff --git a/lily/include/clef.hh b/lily/include/clef.hh
index 5f05fe31d82c4fca0354e81203f5adde64b808f0..038d21f7aa0c3acf0f8e36f8153a7301d6c66c89 100644 (file)
--- a/lily/include/clef.hh
+++ b/lily/include/clef.hh
@@ -1,25 +1,23 @@
-/*   
+/*
   clef.hh -- declare Clef
-  
+
   source file of the GNU LilyPond music typesetter
-  
-  (c) 2000--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-  
- */
+
+  (c) 2000--2009 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 
+struct Clef
 {
-  DECLARE_SCHEME_CALLBACK (before_line_breaking, (SCM ));
-  DECLARE_SCHEME_CALLBACK (brew_molecule, (SCM ));
-  static bool has_interface (Grob*);
-  
+  DECLARE_SCHEME_CALLBACK (calc_glyph_name, (SCM));
+  DECLARE_SCHEME_CALLBACK (print, (SCM));
+  DECLARE_GROB_INTERFACE();
 };
 
-
 #endif /* CLEF_HH */