From: fred Date: Sun, 24 Mar 2002 19:40:47 +0000 (+0000) Subject: lilypond-0.0.65 X-Git-Tag: release/1.5.59~4869 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=6a2f8cbc8f0eee4a671993096f4ce8211bd0e5dc;p=lilypond.git lilypond-0.0.65 --- diff --git a/lily/include/crescendo.hh b/lily/include/crescendo.hh index 915094e1dc..72ff2c1d1b 100644 --- a/lily/include/crescendo.hh +++ b/lily/include/crescendo.hh @@ -1,7 +1,7 @@ /* crescendo.hh -- declare Crescendo - source file of the LilyPond music typesetter + source file of the GNU LilyPond music typesetter (c) 1997 Han-Wen Nienhuys */ @@ -16,7 +16,6 @@ The hairpin symbol. (cresc) */ class Crescendo : public Spanner , public Staff_side { - public: int grow_dir_i_; @@ -26,10 +25,13 @@ public: /// if there is a dynamic at the end, make the sign smaller. bool left_dyn_b_; Crescendo(); -private: - Spanner* do_break_at( PCol*, PCol*) const; - Molecule*brew_molecule_p()const; +protected: + SPANNER_CLONE(Crescendo) + virtual Molecule*brew_molecule_p()const; NAME_MEMBERS(Crescendo); + +private: + }; #endif // CRESCENDO_HH diff --git a/lily/include/staff-sym.hh b/lily/include/staff-sym.hh index 852771b79e..c3a49dfc57 100644 --- a/lily/include/staff-sym.hh +++ b/lily/include/staff-sym.hh @@ -1,7 +1,7 @@ /* staffsym.hh -- declare Staff_symbol - source file of the LilyPond music typesetter + source file of the GNU LilyPond music typesetter (c) 1997 Han-Wen Nienhuys */ @@ -21,14 +21,15 @@ class Staff_symbol : public Spanner int no_lines_i_; public: + void set_extent(PCol* p1, PCol* p2); NAME_MEMBERS(Staff_symbol); Staff_symbol(int lines); Real inter_note_f()const; int steps_i()const; protected: + SPANNER_CLONE(Staff_symbol) virtual Molecule* brew_molecule_p() const; virtual void do_print()const; - virtual Spanner *do_break_at( PCol *c1, PCol *c2) const; }; #endif // STAFFSYM_HH