From: fred <fred>
Date: Sun, 24 Mar 2002 20:08:01 +0000 (+0000)
Subject: lilypond-0.1.57
X-Git-Tag: release/1.5.59~3307
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=1672207eb41fb503139e9d706c5cd9f0d67da437;p=lilypond.git

lilypond-0.1.57
---

diff --git a/lily/col-info.cc b/lily/col-info.cc
index 9fa43ef8d3..769bc5ed72 100644
--- 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 405712e99d..8e64f68d46 100644
--- 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 *);