X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fnote-column.hh;h=5085ee52ebf8a91287360b60726512b4c3487395;hb=3b7eb398f096a9291de36d7f8716c3cf43614a7f;hp=805b969bbc1f5d278474977b405109a0650f0c88;hpb=0d2593e4ef1f3d1eb6994223f1de8f6c8fbcd066;p=lilypond.git

diff --git a/lily/include/note-column.hh b/lily/include/note-column.hh
index 805b969bbc..5085ee52eb 100644
--- a/lily/include/note-column.hh
+++ b/lily/include/note-column.hh
@@ -3,42 +3,38 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c) 1997--2006 Han-Wen Nienhuys <hanwen@xs4all.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 {
-protected:
-    virtual void do_pre_processing();
-    virtual void do_substitute_dependency(Score_elem*,Score_elem*);
+    (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_;
-    
-    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_;
-   
-        
-    NAME_MEMBERS();
-    Note_column();
-    void add(Note_head *);
-    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 Grob *arpeggio (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