X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fside-position-interface.cc;h=5c947d8b20e90ab2f3ce3e4ecef7d8d03a1b2210;hb=0c1ce854cfb2b9ad594526e359ec206fdd9b21fe;hp=9ad3f6f3c4e0a2499245fd959f10196bbf0571a9;hpb=9b40d66187029df3dca86fc5ecc65f64db315a48;p=lilypond.git diff --git a/lily/side-position-interface.cc b/lily/side-position-interface.cc index 9ad3f6f3c4..5c947d8b20 100644 --- a/lily/side-position-interface.cc +++ b/lily/side-position-interface.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1998--2000 Han-Wen Nienhuys + (c) 1998--2001 Han-Wen Nienhuys */ #include // ceil. @@ -14,55 +14,64 @@ #include "dimensions.hh" #include "staff-symbol-referencer.hh" #include "group-interface.hh" +#include "directional-element-interface.hh" void -Side_position::add_support (Score_element*me, Score_element*e) +Side_position_interface::add_support (Grob*me, Grob*e) { - Pointer_group_interface (me, "side-support-elements").add_element (e); + Pointer_group_interface::add_element (me, "side-support-elements",e); } Direction -Side_position::get_direction (Score_element*me) +Side_position_interface::get_direction (Grob*me) { - SCM d = me->get_elt_property ("direction"); - if (isdir_b (d)) - return to_dir (d) ? to_dir (d) : DOWN; + SCM d = me->get_grob_property ("direction"); + if (isdir_b (d) && to_dir (d)) + return to_dir (d); - Direction relative_dir = UP; - SCM reldir = me->get_elt_property ("side-relative-direction"); // should use a lambda. + Direction relative_dir = Direction (1); + SCM reldir = me->get_grob_property ("side-relative-direction"); // should use a lambda. if (isdir_b (reldir)) { relative_dir = to_dir (reldir); } - SCM other_elt = me->get_elt_property ("direction-source"); - Score_element * e = unsmob_element(other_elt); + SCM other_elt = me->get_grob_property ("direction-source"); + Grob * e = unsmob_grob (other_elt); if (e) { - return (Direction)(relative_dir * Side_position::get_direction (e)); + return (Direction) (relative_dir * Directional_element_interface::get (e)); } - return DOWN; + return CENTER; } -/* - Callback that does the aligning. Puts the element next to the support - */ -MAKE_SCHEME_CALLBACK(Side_position,side_position,2); +MAKE_SCHEME_CALLBACK (Side_position_interface,aligned_on_support_extents, 2); SCM -Side_position::side_position (SCM element_smob, SCM axis) +Side_position_interface::aligned_on_support_extents (SCM element_smob, SCM axis) { - Score_element *me = unsmob_element (element_smob); + Grob *me = unsmob_grob (element_smob); Axis a = (Axis) gh_scm2int (axis); - Score_element *common = me->parent_l (a); - SCM support = me->get_elt_property ("side-support-elements"); + return general_side_position (me, a, true); +} + + +/* + Puts the element next to the support, optionally taking in + account the extent of the support. +*/ +SCM +Side_position_interface::general_side_position (Grob * me, Axis a, bool use_extents) +{ + Grob *common = me->parent_l (a); + SCM support = me->get_grob_property ("side-support-elements"); for (SCM s = support; s != SCM_EOL; s = gh_cdr (s)) { - Score_element * e = unsmob_element (gh_car (s)); + Grob * e = unsmob_grob (gh_car (s)); if (e) common = common->common_refpoint (e, a); } @@ -70,59 +79,78 @@ Side_position::side_position (SCM element_smob, SCM axis) Interval dim; for (SCM s = support; s != SCM_EOL; s = gh_cdr (s)) { - - Score_element * e = unsmob_element ( gh_car (s)); + Grob * e = unsmob_grob (gh_car (s)); if (e) - { - Real coord = e->relative_coordinate (common, a); - - dim.unite (coord + e->extent (a)); - } + if (use_extents) + dim.unite (e->extent (common, a)); + else + { + Real x = e->relative_coordinate (common, a); + dim.unite (Interval (x,x)); + } } if (dim.empty_b ()) { - dim = Interval(0,0); + dim = Interval (0,0); } - Direction dir = Side_position::get_direction (me); + Direction dir = Side_position_interface::get_direction (me); Real off = me->parent_l (a)->relative_coordinate (common, a); - SCM minimum = me->remove_elt_property ("minimum-space"); + SCM minimum = me->remove_grob_property ("minimum-space"); - Real total_off = dim[dir] + off; - SCM padding = me->remove_elt_property ("padding"); + Real total_off = dim.linear_combination (dir) + off; + SCM padding = me->remove_grob_property ("padding"); if (gh_number_p (padding)) { total_off += gh_scm2double (padding) * dir; } - if (gh_number_p (minimum) && total_off * dir < gh_scm2double (minimum)) + + if (gh_number_p (minimum) + && dir + && total_off * dir < gh_scm2double (minimum)) { total_off = gh_scm2double (minimum) * dir; } + if (fabs (total_off) > 100 CM) programming_error ("Huh ? Improbable staff side dim."); return gh_double2scm (total_off); } +/* + Cut & paste (ugh.) + */ +MAKE_SCHEME_CALLBACK (Side_position_interface,aligned_on_support_refpoints,2); +SCM +Side_position_interface::aligned_on_support_refpoints (SCM smob, SCM axis) +{ + Grob *me = unsmob_grob (smob); + Axis a = (Axis) gh_scm2int (axis); + + return general_side_position (me, a, false); +} + + /** callback that centers the element on itself */ -MAKE_SCHEME_CALLBACK(Side_position,aligned_on_self,2); +MAKE_SCHEME_CALLBACK (Side_position_interface,aligned_on_self,2); SCM -Side_position::aligned_on_self (SCM element_smob, SCM axis) +Side_position_interface::aligned_on_self (SCM element_smob, SCM axis) { - Score_element *me = unsmob_element (element_smob); + Grob *me = unsmob_grob (element_smob); Axis a = (Axis) gh_scm2int (axis); String s ("self-alignment-"); - s += (a == X_AXIS) ? "X" : "Y"; + s += (a == X_AXIS) ? "X" : "Y"; - SCM align (me->get_elt_property (s.ch_C())); + SCM align (me->get_grob_property (s.ch_C ())); if (gh_number_p (align)) { - Interval ext(me->extent (a)); + Interval ext (me->extent (me,a)); if (ext.empty_b ()) { @@ -131,13 +159,12 @@ Side_position::aligned_on_self (SCM element_smob, SCM axis) } else { - Real lambda = (0.5 - gh_scm2double (align) / 2.0); - return gh_double2scm (- (lambda * ext[LEFT] + (1 - lambda) * ext[RIGHT])); + return gh_double2scm (- ext.linear_combination (gh_scm2double (align))); } } - else if (unsmob_element (align)) + else if (unsmob_grob (align)) { - return gh_double2scm (- unsmob_element (align)->relative_coordinate (me, a)); + return gh_double2scm (- unsmob_grob (align)->relative_coordinate (me, a)); } return gh_double2scm (0.0); } @@ -158,24 +185,24 @@ directed_round (Real f, Direction d) of the elements "direction" elt property. Only rounds when we're inside the staff, as determined by - Staff_symbol_referencer::staff_radius() */ -MAKE_SCHEME_CALLBACK(Side_position,quantised_position,2); + Staff_symbol_referencer::staff_radius () */ +MAKE_SCHEME_CALLBACK (Side_position_interface,quantised_position,2); SCM -Side_position::quantised_position (SCM element_smob, SCM ) +Side_position_interface::quantised_position (SCM element_smob, SCM) { - Score_element *me = unsmob_element (element_smob); + Grob *me = unsmob_grob (element_smob); - Direction d = Side_position::get_direction (me); + Direction d = Side_position_interface::get_direction (me); if (Staff_symbol_referencer::has_interface (me)) { Real p = Staff_symbol_referencer::position_f (me); Real rp = directed_round (p, d); Real rad = Staff_symbol_referencer::staff_radius (me) *2 ; - int ip = int (rp); + int ip = int (rp); - if (abs (ip) < rad && Staff_symbol_referencer::on_staffline (me,ip)) + if (abs (ip) <= rad && Staff_symbol_referencer::on_staffline (me,ip)) { ip += d; rp += d; @@ -189,23 +216,29 @@ Side_position::quantised_position (SCM element_smob, SCM ) /* Position next to support, taking into account my own dimensions and padding. */ -MAKE_SCHEME_CALLBACK(Side_position,aligned_side,2); +MAKE_SCHEME_CALLBACK (Side_position_interface,aligned_side,2); SCM -Side_position::aligned_side (SCM element_smob, SCM axis) +Side_position_interface::aligned_side (SCM element_smob, SCM axis) { - Score_element *me = unsmob_element (element_smob); + Grob *me = unsmob_grob (element_smob); Axis a = (Axis) gh_scm2int (axis); - Direction d = Side_position::get_direction (me); - Real o = gh_scm2double (side_position (element_smob,axis)); + Direction d = Side_position_interface::get_direction (me); + + Real o = gh_scm2double (aligned_on_support_extents (element_smob,axis)); - Interval iv = me->extent (a); + Interval iv = me->extent (me, a); if (!iv.empty_b ()) { + if (!d) + { + programming_error ("Direction unknown, but aligned-side wanted."); + d = DOWN; + } o += - iv[-d]; - SCM pad = me->get_elt_property ("padding"); + SCM pad = me->get_grob_property ("padding"); if (gh_number_p (pad)) o += d *gh_scm2double (pad) ; } @@ -215,22 +248,22 @@ Side_position::aligned_side (SCM element_smob, SCM axis) /* Position centered on parent. */ -MAKE_SCHEME_CALLBACK(Side_position,centered_on_parent,2); +MAKE_SCHEME_CALLBACK (Side_position_interface,centered_on_parent,2); SCM -Side_position::centered_on_parent (SCM element_smob, SCM axis) +Side_position_interface::centered_on_parent (SCM element_smob, SCM axis) { - Score_element *me = unsmob_element (element_smob); + Grob *me = unsmob_grob (element_smob); Axis a = (Axis) gh_scm2int (axis); - Score_element *him = me->parent_l (a); + Grob *him = me->parent_l (a); - return gh_double2scm (him->extent (a).center ()); + return gh_double2scm (him->extent (him,a).center ()); } void -Side_position::add_staff_support (Score_element*me) +Side_position_interface::add_staff_support (Grob*me) { - Score_element* st = Staff_symbol_referencer::staff_symbol_l (me); + Grob* st = Staff_symbol_referencer::staff_symbol_l (me); if (st) { add_support (me,st); @@ -238,19 +271,19 @@ Side_position::add_staff_support (Score_element*me) } void -Side_position::set_axis (Score_element*me, Axis a) +Side_position_interface::set_axis (Grob*me, Axis a) { - me->add_offset_callback (Side_position::aligned_side_proc, a); + me->add_offset_callback (Side_position_interface::aligned_side_proc, a); } // ugh. doesn't cactch all variants. Axis -Side_position::get_axis (Score_element*me) +Side_position_interface::get_axis (Grob*me) { - if (me->has_offset_callback_b (Side_position::aligned_side_proc, X_AXIS) - || me->has_offset_callback_b (Side_position::aligned_side_proc , X_AXIS)) + if (me->has_offset_callback_b (Side_position_interface::aligned_side_proc, X_AXIS) + || me->has_offset_callback_b (Side_position_interface::aligned_side_proc , X_AXIS)) return X_AXIS; @@ -258,34 +291,34 @@ Side_position::get_axis (Score_element*me) } void -Side_position::set_direction (Score_element*me, Direction d) +Side_position_interface::set_direction (Grob*me, Direction d) { - me->set_elt_property ("direction", gh_int2scm (d)); + me->set_grob_property ("direction", gh_int2scm (d)); } void -Side_position::set_minimum_space (Score_element*me, Real m) +Side_position_interface::set_minimum_space (Grob*me, Real m) { - me->set_elt_property ("minimum-space", gh_double2scm (m)); + me->set_grob_property ("minimum-space", gh_double2scm (m)); } void -Side_position::set_padding (Score_element*me, Real p) +Side_position_interface::set_padding (Grob*me, Real p) { - me->set_elt_property ("padding", gh_double2scm (p)); + me->set_grob_property ("padding", gh_double2scm (p)); } bool -Side_position::has_interface (Score_element*me) +Side_position_interface::has_interface (Grob*me) { return me->has_interface (ly_symbol2scm ("side-position-interface")); } bool -Side_position::supported_b (Score_element*me) +Side_position_interface::supported_b (Grob*me) { - SCM s = me->get_elt_property ("side-support-elements"); - return gh_pair_p(s); + SCM s = me->get_grob_property ("side-support-elements"); + return gh_pair_p (s); }