X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fnote-column.hh;h=1760eb3474eab8065bd857c042b605c02f97f6e6;hb=3fcd24d93d7e76cd01ef9ee13ed91ed4e106986c;hp=b9fc8952bdc10c03eea517d5977ae2a2a5303b0b;hpb=afa5829cd270e1b0c616b7ba5c5e6cdc0e920e5f;p=lilypond.git

diff --git a/lily/include/note-column.hh b/lily/include/note-column.hh
index b9fc8952bd..1760eb3474 100644
--- a/lily/include/note-column.hh
+++ b/lily/include/note-column.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--1998 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 
@@ -11,41 +11,31 @@
 #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_print () const;
-  virtual void do_substitute_dependency (Score_element*,Score_element*);
+ (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;
-  //  Interval width () const;
-
-  void translate_rests(int dy);
-        
+  static int shift_compare (Grob *const &, Grob*const&);
+  static Direction dir (Grob*me);
+  static Grob * accidentals (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*);
   
-  Note_column ();
-  void set_stem (Stem*);
-  void set_dotcol (Dot_column*);
-  void add_head (Rhythmic_head*);
-  bool rest_b () const;
-  virtual void add_script (Script*s);
-  void sort ();
+  static Item *get_stem (Grob*);
 };
 
 #endif // NOTE_COLUMN_HH