release: 1.2.14

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

diff --git a/lily/include/col-info.hh b/lily/include/col-info.hh
index 36a2f73f721fa3d06a8b8ede55fec088ee228eb8..e5d93f4a57b88f23505d7af2f8b3a77b3062828f 100644 (file)
--- a/lily/include/col-info.hh
+++ b/lily/include/col-info.hh
@@ -1,9 +1,9 @@
 /*
-  col-info.hh -- declare 
+  col-info.hh -- declare Column_info
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 
@@ -13,24 +13,33 @@
 #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 {
-    PCol *pcol_l_;
-    P<Real> fixpos_p_;
-    Interval width;
-    int rank_i_;
-    /// did some tricks to make this column come out.
-    bool ugh_b_;               
-    /* *************** */
-    Colinfo();
-    Colinfo (PCol *,Real const *);
-
-    void print() const;
-    bool fixed() const { return fixpos_p_.get_C();}
-    Real fixed_position()const { return *fixpos_p_; }
-    Real minright() const { return width.right; }
-    Real minleft() const { return -width.left; }
+struct Column_info {
+  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_;
+
+  Column_info();
+  Column_info (Paper_column *,Real const *);
+
+  int rank_i () const;
+  void print() const;
+  bool fixed_b() const ;
+  Real fixed_position() const ;
 };
 
 #endif // COL_INFO_HH