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

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

diff --git a/lily/include/font-interface.hh b/lily/include/font-interface.hh
index a75a25b5b56cb4e0076d966e54550936dc970ce1..cc68af60d7fd725e9e25f04d57e4b91d7e168a95 100644 (file)
--- a/lily/include/font-interface.hh
+++ b/lily/include/font-interface.hh
@@ -1,26 +1,23 @@
-/*   
+/*
   font-interface.hh -- declare Font_interface
-  
+
   source file of the GNU LilyPond music typesetter
-  
-  (c) 2000--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-  
- */
+
+  (c) 2000--2006 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 SCM add_style (Grob*, SCM style, SCM alist_chain);
-  static bool wild_compare(SCM field_val, SCM val);
-  DECLARE_SCHEME_CALLBACK(properties_to_font_name, (SCM,SCM));
+  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 */