X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fstaff-symbol-referencer.cc;h=604eac7b3d837625d04012a2c9cb68aadb3e8006;hb=33f2e59ea0b2a1ba41e943b5afa29e5fee97ba94;hp=2c6a3a17bc5c1451621e4b683d8f1e227f681f27;hpb=2b0aa2c5bbb4af4e7d0d3c057de066dc1d6d6b8d;p=lilypond.git diff --git a/lily/staff-symbol-referencer.cc b/lily/staff-symbol-referencer.cc index 2c6a3a17bc..604eac7b3d 100644 --- a/lily/staff-symbol-referencer.cc +++ b/lily/staff-symbol-referencer.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999 Han-Wen Nienhuys + (c) 1999--2003 Han-Wen Nienhuys */ #include @@ -11,78 +11,170 @@ #include "staff-symbol-referencer.hh" #include "staff-symbol.hh" #include "paper-def.hh" -#include "dimension-cache.hh" +#include "libc-extension.hh" -Staff_symbol_referencer::Staff_symbol_referencer () + +int +Staff_symbol_referencer::line_count (Grob*me) { - staff_sym_l_ =0; - position_i_ =0; + Grob *st = get_staff_symbol (me); + return st ? Staff_symbol::line_count (st) : 0; } -void -Staff_symbol_referencer::do_substitute_element_pointer (Score_element *o, Score_element*n) +bool +Staff_symbol_referencer::on_staffline (Grob*me) { - if (staff_sym_l_ == o) - { - staff_sym_l_ = dynamic_cast (n); - } + return on_staffline (me, (int) rint (get_position (me))); } -int -Staff_symbol_referencer::lines_i () const +bool +Staff_symbol_referencer::on_staffline (Grob*me, int pos) { - return (staff_sym_l_) ? staff_sym_l_->no_lines_i_ : 5; + int sz = line_count (me)-1; + return ((pos + sz) % 2) == 0; } -void -Staff_symbol_referencer::set_staff_symbol (Staff_symbol*s) +Grob* +Staff_symbol_referencer::get_staff_symbol (Grob*me) { - staff_sym_l_ =s; - add_dependency (s); + SCM st = me->get_grob_property ("staff-symbol"); + return unsmob_grob (st); } -Staff_symbol* -Staff_symbol_referencer::staff_symbol_l () const +Real +Staff_symbol_referencer::staff_space (Grob*me) { - return staff_sym_l_; + Grob * st = get_staff_symbol (me); + if (st) + return Staff_symbol::staff_space (st); + + return 1.0; } Real -Staff_symbol_referencer::staff_line_leading_f () const +Staff_symbol_referencer::line_thickness (Grob*me) { - return (staff_sym_l_) ? staff_sym_l_->staff_line_leading_f_ : paper_l ()->get_var ("interline"); + Grob * st = get_staff_symbol (me); + if (st) + return Staff_symbol::get_line_thickness (st); + + return me->get_paper ()->get_realvar (ly_symbol2scm ("linethickness")); } Real -Staff_symbol_referencer::position_f () const +Staff_symbol_referencer::get_position (Grob*me) { - Real p = position_i_; - if (staff_sym_l_ ) + Real p =0.0; + Grob * st = get_staff_symbol (me); + Grob * c = st ? me->common_refpoint (st, Y_AXIS) : 0; + if (st && c) { - Graphical_element * c = common_refpoint (staff_sym_l_, Y_AXIS); - Real y = relative_coordinate (c, Y_AXIS) - staff_sym_l_->relative_coordinate (c, Y_AXIS); + Real y = me->relative_coordinate (c, Y_AXIS) + - st->relative_coordinate (c, Y_AXIS); - p += 2.0 * y / staff_line_leading_f (); + p += 2.0 * y / Staff_symbol::staff_space (st); + return p; } - return p; + + return robust_scm2double ( me->get_grob_property ("staff-position"), p); } +LY_DEFINE(ly_grob_staff_position, + "ly:grob-staff-position", + 1, 0,0, (SCM sg), + "Return the Y-position of this grob relative to the staff.") +{ + Grob * g = unsmob_grob (sg); -void -Staff_symbol_referencer::do_pre_processing () + SCM_ASSERT_TYPE (g, sg, SCM_ARG1, __FUNCTION__, "grob"); + Real pos = Staff_symbol_referencer::get_position (g); + + if (fabs (rint (pos) -pos) < 1e-6) // ugh. + return gh_int2scm ((int) my_round (pos)); + else + return gh_double2scm (pos); +} + + +/* + should use offset callback! + */ +MAKE_SCHEME_CALLBACK (Staff_symbol_referencer,callback,2); +SCM +Staff_symbol_referencer::callback (SCM element_smob, SCM) { - translate_axis (position_i_ * staff_line_leading_f () /2.0, Y_AXIS); - position_i_ =0; + Grob *me = unsmob_grob (element_smob); + + SCM pos = me->get_grob_property ("staff-position"); + Real off =0.0; + if (gh_number_p (pos)) + { + Real space = Staff_symbol_referencer::staff_space (me); + off = gh_scm2double (pos) * space/2.0; + me->set_grob_property ("staff-position", gh_int2scm (0)); + } + + return gh_double2scm (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 + + */ void -Staff_symbol_referencer::set_position (int p) +Staff_symbol_referencer::set_position (Grob*me,Real p) { - /* - UGH. Use position_f() as well. - */ - position_i_ = p; - + Grob * st = get_staff_symbol (me); + if (st && me->common_refpoint (st, Y_AXIS)) + { + Real oldpos = get_position (me); + me->set_grob_property ("staff-position", gh_double2scm (p - oldpos)); + } + else + { + me->set_grob_property ("staff-position", + gh_double2scm (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); +} + +/* + Half of the height, in staff space, i.e. 2.0 for a normal staff. +*/ +Real +Staff_symbol_referencer::staff_radius (Grob*me) +{ + return (line_count (me) -1) / 2.0; } + + +int +compare_position (Grob *const &a, Grob * const &b) +{ + return sign (Staff_symbol_referencer::get_position ((Grob*)a) - + Staff_symbol_referencer::get_position ((Grob*)b)); +} + +ADD_INTERFACE (Staff_symbol_referencer,"staff-symbol-referencer-interface", + "Object whose Y position is meaning with reference to a staff " +"symbol. Objects that have this interface should include " +"Staff_symbol_referencer::callback in their Y-offset-callback. " +, + "staff-position");