X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fspacing-spanner.hh;h=72848b898f7b8d6ae51174920c16cafff5a5f158;hb=b76907a5a0c3663895350205e29c7462db4b2b45;hp=73d8da023d37f1a2528cd2808dec2d102bb5928c;hpb=94189ec2b8da6d7e89dc619c646a927adead9b19;p=lilypond.git

diff --git a/lily/include/spacing-spanner.hh b/lily/include/spacing-spanner.hh
index 73d8da023d..72848b898f 100644
--- a/lily/include/spacing-spanner.hh
+++ b/lily/include/spacing-spanner.hh
@@ -1,29 +1,45 @@
-/*   
-  spacing-spanner.hh -- declare Spacing_spanner
-  
+/*
+  spacing-spanner.hh -- declare Spacing spanner
+
   source file of the GNU LilyPond music typesetter
-  
-  (c) 1999--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-  
- */
+
+  (c) 2005--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
+*/
 
 #ifndef SPACING_SPANNER_HH
 #define SPACING_SPANNER_HH
 
-#include "spanner.hh"
+#include "lily-proto.hh"
+#include "rational.hh"
+#include "std-vector.hh"
+#include "grob-interface.hh"
+#include "spring.hh"
 
 class Spacing_spanner
 {
+private:
+  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,
+				     Spacing_options const *options);
+  static Real default_bar_spacing (Grob *, Grob *, Grob *, Moment);
+  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  *);
+  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 bool fills_measure (Grob *, Item *, Item *);
 public:
-  static void set_interface (Grob*);
-  static void do_measure (Grob*,Link_array<Grob>) ;
-
-  DECLARE_SCHEME_CALLBACK(set_springs, (SCM ));
-  static Real stem_dir_correction (Grob*,Grob*,Grob*)  ;
-  static Real default_bar_spacing (Grob*,Grob*,Grob*,Moment)  ;
-  static Real note_spacing (Grob*,Grob*,Grob*,Moment)  ;
-  static Real get_duration_space (Grob*,Moment dur, Moment shortest) ;
+  static vector<Grob*> get_columns (Grob *me);
+  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));
+  DECLARE_GROB_INTERFACE();
 };
 
 #endif /* SPACING_SPANNER_HH */
-