X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fstaff-symbol-referencer.hh;h=51fe44fc466fdd3a26280b294e6823c28119be77;hb=091e3f8f91e1eff1e81f25896ca3736be5560149;hp=1b4c096b8ee4b38fa0351a360191342f4f2e649b;hpb=a68f287dcc2277fb7943923426c459dde0426598;p=lilypond.git diff --git a/lily/include/staff-symbol-referencer.hh b/lily/include/staff-symbol-referencer.hh index 1b4c096b8e..51fe44fc46 100644 --- a/lily/include/staff-symbol-referencer.hh +++ b/lily/include/staff-symbol-referencer.hh @@ -3,13 +3,14 @@ source file of the GNU LilyPond music typesetter - (c) 1999--2006 Han-Wen Nienhuys + (c) 1999--2007 Han-Wen Nienhuys */ #ifndef STAFF_SYMBOL_REFERENCER_HH #define STAFF_SYMBOL_REFERENCER_HH -#include "grob.hh" +#include "grob-interface.hh" +#include "lily-proto.hh" /** A notation object that needs access to variables of the staff (no @@ -18,7 +19,7 @@ class Staff_symbol_referencer { public: - static bool has_interface (Grob *); + DECLARE_GROB_INTERFACE(); static bool ugly_hack (Grob *); static void set_position (Grob *, Real); DECLARE_SCHEME_CALLBACK (callback, (SCM element)); @@ -30,14 +31,13 @@ public: static Real line_thickness (Grob *); static Real staff_space (Grob *); static Grob *get_staff_symbol (Grob *); - static bool on_line (Grob *); static bool on_line (Grob *, int); static bool on_staff_line (Grob *, int); - static bool on_staff_line (Grob *); static int line_count (Grob *); static Real get_position (Grob *); static Real staff_radius (Grob *); static int get_rounded_position (Grob *); + static Interval extent_in_staff (Grob *); }; int compare_position (Grob *const &, Grob *const &);\