X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fside-position-interface.cc;h=103593b686c95be0bf6a7e80b69e5460209bfcea;hb=6f5b694886301a2facf7293d9f70cf41232103a6;hp=2e83ee183c082527306229df7f1c409f2a85f741;hpb=d9b43b93f2c885409bafdb157138158f65cc49aa;p=lilypond.git diff --git a/lily/side-position-interface.cc b/lily/side-position-interface.cc index 2e83ee183c..103593b686 100644 --- a/lily/side-position-interface.cc +++ b/lily/side-position-interface.cc @@ -3,13 +3,13 @@ source file of the GNU LilyPond music typesetter - (c) 1998--2002 Han-Wen Nienhuys + (c) 1998--2003 Han-Wen Nienhuys */ #include // ceil. #include "side-position-interface.hh" -#include "debug.hh" +#include "warn.hh" #include "warn.hh" #include "dimensions.hh" #include "staff-symbol-referencer.hh" @@ -28,12 +28,12 @@ Direction Side_position_interface::get_direction (Grob*me) { SCM d = me->get_grob_property ("direction"); - if (isdir_b (d) && to_dir (d)) + if (is_direction (d) && to_dir (d)) return to_dir (d); Direction relative_dir = Direction (1); SCM reldir = me->get_grob_property ("side-relative-direction"); // should use a lambda. - if (isdir_b (reldir)) + if (is_direction (reldir)) { relative_dir = to_dir (reldir); } @@ -67,7 +67,7 @@ Side_position_interface::aligned_on_support_extents (SCM element_smob, SCM axis) SCM Side_position_interface::general_side_position (Grob * me, Axis a, bool use_extents) { - Grob *common = me->get_parent (a); + /* As this is only used as a callback, this is called only once. We @@ -79,13 +79,7 @@ Side_position_interface::general_side_position (Grob * me, Axis a, bool use_exte */ SCM support = me->get_grob_property ("side-support-elements"); - // me->remove_grob_property ("side-support-elements"); - for (SCM s = support; s != SCM_EOL; s = ly_cdr (s)) - { - Grob * e = unsmob_grob (ly_car (s)); - if (e) - common = common->common_refpoint (e, a); - } + Grob *common = common_refpoint_of_list (support, me->get_parent (a), a); Interval dim; for (SCM s = support; s != SCM_EOL; s = ly_cdr (s)) @@ -109,10 +103,10 @@ Side_position_interface::general_side_position (Grob * me, Axis a, bool use_exte Direction dir = Side_position_interface::get_direction (me); Real off = me->get_parent (a)->relative_coordinate (common, a); - SCM minimum = me->remove_grob_property ("minimum-space"); + SCM minimum = me->get_grob_property ("minimum-space"); - Real total_off = dim.linear_combination (dir) + off; - SCM padding = me->remove_grob_property ("padding"); + Real total_off = dim.linear_combination (dir) - off; + SCM padding = me->get_grob_property ("padding"); if (gh_number_p (padding)) { total_off += gh_scm2double (padding) * dir; @@ -145,43 +139,6 @@ Side_position_interface::aligned_on_support_refpoints (SCM smob, SCM axis) } -/** - callback that centers the element on itself - - Requires that self-alignment-{X,Y} be set. - */ -MAKE_SCHEME_CALLBACK (Side_position_interface,aligned_on_self,2); -SCM -Side_position_interface::aligned_on_self (SCM element_smob, SCM axis) -{ - Grob *me = unsmob_grob (element_smob); - Axis a = (Axis) gh_scm2int (axis); - String s ("self-alignment-"); - - s += (a == X_AXIS) ? "X" : "Y"; - - SCM align (me->get_grob_property (s.ch_C ())); - if (gh_number_p (align)) - { - Interval ext (me->extent (me,a)); - - if (ext.empty_b ()) - { - programming_error ("I'm empty. Can't align on self"); - return gh_double2scm (0.0); - } - else - { - return gh_double2scm (- ext.linear_combination (gh_scm2double (align))); - } - } - else if (unsmob_grob (align)) - { - return gh_double2scm (- unsmob_grob (align)->relative_coordinate (me, a)); - } - return gh_double2scm (0.0); -} - Real @@ -205,12 +162,12 @@ Side_position_interface::quantised_position (SCM element_smob, SCM) { Grob *me = unsmob_grob (element_smob); - Direction d = Side_position_interface::get_direction (me); - if (Staff_symbol_referencer::has_interface (me)) + Grob * stsym = Staff_symbol_referencer::get_staff_symbol (me); + if (stsym) { - Real p = Staff_symbol_referencer::position_f (me); + Real p = Staff_symbol_referencer::get_position (me); Real rp = directed_round (p, d); Real rad = Staff_symbol_referencer::staff_radius (me) *2 ; int ip = int (rp); @@ -250,33 +207,45 @@ Side_position_interface::aligned_side (SCM element_smob, SCM axis) d = DOWN; } o += - iv[-d]; - - SCM pad = me->get_grob_property ("padding"); - if (gh_number_p (pad)) - o += d *gh_scm2double (pad) ; } return gh_double2scm (o); } /* - Position centered on parent. + Maintain a minimum distance to the staff. This is similar to side + position with padding, but it will put adjoining objects on a row if + stuff sticks out of the staff a little. */ -MAKE_SCHEME_CALLBACK (Side_position_interface,centered_on_parent,2); +MAKE_SCHEME_CALLBACK (Side_position_interface,out_of_staff,2); SCM -Side_position_interface::centered_on_parent (SCM element_smob, SCM axis) +Side_position_interface::out_of_staff (SCM element_smob, SCM axis) { Grob *me = unsmob_grob (element_smob); Axis a = (Axis) gh_scm2int (axis); - Grob *him = me->get_parent (a); - return gh_double2scm (him->extent (him,a).center ()); -} + Grob * st = Staff_symbol_referencer::get_staff_symbol (me); + if (!st) + return gh_int2scm (0); + + Real padding=0.0; + SCM spad = me->get_grob_property ("staff-padding"); + + if (gh_number_p (spad)) + padding = gh_scm2double (spad); + + Grob *common = me->common_refpoint (st, Y_AXIS); + Direction d = Side_position_interface::get_direction (me); + Interval staff_size = st->extent (common, Y_AXIS); + Interval me_ext = me->extent (common, a); + Real diff = d*staff_size[d] + padding - d*me_ext[-d]; + return gh_double2scm (diff >? 0); +} void Side_position_interface::add_staff_support (Grob*me) { - Grob* st = Staff_symbol_referencer::staff_symbol_l (me); + Grob* st = Staff_symbol_referencer::get_staff_symbol (me); if (st && get_axis (me) == Y_AXIS) { add_support (me,st); @@ -321,11 +290,6 @@ Side_position_interface::set_padding (Grob*me, Real p) me->set_grob_property ("padding", gh_double2scm (p)); } -bool -Side_position_interface::has_interface (Grob*me) -{ - return me->has_interface (ly_symbol2scm ("side-position-interface")); -} bool Side_position_interface::supported_b (Grob*me) @@ -335,3 +299,11 @@ Side_position_interface::supported_b (Grob*me) } + + +ADD_INTERFACE (Side_position_interface,"side-position-interface", + "Position a victim object (this one) next to other objects (the " +"support). In this case, the property @code{direction} signifies where to put the " +"victim object relative to the support (left or right, up or down?) " +, + "staff-padding side-support-elements direction-source direction side-relative-direction minimum-space padding");