X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fnote-column.hh;h=1760eb3474eab8065bd857c042b605c02f97f6e6;hb=7c62e4c7902481a8b6f1cea755fc30228f2c64c7;hp=b5af0185284e18a6bc6ed14b9d1352443548c155;hpb=56126108b2610f82bc7cafaac8741d1aeba1d34f;p=lilypond.git

diff --git a/lily/include/note-column.hh b/lily/include/note-column.hh
index b5af018528..1760eb3474 100644
--- a/lily/include/note-column.hh
+++ b/lily/include/note-column.hh
@@ -1,42 +1,41 @@
 /*
   note-column.hh -- declare Note_column
 
-  source file of the LilyPond music typesetter
+  source file of the GNU LilyPond music typesetter
 
-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 
 #ifndef NOTE_COLUMN_HH
 #define NOTE_COLUMN_HH
+
 #include "item.hh"
-#include "script-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 {
-    void do_pre_processing();
+ (chord) and scripts) as a single entity.
+
+  UGR. Junkme.  refpoint should be the notehead, dir should come from stem.
+
+*/
+class Note_column
+{
 public:
-        /// link to the stem. For setting default direction
-    Stem * stem_l_;
-
-    bool h_shift_b_;
-    
-    Array<Notehead*> 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_;
-   
-        
-    NAME_MEMBERS(Note_column);
-    Note_column();
-    void add(Notehead *);
-    void add(Stem *);
-    void sort();
-    void add(Script* s) { Script_column::add(s);}
+  static int shift_compare (Grob *const &, Grob*const&);
+  static Direction dir (Grob*me);
+  static Grob * accidentals (Grob*me);
+  static Slice head_positions_interval (Grob* me);
+  static Direction static_dir (Grob*);
+  static void translate_rests (Grob*me,int dy);
+  static Grob *first_head (Grob*me);
+  static Grob *get_rest (Grob*me);
+  static void set_stem (Grob*me,Grob*);
+  static void set_dotcol (Grob*me,Grob*);
+  static void add_head (Grob*me,Grob*);
+  static bool has_rests (Grob*me);
+  static bool has_interface (Grob*);
+  
+  static Item *get_stem (Grob*);
 };
 
 #endif // NOTE_COLUMN_HH