Run grand replace for 2015.

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

diff --git a/lily/include/note-column.hh b/lily/include/note-column.hh
index 60c2668890eef9f07aa3ea50a68484295f298042..cd09b076afe2d36942c425ee0f9344c1e5e16b55 100644 (file)
--- a/lily/include/note-column.hh
+++ b/lily/include/note-column.hh
@@ -1,9 +1,20 @@
 /*
-  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--2007 Han-Wen Nienhuys <hanwen@xs4all.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
@@ -12,7 +23,6 @@
 #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.
 
@@ -24,19 +34,19 @@ public:
   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 Direction static_dir (Grob *);
-  static void translate_rests (Grob *me, int dy);
   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 set_dotcol (Grob *me, Grob *);
   static void add_head (Grob *me, Grob *);
   static bool has_rests (Grob *me);
-  DECLARE_GROB_INTERFACE();
+  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