X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Faccidental-interface.hh;h=2a2888c20affe6498d0165b3e30e66e31e11281d;hb=1c4458de37e468a5d4fe023a34a5bcb05bf24aad;hp=f3b2221fd181d0ce79f195b9edaf6d08c533a664;hpb=b0c32ac16816f585d10199f8de80e15bd7243487;p=lilypond.git

diff --git a/lily/include/accidental-interface.hh b/lily/include/accidental-interface.hh
index f3b2221fd1..2a2888c20a 100644
--- a/lily/include/accidental-interface.hh
+++ b/lily/include/accidental-interface.hh
@@ -1,30 +1,32 @@
-/*   
-accidental-interface.hh -- declare  Accidental_interface
+/*
+  accidental-interface.hh -- declare  Accidental_interface
 
-source file of the GNU LilyPond music typesetter
+  source file of the GNU LilyPond music typesetter
 
-(c) 2002--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-
- */
+  (c) 2002--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+*/
 
 #ifndef ACCIDENTAL_INTERFACE_HH
 #define ACCIDENTAL_INTERFACE_HH
 
+#include "std-vector.hh"
+
 #include "box.hh"
-#include "lily-guile.hh"
 #include "lily-proto.hh"
-
+#include "grob-interface.hh"
 
 class Accidental_interface
 {
 public:
   DECLARE_SCHEME_CALLBACK (print, (SCM));
-  DECLARE_SCHEME_CALLBACK (after_line_breaking, (SCM));  
-  static bool has_interface (Grob*);
+  DECLARE_SCHEME_CALLBACK (calc_stencils, (SCM));
+  DECLARE_SCHEME_CALLBACK (after_line_breaking, (SCM));
+  DECLARE_SCHEME_CALLBACK (pure_height, (SCM, SCM, SCM));
   
-  static String get_fontcharname(String style, int alteration);
-  static Array<Box> Accidental_interface::accurate_boxes (Grob *me,Grob**common);
+  DECLARE_GROB_INTERFACE();
+  static string get_fontcharname (string style, int alteration);
+  static vector<Box> accurate_boxes (Grob *me,
+							  Grob **common);
 };
 
-
 #endif