X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fstaff-spacing.hh;h=11a81a998eef5027c792d3735ab314f70b1620d8;hb=1d7689f7135892cb16448f43356b9cb758cb6685;hp=b4241f2800b323363efc57cd57cc7d0a44b8dae4;hpb=87eedcd59f4082cb0841528ad5bc82cb1d1191e3;p=lilypond.git

diff --git a/lily/include/staff-spacing.hh b/lily/include/staff-spacing.hh
index b4241f2800..11a81a998e 100644
--- 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
@@ -11,15 +22,15 @@
 
 #include "lily-proto.hh"
 #include "grob-interface.hh"
+#include "spring.hh"
 
 class Staff_spacing
 {
-public:
-  static void next_notes_correction (Grob *, Grob *, Real, Real, Real *, Real *);
-  static void next_note_correction (Grob *, Grob *, Interval, Real, Real, Real*, Real *, int *);
-  DECLARE_GROB_INTERFACE();
-  static void get_spacing_params (Grob *, Real *, Real *);
+  static Real optical_correction (Grob *, Grob *, Interval);
+  static Real next_notes_correction (Grob *, Grob *);
 
+public:
+  static Spring get_spacing (Grob *, Grob *, Real);
   static Interval bar_y_positions (Grob *);
 };