}
/* Put the element next to the support, optionally taking in
- account the extent of the support.
-
- Does not take into account the extent of ME.
-*/
+ account the extent of the support. */
SCM
-Side_position_interface::general_side_position (Grob *me, Axis a, bool use_extents,
- bool include_my_extent,
- bool pure, int start, int end,
- Real *current_offset)
+Side_position_interface::general_side_position (Grob *me, Axis a, bool use_extents)
{
Real ss = Staff_symbol_referencer::staff_space (me);
if (include_staff)
{
common = staff_symbol->common_refpoint (common, Y_AXIS);
- staff_extents = staff_symbol->maybe_pure_extent (common, Y_AXIS, pure, start, end);
+ staff_extents = staff_symbol->extent (common, Y_AXIS);
if (include_staff)
dim.unite (staff_extents);
Grob *e = support[i];
if (e)
if (use_extents)
- dim.unite (e->maybe_pure_extent (common, a, pure, start, end));
+ dim.unite (e->extent (common, a));
else
{
- Real x = e->maybe_pure_coordinate (common, a, pure, start, end);
+ Real x = e->relative_coordinate (common, a);
dim.unite (Interval (x, x));
}
}
Direction dir = get_grob_direction (me);
- Real off = me->get_parent (a)->maybe_pure_coordinate (common, a, pure, start, end);
+ Real off = me->get_parent (a)->relative_coordinate (common, a);
Real minimum_space = ss * robust_scm2double (me->get_property ("minimum-space"), -1);
Real total_off = dim.linear_combination (dir) - off;
&& dir
&& total_off * dir < minimum_space)
total_off = minimum_space * dir;
-
- if (include_my_extent)
- {
- Interval iv = me->maybe_pure_extent (me, a, pure, start, end);
- if (!iv.is_empty ())
- {
- if (!dir)
- {
- programming_error ("direction unknown, but aligned-side wanted");
- dir = DOWN;
- }
- total_off += -iv[-dir];
- }
- }
-
- if (current_offset)
- total_off = dir * max (dir * total_off,
- dir * (*current_offset));
-
/* FIXME: 1000 should relate to paper size. */
if (fabs (total_off) > 1000)
MAKE_SCHEME_CALLBACK (Side_position_interface, y_aligned_on_support_refpoints, 1);
+
SCM
Side_position_interface::y_aligned_on_support_refpoints (SCM smob)
{
- return general_side_position (unsmob_grob (smob), Y_AXIS, false, false, false, 0, 0, 0);
+ return general_side_position (unsmob_grob (smob), Y_AXIS, false);
}
-MAKE_SCHEME_CALLBACK (Side_position_interface, pure_y_aligned_on_support_refpoints, 3);
-SCM
-Side_position_interface::pure_y_aligned_on_support_refpoints (SCM smob, SCM start, SCM end)
-{
- return general_side_position (unsmob_grob (smob), Y_AXIS, false, false,
- true, scm_to_int (start), scm_to_int (end), 0);
-}
/*
Position next to support, taking into account my own dimensions and padding.
*/
-SCM
-axis_aligned_side_helper (SCM smob, Axis a, bool pure, int start, int end, SCM current_off_scm)
-{
- Real r;
- Real *current_off_ptr = 0;
- if (scm_is_number (current_off_scm))
- {
- r = scm_to_double (current_off_scm);
- current_off_ptr = &r;
- }
-
- return Side_position_interface::aligned_side (unsmob_grob (smob), a, pure, start, end, current_off_ptr);
-}
-
-MAKE_SCHEME_CALLBACK_WITH_OPTARGS (Side_position_interface, x_aligned_side, 2, 1);
+MAKE_SCHEME_CALLBACK (Side_position_interface, x_aligned_side, 1);
SCM
-Side_position_interface::x_aligned_side (SCM smob, SCM current_off)
+Side_position_interface::x_aligned_side (SCM smob)
{
- return axis_aligned_side_helper (smob, X_AXIS, false, 0, 0, current_off);
+ return aligned_side (unsmob_grob (smob), X_AXIS);
}
-MAKE_SCHEME_CALLBACK_WITH_OPTARGS (Side_position_interface, y_aligned_side, 2, 1);
+MAKE_SCHEME_CALLBACK (Side_position_interface, y_aligned_side, 1);
SCM
-Side_position_interface::y_aligned_side (SCM smob, SCM current_off)
+Side_position_interface::y_aligned_side (SCM smob)
{
- return axis_aligned_side_helper (smob, Y_AXIS, false, 0, 0, current_off);
+ return aligned_side (unsmob_grob (smob), Y_AXIS);
}
-MAKE_SCHEME_CALLBACK (Side_position_interface, pure_y_aligned_side, 3);
SCM
-Side_position_interface::pure_y_aligned_side (SCM smob, SCM start, SCM end)
-{
- return aligned_side (unsmob_grob (smob), Y_AXIS, true, scm_to_int (start), scm_to_int (end), 0);
-}
-
-SCM
-Side_position_interface::aligned_side (Grob *me, Axis a, bool pure, int start, int end,
- Real *current_off)
+Side_position_interface::aligned_side (Grob *me, Axis a)
{
Direction dir = get_grob_direction (me);
- Real o = scm_to_double (general_side_position (me, a, true, true, pure, start, end, current_off));
+ Real o = scm_to_double (general_side_position (me, a, true));
+ Interval iv = me->extent (me, a);
+
+ if (!iv.is_empty ())
+ {
+ if (!dir)
+ {
+ programming_error ("direction unknown, but aligned-side wanted");
+ dir = DOWN;
+ }
+ o += -iv[-dir];
+ }
/*
Maintain a minimum distance to the staff. This is similar to side
if (to_boolean (me->get_property ("quantize-position")))
{
Grob *common = me->common_refpoint (staff, Y_AXIS);
- Real my_off = me->get_parent (Y_AXIS)->maybe_pure_coordinate (common, Y_AXIS, pure, start, end);
- Real staff_off = staff->maybe_pure_coordinate (common, Y_AXIS, pure, start, end);
+ Real my_off = me->relative_coordinate (common, Y_AXIS);
+ Real staff_off = staff->relative_coordinate (common, Y_AXIS);
Real ss = Staff_symbol::staff_space (staff);
Real position = 2 * (my_off + o - staff_off) / ss;
Real rounded = directed_round (position, dir);
}
else if (scm_is_number (me->get_property ("staff-padding")))
{
- Interval iv = me->maybe_pure_extent (me, a, pure, start, end);
-
Real padding
= Staff_symbol_referencer::staff_space (me)
* scm_to_double (me->get_property ("staff-padding"));
Grob *common = me->common_refpoint (staff, Y_AXIS);
- Interval staff_size = staff->maybe_pure_extent (common, Y_AXIS, pure, start, end);
+ Interval staff_size = staff->extent (common, Y_AXIS);
Real diff = dir*staff_size[dir] + padding - dir * (o + iv[-dir]);
o += dir * max (diff, 0.0);
}
if (!scm_is_number (me->get_property ("side-axis")))
{
me->set_property ("side-axis", scm_from_int (a));
- chain_offset_callback (me,
- (a==X_AXIS)
- ? x_aligned_side_proc
- : y_aligned_side_proc,
- a);
+ add_offset_callback (me,
+ (a==X_AXIS)
+ ? x_aligned_side_proc
+ : y_aligned_side_proc,
+ a);
}
}
Axis
projects / lilypond.git / blobdiff