X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fnote-column.hh;h=c2723f0ba8d570759a5da8c9cf40717c3937499d;hb=2122a9643a5374edee7a02730b4945d298443afa;hp=df0876b598d7e17f41da28daa0ddd06e673755f7;hpb=fbb6d20e9f58d691ffe845284cbb4d8bacf9ca60;p=lilypond.git

diff --git a/lily/include/note-column.hh b/lily/include/note-column.hh
index df0876b598..c2723f0ba8 100644
--- a/lily/include/note-column.hh
+++ b/lily/include/note-column.hh
@@ -1,48 +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--2012 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c)  1997--2000 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 "axis-group-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.  */
-class Note_column : public Axis_group_item {
-protected:
-  virtual void after_line_breaking () ;
-public:
-
-  static int shift_compare (Note_column *const &, Note_column*const&);
-  
-  /** The relative position of the "voice" containing this
-    chord. Normally this would be the same as the stem direction,
-
-    JUNKME.
-    */
-  Direction dir () const;
+    (chord) and scripts) as a single entity.
 
-
-  Interval_t<int> head_positions_interval() const;
-  //  Interval width () const;
-
-  void translate_rests(int dy);
-  Note_head * first_head ()const;
-  Interval rest_dim ()const ;
-  Note_column ();
-  void set_stem (Stem*);
-  void set_dotcol (Dot_column*);
-  void add_head (Rhythmic_head*);
-  bool rest_b () const;
-
-  Stem *stem_l()const;
+    UGR. Junkme.  refpoint should be the notehead, dir should come from stem.
+*/
+class Note_column
+{
+public:
+  static bool shift_less (Grob *const &, Grob *const &);
+  static Direction dir (Grob *me);
+  static Grob *accidentals (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 *);
+  static Item *get_flag (Grob *);
 };
 
 #endif // NOTE_COLUMN_HH