lilypond-0.0.76

diff --git a/lily/include/p-col.hh b/lily/include/p-col.hh
index 87f15841643f06f08dc4aff847b28447450194c8..2b2266fb7afab91f0f3409448683f61574f0b578 100644 (file)
--- a/lily/include/p-col.hh
+++ b/lily/include/p-col.hh
@@ -44,7 +44,7 @@ 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.. 
@@ -66,8 +66,8 @@ public:
     bool breakable_b()const;
     
     Interval width() const;
-    ~PCol();
-    PCol(PCol * parent);
+    virtual ~PCol();
+    PCol();
 
     /**
       which col comes first?.
@@ -79,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:
     

diff --git a/lily/include/score-column.hh b/lily/include/score-column.hh
index b8daacd1761f9ae5950a7f2e591ddc3a2fe2a8de..396fc0312b93841a216e0261d7e03185e4c23d39 100644 (file)
--- a/lily/include/score-column.hh
+++ b/lily/include/score-column.hh
@@ -13,7 +13,7 @@
 #include "lily-proto.hh"
 #include "varray.hh"
 #include "moment.hh"
-
+#include "p-col.hh"
 
 /**
 
@@ -25,17 +25,13 @@
 
     */
 
-class Score_column {
+class Score_column : public PCol {
     friend class Score;
     friend class Score_engraver;
 
     bool musical_b_;
     Moment when_;
-    void set_breakable();
 public:
-    /// indirection to column
-    PCol * pcol_l_;
-
     /// length of notes/rests in this column
     Array<Moment> durations;
     
@@ -43,21 +39,15 @@ public:
 
     Moment when() {  return when_; }
     Score_column(Moment when);       
-    static int compare(Score_column & c1, Score_column &c2);
     void add_duration(Moment );
     void preprocess();
-    bool breakable_b();
     bool musical_b() { return musical_b_; }
-    bool used_b();
     void print() const;
+    virtual void do_set_breakable();
 
 
 };
 
-#include "compare.hh"
-
-instantiate_compare(Score_column&, Score_column::compare);
-
 #endif // SCORE_COLUMN_HH