release: 0.1.13

[lilypond.git] / lily / include / colhpos.hh

diff --git a/lily/include/colhpos.hh b/lily/include/colhpos.hh
index a1407366eaf6833a7dffba62cf3ad57c66f4f336..56f70c8506672a2bc45bb966337fb1c6cc8d5bc5 100644 (file)
--- a/lily/include/colhpos.hh
+++ b/lily/include/colhpos.hh
@@ -6,23 +6,31 @@
 
 #ifndef COLHPOS_HH
 #define COLHPOS_HH
+
 #include "varray.hh"
 #include "lily-proto.hh"
 
-typedef Array<PCol*>  Line_of_cols;
+typedef Array<Paper_column*>  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;
-
+    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 add (Paper_column*c);
     void print() const;
 };