lilypond-0.0.10

diff --git a/hdr/melodicstaff.hh b/hdr/melodicstaff.hh
index b447102de6ab4b6abc2172469dd5bebc699a7f33..d97bfb17f8b1bf9fc36d5c83a583dc82270b0401 100644 (file)
--- a/hdr/melodicstaff.hh
+++ b/hdr/melodicstaff.hh
@@ -17,9 +17,10 @@ struct Melodic_staff : public Simple_staff
 
     virtual void set_output(PScore *);
     virtual Melodic_staff*clone()const;
-
+    virtual Item* get_TYPESET_item(Command*);
     virtual Stem * get_stem(Stem_req *rq);
-    virtual Notehead * get_notehead(Note_req *rq);
+    virtual Notehead * get_notehead(Note_req *rq, int bot);
+    virtual Local_key_item* get_local_key_item();
 };
 
 #endif // MELODICSTAFF_HH

diff --git a/hdr/rhythmstaff.hh b/hdr/rhythmstaff.hh
index 46c35107d260949962a4147412e0475a0f9eccf8..b402584fde3c94c3c5a03c5af031a950d11870cf 100644 (file)
--- a/hdr/rhythmstaff.hh
+++ b/hdr/rhythmstaff.hh
@@ -17,7 +17,7 @@ struct Rhythmic_staff : public Simple_staff
     
     virtual Item *get_TYPESET_item(Command*);    
     virtual Stem *get_stem(Stem_req *rq);
-    virtual Notehead * get_notehead(Note_req *rq);   
+    virtual Notehead * get_notehead(Note_req *rq, int b);   
     virtual void set_output(PScore *);
     virtual Rhythmic_staff*clone()const;
 };

diff --git a/hdr/simplestaff.hh b/hdr/simplestaff.hh
index c5c025a1660aabcb881ca9b097cdcbcb077467ff..e4c600ba1b4503a843d96730382c93654cd36fb7 100644 (file)
--- a/hdr/simplestaff.hh
+++ b/hdr/simplestaff.hh
@@ -7,9 +7,11 @@
 #ifndef SIMPLESTAFF_HH
 #define SIMPLESTAFF_HH
 
+#include "key.hh"
 #include "stcol.hh"
 #include "staff.hh"
 #include "swalker.hh"
+
 /*
    mega-stupido staffs and cols: they do notes one at each moment.   
    */
@@ -24,9 +26,12 @@ struct Simple_column : Staff_column {
     Beam_req *beam_;
     Simple_staff* staff_;
 
+    
     /****************/
 
-    virtual void typeset_item(Item *, int=1);
+    void typeset_item(Item *, int=1);
+
+    void typeset_item_directional(Item *, int dir, int=1);
 
     Molecule *create_command_mol(Command *com);
 
@@ -47,9 +52,10 @@ struct Simple_staff : Staff {
     
     virtual Item *get_TYPESET_item(Command*);
     virtual Stem *get_stem(Stem_req *rq)=0;
-    virtual Notehead *get_notehead(Note_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 *);
+    virtual Local_key_item* get_local_key_item();
 
     void process_commands( PCursor<Command*> &where);
     virtual void walk();
@@ -57,21 +63,6 @@ struct Simple_staff : Staff {
     Simple_staff();
 };
 
-struct Simple_walker: Staff_walker {
-    Stem *stem_;
-    svec<Notehead *>noteheads;
-    Beam *beam_;
-    
-    /****************/
-    
-    virtual void process_command(Command*);
-    virtual void process_requests();
-    Simple_walker(Simple_staff*);
-    Simple_column *col();
-    Simple_staff *staff();
-};
-
-
 #endif // SIMPLESTAFF_HH
 
 

diff --git a/src/rhythmstaff.cc b/src/rhythmstaff.cc
index e584254bfd21dd60a457354f9edd9f1e569d934d..c9a7831c1b373fedb672c6d554bb916ecf78af15 100644 (file)
--- a/src/rhythmstaff.cc
+++ b/src/rhythmstaff.cc
@@ -17,14 +17,17 @@ Rhythmic_staff::set_output(PScore*ps)
 Item *
 Rhythmic_staff::get_TYPESET_item(Command *com)
 {
+    if (com->args[0] == "KEY" || com->args[0] == "CLEF")
+       return 0;
     Item *i = Simple_staff::get_TYPESET_item(com);
+    if (!i) return 0;
     i->translate(Offset(0,
                        -score_->paper_->standard_height()/2));
     return i;
 }
 
 Notehead*
-Rhythmic_staff::get_notehead(Note_req *rq)
+Rhythmic_staff::get_notehead(Note_req *rq, int)
 {
     int b = rq->rhythmic()->balltype;
     int d = rq->rhythmic()->dots;