From 90e8dc8aa30c9d1cb22fa588d1d74c90644ebd8b Mon Sep 17 00:00:00 2001 From: fred Date: Tue, 26 Mar 2002 23:24:07 +0000 Subject: [PATCH] lilypond-1.3.67 --- lily/include/slur.hh | 9 ++++----- lily/include/tie.hh | 12 ++++-------- lily/include/tuplet-spanner.hh | 4 ++-- 3 files changed, 10 insertions(+), 15 deletions(-) diff --git a/lily/include/slur.hh b/lily/include/slur.hh index 3176d4b6bb..e37761e8a5 100644 --- a/lily/include/slur.hh +++ b/lily/include/slur.hh @@ -23,21 +23,20 @@ public: static SCM brew_molecule (SCM); SCM member_brew_molecule () const; - virtual Array get_encompass_offset_arr () const; + Array get_encompass_offset_arr () const; Bezier get_curve () const; - virtual Direction get_default_dir () const; + Direction get_default_dir () const; SCM member_after_line_breaking (); static SCM after_line_breaking (SCM); - virtual void do_add_processing (); Array get_rods () const; - Offset get_attachment (Direction dir) const; + Offset get_attachment (Direction dir, Score_element**common) const; private: void de_uglyfy (Slur_bezier_bow* bb, Real default_height); void set_extremities (); void set_control_points (); - Offset encompass_offset (Note_column const* )const; + Offset encompass_offset (Score_element *col,Score_element**common)const; }; #endif // SLUR_HH diff --git a/lily/include/tie.hh b/lily/include/tie.hh index bf6f386fc4..92a2b24719 100644 --- a/lily/include/tie.hh +++ b/lily/include/tie.hh @@ -23,16 +23,12 @@ public: void set_head (Direction, Item*head_l); VIRTUAL_COPY_CONS(Score_element); - Note_head* head (Direction) const; + Rhythmic_head* head (Direction) const; Real position_f () const; - static SCM brew_molecule (SCM); - - - virtual Direction get_default_dir() const; - - + static SCM brew_molecule (SCM); + Direction get_default_dir() const; SCM member_brew_molecule () const; - virtual Array get_encompass_offset_arr () const; + Array get_encompass_offset_arr () const; Bezier get_curve () const; /* diff --git a/lily/include/tuplet-spanner.hh b/lily/include/tuplet-spanner.hh index 42019434b7..90496b424e 100644 --- a/lily/include/tuplet-spanner.hh +++ b/lily/include/tuplet-spanner.hh @@ -34,8 +34,8 @@ public: SCM member_brew_molecule () const; VIRTUAL_COPY_CONS(Score_element); - virtual void do_add_processing (); - virtual Direction get_default_dir () const; + + Direction get_default_dir () const; }; #endif // Tuplet_spanner_HH -- 2.39.5