lilypond-0.0.34

diff --git a/hdr/staff.hh b/hdr/staff.hh
index 74b7df13408e0122e47d12ae668005b9a85fcf5c..e45398e7893bcbe4a6ba890ffa58b422c84ff2e2 100644 (file)
--- a/hdr/staff.hh
+++ b/hdr/staff.hh
@@ -15,20 +15,21 @@
 
 /// base class for a collection of voices.
 class Staff {
-    Staff_column *get_col(Moment, PCursor<Staff_column*> * last= 0);
     Staff(const Staff&src);
     
     /// synchronous horizontal stuff
     IPointerList<Voice*> voice_list_;
+    Staff_column *get_col(Moment, PCursor<Staff_column*> * last= 0);
 
 public:
 
     /// runtime field
-    IPointerList<Staff_column*> cols;
+    IPointerList<Staff_column*> cols_;
 
     Score *score_l_;
     PScore *pscore_l_;
-
+    PStaff *pstaff_l_;
+    
     /* *************************************************************** */
 
     void add(const PointerList<Voice*> &s);
@@ -55,6 +56,6 @@ public:
     virtual Staff_walker *get_walker_p()=0;    
     virtual ~Staff() { }
 protected:
-    virtual Staff_column * create_col()=0;
+
 };
 #endif