X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fstaff-symbol-referencer.hh;h=179bae828f6905339b16ffa2757e67b9fb87fa12;hb=5747f46bc458bfca59d5ba97e62b0709c2d36221;hp=ed6156c62c78b1a1acae8423c1906d6e10cf8226;hpb=1c846b2c2348b4e0ca4a3c2e8fb267047ba2d203;p=lilypond.git diff --git a/lily/include/staff-symbol-referencer.hh b/lily/include/staff-symbol-referencer.hh index ed6156c62c..179bae828f 100644 --- a/lily/include/staff-symbol-referencer.hh +++ b/lily/include/staff-symbol-referencer.hh @@ -1,7 +1,7 @@ /* This file is part of LilyPond, the GNU music typesetter. - Copyright (C) 1999--2011 Han-Wen Nienhuys + Copyright (C) 1999--2012 Han-Wen Nienhuys LilyPond is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -30,9 +30,10 @@ class Staff_symbol_referencer { public: - DECLARE_GROB_INTERFACE(); + DECLARE_GROB_INTERFACE (); static bool ugly_hack (Grob *); static void set_position (Grob *, Real); + static void pure_set_position (Grob *, Real); DECLARE_SCHEME_CALLBACK (callback, (SCM element)); /** @@ -46,12 +47,19 @@ public: static bool on_staff_line (Grob *, int); static int line_count (Grob *); static Real get_position (Grob *); + static Real pure_get_position (Grob *); static Real staff_radius (Grob *); static int get_rounded_position (Grob *); - static Interval extent_in_staff (Grob *); + static int pure_get_rounded_position (Grob *); + static Interval extent_in_staff (Grob *); + +private: + static void internal_set_position (Grob *, Real, bool); + static Real internal_get_position (Grob *, bool); }; int compare_position (Grob *const &, Grob *const &); bool position_less (Grob *const &, Grob *const &); +bool pure_position_less (Grob *const &, Grob *const &); #endif /* STAFF_SYMBOL_REFERENCER_HH */