(LY_DEFINE): use scm_c_make_hash_table().

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

diff --git a/lily/include/font-interface.hh b/lily/include/font-interface.hh
index 1ebee16316073eff383a97914d674d87ad00cb7c..0a0b6627239f3b9e313b63088b320c84f209ffe3 100644 (file)
--- a/lily/include/font-interface.hh
+++ b/lily/include/font-interface.hh
@@ -3,24 +3,20 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c)  2000--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 2000--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
 #ifndef FONT_INTERFACE_HH
 #define FONT_INTERFACE_HH
 
-#include "lily-proto.hh"
 #include "font-metric.hh"
 
 struct Font_interface
 {
-  static SCM font_alist_chain (Grob*);
-  static Font_metric * get_font (Paper_def*, SCM alist_chain);
+  static SCM text_font_alist_chain (Grob*);
+  static SCM music_font_alist_chain (Grob*);
   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*);
 };