release: 0.1.38

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

diff --git a/lily/include/staff-side.hh b/lily/include/staff-side.hh
index 1d4245abbbc0b26222c1614ca8bcda50ef2d7870..ffc1e37d9f99011cfeea1e58bb651cf3a29d4fd7 100644 (file)
--- a/lily/include/staff-side.hh
+++ b/lily/include/staff-side.hh
@@ -11,34 +11,41 @@
 #define STAFF_SIDE_HH
 
 #include "score-elem.hh"
+#include "interval.hh"
+#include "direction.hh"
 
-/// A symbol which sits along  the staff
+/** A symbol which sits along a staff.
+
+  */
 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_;
+  Link_array<Score_elem> support_l_arr_;
+
+  Interval support_height() const;
+  Real get_position_f() const;
 
-    void read_staff_sym();
 public:
 
-    /**
-      Vertical dir of symbol relative to staff. -1 = below staff?
-      */
-    int dir_i_;
+  /**
+    Vertical dir of symbol relative to staff. -1 = below staff?
+    */
+  Direction dir_;
+  Interval sym_int_;
     
-    /// follow the support inside the staff?
-    bool inside_staff_b_;
+  /// follow the support inside the staff?
+  bool inside_staff_b_;
+
+  Real y_;
+
 
-    void set_staffsym(Staff_symbol *  );
+  void set_staffsym (Staff_symbol * );
   
-    Staff_side();
-    void add_support(Score_elem*);
-    NAME_MEMBERS();
+  Staff_side();
+  void add_support (Score_elem*);
+  DECLARE_MY_RUNTIME_TYPEINFO;
     
 protected:
-    virtual void do_substitute_dependency(Score_elem *, Score_elem*);
-    int get_position_i()const;
-    int get_position_i(Interval)const;
+  virtual Interval symbol_height() const;
+  virtual void do_substitute_dependency (Score_elem *, Score_elem*);
+  virtual void do_post_processing();
 };
 #endif // STAFF_SIDE_HH