Fix #219.

[lilypond.git] / lily / include / slur.hh

diff --git a/lily/include/slur.hh b/lily/include/slur.hh
index 390bde5c6f27975aa16250f49760c30fa6c78f96..0ec721d4d26f54c945367ede09bc4e2e6a7bd43e 100644 (file)
--- a/lily/include/slur.hh
+++ b/lily/include/slur.hh
@@ -10,19 +10,24 @@
 #define SLUR_HH
 
 #include "lily-proto.hh"
-#include "lily-guile.hh"
+#include "std-vector.hh"
+#include "grob-interface.hh"
 
 class Slur
 {
 public:
   static void add_column (Grob *me, Grob *col);
   static void add_extra_encompass (Grob *me, Grob *col);
+  static void replace_breakable_encompass_objects (Grob *me);
+  static void auxiliary_acknowledge_extra_object (Grob_info const &, vector<Grob*>&, vector<Grob*>&);
   DECLARE_SCHEME_CALLBACK (print, (SCM));
   DECLARE_SCHEME_CALLBACK (calc_control_points, (SCM));
   DECLARE_SCHEME_CALLBACK (calc_direction, (SCM));
+  DECLARE_SCHEME_CALLBACK (pure_height, (SCM, SCM, SCM));
   DECLARE_SCHEME_CALLBACK (height, (SCM));
   DECLARE_SCHEME_CALLBACK (outside_slur_callback, (SCM, SCM));
-  static bool has_interface (Grob *);
+  DECLARE_SCHEME_CALLBACK (pure_outside_slur_callback, (SCM, SCM, SCM, SCM));
+  DECLARE_GROB_INTERFACE();
   static Bezier get_curve (Grob *me);
 };