lilypond-0.1.57

diff --git a/lily/col-info.cc b/lily/col-info.cc
index 9fa43ef8d30f09257fd61f767e3481129299b28f..769bc5ed724849c79452d899e4fbb3ad2786b61a 100644 (file)
--- a/lily/col-info.cc
+++ b/lily/col-info.cc
@@ -19,6 +19,12 @@ Colinfo::print() const
     DOUT << "fixed at " << fixed_position()<<", ";
   assert (pcol_l_);
   DOUT << width_.str();
+  Direction d = LEFT;
+  do {
+    for (int i=0; i < rods_[d].size (); i++)
+      rods_[d][i].print ();
+  } while (flip (&d) != LEFT);
+  
   DOUT <<"}\n";
 #endif
 }
@@ -58,3 +64,9 @@ Colinfo::rank_i () const
 {
   return pcol_l_->rank_i ();
 }
+
+void
+Spacer_rod::print ()const
+{
+  DOUT << "Other " << other_idx_ << "dist = " << distance_f_ << '\n';
+}

diff --git a/lily/include/col-info.hh b/lily/include/col-info.hh
index 405712e99db1bc047d5cae34fa248f274dd492b6..8e64f68d466be2e2268e552233852e705bec8780 100644 (file)
--- a/lily/include/col-info.hh
+++ b/lily/include/col-info.hh
@@ -13,17 +13,27 @@
 #include "lily-proto.hh"
 #include "pointer.hh"
 #include "interval.hh"
-#include "assoc.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_;
-  Assoc<int, Real> min_dists_assoc_;
+
   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 *);