Merge branch 'master' of git+ssh://repo.or.cz/srv/git/lilypond

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

diff --git a/lily/include/spacing-spanner.hh b/lily/include/spacing-spanner.hh
index 1b7a86b10334603139f4e31188b611c964dde9c0..f39ea98bc30726fd2042cd670c1bf9e2f65f5bdb 100644 (file)
--- a/lily/include/spacing-spanner.hh
+++ b/lily/include/spacing-spanner.hh
@@ -12,19 +12,21 @@
 #include "lily-proto.hh"
 #include "lily-guile.hh"
 #include "rational.hh"
+#include "std-vector.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_;
 
-  void init ();
+  Spacing_options();
   void init_from_grob (Grob *me);
-  Real get_duration_space (Moment d, bool *) const;
+  Real get_duration_space (Rational d, bool *) const;
 };
 
 /*
@@ -43,15 +45,17 @@ 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));
+  DECLARE_SCHEME_CALLBACK (calc_common_shortest_duration, (SCM));
   static bool has_interface (Grob *);
 };