X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ftuplet-bracket.cc;h=53253f71ddc120b98c9fd5a93acadba1912bd5b3;hb=87eedcd59f4082cb0841528ad5bc82cb1d1191e3;hp=90edb7c94a53ce1a392b35ce792f7bdb6ed90401;hpb=75eebcb49e52d296b1da3e1074e0825d2c780db4;p=lilypond.git diff --git a/lily/tuplet-bracket.cc b/lily/tuplet-bracket.cc index 90edb7c94a..53253f71dd 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--2006 Jan Nieuwenhuizen + (c) 1997--2007 Jan Nieuwenhuizen Han-Wen Nienhuys */ @@ -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) @@ -64,15 +66,21 @@ 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); + Drul_array pair + = robust_scm2drul (me->internal_get_property (sym), zero); pair[xdir] = 0.0; - me->internal_set_property (sym, ly_interval2scm (pair)); + 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); @@ -81,7 +89,7 @@ Tuplet_bracket::parallel_beam (Grob *me_grob, Link_array const &cols, bool return 0; Drul_array stems (Note_column::get_stem (cols[0]), - Note_column::get_stem (cols.top ())); + Note_column::get_stem (cols.back ())); if (dynamic_cast (stems[RIGHT])->get_column () != me->get_bound (RIGHT)->get_column()) @@ -105,7 +113,9 @@ Tuplet_bracket::parallel_beam (Grob *me_grob, Link_array const &cols, bool return 0; } - *equally_long = (beam_stems[0] == stems[LEFT] && beam_stems.top () == stems[RIGHT]); + *equally_long = + (beam_stems[0] == stems[LEFT] + && beam_stems.back () == stems[RIGHT]); return beams[LEFT]; } @@ -128,7 +138,7 @@ Tuplet_bracket::calc_connect_to_neighbors (SCM smob) Spanner *orig_spanner = dynamic_cast (me->original ()); - int neighbor_idx = me->get_break_index () - break_dir; + vsize neighbor_idx = me->get_break_index () - break_dir; if (break_dir && d == RIGHT && neighbor_idx < orig_spanner->broken_intos_.size ()) @@ -141,8 +151,7 @@ Tuplet_bracket::calc_connect_to_neighbors (SCM smob) connect_to_other[d] = (break_dir - && (neighbor_idx < orig_spanner->broken_intos_.size () - && neighbor_idx >= 0) + && neighbor_idx < orig_spanner->broken_intos_.size () && orig_spanner->broken_intos_[neighbor_idx]->is_live ()); } while (flip (&d) != LEFT); @@ -175,8 +184,15 @@ Tuplet_bracket::calc_control_points (SCM 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 - = ly_scm2realdrul (me->get_property ("positions")); + = robust_scm2drul (scm_positions, Drul_array (0,0)); Grob *commonx = get_common_x (me); Direction dir = get_grob_direction (me); @@ -207,12 +223,16 @@ Tuplet_bracket::calc_control_points (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 ()))) { /* + We're connecting to a column, for the last bit of a broken + fullLength bracket. + TODO: make padding tunable? */ Real padding = 1.0; @@ -220,7 +240,9 @@ Tuplet_bracket::calc_control_points (SCM smob) if (bounds[d]->break_status_dir ()) padding = 0.0; - x_span[d] = robust_relative_extent (bounds[d], commonx, X_AXIS) [LEFT] - padding; + x_span[d] + = robust_relative_extent (bounds[d], commonx, X_AXIS) [LEFT] + - padding; } } while (flip (&d) != LEFT); @@ -398,15 +420,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 @@ -420,14 +441,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; } @@ -435,20 +462,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]; } } @@ -484,56 +511,93 @@ Tuplet_bracket::calc_position_and_height (Grob *me_grob, Real *offset, Real *dy) 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; + bool equally_long = false; + Grob *par_beam = parallel_beam (me, columns, &equally_long); + - *offset = -dir * infinity_f; 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])); + vector points; + + if (columns.size () + && par_beam + && get_grob_direction (par_beam) == dir + && Note_column::get_stem (columns[0]) + && Note_column::get_stem (columns.back ())) + { + /* + 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); + Real rp = ss * robust_scm2double (stems[RIGHT]->get_property ("stem-end-position"), 0.0); - for (int i = 0; i < columns.size (); i++) + *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 { - Interval note_ext = columns[i]->extent (commony, Y_AXIS); - Real notey = note_ext[dir] - me->relative_coordinate (commony, Y_AXIS); + /* + 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; + 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 x = columns[i]->relative_coordinate (commonx, X_AXIS) - x0; - points.push (Offset (x, notey)); + 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)) + { + 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. @@ -541,13 +605,17 @@ 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; - Drul_array positions = ly_scm2realdrul (tuplets[i]->get_property ("positions")); + Drul_array positions = robust_scm2interval (tuplets[i]->get_property ("positions"), + Interval (0,0)); Real other_dy = positions[RIGHT] - positions[LEFT]; @@ -557,27 +625,19 @@ Tuplet_bracket::calc_position_and_height (Grob *me_grob, Real *offset, Real *dy) 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); } 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; @@ -602,7 +662,7 @@ 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; @@ -623,35 +683,21 @@ MAKE_SCHEME_CALLBACK (Tuplet_bracket, calc_positions, 1); SCM Tuplet_bracket::calc_positions (SCM smob) { - Grob *me = unsmob_grob (smob); - extract_grob_set (me, "note-columns", columns); - - Direction dir = get_grob_direction (me); - 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 + Don't print if it doesn't span time. + */ + 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))) { - 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; + me->suicide (); + return SCM_EOL; } + Real dy = 0.0; + Real offset = 0.0; + calc_position_and_height (me, &offset, &dy); SCM x = scm_cons (scm_from_double (offset), scm_from_double (offset + dy)); @@ -667,7 +713,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); @@ -692,7 +738,6 @@ Tuplet_bracket::add_tuplet_bracket (Grob *me, Grob *bracket) } 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 "