Run `make grand-replace'.

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

diff --git a/lily/include/accidental-interface.hh b/lily/include/accidental-interface.hh
index 3b6ba6aff398b9b9be553f634d0bc5967cf1e351..440740b407f1bf152ecc50c55726a46cdfec7ed7 100644 (file)
--- a/lily/include/accidental-interface.hh
+++ b/lily/include/accidental-interface.hh
@@ -3,26 +3,30 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2002--2005 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2002--2008 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));
+  DECLARE_SCHEME_CALLBACK (height, (SCM));
+  DECLARE_SCHEME_CALLBACK (width, (SCM));
+  DECLARE_SCHEME_CALLBACK (pure_height, (SCM, SCM, SCM));
   
-  static bool has_interface (Grob *);
-  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);
+  static SCM get_stencil (Grob *me);
 };
 
 #endif