X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fslur.hh;h=b20311785d2d1870c23075cc28e4645f4ea70c4d;hb=29af9bda720e7624494abbacb9895ac7d63b5221;hp=61a32348c2fa8d85d5c79245f0aef1794d55aca8;hpb=89b7e75f6888d2020f7fe8b258e818c0c5e7a223;p=lilypond.git

diff --git a/lily/include/slur.hh b/lily/include/slur.hh
index 61a32348c2..b20311785d 100644
--- a/lily/include/slur.hh
+++ b/lily/include/slur.hh
@@ -24,27 +24,18 @@
 #include "std-vector.hh"
 #include "grob-interface.hh"
 
-struct Slur_info
-{
-  Slur_info (Grob *slur);
-  Grob *slur_;
-  vector<Grob *> stubs_;
-};
-
 class Slur
 {
 public:
   static void add_column (Grob *me, Grob *col);
   static void add_extra_encompass (Grob *me, Grob *col);
-  static void main_to_stub (Grob *main, Grob *stub);
   static void replace_breakable_encompass_objects (Grob *me);
-  static void auxiliary_acknowledge_extra_object (Grob_info const &, vector<Slur_info> &, vector<Slur_info> &);
+  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 (extremal_stub_vertical_skylines, (SCM));
   DECLARE_SCHEME_CALLBACK (vertical_skylines, (SCM));
   DECLARE_SCHEME_CALLBACK (outside_slur_callback, (SCM, SCM));
   DECLARE_SCHEME_CALLBACK (pure_outside_slur_callback, (SCM, SCM, SCM, SCM));