release: 0.0.15

[lilypond.git] / hdr / simplestaff.hh

diff --git a/hdr/simplestaff.hh b/hdr/simplestaff.hh
index e4c600ba1b4503a843d96730382c93654cd36fb7..faf1002d53a01dc03874e2a0ad851ee95e35ddc0 100644 (file)
--- a/hdr/simplestaff.hh
+++ b/hdr/simplestaff.hh
@@ -22,15 +22,16 @@ struct Simple_staff;
 struct Simple_column : Staff_column {
 
     svec<Rhythmic_req *> notes;
+    svec<Slur_req *> slurs;
     Stem_req *stem_;
+    Real stem_requester_len;
     Beam_req *beam_;
     Simple_staff* staff_;
 
     
     /****************/
-
+    Slur_req  * find_slur(Voice *);
     void typeset_item(Item *, int=1);
-
     void typeset_item_directional(Item *, int dir, int=1);
 
     Molecule *create_command_mol(Command *com);
@@ -51,7 +52,7 @@ struct Simple_staff : Staff {
     Staff_column*create_col(Score_column*);
     
     virtual Item *get_TYPESET_item(Command*);
-    virtual Stem *get_stem(Stem_req *rq)=0;
+    virtual Stem *get_stem(Stem_req *rq, Real)=0;
     virtual Notehead *get_notehead(Note_req *rq, int b)=0;
     virtual Rest *get_rest(Rest_req *rq);
     virtual void set_output(PScore *);