X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fspacing-spanner.hh;h=f39ea98bc30726fd2042cd670c1bf9e2f65f5bdb;hb=621e5fb6a5c3cb67c46082e561cffad691ead30c;hp=73fffccadd4b180b5531881f300056ac0af0531a;hpb=8097d28e1530571451dc9c73a6fe65b747aa92bd;p=lilypond.git

diff --git a/lily/include/spacing-spanner.hh b/lily/include/spacing-spanner.hh
index 73fffccadd..f39ea98bc3 100644
--- a/lily/include/spacing-spanner.hh
+++ b/lily/include/spacing-spanner.hh
@@ -3,8 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2005 Han-Wen Nienhuys <hanwen@xs4all.nl>
-
+  (c) 2005--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef SPACING_SPANNER_HH
@@ -13,44 +12,50 @@
 #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_;
-  
-  void init (Grob *me);
+  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 generate_pair_spacing (Grob *me,
 				     Paper_column *l, Paper_column *r,
 				     Paper_column *nextr,
-				     Spacing_options const *options);  
+				     Spacing_options const *options);
   static void standard_breakable_column_spacing (Grob *me, Item *l, Item *r,
 						 Real *fixed, Real *space,
-						 Spacing_options const*);
+						 Spacing_options const *);
   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 (Grob *, Moment dur, Rational shortest, bool *);
-  static Rational find_shortest (Grob *, Link_array<Grob> const &);
-  static Rational effective_shortest_duration (Grob *me, Link_array<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 musical_column_spacing (Grob *, Item *, Item *, Spacing_options const*);
+  static Real note_spacing (Grob *, Grob *, Grob *, Spacing_options const *, bool *);
+  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 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 *);
 };