X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ftuplet-bracket.cc;h=cfae0b98650d2317976c2ff9fae9338fe434a149;hb=9a14a394dfa23b38ab78c3eb09a2d7b5f504fa35;hp=faa25a85ca6a06e9203c3fde6fa6fed830855b83;hpb=c4a377d30d0f18ca7722cb64225215b47e50dc61;p=lilypond.git diff --git a/lily/tuplet-bracket.cc b/lily/tuplet-bracket.cc index faa25a85ca..cfae0b9865 100644 --- a/lily/tuplet-bracket.cc +++ b/lily/tuplet-bracket.cc @@ -77,7 +77,6 @@ flatten_number_pair_property (Grob *me, /* Return beam that encompasses the span of the tuplet bracket. */ - Grob * Tuplet_bracket::parallel_beam (Grob *me_grob, vector const &cols, bool *equally_long) @@ -91,8 +90,10 @@ Tuplet_bracket::parallel_beam (Grob *me_grob, vector const &cols, Drul_array stems (Note_column::get_stem (cols[0]), Note_column::get_stem (cols.back ())); - if (dynamic_cast (stems[RIGHT])->get_column () - != me->get_bound (RIGHT)->get_column ()) + if (!stems[RIGHT] + || !stems[LEFT] + || (dynamic_cast (stems[RIGHT])->get_column () + != me->get_bound (RIGHT)->get_column ())) return 0; Drul_array beams; @@ -135,9 +136,7 @@ Tuplet_bracket::calc_connect_to_neighbors (SCM smob) do { Direction break_dir = bounds[d]->break_status_dir (); - Spanner *orig_spanner = dynamic_cast (me->original ()); - vsize neighbor_idx = me->get_break_index () - break_dir; if (break_dir && d == RIGHT @@ -280,7 +279,6 @@ Tuplet_bracket::print (SCM smob) 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) @@ -296,8 +294,6 @@ Tuplet_bracket::print (SCM smob) Interval x_span (points[LEFT][X_AXIS], points[RIGHT][X_AXIS]); Drul_array positions (points[LEFT][Y_AXIS], points[RIGHT][Y_AXIS]); - - Output_def *pap = me->layout (); Grob *number_grob = unsmob_grob (me->get_object ("tuplet-number")); @@ -494,17 +490,23 @@ Tuplet_bracket::calc_position_and_height (Grob *me_grob, Real *offset, Real *dy) 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); Interval staff; - if (Grob *st = Staff_symbol_referencer::get_staff_symbol (me)) + Grob *st = Staff_symbol_referencer::get_staff_symbol (me); + + /* staff-padding doesn't work correctly on cross-staff tuplets + because it only considers one staff symbol. Until this works, + disable it. */ + if (st && !to_boolean (me->get_property ("cross-staff"))) { 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); } } @@ -514,18 +516,17 @@ Tuplet_bracket::calc_position_and_height (Grob *me_grob, Real *offset, Real *dy) 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 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 ())) { @@ -534,19 +535,14 @@ Tuplet_bracket::calc_position_and_height (Grob *me_grob, Real *offset, Real *dy) */ (void) par_beam->get_property ("quantized-positions"); - Drul_array 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); 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); *dy = rp - lp; points.push_back (Offset (stems[LEFT]->relative_coordinate (commonx, X_AXIS) - x0, lp)); @@ -562,10 +558,11 @@ Tuplet_bracket::calc_position_and_height (Grob *me_grob, Real *offset, Real *dy) get_bounds (me, &left_col, &right_col); if (left_col && right_col) { - Interval rv = right_col->extent (commony, Y_AXIS); - Interval lv = left_col->extent (commony, Y_AXIS); + Interval rv = Note_column::cross_staff_extent (right_col, commony); + Interval lv = Note_column::cross_staff_extent (left_col, commony); rv.unite (staff); lv.unite (staff); + Real graphical_dy = rv[dir] - lv[dir]; Slice ls = Note_column::head_positions_interval (left_col); @@ -584,18 +581,16 @@ Tuplet_bracket::calc_position_and_height (Grob *me_grob, Real *offset, Real *dy) 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); - + Interval note_ext = Note_column::cross_staff_extent (columns[i], commony); Real x = columns[i]->relative_coordinate (commonx, X_AXIS) - x0; - points.push_back (Offset (x, notey)); + + points.push_back (Offset (x, note_ext[dir])); } } - 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])); @@ -639,11 +634,12 @@ Tuplet_bracket::calc_position_and_height (Grob *me_grob, Real *offset, Real *dy) 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++) { Real x = points[i][X_AXIS]; - Real tuplety = (*dy) * x * factor; + Real tuplety = (*dy) * x * factor + my_offset; if (points[i][Y_AXIS] * dir > (*offset + tuplety) * dir) *offset = points[i][Y_AXIS] - tuplety; @@ -749,9 +745,21 @@ Tuplet_bracket::calc_cross_staff (SCM smob) 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;