X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fstaff-spacing.hh;h=9503c610ec4b59cb90094e6e29355e8d9cda8dc9;hb=834acb0fc9ecc4bf5e7726f5ed0229a52be0ae6a;hp=b4241f2800b323363efc57cd57cc7d0a44b8dae4;hpb=f9214bac21e9926dc3248416f58190c98c4167a9;p=lilypond.git

diff --git a/lily/include/staff-spacing.hh b/lily/include/staff-spacing.hh
index b4241f2800..9503c610ec 100644
--- a/lily/include/staff-spacing.hh
+++ b/lily/include/staff-spacing.hh
@@ -11,15 +11,16 @@
 
 #include "lily-proto.hh"
 #include "grob-interface.hh"
+#include "spring.hh"
 
 class Staff_spacing
 {
+  static Real optical_correction (Grob *, Grob *, Interval);
+  static Real next_notes_correction (Grob *, Grob *);
+
 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 Spring get_spacing (Grob *, Grob *right_col);
   static Interval bar_y_positions (Grob *);
 };