X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ftuplet-bracket.cc;h=3e05c75a8a5d436280578c14e8b83fff1b3e9440;hb=9106e3bd374198c5457c35181ae1d66b3ec95236;hp=a13a896c49a57312c9e5ceae54bd54ac18c36b67;hpb=3032301cc8609347d997cd4367aa7ab055196e80;p=lilypond.git diff --git a/lily/tuplet-bracket.cc b/lily/tuplet-bracket.cc index a13a896c49..3e05c75a8a 100644 --- a/lily/tuplet-bracket.cc +++ b/lily/tuplet-bracket.cc @@ -29,7 +29,6 @@ todo: handle breaking elegantly. */ -#include #include "tuplet-bracket.hh" #include "line-interface.hh" @@ -49,37 +48,43 @@ static Item * get_x_bound_item (Grob *me_grob, Direction hdir, Direction my_dir) { - Spanner *me = dynamic_cast (me_grob); + Spanner *me = dynamic_cast (me_grob); Item *g = me->get_bound (hdir); if (Note_column::has_interface (g) && Note_column::get_stem (g) && Note_column::dir (g) == my_dir) - { - g = Note_column::get_stem (g); - } - + g = Note_column::get_stem (g); + return g; } Grob * -Tuplet_bracket::parallel_beam (Grob *me, Link_array const &cols, bool *equally_long) +Tuplet_bracket::parallel_beam (Grob *me_grob, Link_array const &cols, bool *equally_long) { - /* - ugh: code dup. - */ - Grob *s1 = Note_column::get_stem (cols[0]); - Grob *s2 = Note_column::get_stem (cols.top ()); + Spanner *me = dynamic_cast (me_grob); - Grob *b1 = s1 ? Stem::get_beam (s1) : 0; - Grob *b2 = s2 ? Stem::get_beam (s2) : 0; + if (me->get_bound (LEFT)->break_status_dir () + || me->get_bound (RIGHT)->break_status_dir ()) + return 0; - Spanner *sp = dynamic_cast (me); + Drul_array stems (Note_column::get_stem (cols[0]), + Note_column::get_stem (cols.top ())); + if (dynamic_cast (stems[RIGHT])->get_column () + != me->get_bound (RIGHT)->get_column()) + return 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) && !sp->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"); @@ -87,8 +92,8 @@ Tuplet_bracket::parallel_beam (Grob *me, Link_array const &cols, bool *equ return 0; } - *equally_long = (beam_stems[0] == s1 && beam_stems.top () == s2); - return b1; + *equally_long = (beam_stems[0] == stems[LEFT] && beam_stems.top () == stems[RIGHT]); + return beams[LEFT]; } /* @@ -101,36 +106,14 @@ MAKE_SCHEME_CALLBACK (Tuplet_bracket, print, 1); SCM Tuplet_bracket::print (SCM smob) { - Grob *me = unsmob_grob (smob); + Spanner *me = unsmob_spanner (smob); Stencil mol; extract_grob_set (me, "note-columns", columns); - if (!columns.size ()) - return mol.smobbed_copy (); - - { - 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); - } - } - - Real ly = robust_scm2double (me->get_property ("left-position"), 0); - Real ry = robust_scm2double (me->get_property ("right-position"), 0); - + Drul_array positions = ly_scm2realdrul (me->get_property ("positions")); + Real dy = positions[RIGHT] - positions[LEFT]; bool equally_long = false; Grob *par_beam = parallel_beam (me, columns, &equally_long); - Spanner *sp = dynamic_cast (me); bool bracket_visibility = !(par_beam && equally_long); @@ -141,26 +124,17 @@ Tuplet_bracket::print (SCM smob) */ SCM bracket = me->get_property ("bracket-visibility"); if (scm_is_bool (bracket)) - { - bracket_visibility = ly_scm2bool (bracket); - } + bracket_visibility = ly_scm2bool (bracket); else if (bracket == ly_symbol2scm ("if-no-beam")) bracket_visibility = !par_beam; SCM numb = me->get_property ("number-visibility"); if (scm_is_bool (numb)) - { - number_visibility = ly_scm2bool (numb); - } + number_visibility = ly_scm2bool (numb); else if (numb == ly_symbol2scm ("if-no-beam")) number_visibility = !par_beam; - Grob *commonx = columns[0]->common_refpoint (columns.top (), X_AXIS); - - /* - Tuplet brackets are normally not broken, but we shouldn't crash if - they are. - */ + 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); @@ -170,23 +144,64 @@ Tuplet_bracket::print (SCM smob) bounds[LEFT] = get_x_bound_item (me, LEFT, dir); bounds[RIGHT] = get_x_bound_item (me, RIGHT, dir); + Drul_array connect_to_other; 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_); + + int 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]; + + /* trigger possible suicide*/ + (void) neighbor->get_property ("positions"); + } + + connect_to_other[d] + = (break_dir + && (neighbor_idx < orig_spanner->broken_intos_.size () + && neighbor_idx >= 0) + && orig_spanner->broken_intos_[neighbor_idx]->is_live ()); + - if (bounds[d]->break_status_dir()) + if (connect_to_other[d]) { Interval overshoot (robust_scm2drul (me->get_property ("break-overshoot"), - Interval (0,0))); + Interval (-0.5, 0.0))); + + if (d == RIGHT) + x_span[d] += d * overshoot[d]; + else + x_span[d] = robust_relative_extent (bounds[d], commonx, X_AXIS)[RIGHT] + - overshoot[LEFT]; + } + else if (d == RIGHT + && (columns.is_empty () + || (bounds[d]->get_column () + != dynamic_cast (columns.top ())->get_column ()))) + { + /* + TODO: make padding tunable? + */ + Real padding = 1.0; - x_span[d] += d * overshoot[d]; + if (bounds[d]->break_status_dir ()) + padding = 0.0; + + x_span[d] = robust_relative_extent (bounds[d], commonx, X_AXIS) [LEFT] - padding; } } while (flip (&d) != LEFT); - Real w = x_span.length(); + Real w = x_span.length (); SCM number = me->get_property ("text"); Output_def *pap = me->get_layout (); @@ -194,13 +209,14 @@ Tuplet_bracket::print (SCM smob) 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); + 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); - num.translate_axis ((ry - ly) / 2, Y_AXIS); + num.translate_axis (dy / 2, Y_AXIS); mol.add_stencil (num); } @@ -212,9 +228,7 @@ Tuplet_bracket::print (SCM smob) */ if (bracket_visibility && number_visibility && mol.extent (X_AXIS).length () > w) - { - bracket_visibility = false; - } + bracket_visibility = false; if (bracket_visibility) { @@ -223,7 +237,7 @@ Tuplet_bracket::print (SCM smob) if (!num.extent (X_AXIS).is_empty ()) gap = num.extent (X_AXIS).length () + 1.0; - Drul_array zero (0,0); + Drul_array zero (0, 0); Real ss = Staff_symbol_referencer::staff_space (me); Drul_array height = robust_scm2drul (me->get_property ("edge-height"), zero); @@ -231,26 +245,41 @@ Tuplet_bracket::print (SCM smob) = robust_scm2drul (me->get_property ("bracket-flare"), zero); Drul_array shorten = robust_scm2drul (me->get_property ("shorten-pair"), zero); + Drul_array edge_stencils; scale_drul (&height, -ss * dir); scale_drul (&flare, ss); scale_drul (&shorten, ss); - - do { - if (bounds[d]->break_status_dir ()) + if (connect_to_other[d]) { height[d] = 0.0; flare[d] = 0.0; shorten[d] = 0.0; + + SCM edge_text = me->get_property ("edge-text"); + + if (scm_is_pair (edge_text)) + { + SCM properties = Font_interface::text_font_alist_chain (me); + 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); + + Stencil *edge_text = unsmob_stencil (t); + edge_text->translate_axis (x_span[d] - x_span[LEFT], X_AXIS); + edge_stencils[d] = *edge_text; + } + } } } while (flip (&d) != LEFT); - Stencil brack = make_bracket (me, Y_AXIS, - Offset (w, ry - ly), + Offset (w, dy), height, /* 0.1 = more space at right due to italics @@ -261,30 +290,15 @@ Tuplet_bracket::print (SCM smob) do { - if (bounds[d]->break_status_dir ()) - { - SCM properties = Font_interface::text_font_alist_chain (me); - SCM edge_text = me->get_property ("edge-text"); - - 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); - - Stencil *edge_text = unsmob_stencil (t); - edge_text->translate_axis (x_span[d] - x_span[LEFT], X_AXIS); - mol.add_stencil (*edge_text); - } - } + if (!edge_stencils[d].is_empty ()) + brack.add_stencil (edge_stencils[d]); } while (flip (&d) != LEFT); - mol.add_stencil (brack); } - mol.translate_axis (ly, Y_AXIS); + mol.translate_axis (positions[LEFT], Y_AXIS); mol.translate_axis (x_span[LEFT] - sp->get_bound (LEFT)->relative_coordinate (commonx, X_AXIS), X_AXIS); return mol.smobbed_copy (); @@ -316,18 +330,16 @@ 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); + straight_corners[d] += -d * shorten[d] / length * dz; + 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); + gap_corners[d] = (dz * 0.5) + gap[d] / length * dz; + while (flip (&d) != LEFT) + ; Drul_array flare_corners = straight_corners; do @@ -373,27 +385,35 @@ Tuplet_bracket::get_bounds (Grob *me, Grob **left, Grob **right) } } - /* use first -> last note for slope, and then correct for disturbing notes in between. */ void Tuplet_bracket::calc_position_and_height (Grob *me_grob, Real *offset, Real *dy) { - Spanner *me = dynamic_cast (me_grob); - + Spanner *me = dynamic_cast (me_grob); + extract_grob_set (me, "note-columns", columns); extract_grob_set (me, "tuplets", tuplets); - + Grob *commony = common_refpoint_of_array (columns, me, Y_AXIS); 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); + Grob *commonx = common_refpoint_of_array (columns, me, X_AXIS); 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)) - staff = st->extent (commony, Y_AXIS); - + { + staff = st->extent (commony, Y_AXIS); + Real pad = robust_scm2double (me->get_property ("staff-padding"), 0.5); + staff.widen (pad); + } + Direction dir = get_grob_direction (me); /* @@ -428,37 +448,30 @@ Tuplet_bracket::calc_position_and_height (Grob *me_grob, Real *offset, Real *dy) *offset = -dir * infinity_f; - if (!columns.size ()) - return; - 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]; - /* - offset - */ - Real factor = columns.size () > 1 ? 1 / (x1 - x0) : 1.0; - Array points; + points.push (Offset (x0 - x0, staff[dir])); + points.push (Offset (x1 - x0, staff[dir])); + for (int i = 0; i < columns.size (); i++) { Interval note_ext = columns[i]->extent (commony, Y_AXIS); - note_ext.unite (staff); Real notey = note_ext[dir] - me->relative_coordinate (commony, Y_AXIS); Real x = columns[i]->relative_coordinate (commonx, X_AXIS) - x0; points.push (Offset (x, notey)); } - + /* This is a slight hack. We compute two encompass points from the bbox of the smaller tuplets. - + 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++) { @@ -466,44 +479,45 @@ Tuplet_bracket::calc_position_and_height (Grob *me_grob, Real *offset, Real *dy) Interval tuplet_y (tuplets[i]->extent (commony, Y_AXIS)); 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 = ly_scm2realdrul (tuplets[i]->get_property ("positions")); + + + Real other_dy = positions[RIGHT] - positions[LEFT]; do { - Real y = - tuplet_y.linear_combination (d * sign (other_dy)); + Real y + = tuplet_y.linear_combination (d * sign (other_dy)); #if 0 /* Let's not 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]; - } + = 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)); } while (flip (&d) != LEFT); } + Real factor = (columns.size () > 1) ? 1 / (x1 - x0) : 1.0; for (int i = 0; i < points.size (); i++) { Real x = points[i][X_AXIS]; - Real tuplety = *dy * x * factor; + Real tuplety = (*dy) * x * factor; if (points[i][Y_AXIS] * dir > (*offset + tuplety) * dir) *offset = points[i][Y_AXIS] - tuplety; } - + *offset += scm_to_double (me->get_property ("padding")) * dir; /* @@ -513,8 +527,8 @@ Tuplet_bracket::calc_position_and_height (Grob *me_grob, Real *offset, Real *dy) let's leave code for the future when possibly allow them to move into the staff once again. */ - if (*dy == 0 && - fabs (*offset) < ss * Staff_symbol_referencer::staff_radius (me)) + if (*dy == 0 + && fabs (*offset) < ss * Staff_symbol_referencer::staff_radius (me)) { // quantize, then do collision check. *offset *= 2 / ss; @@ -527,53 +541,31 @@ Tuplet_bracket::calc_position_and_height (Grob *me_grob, Real *offset, Real *dy) } } -/* - 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); - if (!columns.size ()) + if (columns.is_empty()) { me->suicide (); - return SCM_UNSPECIFIED; + return scm_cons (scm_from_double (0), + scm_from_double (0)); } - if (dynamic_cast (me)->is_broken ()) - { - me->warning (_ ("removing tuplet bracket across linebreak")); - me->suicide (); - return SCM_UNSPECIFIED; - } - + 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); @@ -584,9 +576,7 @@ Tuplet_bracket::after_line_breaking (SCM smob) Real offset = 0.0; if (!par_beam || get_grob_direction (par_beam) != dir) - { - calc_position_and_height (me, &offset, &dy); - } + calc_position_and_height (me, &offset, &dy); else { SCM ps = par_beam->get_property ("positions"); @@ -598,30 +588,14 @@ Tuplet_bracket::after_line_breaking (SCM smob) 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); + dy = rp - lp; } - me->set_property ("left-position", lp); - me->set_property ("right-position", rp); - - return SCM_UNSPECIFIED; + + SCM x = scm_cons (scm_from_double (offset), + scm_from_double (offset + dy)); + + return x; } /* @@ -632,7 +606,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 (int i = 0; i < columns.size (); i++) { Grob *nc = columns[i]; Direction d = Note_column::dir (nc); @@ -647,8 +621,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); } @@ -656,21 +628,31 @@ void Tuplet_bracket::add_tuplet_bracket (Grob *me, Grob *bracket) { Pointer_group_interface::add_grob (me, ly_symbol2scm ("tuplets"), bracket); - me->add_dependency (bracket); } - - ADD_INTERFACE (Tuplet_bracket, "tuplet-bracket-interface", - "A bracket with a number in the middle, used for tuplets. ", + "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. " + "@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. " - - "note-columns bracket-flare edge-height shorten-pair " - "tuplets edge-text break-overshoot " - "padding left-position right-position bracket-visibility " - "number-visibility thickness direction"); + "at the edges. ", + + + /* properties */ + "bracket-flare " + "bracket-visibility " + "break-overshoot " + "direction " + "edge-height " + "edge-text " + "positions " + "note-columns " + "number-visibility " + "padding " + "shorten-pair " + "staff-padding " + "thickness " + "tuplets ");