X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fnote-column.hh;h=1738e427e2aa3d76298f2e72aa1ed0da591a23a4;hb=01d84d552854fb399bd0e819502c6c2db2a1b214;hp=097079c7127f833270fa9a68d13027d0c55c031f;hpb=8aad615ea7bb31f49a0c2afc21eea5ff5de20437;p=lilypond.git

diff --git a/lily/include/note-column.hh b/lily/include/note-column.hh
index 097079c712..1738e427e2 100644
--- a/lily/include/note-column.hh
+++ b/lily/include/note-column.hh
@@ -11,41 +11,38 @@
 #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_dependency (Score_element*,Score_element*);
+  virtual void do_post_processing () ;
 public:
+
+  static int shift_compare (Note_column *const &, Note_column*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.  
+
+    JUNKME.
     */
-  Direction dir_;
-  bool h_shift_b_;
-  Stem* stem_l_;
+  Direction dir () const;
 
 
-  Link_array<Note_head> head_l_arr_;
-  Link_array<Rest> rest_l_arr_;
-    
   Interval_t<int> head_positions_interval() const;
   //  Interval width () const;
 
   void translate_rests(int dy);
-        
-  
+  Note_head * first_head ()const;
+  Interval rest_dim ()const ;
   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 ();
+
+  Stem *stem_l()const;
 };
 
 #endif // NOTE_COLUMN_HH