X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ftuplet-bracket.cc;h=4edf3f3ba639425f438d458fe7cf476a208e93eb;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=8a18e4c7b9f361d767cc4316f392ffb3237b4071;hpb=eb72c0f066957c3e71d336db0f72814e34d3964d;p=lilypond.git diff --git a/lily/tuplet-bracket.cc b/lily/tuplet-bracket.cc index 8a18e4c7b9..4edf3f3ba6 100644 --- a/lily/tuplet-bracket.cc +++ b/lily/tuplet-bracket.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2005 Jan Nieuwenhuizen + (c) 1997--2008 Jan Nieuwenhuizen Han-Wen Nienhuys */ @@ -34,8 +34,8 @@ #include "line-interface.hh" #include "beam.hh" #include "warn.hh" -#include "font-interface.hh" #include "output-def.hh" +#include "font-interface.hh" #include "text-interface.hh" #include "stem.hh" #include "note-column.hh" @@ -44,6 +44,8 @@ #include "spanner.hh" #include "staff-symbol-referencer.hh" #include "lookup.hh" +#include "paper-column.hh" +#include "moment.hh" static Item * get_x_bound_item (Grob *me_grob, Direction hdir, Direction my_dir) @@ -58,8 +60,26 @@ get_x_bound_item (Grob *me_grob, Direction hdir, Direction my_dir) return g; } + +void +flatten_number_pair_property (Grob *me, + Direction xdir, SCM sym) +{ + Drul_array zero (0, 0); + Drul_array pair + = robust_scm2drul (me->internal_get_property (sym), zero); + pair[xdir] = 0.0; + + me->set_property (sym, ly_interval2scm (pair)); +} + + +/* + Return beam that encompasses the span of the tuplet bracket. +*/ Grob * -Tuplet_bracket::parallel_beam (Grob *me_grob, Link_array const &cols, bool *equally_long) +Tuplet_bracket::parallel_beam (Grob *me_grob, vector const &cols, + bool *equally_long) { Spanner *me = dynamic_cast (me_grob); @@ -67,20 +87,26 @@ Tuplet_bracket::parallel_beam (Grob *me_grob, Link_array const &cols, bool || me->get_bound (RIGHT)->break_status_dir ()) return 0; - Grob *s1 = Note_column::get_stem (cols[0]); - Grob *s2 = Note_column::get_stem (cols.top ()); + Drul_array stems (Note_column::get_stem (cols[0]), + Note_column::get_stem (cols.back ())); - if (s2 != me->get_bound (RIGHT)) + if (!stems[RIGHT] + || !stems[LEFT] + || (dynamic_cast (stems[RIGHT])->get_column () + != me->get_bound (RIGHT)->get_column ())) return 0; - Grob *b1 = s1 ? Stem::get_beam (s1) : 0; - Grob *b2 = s2 ? Stem::get_beam (s2) : 0; - + Drul_array beams; + Direction d = LEFT; + do { + beams[d] = stems[d] ? Stem::get_beam (stems[d]) : 0; + } while (flip (&d) != LEFT); + *equally_long = false; - if (! (b1 && (b1 == b2) && !me->is_broken ())) + if (! (beams[LEFT] && (beams[LEFT] == beams[RIGHT]) && !me->is_broken ())) return 0; - extract_grob_set (b1, "stems", beam_stems); + extract_grob_set (beams[LEFT], "stems", beam_stems); if (beam_stems.size () == 0) { programming_error ("beam under tuplet bracket has no stems"); @@ -88,88 +114,102 @@ Tuplet_bracket::parallel_beam (Grob *me_grob, Link_array const &cols, bool return 0; } - *equally_long = (beam_stems[0] == s1 && beam_stems.top () == s2); - return b1; + *equally_long = + (beam_stems[0] == stems[LEFT] + && beam_stems.back () == stems[RIGHT]); + return beams[LEFT]; } -/* - TODO: - in the case that there is no bracket, but there is a (single) beam, - follow beam precisely for determining tuplet number location. -*/ -MAKE_SCHEME_CALLBACK (Tuplet_bracket, print, 1); +MAKE_SCHEME_CALLBACK (Tuplet_bracket, calc_connect_to_neighbors,1); SCM -Tuplet_bracket::print (SCM smob) +Tuplet_bracket::calc_connect_to_neighbors (SCM smob) { Spanner *me = unsmob_spanner (smob); - Stencil mol; - extract_grob_set (me, "note-columns", columns); - { - SCM lp = me->get_property ("left-position"); - SCM rp = me->get_property ("right-position"); - - if (!scm_is_number (rp) || !scm_is_number (lp)) - { - /* - UGH. dependency tracking! - */ - extract_grob_set (me, "tuplets", tuplets); - for (int i = 0; i < tuplets.size (); i++) - Tuplet_bracket::print (tuplets[i]->self_scm ()); - - after_line_breaking (smob); - } - } + Direction dir = get_grob_direction (me); + Drul_array bounds (get_x_bound_item (me, LEFT, dir), + get_x_bound_item (me, RIGHT, dir)); + + Drul_array connect_to_other (false, false); + Direction d = LEFT; + 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 + && neighbor_idx < orig_spanner->broken_intos_.size ()) + { + Grob *neighbor = orig_spanner->broken_intos_[neighbor_idx]; - Real ly = robust_scm2double (me->get_property ("left-position"), 0); - Real ry = robust_scm2double (me->get_property ("right-position"), 0); + /* trigger possible suicide*/ + (void) neighbor->get_property ("positions"); + } - bool equally_long = false; - Grob *par_beam = parallel_beam (me, columns, &equally_long); + connect_to_other[d] + = (break_dir + && neighbor_idx < orig_spanner->broken_intos_.size () + && orig_spanner->broken_intos_[neighbor_idx]->is_live ()); + } + while (flip (&d) != LEFT); - Spanner *sp = dynamic_cast (me); - bool bracket_visibility = !(par_beam && equally_long); - bool number_visibility = true; + if (connect_to_other[LEFT] || connect_to_other[RIGHT]) + return scm_cons (scm_from_bool (connect_to_other[LEFT]), + scm_from_bool (connect_to_other[RIGHT])); + + return SCM_EOL; +} - /* - Fixme: the type of this prop is sucky. - */ - SCM bracket = me->get_property ("bracket-visibility"); - if (scm_is_bool (bracket)) - bracket_visibility = ly_scm2bool (bracket); - else if (bracket == ly_symbol2scm ("if-no-beam")) - bracket_visibility = !par_beam; +Grob* +Tuplet_bracket::get_common_x (Spanner *me) +{ + extract_grob_set (me, "note-columns", columns); - SCM numb = me->get_property ("number-visibility"); - if (scm_is_bool (numb)) - number_visibility = ly_scm2bool (numb); - else if (numb == ly_symbol2scm ("if-no-beam")) - number_visibility = !par_beam; + Grob * commonx = common_refpoint_of_array (columns, me, X_AXIS); + commonx = commonx->common_refpoint (me->get_bound (LEFT), X_AXIS); + commonx = commonx->common_refpoint (me->get_bound (RIGHT), X_AXIS); - Grob *commonx = common_refpoint_of_array (columns, me, X_AXIS); - commonx = commonx->common_refpoint (sp->get_bound (LEFT), X_AXIS); - commonx = commonx->common_refpoint (sp->get_bound (RIGHT), X_AXIS); + return commonx; +} + +MAKE_SCHEME_CALLBACK (Tuplet_bracket, calc_control_points,1) +SCM +Tuplet_bracket::calc_control_points (SCM smob) +{ + Spanner *me = unsmob_spanner (smob); + + extract_grob_set (me, "note-columns", columns); + + SCM scm_positions = me->get_property ("positions"); + if (!me->is_live ()) + return SCM_EOL; + + if (!scm_is_pair (scm_positions)) + programming_error ("Positions should be number pair"); + + Drul_array positions + = robust_scm2drul (scm_positions, Drul_array (0,0)); + Grob *commonx = get_common_x (me); Direction dir = get_grob_direction (me); Drul_array bounds; bounds[LEFT] = get_x_bound_item (me, LEFT, dir); bounds[RIGHT] = get_x_bound_item (me, RIGHT, dir); - Drul_array connect_to_other; + Drul_array connect_to_other = + robust_scm2booldrul (me->get_property ("connect-to-neighbor"), + Drul_array (false, false)); + + Interval x_span; Direction d = LEFT; do { x_span[d] = robust_relative_extent (bounds[d], commonx, X_AXIS)[d]; - Direction break_dir = bounds[d]->break_status_dir (); - Spanner *orig_spanner = dynamic_cast (me->original_); - connect_to_other[d] - = (break_dir - && (me->get_break_index () - break_dir < orig_spanner->broken_intos_.size ())); if (connect_to_other[d]) { @@ -182,55 +222,111 @@ Tuplet_bracket::print (SCM smob) x_span[d] = robust_relative_extent (bounds[d], commonx, X_AXIS)[RIGHT] - overshoot[LEFT]; } + else if (d == RIGHT - && (columns.is_empty () + && (columns.empty () || (bounds[d]->get_column () - != dynamic_cast (columns.top ())->get_column ()))) + != dynamic_cast (columns.back ())->get_column ()))) { /* - TODO: make padding tunable? + We're connecting to a column, for the last bit of a broken + fullLength bracket. */ - x_span[d] = robust_relative_extent (bounds[d], commonx, X_AXIS) [LEFT] - 1.0; + Real padding = + robust_scm2double(me->get_property("full-length-padding"), 1.0); + + if (bounds[d]->break_status_dir ()) + padding = 0.0; + + Real coord = bounds[d]->relative_coordinate(commonx, X_AXIS); + if (to_boolean (me->get_property ("full-length-to-extent"))) + coord = robust_relative_extent(bounds[d], commonx, X_AXIS)[LEFT]; + + coord = max (coord, x_span[LEFT]); + + x_span[d] = coord - padding; } } while (flip (&d) != LEFT); - Real w = x_span.length (); - SCM number = me->get_property ("text"); + + + x_span -= me->get_bound (LEFT)->relative_coordinate (commonx, X_AXIS); + return scm_list_2 (ly_offset2scm (Offset (x_span[LEFT], positions[LEFT])), + ly_offset2scm (Offset (x_span[RIGHT], positions[RIGHT]))); +} - Output_def *pap = me->get_layout (); - Stencil num; - if (scm_is_string (number) && number_visibility) - { - SCM properties = Font_interface::text_font_alist_chain (me); - SCM snum = Text_interface::interpret_markup (pap->self_scm (), - properties, number); - num = *unsmob_stencil (snum); - num.align_to (X_AXIS, CENTER); - num.translate_axis (w / 2, X_AXIS); - num.align_to (Y_AXIS, CENTER); +/* + TODO: - num.translate_axis ((ry - ly) / 2, Y_AXIS); + in the case that there is no bracket, but there is a (single) beam, + follow beam precisely for determining tuplet number location. +*/ +MAKE_SCHEME_CALLBACK (Tuplet_bracket, print, 1); +SCM +Tuplet_bracket::print (SCM smob) +{ + Spanner *me = unsmob_spanner (smob); + Stencil mol; - mol.add_stencil (num); + extract_grob_set (me, "note-columns", columns); + bool equally_long = false; + Grob *par_beam = parallel_beam (me, columns, &equally_long); + + bool bracket_visibility = !(par_beam && equally_long); + /* + Fixme: the type of this prop is sucky. + */ + SCM bracket = me->get_property ("bracket-visibility"); + if (scm_is_bool (bracket)) + bracket_visibility = ly_scm2bool (bracket); + else if (bracket == ly_symbol2scm ("if-no-beam")) + bracket_visibility = !par_beam; + + /* Don't print a tuplet bracket and number if no control-points were calculated */ + SCM cpoints = me->get_property ("control-points"); + if (scm_ilength (cpoints) < 2) + { + me->suicide (); + return SCM_EOL; } + /* if the tuplet does not span any time, i.e. a single-note tuplet, hide + the bracket, but still let the number be displayed */ + if (robust_scm2moment (me->get_bound (LEFT)->get_column ()->get_property ("when"), Moment (0)) + == robust_scm2moment (me->get_bound (RIGHT)->get_column ()->get_property ("when"), Moment (0))) + { + bracket_visibility = false; + } + + Drul_array points; + points[LEFT] = ly_scm2offset (scm_car (cpoints)); + points[RIGHT] = ly_scm2offset (scm_cadr (cpoints)); + + 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")); + /* No bracket when it would be smaller than the number. - - TODO: should use GAP in calculation too. */ - if (bracket_visibility && number_visibility - && mol.extent (X_AXIS).length () > w) - bracket_visibility = false; + Real gap = 0.; + if (bracket_visibility && number_grob) + { + Interval ext = number_grob->extent (number_grob, X_AXIS); + if (!ext.is_empty ()) + { + gap = ext.length () + 1.0; + + if (0.75 * x_span.length () < gap) + bracket_visibility = false; + } + } if (bracket_visibility) { - Real gap = 0.; - - if (!num.extent (X_AXIS).is_empty ()) - gap = num.extent (X_AXIS).length () + 1.0; - Drul_array zero (0, 0); Real ss = Staff_symbol_referencer::staff_space (me); Drul_array height @@ -241,9 +337,17 @@ Tuplet_bracket::print (SCM smob) = robust_scm2drul (me->get_property ("shorten-pair"), zero); Drul_array edge_stencils; + Direction dir = get_grob_direction (me); + scale_drul (&height, -ss * dir); scale_drul (&flare, ss); scale_drul (&shorten, ss); + + Drul_array connect_to_other = + robust_scm2booldrul (me->get_property ("connect-to-neighbor"), + Drul_array (false, false)); + + Direction d = LEFT; do { if (connect_to_other[d]) @@ -260,7 +364,8 @@ Tuplet_bracket::print (SCM smob) SCM text = index_get_cell (edge_text, d); if (Text_interface::is_markup (text)) { - SCM t = Text_interface::interpret_markup (pap->self_scm (), properties, text); + SCM t = Text_interface::interpret_markup (pap->self_scm (), + properties, text); Stencil *edge_text = unsmob_stencil (t); edge_text->translate_axis (x_span[d] - x_span[LEFT], X_AXIS); @@ -272,7 +377,7 @@ Tuplet_bracket::print (SCM smob) while (flip (&d) != LEFT); Stencil brack = make_bracket (me, Y_AXIS, - Offset (w, ry - ly), + points[RIGHT] - points[LEFT], height, /* 0.1 = more space at right due to italics @@ -291,9 +396,7 @@ Tuplet_bracket::print (SCM smob) mol.add_stencil (brack); } - mol.translate_axis (ly, Y_AXIS); - mol.translate_axis (x_span[LEFT] - - sp->get_bound (LEFT)->relative_coordinate (commonx, X_AXIS), X_AXIS); + mol.translate (points[LEFT]); return mol.smobbed_copy (); } @@ -324,15 +427,14 @@ Tuplet_bracket::make_bracket (Grob *me, // for line properties. Direction d = LEFT; do straight_corners[d] += -d * shorten[d] / length * dz; - while (flip (&d) != LEFT) - ; + while (flip (&d) != LEFT); - if (gap.is_empty ()) - gap = Interval (0, 0); - do - gap_corners[d] = (dz * 0.5) + gap[d] / length * dz; - while (flip (&d) != LEFT) - ; + if (!gap.is_empty ()) + { + do + gap_corners[d] = (dz * 0.5) + gap[d] / length * dz; + while (flip (&d) != LEFT); + } Drul_array flare_corners = straight_corners; do @@ -346,14 +448,20 @@ Tuplet_bracket::make_bracket (Grob *me, // for line properties. Stencil m; do { - m.add_stencil (Line_interface::line (me, straight_corners[d], - gap_corners[d])); + if (!gap.is_empty ()) + m.add_stencil (Line_interface::line (me, straight_corners[d], + gap_corners[d])); m.add_stencil (Line_interface::line (me, straight_corners[d], flare_corners[d])); } + while (flip (&d) != LEFT); + if (gap.is_empty ()) + m.add_stencil (Line_interface::line (me, straight_corners[LEFT], + straight_corners[RIGHT])); + return m; } @@ -361,20 +469,20 @@ void Tuplet_bracket::get_bounds (Grob *me, Grob **left, Grob **right) { extract_grob_set (me, "note-columns", columns); - int l = 0; + vsize l = 0; while (l < columns.size () && Note_column::has_rests (columns[l])) l++; - int r = columns.size ()- 1; - while (r >= l && Note_column::has_rests (columns[r])) + vsize r = columns.size (); + while (r > l && Note_column::has_rests (columns[r-1])) r--; *left = *right = 0; - if (l <= r) + if (l < r) { *left = columns[l]; - *right = columns[r]; + *right = columns[r-1]; } } @@ -393,72 +501,112 @@ 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 = common_refpoint_of_array (columns, me, X_AXIS); + Grob *commonx = get_common_x (me); commonx = common_refpoint_of_array (tuplets, commonx, Y_AXIS); - commonx = commonx->common_refpoint (me->get_bound (LEFT), X_AXIS); - commonx = commonx->common_refpoint (me->get_bound (RIGHT), X_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"))) { - staff = st->extent (commony, Y_AXIS); - Real pad = robust_scm2double (me->get_property ("staff-padding"), 0.5); - staff.widen (pad); + Real pad = robust_scm2double (me->get_property ("staff-padding"), -1.0); + if (pad >= 0.0) + { + staff = st->extent (commony, Y_AXIS) - my_offset; + staff.widen (pad); + } } Direction dir = get_grob_direction (me); - /* - Use outer non-rest columns to determine slope - */ - Grob *left_col = 0; - Grob *right_col = 0; - 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); - rv.unite (staff); - lv.unite (staff); - Real graphical_dy = rv[dir] - lv[dir]; - - Slice ls = Note_column::head_positions_interval (left_col); - Slice rs = Note_column::head_positions_interval (right_col); - - Interval musical_dy; - musical_dy[UP] = rs[UP] - ls[UP]; - musical_dy[DOWN] = rs[DOWN] - ls[DOWN]; - if (sign (musical_dy[UP]) != sign (musical_dy[DOWN])) - *dy = 0.0; - else if (sign (graphical_dy) != sign (musical_dy[DOWN])) - *dy = 0.0; - else - *dy = graphical_dy; - } - else - *dy = 0; - - *offset = -dir * infinity_f; - + 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]; - - Array points; - points.push (Offset (x0 - x0, staff[dir])); - points.push (Offset (x1 - x0, staff[dir])); - - for (int i = 0; i < columns.size (); i++) + bool follow_beam = par_beam + && get_grob_direction (par_beam) == dir + && ! to_boolean (par_beam->get_property ("knee")); + + vector points; + if (columns.size () + && follow_beam + && Note_column::get_stem (columns[0]) + && Note_column::get_stem (columns.back ())) { - Interval note_ext = columns[i]->extent (commony, Y_AXIS); - Real notey = note_ext[dir] - me->relative_coordinate (commony, Y_AXIS); + /* + trigger set_stem_ends + */ + (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 lp = ss * robust_scm2double (stems[LEFT]->get_property ("stem-end-position"), 0.0) + + 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); + + *dy = rp - lp; + points.push_back (Offset (stems[LEFT]->relative_coordinate (commonx, X_AXIS) - x0, lp)); + points.push_back (Offset (stems[RIGHT]->relative_coordinate (commonx, X_AXIS) - x0, rp)); + } + else + { + /* + Use outer non-rest columns to determine slope + */ + Grob *left_col = 0; + Grob *right_col = 0; + get_bounds (me, &left_col, &right_col); + if (left_col && right_col) + { + 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); + Slice rs = Note_column::head_positions_interval (right_col); + + Interval musical_dy; + musical_dy[UP] = rs[UP] - ls[UP]; + musical_dy[DOWN] = rs[DOWN] - ls[DOWN]; + if (sign (musical_dy[UP]) != sign (musical_dy[DOWN])) + *dy = 0.0; + else if (sign (graphical_dy) != sign (musical_dy[DOWN])) + *dy = 0.0; + else + *dy = graphical_dy; + } + else + *dy = 0; + + for (vsize i = 0; i < columns.size (); i++) + { + Interval note_ext = Note_column::cross_staff_extent (columns[i], commony); + Real x = columns[i]->relative_coordinate (commonx, X_AXIS) - x0; - Real x = columns[i]->relative_coordinate (commonx, X_AXIS) - x0; - points.push (Offset (x, notey)); + points.push_back (Offset (x, note_ext[dir])); + } } + if (!follow_beam) + { + points.push_back (Offset (x0 - x0, staff[dir])); + points.push_back (Offset (x1 - x0, staff[dir])); + } + /* This is a slight hack. We compute two encompass points from the bbox of the smaller tuplets. @@ -466,45 +614,43 @@ Tuplet_bracket::calc_position_and_height (Grob *me_grob, Real *offset, Real *dy) We assume that the smaller bracket is 1.0 space high. */ Real ss = Staff_symbol_referencer::staff_space (me); - for (int i = 0; i < tuplets.size (); i++) + for (vsize i = 0; i < tuplets.size (); i++) { Interval tuplet_x (tuplets[i]->extent (commonx, X_AXIS)); Interval tuplet_y (tuplets[i]->extent (commony, Y_AXIS)); + if (!tuplets[i]->is_live ()) + continue; + Direction d = LEFT; - Real lp = scm_to_double (tuplets[i]->get_property ("left-position")); - Real rp = scm_to_double (tuplets[i]->get_property ("right-position")); - Real other_dy = rp - lp; + Drul_array positions = robust_scm2interval (tuplets[i]->get_property ("positions"), + Interval (0,0)); + + + Real other_dy = positions[RIGHT] - positions[LEFT]; do { Real y = tuplet_y.linear_combination (d * sign (other_dy)); -#if 0 /* - Let's not take padding into account for nested tuplets. + We don't take padding into account for nested tuplets. the edges can come very close to the stems, likewise for nested tuplets? */ - Drul_array my_height - = robust_scm2drul (me->get_property ("edge-height"), - Interval (0, 0)); - if (dynamic_cast (tuplets[i])->get_bound (d) - == me->get_bound (d)) - y += dir * my_height[d]; -#endif - - points.push (Offset (tuplet_x[d] - x0, y)); + + points.push_back (Offset (tuplet_x[d] - x0, y)); } while (flip (&d) != LEFT); } + *offset = -dir * infinity_f; Real factor = (columns.size () > 1) ? 1 / (x1 - x0) : 1.0; - for (int i = 0; i < points.size (); i++) + 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; @@ -518,6 +664,8 @@ Tuplet_bracket::calc_position_and_height (Grob *me_grob, Real *offset, Real *dy) Kind of pointless since we put them outside the staff anyway, but let's leave code for the future when possibly allow them to move into the staff once again. + + This doesn't seem to support cross-staff tuplets atm. */ if (*dy == 0 && fabs (*offset) < ss * Staff_symbol_referencer::staff_radius (me)) @@ -526,90 +674,37 @@ Tuplet_bracket::calc_position_and_height (Grob *me_grob, Real *offset, Real *dy) *offset *= 2 / ss; *offset = rint (*offset); - if (Staff_symbol_referencer::on_staffline (me, (int) rint (*offset))) + if (Staff_symbol_referencer::on_line (me, (int) rint (*offset))) *offset += dir; *offset *= 0.5 * ss; } } -/* - We depend on the beams if there are any. -*/ -MAKE_SCHEME_CALLBACK (Tuplet_bracket, before_line_breaking, 1); + +MAKE_SCHEME_CALLBACK (Tuplet_bracket, calc_direction, 1); SCM -Tuplet_bracket::before_line_breaking (SCM smob) +Tuplet_bracket::calc_direction (SCM smob) { Grob *me = unsmob_grob (smob); - extract_grob_set (me, "note-columns", columns); - - for (int i = columns.size (); i--;) - { - Grob *s = Note_column::get_stem (columns[i]); - Grob *b = s ? Stem::get_beam (s) : 0; - if (b) - me->add_dependency (b); - } - return SCM_UNSPECIFIED; + Direction dir = Tuplet_bracket::get_default_dir (me); + return scm_from_int (dir); } -MAKE_SCHEME_CALLBACK (Tuplet_bracket, after_line_breaking, 1); - +MAKE_SCHEME_CALLBACK (Tuplet_bracket, calc_positions, 1); SCM -Tuplet_bracket::after_line_breaking (SCM smob) +Tuplet_bracket::calc_positions (SCM smob) { - Grob *me = unsmob_grob (smob); - extract_grob_set (me, "note-columns", columns); - - Direction dir = get_grob_direction (me); - if (!dir) - { - dir = Tuplet_bracket::get_default_dir (me); - set_grob_direction (me, dir); - } - - bool equally_long = false; - Grob *par_beam = parallel_beam (me, columns, &equally_long); + Spanner *me = unsmob_spanner (smob); - /* - We follow the beam only if there is one, and we are next to it. - */ Real dy = 0.0; Real offset = 0.0; - if (!par_beam - || get_grob_direction (par_beam) != dir) - calc_position_and_height (me, &offset, &dy); - else - { - SCM ps = par_beam->get_property ("positions"); - - Real lp = scm_to_double (scm_car (ps)); - Real rp = scm_to_double (scm_cdr (ps)); - - /* - duh. magic. - */ - offset = lp + dir * (0.5 + scm_to_double (me->get_property ("padding"))); - dy = rp - lp; - } - - SCM lp = me->get_property ("left-position"); - SCM rp = me->get_property ("right-position"); - - if (scm_is_number (lp) && !scm_is_number (rp)) - rp = scm_from_double (scm_to_double (lp) + dy); - else if (scm_is_number (rp) && !scm_is_number (lp)) - lp = scm_from_double (scm_to_double (rp) - dy); - else if (!scm_is_number (rp) && !scm_is_number (lp)) - { - lp = scm_from_double (offset); - rp = scm_from_double (offset + dy); - } - - me->set_property ("left-position", lp); - me->set_property ("right-position", rp); - - return SCM_UNSPECIFIED; + calc_position_and_height (me, &offset, &dy); + + SCM x = scm_cons (scm_from_double (offset), + scm_from_double (offset + dy)); + + return x; } /* @@ -620,7 +715,7 @@ Tuplet_bracket::get_default_dir (Grob *me) { Drul_array dirs (0, 0); extract_grob_set (me, "note-columns", columns); - for (int i = 0; i < columns.size (); i++) + for (vsize i = 0; i < columns.size (); i++) { Grob *nc = columns[i]; Direction d = Note_column::dir (nc); @@ -635,8 +730,6 @@ void Tuplet_bracket::add_column (Grob *me, Item *n) { Pointer_group_interface::add_grob (me, ly_symbol2scm ("note-columns"), n); - me->add_dependency (n); - add_bound_item (dynamic_cast (me), n); } @@ -644,32 +737,65 @@ void Tuplet_bracket::add_tuplet_bracket (Grob *me, Grob *bracket) { Pointer_group_interface::add_grob (me, ly_symbol2scm ("tuplets"), bracket); - me->add_dependency (bracket); +} + +MAKE_SCHEME_CALLBACK (Tuplet_bracket, calc_cross_staff, 1); +SCM +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; + staff_symbol = stem_staff; + } + return SCM_BOOL_F; } ADD_INTERFACE (Tuplet_bracket, - "tuplet-bracket-interface", - "A bracket with a number in the middle, used for tuplets. " - "When the bracket spans a line break, the value of " - "@code{break-overshoot} determines how far it extends " - "beyond the staff. " - "At a line break, the markups in the @code{edge-text} are printed " - "at the edges. ", - - + "A bracket with a number in the middle, used for tuplets." + " When the bracket spans a line break, the value of" + " @code{break-overshoot} determines how far it extends" + " beyond the staff. At a line break, the markups in the" + " @code{edge-text} are printed at the edges.", + + /* properties */ "bracket-flare " "bracket-visibility " "break-overshoot " + "connect-to-neighbor " + "control-points " "direction " "edge-height " "edge-text " - "left-position " + "full-length-padding " + "full-length-to-extent " + "gap " + "positions " "note-columns " - "number-visibility " "padding " - "right-position " + "tuplet-number " "shorten-pair " "staff-padding " "thickness " - "tuplets "); + "tuplets " + ); +