/*
Return beam that encompasses the span of the tuplet bracket.
*/
-
Grob *
Tuplet_bracket::parallel_beam (Grob *me_grob, vector<Grob*> const &cols,
bool *equally_long)
Drul_array<Grob*> stems (Note_column::get_stem (cols[0]),
Note_column::get_stem (cols.back ()));
- if (dynamic_cast<Item*> (stems[RIGHT])->get_column ()
- != me->get_bound (RIGHT)->get_column ())
+ if (!stems[RIGHT]
+ || !stems[LEFT]
+ || (dynamic_cast<Item*> (stems[RIGHT])->get_column ()
+ != me->get_bound (RIGHT)->get_column ()))
return 0;
Drul_array<Grob*> beams;
do
{
Direction break_dir = bounds[d]->break_status_dir ();
-
Spanner *orig_spanner = dynamic_cast<Spanner*> (me->original ());
-
vsize neighbor_idx = me->get_break_index () - break_dir;
if (break_dir
&& d == RIGHT
bracket_visibility = ly_scm2bool (bracket);
else if (bracket == ly_symbol2scm ("if-no-beam"))
bracket_visibility = !par_beam;
-
SCM cpoints = me->get_property ("control-points");
if (scm_ilength (cpoints) < 2)
Interval x_span (points[LEFT][X_AXIS], points[RIGHT][X_AXIS]);
Drul_array<Real> positions (points[LEFT][Y_AXIS], points[RIGHT][Y_AXIS]);
-
-
Output_def *pap = me->layout ();
Grob *number_grob = unsmob_grob (me->get_object ("tuplet-number"));
commony = common_refpoint_of_array (tuplets, commony, Y_AXIS);
if (Grob *st = Staff_symbol_referencer::get_staff_symbol (me))
commony = st->common_refpoint (commony, Y_AXIS);
+ Real my_offset = me->relative_coordinate (commony, Y_AXIS);
Grob *commonx = get_common_x (me);
commonx = common_refpoint_of_array (tuplets, commonx, Y_AXIS);
Real pad = robust_scm2double (me->get_property ("staff-padding"), -1.0);
if (pad >= 0.0)
{
- staff = st->extent (commony, Y_AXIS);
+ staff = st->extent (commony, Y_AXIS) - my_offset;
staff.widen (pad);
}
}
bool equally_long = false;
Grob *par_beam = parallel_beam (me, columns, &equally_long);
-
-
Item *lgr = get_x_bound_item (me, LEFT, dir);
Item *rgr = get_x_bound_item (me, RIGHT, dir);
Real x0 = robust_relative_extent (lgr, commonx, X_AXIS)[LEFT];
Real x1 = robust_relative_extent (rgr, commonx, X_AXIS)[RIGHT];
+ bool follow_beam = par_beam
+ && ((get_grob_direction (par_beam) == dir)
+ || to_boolean (par_beam->get_property ("knee")));
vector<Offset> points;
-
if (columns.size ()
- && par_beam
- && get_grob_direction (par_beam) == dir
+ && follow_beam
&& Note_column::get_stem (columns[0])
&& Note_column::get_stem (columns.back ()))
{
*/
(void) par_beam->get_property ("quantized-positions");
-
Drul_array<Grob *> stems (Note_column::get_stem (columns[0]),
Note_column::get_stem (columns.back ()));
-
-
-
Real ss = 0.5 * Staff_symbol_referencer::staff_space (me);
- Real my_parent_offset = me->get_parent (Y_AXIS)->relative_coordinate (commony, Y_AXIS);
Real lp = ss * robust_scm2double (stems[LEFT]->get_property ("stem-end-position"), 0.0)
- + stems[LEFT]->get_parent (Y_AXIS)->relative_coordinate (commony, Y_AXIS) - my_parent_offset;
+ + stems[LEFT]->get_parent (Y_AXIS)->relative_coordinate (commony, Y_AXIS) - my_offset;
Real rp = ss * robust_scm2double (stems[RIGHT]->get_property ("stem-end-position"), 0.0)
- + stems[RIGHT]->get_parent (Y_AXIS)->relative_coordinate (commony, Y_AXIS) - my_parent_offset;
+ + stems[RIGHT]->get_parent (Y_AXIS)->relative_coordinate (commony, Y_AXIS) - my_offset;
*dy = rp - lp;
points.push_back (Offset (stems[LEFT]->relative_coordinate (commonx, X_AXIS) - x0, lp));
else
*dy = 0;
- *offset = -dir * infinity_f;
for (vsize i = 0; i < columns.size (); i++)
{
Interval note_ext = columns[i]->extent (commony, Y_AXIS);
- Real notey = note_ext[dir] - me->relative_coordinate (commony, Y_AXIS);
+ Real notey = note_ext[dir] - my_offset;
Real x = columns[i]->relative_coordinate (commonx, X_AXIS) - x0;
points.push_back (Offset (x, notey));
}
}
- if (!(par_beam && get_grob_direction (par_beam) == dir))
+ if (!follow_beam)
{
points.push_back (Offset (x0 - x0, staff[dir]));
points.push_back (Offset (x1 - x0, staff[dir]));
while (flip (&d) != LEFT);
}
+ *offset = -dir * infinity_f;
Real factor = (columns.size () > 1) ? 1 / (x1 - x0) : 1.0;
for (vsize i = 0; i < points.size (); i++)
{
Grob *me = unsmob_grob (smob);
Grob *staff_symbol = 0;
extract_grob_set (me, "note-columns", cols);
+ bool equally_long = false;
+ Grob *par_beam = parallel_beam (me, cols, &equally_long);
+
+ if (par_beam)
+ return par_beam->get_property ("cross-staff");
+
for (vsize i = 0; i < cols.size (); i++)
{
Grob *stem = unsmob_grob (cols[i]->get_object ("stem"));
+ if (!stem)
+ continue;
+
+ if (to_boolean (stem->get_property ("cross-staff")))
+ return SCM_BOOL_T;
+
Grob *stem_staff = Staff_symbol_referencer::get_staff_symbol (stem);
if (staff_symbol && (stem_staff != staff_symbol))
return SCM_BOOL_T;