release: 0.1.57

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

diff --git a/lily/include/col-info.hh b/lily/include/col-info.hh
index 50944b6fc43d2f0f2cf66989c26dcc3218161c62..8e64f68d466be2e2268e552233852e705bec8780 100644 (file)
--- a/lily/include/col-info.hh
+++ b/lily/include/col-info.hh
@@ -13,22 +13,35 @@
 #include "lily-proto.hh"
 #include "pointer.hh"
 #include "interval.hh"
+#include "drul-array.hh"
+
+struct Spacer_rod {
+  Real distance_f_;
+  int other_idx_;
+  void print () const;
+};
+
 
 /// helper struct for #Spacing_problem#
 struct Colinfo {
   Paper_column *pcol_l_;
   P<Real> fixpos_p_;
+
   Interval width_;
   int rank_i_;
   /// did some tricks to make this column come out.
   bool ugh_b_;         
+
+  Drul_array< Array<Spacer_rod> > rods_;
+  
   /* *************** */
   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