X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fslur.hh;h=20fb7030ce60c134b9b20801e2eea5a4e98cba96;hb=f9214bac21e9926dc3248416f58190c98c4167a9;hp=68f073e10f4d32f2ad4c48bc914002c335ef5474;hpb=56126108b2610f82bc7cafaac8741d1aeba1d34f;p=lilypond.git

diff --git a/lily/include/slur.hh b/lily/include/slur.hh
index 68f073e10f..20fb7030ce 100644
--- a/lily/include/slur.hh
+++ b/lily/include/slur.hh
@@ -1,31 +1,34 @@
 /*
-  slur.hh -- part of LilyPond
+  slur.hh -- declare Slur
 
-  (c) 1996,97 Han-Wen Nienhuys
+  source file of the GNU LilyPond music typesetter
+
+  (c) 2004--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef SLUR_HH
 #define SLUR_HH
 
-#include "directional-spanner.hh"
 #include "lily-proto.hh"
-#include "varray.hh"
-#include "bow.hh"
+#include "std-vector.hh"
+#include "grob-interface.hh"
 
-class Slur : public Bow {
+class Slur
+{
 public:
-    Array<Note_column*> encompass_arr_;
-
-    void do_post_processing();
-    void do_pre_processing();
-    void add(Note_column*);
-    void set_default_dir();
-
-    Spanner* do_break_at( PCol*, PCol*) const; 
-private:
-    NAME_MEMBERS(Slur);
+  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));
+  DECLARE_SCHEME_CALLBACK (pure_outside_slur_callback, (SCM, SCM, SCM, SCM));
+  DECLARE_GROB_INTERFACE();
+  static Bezier get_curve (Grob *me);
 };
 
-#endif // SLUR_HH
-
-
+#endif /* SLUR_HH */