lilypond-0.0.32

diff --git a/hdr/stcol.hh b/hdr/stcol.hh
index 0ae5244d8a6751d9c8a366bb81f69f2ad26c9bd3..613dffb7583ba727792cab70c382d9df2b2f05a8 100644 (file)
--- a/hdr/stcol.hh
+++ b/hdr/stcol.hh
@@ -11,34 +11,27 @@
 #include "moment.hh"
 
 /// store simultaneous requests
-struct Staff_column {
-
-    Score_column *score_column_l_;
-
-    /// fields to collect data vertically.
-    Array<Voice_element *> v_elts;
-
-    /// idem
-    Staff_commands_at *staff_commands_p_;
+class Staff_column {
+    Staff_column(Staff_column const&);
+public:
+    /// fields to collect timing data vertically.
+    Array<Timing_req*> timing_req_l_arr_;
+    Score_column *musical_column_l_, *command_column_l_;
 
-    Time_description *tdescription_;
-    
     /* *************** */
     
-    Staff_column(Score_column*); 
-    bool musical_b() const;
+    Staff_column();
+
     Moment when() const;
+    void set_cols(Score_column *c1, Score_column *c2);
     void add(Voice_element*ve);
     void OK() const;
-    /*
-      VIRTUAL
-    */
+    virtual ~Staff_column();
 
-    virtual void setup_requests()=0;
 
-    virtual ~Staff_column();
-private:
-    Staff_column(Staff_column const&);
+protected:
+    virtual void setup_one_request(Request*)=0;
+
 };