Merge branch 'master' into nested-bookparts

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

diff --git a/lily/include/note-spacing.hh b/lily/include/note-spacing.hh
index dcc9b2fe5a4ba68866ccf77af8482533c35d10f9..a14c43c8b79860e1acdcc1b3d1d41ab028068184 100644 (file)
--- a/lily/include/note-spacing.hh
+++ b/lily/include/note-spacing.hh
@@ -11,13 +11,14 @@
 
 #include "grob-interface.hh"
 #include "lily-proto.hh"
+#include "spring.hh"
 
 class Note_spacing
 {
 public:
   DECLARE_GROB_INTERFACE();
 
-  static void get_spacing (Grob *me, Item *, Real, Real, Real *, Real *);
+  static Spring get_spacing (Grob *me, Item *, Real, Real);
   static void stem_dir_correction (Grob *me, Item *next_col, Real incr,
                                   Real *, Real *);
 };