X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fnote-column.hh;h=edf8b969d199b6e5261e38f64b15a2b5e8d0c68b;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=b6562ed83b6bdf3ec8159a24f9376e0d24c8dae8;hpb=d8018dfc750f1dee8e1ee78a5d5f51b06d4c8348;p=lilypond.git

diff --git a/lily/include/note-column.hh b/lily/include/note-column.hh
index b6562ed83b..edf8b969d1 100644
--- a/lily/include/note-column.hh
+++ b/lily/include/note-column.hh
@@ -1,44 +1,42 @@
 /*
   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--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
-
 #ifndef NOTE_COLUMN_HH
 #define NOTE_COLUMN_HH
-#include "item.hh"
-#include "interval.hh"
+
+#include "grob-interface.hh"
+#include "lily-proto.hh"
+
 
 /** a struct for treating a group of noteheads (noteheads, stem
-  (chord) and scripts ) as a single entity.  */
-class Note_column : public Item {
-    virtual  Interval do_height()const;
-    virtual void do_print() const ;
-    virtual void do_pre_processing();
-    virtual Interval do_width()const;
+    (chord) and scripts) as a single entity.
+
+    UGR. Junkme.  refpoint should be the notehead, dir should come from stem.
+*/
+class Note_column
+{
 public:
-    bool h_shift_b_;
-    Stem * stem_l_;
-    Array<Script *> script_l_arr_;
-    bool rest_b_;
-    Array<Notehead*> head_l_arr_;
-    
-    /** 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);
-    Note_column();
-    void add(Notehead *);
-    void add(Stem *);
-    virtual void translate(Offset);
-    void sort();
-    void add(Script *);
+  static bool shift_less (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 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 add_head (Grob *me, Grob *);
+  static bool has_rests (Grob *me);
+  static Grob *dot_column (Grob *me);
+  static Interval cross_staff_extent (Grob *me, Grob *refp);
+  DECLARE_GROB_INTERFACE();
+
+  static Item *get_stem (Grob *);
 };
+
 #endif // NOTE_COLUMN_HH