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

diff --git a/lily/include/note-column.hh b/lily/include/note-column.hh
index 65dd50c2ab..edf8b969d1 100644
--- a/lily/include/note-column.hh
+++ b/lily/include/note-column.hh
@@ -3,44 +3,40 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
-
 #ifndef NOTE_COLUMN_HH
 #define NOTE_COLUMN_HH
 
-#include "item.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.
 
-  UGR. Junkme.  refpoint should be the notehead, dir should come from stem.
+/** a struct for treating a group of noteheads (noteheads, stem
+    (chord) and scripts) as a single entity.
 
+    UGR. Junkme.  refpoint should be the notehead, dir should come from stem.
 */
 class Note_column
 {
 public:
-  static int shift_compare (Score_element *const &, Score_element*const&);
-  
-  /** The relative position of the "voice" containing this
-    chord. Normally this would be the same as the stem direction,
-
-    JUNKME.
-    */
-
-  static Direction dir (Score_element*me);
-  static Slice head_positions_interval(Score_element* me);
-  static Direction static_dir (Score_element*);
-  static void translate_rests(Score_element*me,int dy);
-  static Score_element * first_head (Score_element*me);
-  static void set_stem (Score_element*me,Score_element*);
-  static void set_dotcol (Score_element*me,Score_element*);
-  static void add_head (Score_element*me,Score_element*);
-  static bool rest_b (Score_element*me);
-  static bool has_interface (Score_element*);
-  static void set_interface (Score_element*);
-  static Item *stem_l(Score_element*);
+  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