/*
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
Pointer_group_interface::add_unordered_grob (me, ly_symbol2scm ("side-support-elements"), e);
}
-void
-Side_position_interface::recursive_add_support (Grob *me, Grob *e)
-{
- Pointer_group_interface::add_unordered_grob (me, ly_symbol2scm ("side-support-elements"), e);
- extract_grob_set (e, "side-support-elements", sse);
- for (vsize i = 0; i < sse.size (); i++)
- recursive_add_support (me, sse[i]);
-}
-
set<Grob *>
get_support_set (Grob *me)
{
Grob *staff_symbol = Staff_symbol_referencer::get_staff_symbol (me);
bool quantize_position = to_boolean (me->get_maybe_pure_property ("quantize-position", pure, start, end));
+ bool me_cross_staff = to_boolean (me->get_property ("cross-staff"));
bool include_staff
= staff_symbol
common[Y_AXIS] = staff_symbol->common_refpoint (common[Y_AXIS], Y_AXIS);
Skyline my_dim;
- Skyline_pair *skyp = Skyline_pair::unsmob (
- me->get_maybe_pure_property (a == X_AXIS
- ? "horizontal-skylines"
- : "vertical-skylines",
- pure,
- start,
- end));
- if (skyp)
+ SCM skyp = me->get_maybe_pure_property (a == X_AXIS
+ ? "horizontal-skylines"
+ : "vertical-skylines",
+ pure,
+ start,
+ end);
+ if (Skyline_pair::unsmob (skyp))
{
// for spanner pure heights, we don't know horizontal spacing,
// so a spanner can never have a meaningful x coordiante
Real yc = a == X_AXIS
? me->pure_relative_y_coordinate (common[Y_AXIS], start, end)
: me->get_parent (Y_AXIS)->maybe_pure_coordinate (common[Y_AXIS], Y_AXIS, pure, start, end);
- Skyline_pair copy = Skyline_pair (*skyp);
+ Skyline_pair copy = *Skyline_pair::unsmob (skyp);
copy.shift (a == X_AXIS ? yc : xc);
copy.raise (a == X_AXIS ? xc : yc);
my_dim = copy[-dir];
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++)
{
Grob *e = *it;
- // In the case of a stem, we will find a note head as well
- // ignoring the stem solves cyclic dependencies if the stem is
- // attached to a cross-staff beam.
bool cross_staff = to_boolean (e->get_property ("cross-staff"));
-
- // avoid cyclic dependency for direction
if (a == Y_AXIS
- && pure
- && Stem::has_interface (e)
- && cross_staff
- && !is_direction (e->get_property_data ("direction")))
- continue;
-
- // avoid unnecessary stem look up (if pointing away, it is not
- // supporting anything)
+ && !me_cross_staff // 'me' promised not to adapt to staff-spacing
+ && cross_staff) // but 'e' might move based on staff-pacing
+ continue; // so 'me' may not move in response to 'e'
+
if (a == Y_AXIS
- && Stem::has_interface (e)
- && dir == - get_grob_direction (e))
- continue;
+ && Stem::has_interface (e))
+ {
+ // If called as 'pure' we may not force a stem to set its direction,
+ if (pure && !is_direction (e->get_property_data ("direction")))
+ continue;
+ // There is no need to consider stems pointing away.
+ if (dir == -get_grob_direction (e))
+ continue;
+ }
if (e)
{
-
-
- Skyline_pair *sp = Skyline_pair::unsmob
- (e->get_maybe_pure_property (a == X_AXIS
- ? "horizontal-skylines"
- : "vertical-skylines",
- pure || cross_staff,
- start,
- end));
-
- aligns_to_cross_staff |= cross_staff;
- if (sp)
+ SCM sp = e->get_maybe_pure_property (a == X_AXIS
+ ? "horizontal-skylines"
+ : "vertical-skylines",
+ pure,
+ start,
+ end);
+
+ if (Skyline_pair::unsmob (sp))
{
Real xc = pure && dynamic_cast<Spanner *> (e)
? e->get_parent (X_AXIS)->relative_coordinate (common[X_AXIS], X_AXIS)
Real yc = a == X_AXIS
? e->pure_relative_y_coordinate (common[Y_AXIS], start, end)
: e->maybe_pure_coordinate (common[Y_AXIS], Y_AXIS, pure, start, end);
- Skyline_pair copy = Skyline_pair (*sp);
+ Skyline_pair copy = *Skyline_pair::unsmob (sp);
if (a == Y_AXIS
&& Stem::has_interface (e)
&& to_boolean (me->get_maybe_pure_property ("add-stem-support", pure, start, end)))
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);
}
projects / lilypond.git / blobdiff