release: 0.0.59

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

diff --git a/lily/include/slur.hh b/lily/include/slur.hh
index c8363075c4569bde2fe96e71f44b5fe628c84111..68f073e10f4d32f2ad4c48bc914002c335ef5474 100644 (file)
--- a/lily/include/slur.hh
+++ b/lily/include/slur.hh
@@ -8,26 +8,21 @@
 #define SLUR_HH
 
 #include "directional-spanner.hh"
-#include "fproto.hh"
+#include "lily-proto.hh"
 #include "varray.hh"
+#include "bow.hh"
 
-struct Slur : Directional_spanner {
+class Slur : public Bow {
+public:
+    Array<Note_column*> encompass_arr_;
 
-    Array<Notehead*> encompass;
-
-    bool open_left, open_right;                        
-
-    /* *************** */
-    Offset center() const;
-    Slur();
     void do_post_processing();
     void do_pre_processing();
-    void add(Notehead*);
+    void add(Note_column*);
     void set_default_dir();
 
     Spanner* do_break_at( PCol*, PCol*) const; 
 private:
-    Molecule*brew_molecule_p()const;
     NAME_MEMBERS(Slur);
 };