The problem here appears to be that Beam::rest-collision-callback
returned 0 instead of any previously established offset when it
decided not to tamper with the default rest positioning without beam.
This also rewrites Beam::pure-rest-collision-callback (which appears
to have dealt correctly with the offsets here and appears
disconcertingly diverged from the unpure callback) a bit.
SCM
Beam::rest_collision_callback (SCM smob, SCM prev_offset)
{
SCM
Beam::rest_collision_callback (SCM smob, SCM prev_offset)
{
+ if (!scm_is_number (prev_offset))
+ prev_offset = SCM_INUM0;
+
Grob *rest = unsmob<Grob> (smob);
if (scm_is_number (rest->get_property ("staff-position")))
Grob *rest = unsmob<Grob> (smob);
if (scm_is_number (rest->get_property ("staff-position")))
- return scm_from_int (0);
- Real offset = robust_scm2double (prev_offset, 0.0);
+ Grob *stem = unsmob<Grob> (rest->get_object ("stem"));
- Grob *st = unsmob<Grob> (rest->get_object ("stem"));
- Grob *stem = st;
- return scm_from_double (0.0);
Grob *beam = unsmob<Grob> (stem->get_object ("beam"));
if (!beam
|| !has_interface<Beam> (beam)
|| !Beam::normal_stem_count (beam))
Grob *beam = unsmob<Grob> (stem->get_object ("beam"));
if (!beam
|| !has_interface<Beam> (beam)
|| !Beam::normal_stem_count (beam))
- return scm_from_double (0.0);
Grob *common_y = rest->common_refpoint (beam, Y_AXIS);
Grob *common_y = rest->common_refpoint (beam, Y_AXIS);
+ (beam_count - 1) * beam_translation;
Real beam_y = stem_y - d * height_of_my_beams;
+ (beam_count - 1) * beam_translation;
Real beam_y = stem_y - d * height_of_my_beams;
+ Real offset = robust_scm2double (prev_offset, 0.0);
Interval rest_extent = rest->extent (rest, Y_AXIS);
rest_extent.translate (offset + rest->get_parent (Y_AXIS)->relative_coordinate (common_y, Y_AXIS));
Interval rest_extent = rest->extent (rest, Y_AXIS);
rest_extent.translate (offset + rest->get_parent (Y_AXIS)->relative_coordinate (common_y, Y_AXIS));
SCM, /* end */
SCM prev_offset)
{
SCM, /* end */
SCM prev_offset)
{
- Real previous = robust_scm2double (prev_offset, 0.0);
+ if (!scm_is_number (prev_offset))
+ prev_offset = SCM_INUM0;
Grob *me = unsmob<Grob> (smob);
Grob *stem = unsmob<Grob> (me->get_object ("stem"));
if (!stem)
Grob *me = unsmob<Grob> (smob);
Grob *stem = unsmob<Grob> (me->get_object ("stem"));
if (!stem)
- return scm_from_double (previous);
Grob *beam = unsmob<Grob> (stem->get_object ("beam"));
if (!beam
|| !Beam::normal_stem_count (beam)
|| !is_direction (beam->get_property_data ("direction")))
Grob *beam = unsmob<Grob> (stem->get_object ("beam"));
if (!beam
|| !Beam::normal_stem_count (beam)
|| !is_direction (beam->get_property_data ("direction")))
- return scm_from_double (previous);
Real ss = Staff_symbol_referencer::staff_space (me);
Real ss = Staff_symbol_referencer::staff_space (me);
Grob *right;
if (idx == (vsize) - 1 || my_stems.size () == 1)
Grob *right;
if (idx == (vsize) - 1 || my_stems.size () == 1)
- return scm_from_double (previous);
else if (idx == 0)
left = right = my_stems[1];
else if (idx == my_stems.size () - 1)
else if (idx == 0)
left = right = my_stems[1];
else if (idx == my_stems.size () - 1)
Real offset = beam_pos * ss / 2.0
- minimum_distance * beamdir
- me->extent (me, Y_AXIS)[beamdir];
Real offset = beam_pos * ss / 2.0
- minimum_distance * beamdir
- me->extent (me, Y_AXIS)[beamdir];
+ Real previous = robust_scm2double (prev_offset, 0.0);
/* Always move by a whole number of staff spaces, always away from the beam */
offset = floor (min (0.0, (offset - previous) / ss * beamdir))
/* Always move by a whole number of staff spaces, always away from the beam */
offset = floor (min (0.0, (offset - previous) / ss * beamdir))