Run `make grand-replace'.

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

diff --git a/lily/include/staff-spacing.hh b/lily/include/staff-spacing.hh
index 9b3010facd31c74b11229d10b21d9811c4c8714c..4e02adc73d5ecd2a6432a5ec49028b650e728d81 100644 (file)
--- a/lily/include/staff-spacing.hh
+++ b/lily/include/staff-spacing.hh
@@ -3,22 +3,24 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2001--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2001--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef STAFF_SPACING_HH
 #define STAFF_SPACING_HH
 
 #include "lily-proto.hh"
+#include "grob-interface.hh"
+#include "spring.hh"
 
 class Staff_spacing
 {
-public:
-  static void next_notes_correction (Grob *, Grob *, Real *, Real *);
-  static void next_note_correction (Grob *, Grob *, Interval, Real*, Real *);
-  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 *);
 
+public:
+  DECLARE_GROB_INTERFACE();
+  static Spring get_spacing (Grob *, Grob *right_col);
   static Interval bar_y_positions (Grob *);
 };