X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fslur.hh;h=0ec721d4d26f54c945367ede09bc4e2e6a7bd43e;hb=89db5c71c36627cfc7d9bd9754a014b8bc95c6c2;hp=2c797239ce2876acf221f692dbe492ded0970657;hpb=9f3572d98bb948c9689cd1f75401a029451fa001;p=lilypond.git

diff --git a/lily/include/slur.hh b/lily/include/slur.hh
index 2c797239ce..0ec721d4d2 100644
--- a/lily/include/slur.hh
+++ b/lily/include/slur.hh
@@ -9,23 +9,25 @@
 #ifndef SLUR_HH
 #define SLUR_HH
 
-#include "grob-info.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 auxiliary_acknowledge_extra_object (Grob_info, vector<Grob*>&, vector<Grob*>&);
+  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);
 };