/*
This file is part of LilyPond, the GNU music typesetter.
- Copyright (C) 1998--2012 Han-Wen Nienhuys <hanwen@xs4all.nl>
+ Copyright (C) 1998--2014 Han-Wen Nienhuys <hanwen@xs4all.nl>
LilyPond is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
acs = scm_cdr (acs))
for (SCM s = scm_cdar (acs); scm_is_pair (s); s = scm_cdr (s))
{
- Grob *a = unsmob_grob (scm_car (s));
+ Grob *a = Grob::unsmob (scm_car (s));
support.insert (a);
}
}
current_off_ptr = &r;
}
- Grob *me = unsmob_grob (smob);
+ Grob *me = Grob::unsmob (smob);
// We will only ever want widths of spanners after line breaking
// so we can set pure to false
if (dynamic_cast<Spanner *> (me) && a == X_AXIS)
SCM
Side_position_interface::calc_cross_staff (SCM smob)
{
- Grob *me = unsmob_grob (smob);
+ Grob *me = Grob::unsmob (smob);
extract_grob_set (me, "side-support-elements", elts);
Direction my_dir = get_grob_direction (me) ;
vector<Box> boxes;
vector<Skyline_pair> skyps;
set<Grob *>::iterator it;
- Real max_raise = -dir * infinity_f;
- bool aligns_to_cross_staff = false;
for (it = support.begin (); it != support.end (); it++)
{
start,
end);
- aligns_to_cross_staff |= cross_staff;
if (Skyline_pair::unsmob (sp))
{
Real xc = pure && dynamic_cast<Spanner *> (e)
copy[dir].set_minimum_height (copy[dir].max_height ());
copy.shift (a == X_AXIS ? yc : xc);
copy.raise (a == X_AXIS ? xc : yc);
- max_raise = minmax (dir, max_raise, a == X_AXIS ? xc : yc);
skyps.push_back (copy);
}
else { /* no warning*/ }
dim.set_minimum_height (0.0);
}
- // Many cross-staff grobs do not have good height estimations.
- // We give the grob the best chance of not colliding by shifting
- // it to the maximum height in the case of cross-staff alignment.
- // This means, in other words, that the old way things were done
- // (using boxes instead of skylines) is just reactivated for
- // alignment to cross-staff grobs.
- if (aligns_to_cross_staff)
- dim.set_minimum_height (dim.max_height ());
-
Real ss = Staff_symbol_referencer::staff_space (me);
Real dist = dim.distance (my_dim, robust_scm2double (me->get_maybe_pure_property ("horizon-padding", pure, start, end), 0.0));
Real total_off = !isinf (dist) ? dir * dist : 0.0;
}
/*
- 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
+ Ensure 'staff-padding' from my refpoint 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.
*/
Grob *staff = Staff_symbol_referencer::get_staff_symbol (me);
}
else if (scm_is_number (me->get_maybe_pure_property ("staff-padding", pure, start, end)) && dir)
{
- Interval iv = me->maybe_pure_extent (me, a, pure, start, end);
-
Real staff_padding
= Staff_symbol_referencer::staff_space (me)
* scm_to_double (me->get_maybe_pure_property ("staff-padding", pure, start, end));
Real staff_position = staff->maybe_pure_coordinate (common, Y_AXIS, pure, start, end);
Interval staff_extent = staff->maybe_pure_extent (staff, a, pure, start, end);
Real diff = (dir * staff_extent[dir] + staff_padding
- - dir * (total_off + iv[-dir])
+ - dir * total_off
+ dir * (staff_position - parent_position));
total_off += dir * max (diff, 0.0);
}
SCM
Side_position_interface::move_to_extremal_staff (SCM smob)
{
- Grob *me = unsmob_grob (smob);
+ Grob *me = Grob::unsmob (smob);
System *sys = dynamic_cast<System *> (me->get_system ());
Direction dir = get_grob_direction (me);
if (dir != DOWN)
Axis_group_interface::add_element (top_staff, me);
// Remove any cross-staff side-support dependencies
- Grob_array *ga = unsmob_grob_array (me->get_object ("side-support-elements"));
+ Grob_array *ga = Grob_array::unsmob (me->get_object ("side-support-elements"));
if (ga)
{
vector<Grob *> const &elts = ga->array ();