Run grand replace for 2015.

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

diff --git a/lily/include/staff-spacing.hh b/lily/include/staff-spacing.hh
index 6180e102026aa4f86902a10c9cf633deeb3f6059..521be99d19c88538069321c1ad6e36a3de446d0c 100644 (file)
--- a/lily/include/staff-spacing.hh
+++ b/lily/include/staff-spacing.hh
@@ -1,9 +1,20 @@
 /*
-  staff-spacing.hh -- declare Staff_spacing
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 2001--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c) 2001--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 STAFF_SPACING_HH
@@ -16,12 +27,11 @@
 class Staff_spacing
 {
   static Real optical_correction (Grob *, Grob *, Interval);
-  static Real left_stickout (Grob *, Grob *);
-  static Real next_notes_correction (Grob *, Grob *, Real, Real);
+  static Real next_notes_correction (Grob *, Grob *);
 
 public:
-  DECLARE_GROB_INTERFACE();
-  static Spring get_spacing_params (Grob *);
+  DECLARE_GROB_INTERFACE ();
+  static Spring get_spacing (Grob *, Grob *, Real);
   static Interval bar_y_positions (Grob *);
 };