lilypond-0.0.14

diff --git a/hdr/melodicstaff.hh b/hdr/melodicstaff.hh
index c908f1dcb0344d250387d4486636cc9c7c6b75d6..733eae3fef8d9fd1ee6a18b380039bae44950abd 100644 (file)
--- a/hdr/melodicstaff.hh
+++ b/hdr/melodicstaff.hh
@@ -17,7 +17,7 @@ struct Melodic_staff : public Simple_staff
 
     virtual Rest *get_rest(Rest_req *rq);
     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, int bot);

diff --git a/hdr/rhythmstaff.hh b/hdr/rhythmstaff.hh
index b402584fde3c94c3c5a03c5af031a950d11870cf..2c099afa0bc329803181506889c520b24efd20c6 100644 (file)
--- a/hdr/rhythmstaff.hh
+++ b/hdr/rhythmstaff.hh
@@ -19,7 +19,6 @@ struct Rhythmic_staff : public Simple_staff
     virtual Stem *get_stem(Stem_req *rq);
     virtual Notehead * get_notehead(Note_req *rq, int b);   
     virtual void set_output(PScore *);
-    virtual Rhythmic_staff*clone()const;
 };
 
 #endif // RHYTHMSTAF_HH

diff --git a/src/melodicstaff.cc b/src/melodicstaff.cc
index a0c0b2e46f53e6628398f344c810d318f0894d33..b6d1ea59d7f23deb897046b240ace1686d9667fa 100644 (file)
--- a/src/melodicstaff.cc
+++ b/src/melodicstaff.cc
@@ -66,17 +66,12 @@ Melodic_staff::get_rest(Rest_req*rq)
 {
     Rest*r = Simple_staff::get_rest(rq);
     if (rq->balltype <= 2)
-       r->translate(Offset(0, NO_LINES * paper()->internote()));
+       r->translate(Offset(0, (NO_LINES-1) * paper()->internote()));
     return r;
 }
 
-Melodic_staff*
-Melodic_staff::clone()const
-{
-    return new Melodic_staff(*this);
-}
-
-Local_key_item* Melodic_staff::get_local_key_item()
+Local_key_item*
+Melodic_staff::get_local_key_item()
 {
     return new Local_key_item(-2);
 }