X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fstaff-spacing.hh;h=d8be90d0418a2f5ee8b5910b6b49871bb3550d11;hb=151661b40b650bab2be7087d07b21012ca826432;hp=a7ef8bf723e00ce5b7f3b99c03f2b6855a218474;hpb=48189914f51eb9c2f1c14931c72d267a25d5f812;p=lilypond.git

diff --git a/lily/include/staff-spacing.hh b/lily/include/staff-spacing.hh
index a7ef8bf723..d8be90d041 100644
--- a/lily/include/staff-spacing.hh
+++ b/lily/include/staff-spacing.hh
@@ -1,26 +1,38 @@
-/*   
-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--2010 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-(c)  2001--2003 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 STAFF_SPACING_HH
 #define STAFF_SPACING_HH
 
 #include "lily-proto.hh"
+#include "grob-interface.hh"
+#include "spring.hh"
 
 class Staff_spacing
 {
-public:
-  static Real next_notes_correction (Grob*, Grob*);
-  static Real next_note_correction (Grob*, Grob*, Interval);  
-  static bool has_interface (Grob*);
-  static void get_spacing_params (Grob*,Real*,Real*);
+  static Real optical_correction (Grob *, Grob *, Interval);
+  static Real next_notes_correction (Grob *, Grob *);
 
-  static Interval bar_y_positions (Grob*);
+public:
+  DECLARE_GROB_INTERFACE();
+  static Spring get_spacing (Grob *, Grob *right_col);
+  static Interval bar_y_positions (Grob *);
 };
 
 #endif /* STAFF_SPACING_HH */