Make pure-height on accidentals ignore tied accidentals after breaks.

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

diff --git a/lily/include/accidental-interface.hh b/lily/include/accidental-interface.hh
index 12c77eace24ff94327baeb778ca41890e2761a0d..2a2888c20affe6498d0165b3e30e66e31e11281d 100644 (file)
--- a/lily/include/accidental-interface.hh
+++ b/lily/include/accidental-interface.hh
@@ -9,19 +9,23 @@
 #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 (calc_stencils, (SCM));
   DECLARE_SCHEME_CALLBACK (after_line_breaking, (SCM));
+  DECLARE_SCHEME_CALLBACK (pure_height, (SCM, SCM, SCM));
   
-  static bool has_interface (Grob *);
-  static std::string get_fontcharname (std::string style, int alteration);
-  static Array<Box> accurate_boxes (Grob *me,
+  DECLARE_GROB_INTERFACE();
+  static string get_fontcharname (string style, int alteration);
+  static vector<Box> accurate_boxes (Grob *me,
                                                          Grob **common);
 };