Merge branch 'vertaal'

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

diff --git a/lily/include/spacing-spanner.hh b/lily/include/spacing-spanner.hh
index f8161292fed10cfac0b5bac89918c111f8e91ee3..7d46f78e1ce2b93151378fb37e4febe6f9638bfa 100644 (file)
--- a/lily/include/spacing-spanner.hh
+++ b/lily/include/spacing-spanner.hh
@@ -10,29 +10,18 @@
 #define SPACING_SPANNER_HH
 
 #include "lily-proto.hh"
-#include "lily-guile.hh"
 #include "rational.hh"
-
-struct Spacing_options
-{
-  bool packed_;
-  bool stretch_uniformly_;
-  bool float_nonmusical_columns_;
-  Rational global_shortest_;
-  Real increment_;
-  Real shortest_duration_space_;
-
-  void init ();
-  void init_from_grob (Grob *me);
-  Real get_duration_space (Moment d, bool *) const;
-};
+#include "std-vector.hh"
+#include "grob-interface.hh"
 
 /*
   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,
@@ -43,16 +32,18 @@ public:
   static Real default_bar_spacing (Grob *, Grob *, Grob *, Moment);
   static Real note_spacing (Grob *, Grob *, Grob *, Spacing_options const *, bool *);
   static Real get_duration_space (Moment dur, Spacing_options const *, bool *);
-  static Rational find_shortest (Grob *, Link_array<Grob> const &);
-  static Rational effective_shortest_duration (Grob *me, Link_array<Grob> const &all);
+  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 *, Link_array<Grob> *cols, Spacing_options const *);
-  static void set_explicit_neighbor_columns (Link_array<Grob> const &cols);
-  static void set_implicit_neighbor_columns (Link_array<Grob> const &cols);
-  static void generate_springs (Grob *me, Link_array<Grob> const &cols, Spacing_options const *);
+  static void prune_loose_columns (Grob *, vector<Grob*> *cols, Spacing_options const *);
+  static void set_explicit_neighbor_columns (vector<Grob*> const &cols);
+  static void set_implicit_neighbor_columns (vector<Grob*> const &cols);
+  static void generate_springs (Grob *me, vector<Grob*> const &cols, Spacing_options const *);
   static void musical_column_spacing (Grob *, Item *, Item *, Spacing_options const *);
+  static vector<Grob*> get_columns (Spanner *me);
+
   DECLARE_SCHEME_CALLBACK (set_springs, (SCM));
-  static bool has_interface (Grob *);
+  DECLARE_SCHEME_CALLBACK (calc_common_shortest_duration, (SCM));
+  DECLARE_GROB_INTERFACE();
 };
 
 #endif /* SPACING_SPANNER_HH */