Fix a cyclic dependency.

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

diff --git a/lily/include/note-column.hh b/lily/include/note-column.hh
index 3065642be65f3b4d7592405aa7e782f7cfcbf870..be673ec611fed08fa2b4a3ddd2b4c956f47d91c0 100644 (file)
--- a/lily/include/note-column.hh
+++ b/lily/include/note-column.hh
@@ -1,33 +1,52 @@
 /*
-  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--2010 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 "head-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 Head_column {
-protected:
-    virtual 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_;
-    
-    Interval_t<int> head_positions_interval()const;
-        
-    NAME_MEMBERS();
-    Note_column();
-    virtual void set(Stem *);
-    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