Side_position_interface::aligned_on_support_extents (SCM element_smob, SCM axis)
{
Grob *me = unsmob_grob (element_smob);
- Axis a = (Axis) gh_scm2int (axis);
+ Axis a = (Axis) scm_to_int (axis);
return general_side_position (me, a, true);
}
Grob * st = Staff_symbol_referencer::get_staff_symbol (me);
bool include_staff = (st
&& a == Y_AXIS
- && gh_number_p (me->get_property ("staff-padding")));
+ && scm_is_number (me->get_property ("staff-padding")));
Interval dim;
if (include_staff)
- return gh_double2scm (total_off);
+ return scm_make_real (total_off);
}
/*
Side_position_interface::aligned_on_support_refpoints (SCM smob, SCM axis)
{
Grob *me = unsmob_grob (smob);
- Axis a = (Axis) gh_scm2int (axis);
+ Axis a = (Axis) scm_to_int (axis);
return general_side_position (me, a, false);
}
rp += d;
}
- return gh_double2scm ((rp - p) * Staff_symbol_referencer::staff_space (me) / 2.0);
+ return scm_make_real ((rp - p) * Staff_symbol_referencer::staff_space (me) / 2.0);
}
- return gh_double2scm (0.0);
+ return scm_make_real (0.0);
}
/*
Side_position_interface::aligned_side (SCM element_smob, SCM axis)
{
Grob *me = unsmob_grob (element_smob);
- Axis a = (Axis) gh_scm2int (axis);
+ Axis a = (Axis) scm_to_int (axis);
Direction d = Side_position_interface::get_direction (me);
- Real o = gh_scm2double (aligned_on_support_extents (element_smob,axis));
+ Real o = scm_to_double (aligned_on_support_extents (element_smob,axis));
Interval iv = me->extent (me, a);
*/
Grob * st = Staff_symbol_referencer::get_staff_symbol (me);
if (st && a == Y_AXIS
- && gh_number_p (me->get_property ("staff-padding")))
+ && scm_is_number (me->get_property ("staff-padding")))
{
Real padding=
Staff_symbol_referencer::staff_space (me)
- * gh_scm2double (me->get_property ("staff-padding"));
+ * scm_to_double (me->get_property ("staff-padding"));
Grob *common = me->common_refpoint (st, Y_AXIS);
Interval staff_size = st->extent (common, Y_AXIS);
- Interval me_ext = me->extent (common, a);
Real diff = d*staff_size[d] + padding - d*(o + iv[-d]);
o += (d* (diff >? 0));
}
- return gh_double2scm (o);
+ return scm_make_real (o);
}
me->add_offset_callback (Side_position_interface::aligned_side_proc, a);
}
-
-
// ugh. doesn't catch all variants.
Axis
Side_position_interface::get_axis (Grob*me)
if (me->has_offset_callback (Side_position_interface::aligned_side_proc, X_AXIS)
|| me->has_offset_callback (Side_position_interface::aligned_side_proc , X_AXIS))
return X_AXIS;
-
return Y_AXIS;
}
-
-
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 "
+ "support). The property @code{direction} signifies where to put the "
"victim object relative to the support (left or right, up or down?)\n\n "
"The routine also takes the size the staff into account if "
"@code{staff-padding} is set. If undefined, the staff symbol is ignored."