X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fnote-column.hh;h=d2138e9fcdce2bdecae5808791ee528eec62ebb0;hb=0ce3e31fb6d24e40ecf45fc8d4d04df6f307a7db;hp=ba118fcbde3129209796df8302fb1c476113df91;hpb=7c9b553acad88d5cd62461989f0f20652dc04dda;p=lilypond.git

diff --git a/lily/include/note-column.hh b/lily/include/note-column.hh
index ba118fcbde..d2138e9fcd 100644
--- a/lily/include/note-column.hh
+++ b/lily/include/note-column.hh
@@ -1,41 +1,52 @@
 /*
-  note-column.hh -- declare Note_column
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the LilyPond music typesetter
+  Copyright (C) 1997--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
-*/
+  LilyPond is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
 
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
+*/
 
 #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 {
-    /// link to the stem. For setting default direction
-    Stem * stem_l_;
-    void do_pre_processing();
+    (chord) and scripts) as a single entity.
+
+    UGR. Junkme.  refpoint should be the notehead, dir should come from stem.
+*/
+class Note_column
+{
 public:
-    bool h_shift_b_;
-    
-    Array<Notehead*> head_l_arr_;
-    Interval_t<int> head_positions_interval()const;
-
-    /** 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.  */
-    int dir_i_;
-   
-        
-    NAME_MEMBERS(Note_column);
-    Note_column();
-    void add(Notehead *);
-    void add(Stem *);
-    void sort();
-    void add(Script* s) { Script_column::add(s);}
+  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 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