X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fnote-column.hh;h=de440b31d3ee1c431fa9008865c20eca6e827335;hb=cb20a87a5875c0f9d4c7550e831db2d03bc9a41c;hp=8fd5af02b115119ceb3aad9a9343cfca1aa53731;hpb=74e65211d6cda3818a6d4891f1f1c31f457e94cd;p=lilypond.git

diff --git a/lily/include/note-column.hh b/lily/include/note-column.hh
index 8fd5af02b1..de440b31d3 100644
--- a/lily/include/note-column.hh
+++ b/lily/include/note-column.hh
@@ -1,52 +1,51 @@
 /*
-  note-column.hh -- declare Note_column
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 1997--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c)  1997--1999 Han-Wen Nienhuys <hanwen@cs.uu.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 {
-protected:
-  virtual void do_pre_processing();
-  virtual void do_print () const;
-  virtual void do_substitute_element_pointer (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.
-
-    JUNKME.v
-    */
-  Direction dir_;
-  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);
-        
-  
-  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 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