Merge branch 'master' of git://git.sv.gnu.org/lilypond

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

diff --git a/lily/include/spacing-spanner.hh b/lily/include/spacing-spanner.hh
index 719d8d1fb329f0a555e1cc98cc31594fcccfa16b..7d46f78e1ce2b93151378fb37e4febe6f9638bfa 100644 (file)
--- a/lily/include/spacing-spanner.hh
+++ b/lily/include/spacing-spanner.hh
@@ -10,32 +10,18 @@
 #define SPACING_SPANNER_HH
 
 #include "lily-proto.hh"
-#include "lily-guile.hh"
 #include "rational.hh"
 #include "std-vector.hh"
 #include "grob-interface.hh"
 
-struct Spacing_options
-{
-  bool packed_;
-  bool stretch_uniformly_;
-  bool float_nonmusical_columns_;
-  bool float_grace_columns_;
-  Rational global_shortest_;
-  Real increment_;
-  Real shortest_duration_space_;
-
-  Spacing_options();
-  void init_from_grob (Grob *me);
-  Real get_duration_space (Rational d, bool *) const;
-};
-
 /*
   TODO: prune to public interface.
 */
 class Spacing_spanner
+
 {
 public:
+  static void set_distances_for_loose_col (Grob *me, Grob *c, Drul_array<Item *> next_door, Spacing_options const *);
   static void generate_pair_spacing (Grob *me,
                                     Paper_column *l, Paper_column *r,
                                     Paper_column *nextr,