X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fnote-column.hh;h=cd09b076afe2d36942c425ee0f9344c1e5e16b55;hb=47db9a3883d726ca53e2133a3b2298f78dd6a32e;hp=7bf51956d5144f9cd1e92810a563b3413f0eb755;hpb=0af2486a28f1c60b9de929a9101964d880927e54;p=lilypond.git

diff --git a/lily/include/note-column.hh b/lily/include/note-column.hh
index 7bf51956d5..cd09b076af 100644
--- a/lily/include/note-column.hh
+++ b/lily/include/note-column.hh
@@ -1,50 +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--2015 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 "grob-interface.hh"
+#include "lily-proto.hh"
 
 /** a struct for treating a group of noteheads (noteheads, stem
-  (chord) and scripts) as a single entity.
-
-  UGR. Junkme.  refpoint should be the notehead, dir should come from stem.
+    (chord) and scripts) as a single entity.
 
+    UGR. Junkme.  refpoint should be the notehead, dir should come from stem.
 */
-class Note_column : public Item
+class Note_column
 {
 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;
-
-
-  static Slice head_positions_interval(Score_element* me) ;
-  static Direction static_dir (Score_element*);
-  void translate_rests(int dy);
-  Score_element * first_head ()const;
-  Interval rest_dim ()const ;
-  Note_column (SCM);
-  void set_stem (Score_element*);
-  void set_dotcol (Score_element*);
-  void add_head (Score_element*);
-  bool rest_b () const;
-
-  static bool has_interface (Score_element*);
-
-  Item *stem_l()const;
+  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 Interval calc_main_extent (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