Run `make grand-replace'.

[lilypond.git] / lily / include / note-column.hh

diff --git a/lily/include/note-column.hh b/lily/include/note-column.hh
index 72790486601dce56caf1fe33417a296feefc9bb2..edf8b969d199b6e5261e38f64b15a2b5e8d0c68b 100644 (file)
--- a/lily/include/note-column.hh
+++ b/lily/include/note-column.hh
@@ -3,45 +3,40 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2002 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 (Grob *const &, Grob*const&);
-  
-  /** The relative position of the "voice" containing this
-    chord. Normally this would be the same as the stem direction,
-
-    JUNKME.
-    */
-
-  static Grob * accidentals (Grob*me);
-  static Direction dir (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 void set_stem (Grob*me,Grob*);
-  static void set_dotcol (Grob*me,Grob*);
-  static void add_head (Grob*me,Grob*);
-  static bool rest_b (Grob*me);
-  static bool has_interface (Grob*);
-  
-  static Item *stem_l (Grob*);
+  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