lilypond-0.0.34

diff --git a/hdr/complexstaff.hh b/hdr/complexstaff.hh
index 5a605d475e8fbb043e9807fb5a58cd19023946fd..b7d0c714d9cdbc008dc74fbc477a25a9c6cdc769 100644 (file)
--- a/hdr/complexstaff.hh
+++ b/hdr/complexstaff.hh
@@ -12,19 +12,14 @@
 #include "stcol.hh"
 #include "staff.hh"
 #include "staffwalker.hh"
-#include "complexcolumn.hh"
 
-
-/// Complex  staff: one voicegroup  at a time
+/// 
 struct Complex_staff : Staff {
-    /// indirection to the PStaff.
-    PStaff *pstaff_l_;
 
     /* *************** */
-    Staff_column*create_col();    
+
     virtual void set_output(PScore *);
     virtual Staff_walker *get_walker_p();
-    Complex_staff();
 };
 
 #endif // COMPLEXSTAF_HH

diff --git a/hdr/lyricstaff.hh b/hdr/lyricstaff.hh
index f7166bfc99b491e8694743389a75dd5fa090c6bc..fb88c5e5aa0c1d8174fd2113616b1710ca84c2ea 100644 (file)
--- a/hdr/lyricstaff.hh
+++ b/hdr/lyricstaff.hh
@@ -13,12 +13,8 @@
   Hungarian prefix lstaff
  */
 struct Lyric_staff : Staff {
-    PStaff* pstaff_l_;
-
-    Staff_column* create_col();
     virtual void set_output(PScore *);
     virtual Staff_walker *get_walker_p();
-    Lyric_staff();
 };
 
 #endif // LYRICSTAFF_HH

diff --git a/hdr/lyricwalker.hh b/hdr/lyricwalker.hh
index f89be762496e79b687d5723bc9fad8cae87cbe82..40ef06d97291cb9e20b023ee6c51e38adfea511e 100644 (file)
--- a/hdr/lyricwalker.hh
+++ b/hdr/lyricwalker.hh
@@ -10,7 +10,6 @@
 #include "proto.hh"
 #include "grouping.hh"
 #include "staffwalker.hh"
-#include "lyriccolumn.hh"
 
 /// a simple walker which collects words, and then print them, first on top
 struct Lyric_walker: Staff_walker {
@@ -20,7 +19,6 @@ struct Lyric_walker: Staff_walker {
     virtual void process_requests();
     
     Lyric_walker(Lyric_staff* lstaff_l);
-    Lyric_column* lcol_l();
     Lyric_staff* lstaff_l();
 };
 

diff --git a/hdr/stcol.hh b/hdr/stcol.hh
index 613dffb7583ba727792cab70c382d9df2b2f05a8..b6ecdb18a6408010eae75e1f9a8a6c5193950d56 100644 (file)
--- a/hdr/stcol.hh
+++ b/hdr/stcol.hh
@@ -12,8 +12,14 @@
 
 /// store simultaneous requests
 class Staff_column {
+
     Staff_column(Staff_column const&);
+
 public:
+    Array<Request*> musicalreq_l_arr_;
+    Array<Request*> commandreq_l_arr_;
+    Staff * staff_l_;
+
     /// fields to collect timing data vertically.
     Array<Timing_req*> timing_req_l_arr_;
     Score_column *musical_column_l_, *command_column_l_;
@@ -26,12 +32,13 @@ public:
     void set_cols(Score_column *c1, Score_column *c2);
     void add(Voice_element*ve);
     void OK() const;
-    virtual ~Staff_column();
-
-
+    ~Staff_column();
+    void typeset_breakable_items(Array<Item *> &pre_p_arr,
+                                Array<Item *> &nobreak_p_arr,
+                                Array<Item *> &post_p_arr);
+    void typeset_musical_item(Item *i);
 protected:
-    virtual void setup_one_request(Request*)=0;
-
+     void setup_one_request(Request*);
 };
 
 

diff --git a/src/barreg.cc b/src/barreg.cc
index 566b9d58a587993c462b9a50b50093c4e3be7b9d..9a10f913b5f0c8e438c11e5fcf9f62f4c05c1aa2 100644 (file)
--- a/src/barreg.cc
+++ b/src/barreg.cc
@@ -10,7 +10,6 @@
 #include "bar.hh"
 #include "commandrequest.hh"
 #include "complexwalker.hh"
-#include "complexcolumn.hh"
 #include "sccol.hh"