release: 1.1.38

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

diff --git a/lily/include/note-column.hh b/lily/include/note-column.hh
index 8fd5af02b115119ceb3aad9a9343cfca1aa53731..db18a621c9adbdb4e8191169be3e47c0a49ee709 100644 (file)
--- a/lily/include/note-column.hh
+++ b/lily/include/note-column.hh
@@ -11,13 +11,13 @@
 #define NOTE_COLUMN_HH
 
 #include "item.hh"
-#include "script-column.hh"
+#include "axis-group-item.hh"
 
 /** a struct for treating a group of noteheads (noteheads, stem
   (chord) and scripts) as a single entity.  */
-class Note_column : public Script_column {
+class Note_column : public Axis_group_item {
 protected:
-  virtual void do_pre_processing();
+
   virtual void do_print () const;
   virtual void do_substitute_element_pointer (Score_element*,Score_element*);
 public:
@@ -27,10 +27,9 @@ public:
 
     JUNKME.v
     */
-  Direction dir_;
+  Direction dir () const;
   Stem* stem_l_;
 
-
   Link_array<Note_head> head_l_arr_;
   Link_array<Rest> rest_l_arr_;
     
@@ -38,14 +37,12 @@ public:
   //  Interval width () const;
 
   void translate_rests(int dy);
-        
   
   Note_column ();
   void set_stem (Stem*);
   void set_dotcol (Dot_column*);
   void add_head (Rhythmic_head*);
   bool rest_b () const;
-  virtual void add_script (Script*s);
   void sort ();
 };