lilypond-0.0.26

diff --git a/hdr/melodicstaff.hh b/hdr/melodicstaff.hh
index e3a5ff1f6184a3bfcaac76d4d638b00b486ce0a3..cec73517d72bdcfa4b9f5d32279c62fa60ff21b4 100644 (file)
--- a/hdr/melodicstaff.hh
+++ b/hdr/melodicstaff.hh
@@ -19,7 +19,7 @@ struct Melodic_staff : public Simple_staff
     virtual void set_output(PScore *);
 
     virtual Item* get_TYPESET_item(Command*);
-    virtual Stem * get_stem(Stem_req *rq,Moment);
+    virtual Stem * get_stem(Stem_req *rq);
     virtual Notehead * get_notehead(Note_req *rq, int bot);
     virtual Local_key_item* get_local_key_item();
 };

diff --git a/hdr/rhythmstaff.hh b/hdr/rhythmstaff.hh
index 741be45e787c3e55fe0354e6262616b6925d849e..0508224a3a6f71f1ed6e0ec305d990de43345fbb 100644 (file)
--- a/hdr/rhythmstaff.hh
+++ b/hdr/rhythmstaff.hh
@@ -16,7 +16,7 @@ struct Rhythmic_staff : public Simple_staff
     /****************/
     
     virtual Item *get_TYPESET_item(Command*);    
-    virtual Stem *get_stem(Stem_req *rq,Moment);
+    virtual Stem *get_stem(Stem_req *rq);
     virtual Notehead * get_notehead(Note_req *rq, int b);   
     virtual void set_output(PScore *);
 };

diff --git a/hdr/simplestaff.hh b/hdr/simplestaff.hh
index 531f994d6e8594ca0b84a0ae111b2a45e1d085b8..f0ff1679e2571133a300c9e409ed7737db1f7fdd 100644 (file)
--- a/hdr/simplestaff.hh
+++ b/hdr/simplestaff.hh
@@ -34,7 +34,6 @@ struct Simple_column : Staff_column {
     Beam_req *beam_;
     Simple_staff* staff_l_;
     Text_req *text_;
-    Lyric_req* lreq_p_;
     
     /****************/
     Slur_req  * find_slur(Voice *);
@@ -44,7 +43,7 @@ struct Simple_column : Staff_column {
     Molecule *create_command_mol(Command *com);
 
     void take_request(Request *rq);   
-    virtual void process_requests();
+    virtual void setup_requests();
 
     Simple_column(Score_column*s,Simple_staff*rs);
 };
@@ -59,7 +58,7 @@ struct Simple_staff : Staff {
     Staff_column*create_col(Score_column*);
     
     virtual Item *get_TYPESET_item(Command*);
-    virtual Stem *get_stem(Stem_req *rq, Moment)=0;
+    virtual Stem *get_stem(Stem_req *rq)=0;
     virtual Notehead *get_notehead(Note_req *rq, int b)=0;
     virtual Rest *get_rest(Rest_req *rq);
     virtual void set_output(PScore *);