release: 0.1.11

[lilypond.git] / lily / include / note-column.hh

diff --git a/lily/include/note-column.hh b/lily/include/note-column.hh
index 805b969bbc1f5d278474977b405109a0650f0c88..3c2eb7568e60f084cae277416fb4bfd5794f95f5 100644 (file)
--- a/lily/include/note-column.hh
+++ b/lily/include/note-column.hh
@@ -9,36 +9,24 @@
 
 #ifndef NOTE_COLUMN_HH
 #define NOTE_COLUMN_HH
+
 #include "item.hh"
-#include "script-column.hh"
+#include "head-column.hh"
 
 /** a struct for treating a group of noteheads (noteheads, stem
-  (chord) and scripts ) as a single entity.  */
-class Note_column : public Script_column {
+  (chord) and scripts) as a single entity.  */
+class Note_column : public Head_column {
 protected:
-    virtual void do_pre_processing();
-    virtual void do_substitute_dependency(Score_elem*,Score_elem*);
-public:
-        /// link to the stem. For setting default direction
-    Stem * stem_l_;
+  virtual void do_pre_processing();
 
-    bool h_shift_b_;
+public:
+  bool h_shift_b_;
     
-    Link_array<Note_head> head_l_arr_;
-    Interval_t<int> head_positions_interval()const;
-
-    /** The relative position of the "voice" containing this
-      chord. Normally this would be the same as the stem direction,
-      but rests do not have stems.  */
-    int dir_i_;
-   
+  Interval_t<int> head_positions_interval() const;
         
-    NAME_MEMBERS();
-    Note_column();
-    void add(Note_head *);
-    void add(Stem *);
-    void sort();
-    void add(Script* s) { Script_column::add(s);}
+  DECLARE_MY_RUNTIME_TYPEINFO;
+  Note_column();
+  void sort();
 };
 
 #endif // NOTE_COLUMN_HH