release: 1.0.15

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

diff --git a/lily/include/col-info.hh b/lily/include/col-info.hh
index 405712e99db1bc047d5cae34fa248f274dd492b6..3b412a321f4f128db6ba897b641b567f78ebe92f 100644 (file)
--- a/lily/include/col-info.hh
+++ b/lily/include/col-info.hh
@@ -1,9 +1,9 @@
 /*
-  col-info.hh -- declare Colinfo
+  col-info.hh -- declare Column_info
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 
@@ -13,20 +13,29 @@
 #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 {
+struct Column_info {
   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_;         
-  /* *************** */
-  Colinfo();
-  Colinfo (Paper_column *,Real const *);
+
+  Drul_array< Array<Spacer_rod> > rods_;
+  
+  Column_info();
+  Column_info (Paper_column *,Real const *);
 
   int rank_i () const;
   void print() const;