X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fspacing-spanner.hh;h=9193a187d476324cc4fa5332239d7078efc1d596;hb=9ae52034113dcfbbc98fd7a0f8075ca3ea2cf3c9;hp=3018cadebcfffdc4a375a4d6cdcd05edf8bda39d;hpb=16cb456cabf477f6d398ff731aa0f10b60913394;p=lilypond.git

diff --git a/lily/include/spacing-spanner.hh b/lily/include/spacing-spanner.hh
index 3018cadebc..9193a187d4 100644
--- a/lily/include/spacing-spanner.hh
+++ b/lily/include/spacing-spanner.hh
@@ -13,6 +13,7 @@
 #include "rational.hh"
 #include "std-vector.hh"
 #include "grob-interface.hh"
+#include "spring.hh"
 
 class Spacing_spanner
 {
@@ -23,7 +24,6 @@ private:
 				     Paper_column *nextr,
 				     Spacing_options const *options);
   static Real default_bar_spacing (Grob *, Grob *, Grob *, Moment);
-  static Real get_duration_space (Moment dur, Spacing_options const *, bool *);
   static Rational effective_shortest_duration (Grob *me, vector<Grob*> const &all);
   static void breakable_column_spacing (Grob *, Item *l, Item *r, Spacing_options const *);
   static void prune_loose_columns (Grob *, vector<Grob*> *cols, Spacing_options  *);
@@ -34,10 +34,8 @@ private:
   static bool fills_measure (Grob *, Item *, Item *);
 public:
   static vector<Grob*> get_columns (Grob *me);
-  static Real note_spacing (Grob *, Grob *, Grob *, Spacing_options const *, bool *);
-  static void standard_breakable_column_spacing (Grob *me, Item *l, Item *r,
-						 Real *fixed, Real *space,
-						 Spacing_options const *);
+  static Real note_spacing (Grob *, Grob *, Grob *, Spacing_options const *);
+  static Spring standard_breakable_column_spacing (Grob *me, Item *l, Item *r, Spacing_options const *);
   
   DECLARE_SCHEME_CALLBACK (set_springs, (SCM));
   DECLARE_SCHEME_CALLBACK (calc_common_shortest_duration, (SCM));