release: 0.1.52

[lilypond.git] / lily / include / col-info.hh

diff --git a/lily/include/col-info.hh b/lily/include/col-info.hh
index 50944b6fc43d2f0f2cf66989c26dcc3218161c62..405712e99db1bc047d5cae34fa248f274dd492b6 100644 (file)
--- a/lily/include/col-info.hh
+++ b/lily/include/col-info.hh
@@ -13,11 +13,13 @@
 #include "lily-proto.hh"
 #include "pointer.hh"
 #include "interval.hh"
+#include "assoc.hh"
 
 /// helper struct for #Spacing_problem#
 struct Colinfo {
   Paper_column *pcol_l_;
   P<Real> fixpos_p_;
+  Assoc<int, Real> min_dists_assoc_;
   Interval width_;
   int rank_i_;
   /// did some tricks to make this column come out.
@@ -26,9 +28,10 @@ struct Colinfo {
   Colinfo();
   Colinfo (Paper_column *,Real const *);
 
+  int rank_i () const;
   void print() const;
-  bool fixed() const { return fixpos_p_.get_C();}
-  Real fixed_position() const { return *fixpos_p_; }
+  bool fixed_b() const ;
+  Real fixed_position() const ;
 };
 
 #endif // COL_INFO_HH