release: 1.1.38

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

diff --git a/lily/include/note-column.hh b/lily/include/note-column.hh
index 23aff88156d2add2d3cc84b22debf9786bce3060..db18a621c9adbdb4e8191169be3e47c0a49ee709 100644 (file)
--- 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--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 
@@ -11,40 +11,38 @@
 #define NOTE_COLUMN_HH
 
 #include "item.hh"
-#include "script-column.hh"
+#include "axis-group-item.hh"
 
 /** a struct for treating a group of noteheads (noteheads, stem
   (chord) and scripts) as a single entity.  */
-class Note_column : public Script_column {
+class Note_column : public Axis_group_item {
 protected:
-  virtual void do_pre_processing();
+
   virtual void do_print () const;
-  virtual void do_substitute_dependency (Score_element*,Score_element*);
+  virtual void do_substitute_element_pointer (Score_element*,Score_element*);
 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.  
+    but rests do not have stems.
+
+    JUNKME.v
     */
-  Direction dir_;
-  bool h_shift_b_;
+  Direction dir () const;
   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;
+  //  Interval width () const;
 
   void translate_rests(int dy);
-        
   
   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 ();
 };