X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ftuplet-bracket.cc;h=4edf3f3ba639425f438d458fe7cf476a208e93eb;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=8c9656d32fd3f87cf777be446387a02735da08f7;hpb=92d1a61acbd9b8a4556eaff60894426b7e133e6f;p=lilypond.git diff --git a/lily/tuplet-bracket.cc b/lily/tuplet-bracket.cc index 8c9656d32f..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--2007 Jan Nieuwenhuizen + (c) 1997--2008 Jan Nieuwenhuizen Han-Wen Nienhuys */ @@ -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) @@ -232,17 +231,20 @@ Tuplet_bracket::calc_control_points (SCM smob) /* We're connecting to a column, for the last bit of a broken fullLength bracket. - - TODO: make padding tunable? */ - Real padding = 1.0; + Real padding = + robust_scm2double(me->get_property("full-length-padding"), 1.0); if (bounds[d]->break_status_dir ()) padding = 0.0; - - x_span[d] - = robust_relative_extent (bounds[d], commonx, X_AXIS) [LEFT] - - padding; + + 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); @@ -281,12 +283,20 @@ Tuplet_bracket::print (SCM smob) 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)); @@ -497,7 +507,12 @@ Tuplet_bracket::calc_position_and_height (Grob *me_grob, Real *offset, Real *dy) 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) @@ -512,17 +527,15 @@ 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"))); + && 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]) @@ -533,18 +546,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 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_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_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)); @@ -560,10 +569,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,11 +594,10 @@ Tuplet_bracket::calc_position_and_height (Grob *me_grob, Real *offset, Real *dy) for (vsize i = 0; i < columns.size (); i++) { - Interval note_ext = columns[i]->extent (commony, Y_AXIS); - Real notey = note_ext[dir] - my_offset; - + 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])); } } @@ -641,7 +650,7 @@ Tuplet_bracket::calc_position_and_height (Grob *me_grob, Real *offset, Real *dy) 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; @@ -688,16 +697,6 @@ Tuplet_bracket::calc_positions (SCM smob) { Spanner *me = unsmob_spanner (smob); - /* - 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))) - { - me->suicide (); - return SCM_EOL; - } - Real dy = 0.0; Real offset = 0.0; calc_position_and_height (me, &offset, &dy); @@ -771,13 +770,11 @@ Tuplet_bracket::calc_cross_staff (SCM smob) } ADD_INTERFACE (Tuplet_bracket, - "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 " @@ -788,6 +785,8 @@ ADD_INTERFACE (Tuplet_bracket, "direction " "edge-height " "edge-text " + "full-length-padding " + "full-length-to-extent " "gap " "positions " "note-columns " @@ -796,6 +795,7 @@ ADD_INTERFACE (Tuplet_bracket, "shorten-pair " "staff-padding " "thickness " - "tuplets "); + "tuplets " + );