lilypond-0.0.21

diff --git a/hdr/linespace.hh b/hdr/linespace.hh
index 8a8742142c9a52deab4b4a34f2cbe3cad7375bcb..75f4b9fb742733d3322d8c880ab88ff434387ad7 100644 (file)
--- a/hdr/linespace.hh
+++ b/hdr/linespace.hh
@@ -4,18 +4,26 @@
 #include "glob.hh"
 #include "plist.hh"
 #include "vray.hh"
-#include "pcol.hh"
-#include "matrix.hh"
+#include "vector.hh"
+#include "interval.hh"
 
 /// helper struct for #Spacing_problem#
 struct Colinfo {
     const PCol *pcol_;
-    bool fixed;
-    Real fixpos;
+    const Real* fixpos;
+    Interval width;
+    
+    /****************/
     Colinfo();
+    void operator=(Colinfo const&);
+    Colinfo(Colinfo const&);
+    ~Colinfo();
+    Colinfo(const PCol*,const Real*);
     void print() const;
-    Real minright() const { return pcol_->width().right; }
-    Real minleft() const { return -pcol_->width().left; }
+    bool fixed() const { return fixpos;}
+    Real fixed_position()const { return *fixpos; }
+    Real minright() const { return width.right; }
+    Real minleft() const { return -width.left; }
 };
 
 

diff --git a/hdr/pcol.hh b/hdr/pcol.hh
index 1f3e15df3fd86d80db393398a232aa704f87e2ae..7da7c02cb262519a147362efc03b53057834f089 100644 (file)
--- a/hdr/pcol.hh
+++ b/hdr/pcol.hh
@@ -79,21 +79,4 @@ struct PCol {
 instantiate_compare(const PCol &, PCol::compare);
      
 
-/// ideal spacing between two columns
-struct Idealspacing {
-
-    /// the ideal distance
-    Real space;
-
-    /// Hooke's constant: how strong are the "springs" attached to columns
-    Real hooke;
-
-    /// the two columns
-    const PCol *left, *right;
-    
-    void print()const;
-    void OK() const ;
-    Idealspacing(const PCol *left,const PCol *right);    
-};
-
 #endif