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

diff --git a/lily/include/note-column.hh b/lily/include/note-column.hh
index 32eec6af31..cd09b076af 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 GNU LilyPond music typesetter
+  Copyright (C) 1997--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c) 1997--2005 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:
-  static int shift_compare (Grob *const &, Grob*const&);
-  static Direction dir (Grob*me);
-  static Grob * accidentals (Grob*me);
-  static Slice head_positions_interval (Grob* me);
-  static Direction static_dir (Grob*);
-  static void translate_rests (Grob*me, int dy);
-  static Grob *first_head (Grob*me);
-  static Grob *get_rest (Grob*me);
-  static void set_stem (Grob*me, Grob*);
-  static void set_dotcol (Grob*me, Grob*);
-  static void add_head (Grob*me, Grob*);
-  static bool has_rests (Grob*me);
-  static bool has_interface (Grob*);
-  
-  static Item *get_stem (Grob*);
+  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