release: 0.0.76

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

diff --git a/lily/include/p-col.hh b/lily/include/p-col.hh
index 11d1cc8cc06fea2da2bd1f6fcf43b72e39c3775e..2b2266fb7afab91f0f3409448683f61574f0b578 100644 (file)
--- a/lily/include/p-col.hh
+++ b/lily/include/p-col.hh
@@ -44,9 +44,10 @@ public:
     /** if lines are broken then this column x-coord #hpos# if not
       known, then hpos == -1.(ugh?)  */
 
-    Real hpos;                 // should use ptr?
+    Real hpos_f_;                      // should use ptr?
 
     bool error_mark_b_;
+    bool used_b_ ;             // manual override.. 
     
     PScore * pscore_l_;
 
@@ -56,6 +57,8 @@ public:
 
     /// does this column have items
     bool used_b() const;
+    bool breakpoint_b() const;
+    void clean_breakable_items();
     
     void add(Item *i);
 
@@ -63,8 +66,8 @@ public:
     bool breakable_b()const;
     
     Interval width() const;
-    ~PCol();
-    PCol(PCol * parent);
+    virtual ~PCol();
+    PCol();
 
     /**
       which col comes first?.
@@ -76,7 +79,8 @@ public:
     void set_rank(int);
 
     void OK() const;
-    void set_breakable();
+ void set_breakable();
+    virtual void do_set_breakable();
     void print()const;
 private: