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

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

diff --git a/lily/include/accidental-interface.hh b/lily/include/accidental-interface.hh
index 62eeb1b5adbaf426345c6654f798490faa90ca6d..2a2888c20affe6498d0165b3e30e66e31e11281d 100644 (file)
--- a/lily/include/accidental-interface.hh
+++ b/lily/include/accidental-interface.hh
@@ -12,7 +12,6 @@
 #include "std-vector.hh"
 
 #include "box.hh"
-#include "lily-guile.hh"
 #include "lily-proto.hh"
 #include "grob-interface.hh"
 
@@ -20,7 +19,9 @@ class Accidental_interface
 {
 public:
   DECLARE_SCHEME_CALLBACK (print, (SCM));
+  DECLARE_SCHEME_CALLBACK (calc_stencils, (SCM));
   DECLARE_SCHEME_CALLBACK (after_line_breaking, (SCM));
+  DECLARE_SCHEME_CALLBACK (pure_height, (SCM, SCM, SCM));
   
   DECLARE_GROB_INTERFACE();
   static string get_fontcharname (string style, int alteration);