X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Ffont-interface.hh;h=ec8f680f32a28f46743c431437194a39714d9ec0;hb=f9214bac21e9926dc3248416f58190c98c4167a9;hp=1ebee16316073eff383a97914d674d87ad00cb7c;hpb=c242304638b8cb73b702b29bc37cfca15d0eb397;p=lilypond.git

diff --git a/lily/include/font-interface.hh b/lily/include/font-interface.hh
index 1ebee16316..ec8f680f32 100644
--- 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 (Paper_def*, 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 */