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

diff --git a/lily/include/note-column.hh b/lily/include/note-column.hh
index b2be9b3479..edf8b969d1 100644
--- a/lily/include/note-column.hh
+++ b/lily/include/note-column.hh
@@ -3,47 +3,40 @@
 
   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 "script-column.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 Script_column {
-protected:
-  virtual void do_pre_processing();
-  virtual void do_print () const;
-  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:
-  /** 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.  
-    */
-  Direction dir_;
-  bool h_shift_b_;
-  Stem* stem_l_;
-
-
-  Link_array<Note_head> head_l_arr_;
-  Link_array<Rest> rest_l_arr_;
-    
-  Interval_t<int> head_positions_interval() const;
-  void translate_rests(int dy);
-        
-  DECLARE_MY_RUNTIME_TYPEINFO;
-  Note_column ();
-  void set (Stem*);
-  void set (Dot_column*);
-  void add (Rhythmic_head*);
-  bool rest_b () const;
-  virtual void add (Script*s);
-  void sort ();
+  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