release: 0.0.74pre

[lilypond.git] / lily / include / staff-side.hh

diff --git a/lily/include/staff-side.hh b/lily/include/staff-side.hh
index 1d4245abbbc0b26222c1614ca8bcda50ef2d7870..d62da65daddf63cf4f2a8194eaeb3d569ab3d18a 100644 (file)
--- a/lily/include/staff-side.hh
+++ b/lily/include/staff-side.hh
@@ -11,13 +11,18 @@
 #define STAFF_SIDE_HH
 
 #include "score-elem.hh"
+#include "interval.hh"
 
-/// A symbol which sits along  the staff
+/** A symbol which sits along a staff
+
+  Should override translate_y() ?
+  */
 class Staff_side : virtual Score_elem {
     Link_array<Score_elem> support_l_arr_;
     int staff_size_i_;
     Interval support_height()const;
     Staff_symbol* staff_sym_l_;
+    int get_position_i()const;
 
     void read_staff_sym();
 public:
@@ -26,10 +31,13 @@ public:
       Vertical dir of symbol relative to staff. -1 = below staff?
       */
     int dir_i_;
+    Interval sym_int_;
     
     /// follow the support inside the staff?
     bool inside_staff_b_;
 
+    int pos_i_;
+
     void set_staffsym(Staff_symbol *  );
   
     Staff_side();
@@ -37,8 +45,8 @@ public:
     NAME_MEMBERS();
     
 protected:
+    virtual Interval symbol_height() const;
     virtual void do_substitute_dependency(Score_elem *, Score_elem*);
-    int get_position_i()const;
-    int get_position_i(Interval)const;
+    virtual void do_post_processing();
 };
 #endif // STAFF_SIDE_HH