X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fstaff-symbol-referencer.cc;h=354c402f792be242cf8d248b726b7fd359bf8f68;hb=b230681e00b54adaba3846209250505a0d0b41f0;hp=9fb2b2bc0dd9df2125b0796f076ac35f5b255d52;hpb=9b40d66187029df3dca86fc5ecc65f64db315a48;p=lilypond.git diff --git a/lily/staff-symbol-referencer.cc b/lily/staff-symbol-referencer.cc index 9fb2b2bc0d..354c402f79 100644 --- a/lily/staff-symbol-referencer.cc +++ b/lily/staff-symbol-referencer.cc @@ -1,173 +1,171 @@ -/* +/* staff-symbol-referencer.cc -- implement Staff_symbol_referencer - + source file of the GNU LilyPond music typesetter - - (c) 1999--2000 Han-Wen Nienhuys - */ + + (c) 1999--2004 Han-Wen Nienhuys +*/ #include #include "staff-symbol-referencer.hh" #include "staff-symbol.hh" #include "paper-def.hh" +#include "libc-extension.hh" -bool -Staff_symbol_referencer::has_interface (Score_element*e) -{ - return unsmob_element (e->get_elt_property ("staff-symbol")) - || gh_number_p (e->get_elt_property ("staff-position")); -} int -Staff_symbol_referencer::line_count (Score_element*me) +Staff_symbol_referencer::line_count (Grob *me) { - Score_element *st = staff_symbol_l (me); - return st ? Staff_symbol::line_count (st) : 0; + Grob *st = get_staff_symbol (me); + return st ? Staff_symbol::line_count (st) : 0; } bool -Staff_symbol_referencer::on_staffline (Score_element*me) +Staff_symbol_referencer::on_staffline (Grob *me) { - return on_staffline (me, (int) position_f (me)); + return on_staffline (me, (int) rint (get_position (me))); } bool -Staff_symbol_referencer::on_staffline (Score_element*me, int pos) +Staff_symbol_referencer::on_staffline (Grob *me, int pos) { - int sz = line_count (me)-1; + int sz = line_count (me) - 1; return ((pos + sz) % 2) == 0; } -Score_element* -Staff_symbol_referencer::staff_symbol_l (Score_element*me) +Grob* +Staff_symbol_referencer::get_staff_symbol (Grob *me) { - SCM st = me->get_elt_property ("staff-symbol"); - return unsmob_element(st); + SCM st = me->get_property ("staff-symbol"); + return unsmob_grob (st); } Real -Staff_symbol_referencer::staff_space (Score_element*me) +Staff_symbol_referencer::staff_space (Grob *me) { - Score_element * st = staff_symbol_l (me); + Grob *st = get_staff_symbol (me); if (st) return Staff_symbol::staff_space (st); - else if (me->pscore_l_ && me->paper_l ()) - return me->paper_l ()->get_var ("staffspace"); - - return 0.0; + return 1.0; } +Real +Staff_symbol_referencer::line_thickness (Grob *me) +{ + Grob *st = get_staff_symbol (me); + if (st) + return Staff_symbol::get_line_thickness (st); + return me->get_paper ()->get_dimension (ly_symbol2scm ("linethickness")); +} Real -Staff_symbol_referencer::position_f (Score_element*me) +Staff_symbol_referencer::get_position (Grob *me) { - Real p =0.0; - Score_element * st = staff_symbol_l (me); - Score_element * c = st ? me->common_refpoint (st, Y_AXIS) : 0; + Real p = 0.0; + Grob *st = get_staff_symbol (me); + Grob *c = st ? me->common_refpoint (st, Y_AXIS) : 0; if (st && c) { Real y = me->relative_coordinate (c, Y_AXIS) - st->relative_coordinate (c, Y_AXIS); p += 2.0 * y / Staff_symbol::staff_space (st); + return p; } - else - { - SCM pos = me->get_elt_property ("staff-position"); - if (gh_number_p (pos)) - return gh_scm2double (pos); - } - - return p; + + return robust_scm2double (me->get_property ("staff-position"), p); +} + +int +Staff_symbol_referencer::get_rounded_position (Grob*me) +{ + return int (rint (get_position (me))); } +LY_DEFINE (ly_grob_staff_position, "ly:grob-staff-position", + 1, 0,0, (SCM sg), + "Return the Y-position of @var{sg} relative to the staff.") +{ + Grob *g = unsmob_grob (sg); + SCM_ASSERT_TYPE (g, sg, SCM_ARG1, __FUNCTION__, "grob"); + Real pos = Staff_symbol_referencer::get_position (g); -/* - should use offset callback! - */ -MAKE_SCHEME_CALLBACK(Staff_symbol_referencer,callback,2); + if (fabs (rint (pos) -pos) < 1e-6) // ugh. + return scm_int2num ((int) my_round (pos)); + else + return scm_make_real (pos); +} + + +/* should use offset callback! */ +MAKE_SCHEME_CALLBACK (Staff_symbol_referencer,callback,2); SCM -Staff_symbol_referencer::callback (SCM element_smob, SCM ) +Staff_symbol_referencer::callback (SCM element_smob, SCM) { - Score_element *me = unsmob_element (element_smob); + Grob *me = unsmob_grob (element_smob); - - SCM pos = me->get_elt_property ("staff-position"); - Real off =0.0; - if (gh_number_p (pos)) + SCM pos = me->get_property ("staff-position"); + Real off = 0.0; + if (ly_c_number_p (pos)) { Real space = Staff_symbol_referencer::staff_space (me); - off = gh_scm2double (pos) * space/2.0; + off = ly_scm2double (pos) * space / 2.0; + me->set_property ("staff-position", scm_int2num (0)); } - me->set_elt_property ("staff-position", gh_double2scm (0.0)); - - return gh_double2scm (off); + return scm_make_real (off); } - /* - - This sets the position relative to the center of the staff symbol. - - The function is hairy, because it can be callled in two situations: - - 1. There is no staff yet; we must set staff-position - - 2. There is a staff, and perhaps someone even applied a - translate_axis (). Then we must compensate for the translation - - In either case, we set a callback to be sure that our new position - will be extracted from staff-position - - */ +/* This sets the position relative to the center of the staff symbol. + +The function is hairy, because it can be callled in two situations: + +1. There is no staff yet; we must set staff-position + +2. There is a staff, and perhaps someone even applied a +translate_axis (). Then we must compensate for the translation + +In either case, we set a callback to be sure that our new position +will be extracted from staff-position */ + void -Staff_symbol_referencer::set_position (Score_element*me,Real p) +Staff_symbol_referencer::set_position (Grob *me, Real p) { - Score_element * st = staff_symbol_l (me); - if (st && me->common_refpoint(st, Y_AXIS)) + Grob *st = get_staff_symbol (me); + if (st && me->common_refpoint (st, Y_AXIS)) { - Real oldpos = position_f (me); - me->set_elt_property ("staff-position", gh_double2scm (p - oldpos)); + Real oldpos = get_position (me); + me->set_property ("staff-position", scm_make_real (p - oldpos)); } else - { - me->set_elt_property ("staff-position", - gh_double2scm (p)); + me->set_property ("staff-position", scm_make_real (p)); - } - - if (me->has_offset_callback_b (Staff_symbol_referencer::callback_proc, Y_AXIS)) - return ; - - me->add_offset_callback (Staff_symbol_referencer::callback_proc, Y_AXIS); + if (!me->has_offset_callback (Staff_symbol_referencer::callback_proc, + Y_AXIS)) + me->add_offset_callback (Staff_symbol_referencer::callback_proc, Y_AXIS); } -/* - half of the height, in staff space. - */ +/* Half of the height, in staff space, i.e. 2.0 for a normal staff. */ Real -Staff_symbol_referencer::staff_radius (Score_element*me) +Staff_symbol_referencer::staff_radius (Grob *me) { - return (line_count (me) -1) / 2; + return (line_count (me) - 1) / 2.0; } - int -compare_position (Score_element *const &a, Score_element * const &b) +compare_position (Grob *const &a, Grob *const &b) { - return sign (Staff_symbol_referencer::position_f((Score_element*)a) - - Staff_symbol_referencer::position_f((Score_element*)b)); + return sign (Staff_symbol_referencer::get_position ((Grob*)a) + - Staff_symbol_referencer::get_position ((Grob*) b)); } - -void -Staff_symbol_referencer::set_interface (Score_element * e) -{ - if (!gh_number_p (e->get_elt_property ("staff-position"))) - e->set_elt_property ("staff-position", gh_double2scm (0.0)); - - e->add_offset_callback (Staff_symbol_referencer::callback_proc, Y_AXIS); -} +ADD_INTERFACE (Staff_symbol_referencer,"staff-symbol-referencer-interface", + "An object whose Y position is meant relative to a staff " + "symbol. " + "These usually have @code{Staff_symbol_referencer::callback} " + "in their @code{Y-offset-callbacks}. " + , + "staff-position");