From: fred <fred>
Date: Sun, 24 Mar 2002 19:50:24 +0000 (+0000)
Subject: lilypond-0.1.1
X-Git-Tag: release/1.5.59~4316
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=850c0720b927f4c04deb6e1f34d293f89f24010e;p=lilypond.git

lilypond-0.1.1
---

diff --git a/lily/include/colhpos.hh b/lily/include/colhpos.hh
index a1407366ea..a8891ea004 100644
--- a/lily/include/colhpos.hh
+++ b/lily/include/colhpos.hh
@@ -6,21 +6,29 @@
 
 #ifndef COLHPOS_HH
 #define COLHPOS_HH
+
 #include "varray.hh"
 #include "lily-proto.hh"
 
 typedef Array<PCol*>  Line_of_cols;
 
 struct Col_hpositions {
+    Line_spacer * spacer_l_;
     bool ugh_b_;
     Line_of_cols error_col_l_arr_;
     Line_of_cols cols;
     Array<Real> config;
-    Real energy;
+    Real energy_f_;
+    bool satisfies_constraints_b_;
 
     /* ************** */
     void OK()const;
-
+    ~Col_hpositions();
+    void solve_line();
+    void approximate_solve_line();
+    /** generate a solution with no regard to idealspacings or
+      constraints.  should always work */
+    void stupid_solution();
     Col_hpositions();
     void add( PCol*c);
     void print() const;