Run grand replace for 2015.

[lilypond.git] / lily / include / spacing-interface.hh

diff --git a/lily/include/spacing-interface.hh b/lily/include/spacing-interface.hh
index 08e404e4e742ad9500fef7d1f8e6ca9c1d0ce250..2ade005a22260363ec25471987646e3a780986f7 100644 (file)
--- a/lily/include/spacing-interface.hh
+++ b/lily/include/spacing-interface.hh
@@ -1,9 +1,20 @@
 /*
-  spacing-interface.hh -- declare Spacing_interface
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 2002--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c) 2002--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/>.
 */
 #include "grob-interface.hh"
 #include "lily-proto.hh"
@@ -13,12 +24,15 @@
 
 struct Spacing_interface
 {
-  static Real minimum_distance (Grob *me);
-  static Drul_array<Item*> note_columns (Grob *me);
-  static Item* right_column (Grob *me);
-  static Item* left_column (Grob *me);
+  static Real minimum_distance (Grob *me, Grob *right_col);
+  static vector<Item *> right_note_columns (Grob *me);
+  static vector<Item *> left_note_columns (Grob *me);
+  static Item *right_column (Grob *me);
+  static Item *left_column (Grob *me);
+  static Drul_array<Skyline> skylines (Grob *me, Grob *right_col);
+  static Grob *extremal_break_aligned_grob (Grob *me, Direction, Direction, Interval *);
 
-  DECLARE_GROB_INTERFACE();
+  DECLARE_GROB_INTERFACE ();
 };
 
 #endif /* SPACING_INTERFACE_HH */