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

[lilypond.git] / lily / include / font-interface.hh

diff --git a/lily/include/font-interface.hh b/lily/include/font-interface.hh
index 8c34e965055c7f941e796dd1156418b6a6bc6c97..ec8f680f32a28f46743c431437194a39714d9ec0 100644 (file)
--- a/lily/include/font-interface.hh
+++ b/lily/include/font-interface.hh
@@ -1,27 +1,23 @@
-/*   
+/*
   font-interface.hh -- declare Font_interface
-  
+
   source file of the GNU LilyPond music typesetter
-  
-  (c)  2000--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-  
- */
+
+  (c) 2000--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
+*/
 
 #ifndef FONT_INTERFACE_HH
 #define FONT_INTERFACE_HH
 
-#include "lily-proto.hh"
 #include "font-metric.hh"
+#include "grob-interface.hh"
 
 struct Font_interface
 {
-  static SCM font_alist_chain (Grob*);
-  static Font_metric * get_font (Grob*, SCM alist_chain);
-  static Font_metric * get_default_font (Grob*);
-  static bool wild_compare (SCM field_val, SCM val);
-  DECLARE_SCHEME_CALLBACK (properties_to_font_name, (SCM,SCM));
-  DECLARE_SCHEME_CALLBACK (get_property_alist_chain, (SCM));
-  static bool has_interface (Grob*);
+  static SCM text_font_alist_chain (Grob *);
+  static SCM music_font_alist_chain (Grob *);
+  static Font_metric *get_default_font (Grob *);
+  DECLARE_GROB_INTERFACE();
 };
 
 #endif /* FONT_INTERFACE_HH */