X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ftuplet-bracket.cc;h=c926966e9c05afa81c7a989312c0d54a8c4fb4ad;hb=47db9a3883d726ca53e2133a3b2298f78dd6a32e;hp=c6dfa799924a5c4b169406cf26854c1b865d0f24;hpb=f93e4199873c91ae32f0e84a610d14853dc379df;p=lilypond.git diff --git a/lily/tuplet-bracket.cc b/lily/tuplet-bracket.cc index c6dfa79992..c926966e9c 100644 --- a/lily/tuplet-bracket.cc +++ b/lily/tuplet-bracket.cc @@ -1,7 +1,7 @@ /* This file is part of LilyPond, the GNU music typesetter. - Copyright (C) 1997--2011 Jan Nieuwenhuizen + Copyright (C) 1997--2015 Jan Nieuwenhuizen Han-Wen Nienhuys LilyPond is free software: you can redistribute it and/or modify @@ -41,6 +41,7 @@ */ #include "tuplet-bracket.hh" +#include "axis-group-interface.hh" #include "line-interface.hh" #include "beam.hh" #include "warn.hh" @@ -51,6 +52,7 @@ #include "note-column.hh" #include "pointer-group-interface.hh" #include "directional-element-interface.hh" +#include "skyline.hh" #include "spanner.hh" #include "staff-symbol-referencer.hh" #include "lookup.hh" @@ -75,7 +77,7 @@ 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); + = robust_scm2drul (me->get_property (sym), zero); pair[xdir] = 0.0; me->set_property (sym, ly_interval2scm (pair)); @@ -90,8 +92,10 @@ Tuplet_bracket::parallel_beam (Grob *me_grob, vector const &cols, { Spanner *me = dynamic_cast (me_grob); - if (me->get_bound (LEFT)->break_status_dir () - || me->get_bound (RIGHT)->break_status_dir ()) + Item *left = me->get_bound (LEFT); + Item *right = me->get_bound (RIGHT); + if (!left || left->break_status_dir () + || !right || right->break_status_dir ()) return 0; Drul_array stems (Note_column::get_stem (cols[0]), @@ -104,10 +108,8 @@ Tuplet_bracket::parallel_beam (Grob *me_grob, vector const &cols, return 0; Drul_array beams; - Direction d = LEFT; - do + for (LEFT_and_RIGHT (d)) beams[d] = stems[d] ? Stem::get_beam (stems[d]) : 0; - while (flip (&d) != LEFT); *equally_long = false; if (! (beams[LEFT] && (beams[LEFT] == beams[RIGHT]) && !me->is_broken ())) @@ -131,15 +133,14 @@ MAKE_SCHEME_CALLBACK (Tuplet_bracket, calc_connect_to_neighbors, 1); SCM Tuplet_bracket::calc_connect_to_neighbors (SCM smob) { - Spanner *me = unsmob_spanner (smob); + Spanner *me = Spanner::unsmob (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 + for (LEFT_and_RIGHT (d)) { Direction break_dir = bounds[d]->break_status_dir (); Spanner *orig_spanner = dynamic_cast (me->original ()); @@ -159,7 +160,6 @@ Tuplet_bracket::calc_connect_to_neighbors (SCM smob) && neighbor_idx < orig_spanner->broken_intos_.size () && orig_spanner->broken_intos_[neighbor_idx]->is_live ()); } - while (flip (&d) != LEFT); if (connect_to_other[LEFT] || connect_to_other[RIGHT]) return scm_cons (scm_from_bool (connect_to_other[LEFT]), @@ -180,24 +180,13 @@ Tuplet_bracket::get_common_x (Spanner *me) return commonx; } -MAKE_SCHEME_CALLBACK (Tuplet_bracket, calc_control_points, 1) +MAKE_SCHEME_CALLBACK (Tuplet_bracket, calc_x_positions, 1) SCM -Tuplet_bracket::calc_control_points (SCM smob) +Tuplet_bracket::calc_x_positions (SCM smob) { - Spanner *me = unsmob_spanner (smob); - + Spanner *me = Spanner::unsmob (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); @@ -210,10 +199,9 @@ Tuplet_bracket::calc_control_points (SCM smob) Drul_array (false, false)); Interval x_span; - Direction d = LEFT; - do + for (LEFT_and_RIGHT (d)) { - x_span[d] = robust_relative_extent (bounds[d], commonx, X_AXIS)[d]; + x_span[d] = Axis_group_interface::generic_bound_extent (bounds[d], commonx, X_AXIS)[d]; if (connect_to_other[d]) { @@ -223,8 +211,9 @@ Tuplet_bracket::calc_control_points (SCM smob) if (d == RIGHT) x_span[d] += d * overshoot[d]; else - x_span[d] = robust_relative_extent (bounds[d], - commonx, X_AXIS)[RIGHT] + x_span[d] = (bounds[d]->break_status_dir () + ? Axis_group_interface::generic_bound_extent (bounds[d], commonx, X_AXIS)[-d] + : robust_relative_extent (bounds[d], commonx, X_AXIS)[-d]) - overshoot[LEFT]; } @@ -252,11 +241,8 @@ Tuplet_bracket::calc_control_points (SCM smob) x_span[d] = coord - padding; } } - while (flip (&d) != LEFT); - 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]))); + return ly_interval2scm (x_span - me->get_bound (LEFT)->relative_coordinate (commonx, X_AXIS)); } /* @@ -269,7 +255,7 @@ MAKE_SCHEME_CALLBACK (Tuplet_bracket, print, 1); SCM Tuplet_bracket::print (SCM smob) { - Spanner *me = unsmob_spanner (smob); + Spanner *me = Spanner::unsmob (smob); Stencil mol; extract_grob_set (me, "note-columns", columns); @@ -290,10 +276,11 @@ Tuplet_bracket::print (SCM smob) /* Don't print a tuplet bracket and number if - no control-points were calculated + no X or Y positions were calculated. */ - SCM cpoints = me->get_property ("control-points"); - if (scm_ilength (cpoints) < 2) + SCM scm_x_span = me->get_property ("X-positions"); + SCM scm_positions = me->get_property ("positions"); + if (!scm_is_pair (scm_x_span) || !scm_is_pair (scm_positions)) { me->suicide (); return SCM_EOL; @@ -307,16 +294,16 @@ Tuplet_bracket::print (SCM smob) == 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 = robust_scm2interval (scm_x_span, Interval (0.0, 0.0)); + Interval positions = robust_scm2interval (scm_positions, Interval (0.0, 0.0)); - Interval x_span (points[LEFT][X_AXIS], points[RIGHT][X_AXIS]); - Drul_array positions (points[LEFT][Y_AXIS], points[RIGHT][Y_AXIS]); + Drul_array points; + for (LEFT_and_RIGHT (d)) + points[d] = Offset (x_span[d], positions[d]); Output_def *pap = me->layout (); - Grob *number_grob = unsmob_grob (me->get_object ("tuplet-number")); + Grob *number_grob = Grob::unsmob (me->get_object ("tuplet-number")); /* Don't print the bracket when it would be smaller than the number. @@ -357,8 +344,7 @@ Tuplet_bracket::print (SCM smob) = robust_scm2booldrul (me->get_property ("connect-to-neighbor"), Drul_array (false, false)); - Direction d = LEFT; - do + for (LEFT_and_RIGHT (d)) { if (connect_to_other[d]) { @@ -378,7 +364,7 @@ Tuplet_bracket::print (SCM smob) = Text_interface::interpret_markup (pap->self_scm (), properties, text); - Stencil *edge_text = unsmob_stencil (t); + Stencil *edge_text = Stencil::unsmob (t); edge_text->translate_axis (x_span[d] - x_span[LEFT], X_AXIS); edge_stencils[d] = *edge_text; @@ -386,7 +372,6 @@ Tuplet_bracket::print (SCM smob) } } } - while (flip (&d) != LEFT); Stencil brack = make_bracket (me, Y_AXIS, points[RIGHT] - points[LEFT], @@ -398,12 +383,11 @@ Tuplet_bracket::print (SCM smob) Interval (-0.5, 0.5) * gap + 0.1, flare, shorten); - do + for (LEFT_and_RIGHT (d)) { if (!edge_stencils[d].is_empty ()) brack.add_stencil (edge_stencils[d]); } - while (flip (&d) != LEFT); mol.add_stencil (brack); } @@ -436,44 +420,37 @@ Tuplet_bracket::make_bracket (Grob *me, // for line properties. Drul_array straight_corners = corners; - Direction d = LEFT; - do + for (LEFT_and_RIGHT (d)) straight_corners[d] += -d * shorten[d] / length * dz; - while (flip (&d) != LEFT); if (!gap.is_empty ()) { - do + for (LEFT_and_RIGHT (d)) gap_corners[d] = (dz * 0.5) + gap[d] / length * dz; - while (flip (&d) != LEFT); } Drul_array flare_corners = straight_corners; - do + for (LEFT_and_RIGHT (d)) { flare_corners[d][bracket_axis] = straight_corners[d][bracket_axis]; flare_corners[d][protrusion_axis] += height[d]; straight_corners[d][bracket_axis] += -d * flare[d]; } - while (flip (&d) != LEFT); Stencil m; - do - { - if (!gap.is_empty ()) - m.add_stencil (Line_interface::line (me, straight_corners[d], - gap_corners[d])); - + if (!gap.is_empty ()) + for (LEFT_and_RIGHT (d)) m.add_stencil (Line_interface::line (me, straight_corners[d], - flare_corners[d])); - } - - while (flip (&d) != LEFT); - - if (gap.is_empty ()) + gap_corners[d])); + else m.add_stencil (Line_interface::line (me, straight_corners[LEFT], straight_corners[RIGHT])); + if (scm_is_number (me->get_property ("dash-fraction"))) + me->set_property ("dash-fraction", scm_from_double (1.0)); + for (LEFT_and_RIGHT (d)) + m.add_stencil (Line_interface::line (me, straight_corners[d], + flare_corners[d])); return m; } @@ -545,7 +522,7 @@ Tuplet_bracket::calc_position_and_height (Grob *me_grob, Real *offset, Real *dy) 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")); + && !Beam::is_knee (par_beam); vector points; if (columns.size () @@ -553,23 +530,22 @@ Tuplet_bracket::calc_position_and_height (Grob *me_grob, Real *offset, Real *dy) && 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) - + 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); + Interval poss; + for (LEFT_and_RIGHT (side)) + { + // Trigger setting of stem lengths if necessary. + if (Grob *beam = Stem::get_beam (stems[side])) + (void) beam->get_property ("quantized-positions"); + poss[side] = stems[side]->extent (stems[side], Y_AXIS)[get_grob_direction (stems[side])] + + stems[side]->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)); + *dy = poss[RIGHT] - poss[LEFT]; + points.push_back (Offset (stems[LEFT]->relative_coordinate (commonx, X_AXIS) - x0, poss[LEFT])); + points.push_back (Offset (stems[RIGHT]->relative_coordinate (commonx, X_AXIS) - x0, poss[RIGHT])); } else { @@ -635,14 +611,13 @@ Tuplet_bracket::calc_position_and_height (Grob *me_grob, Real *offset, Real *dy) if (!tuplets[i]->is_live ()) continue; - Direction d = LEFT; Drul_array positions = robust_scm2interval (tuplets[i]->get_property ("positions"), Interval (0, 0)); Real other_dy = positions[RIGHT] - positions[LEFT]; - do + for (LEFT_and_RIGHT (d)) { Real y = tuplet_y.linear_combination (d * sign (other_dy)); @@ -655,7 +630,36 @@ Tuplet_bracket::calc_position_and_height (Grob *me_grob, Real *offset, Real *dy) points.push_back (Offset (tuplet_x[d] - x0, y)); } - while (flip (&d) != LEFT); + + // Check for number-on-bracket collisions + Grob *number = Grob::unsmob (tuplets[i]->get_object ("tuplet-number")); + if (number) + points.push_back (Offset (number->extent (commonx, X_AXIS).center () - x0, + number->extent (commony, Y_AXIS)[dir])); + } + + if (to_boolean (me->get_property ("avoid-scripts")) + && !scm_is_number (me->get_property ("outside-staff-priority"))) + { + extract_grob_set (me, "scripts", scripts); + for (vsize i = 0; i < scripts.size (); i++) + { + if (!scripts[i]->is_live ()) + continue; + if (scm_is_number (scripts[i]->get_property ("outside-staff-priority"))) + continue; + + // assume that if a script is avoiding slurs, it should not get placed + // under a tuplet bracket + if (Grob::is_smob (scripts[i]->get_object ("slur"))) + continue; + + Interval script_x (scripts[i]->extent (commonx, X_AXIS)); + Interval script_y (scripts[i]->extent (commony, Y_AXIS)); + + points.push_back (Offset (script_x.center () - x0, + script_y[dir])); + } } *offset = -dir * infinity_f; @@ -674,21 +678,20 @@ Tuplet_bracket::calc_position_and_height (Grob *me_grob, Real *offset, Real *dy) /* horizontal brackets should not collide with staff lines. - 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)) + if (*dy == 0) { // quantize, then do collision check. - *offset *= 2 / ss; + *offset /= 0.5 * ss; - *offset = rint (*offset); - if (Staff_symbol_referencer::on_line (me, (int) rint (*offset))) - *offset += dir; + Interval staff_span = Staff_symbol_referencer::staff_span (me); + if (staff_span.contains (*offset)) + { + *offset = rint (*offset); + if (Staff_symbol_referencer::on_line (me, int (*offset))) + *offset += dir; + } *offset *= 0.5 * ss; } @@ -698,7 +701,7 @@ MAKE_SCHEME_CALLBACK (Tuplet_bracket, calc_direction, 1); SCM Tuplet_bracket::calc_direction (SCM smob) { - Grob *me = unsmob_grob (smob); + Grob *me = Grob::unsmob (smob); Direction dir = Tuplet_bracket::get_default_dir (me); return scm_from_int (dir); } @@ -707,7 +710,7 @@ MAKE_SCHEME_CALLBACK (Tuplet_bracket, calc_positions, 1); SCM Tuplet_bracket::calc_positions (SCM smob) { - Spanner *me = unsmob_spanner (smob); + Spanner *me = Spanner::unsmob (smob); Real dy = 0.0; Real offset = 0.0; @@ -752,10 +755,8 @@ Tuplet_bracket::get_default_dir (Grob *me) Direction d = Note_column::dir (columns[i]); extremal_positions[d] = minmax (d, 1.0 * Note_column::head_positions_interval (columns[i])[d], extremal_positions[d]); } - Direction d = LEFT; - do + for (LEFT_and_RIGHT (d)) extremal_positions[d] = -d * (staff_extent[d] - extremal_positions[d]); - while (flip (&d) != LEFT); return extremal_positions[UP] <= extremal_positions[DOWN] ? UP : DOWN; } @@ -770,6 +771,12 @@ Tuplet_bracket::add_column (Grob *me, Item *n) add_bound_item (dynamic_cast (me), n); } +void +Tuplet_bracket::add_script (Grob *me, Item *s) +{ + Pointer_group_interface::add_grob (me, ly_symbol2scm ("scripts"), s); +} + void Tuplet_bracket::add_tuplet_bracket (Grob *me, Grob *bracket) { @@ -780,7 +787,7 @@ MAKE_SCHEME_CALLBACK (Tuplet_bracket, calc_cross_staff, 1); SCM Tuplet_bracket::calc_cross_staff (SCM smob) { - Grob *me = unsmob_grob (smob); + Grob *me = Grob::unsmob (smob); extract_grob_set (me, "note-columns", cols); extract_grob_set (me, "tuplets", tuplets); @@ -799,7 +806,7 @@ Tuplet_bracket::calc_cross_staff (SCM smob) for (vsize i = 0; i < cols.size (); i++) { - Grob *stem = unsmob_grob (cols[i]->get_object ("stem")); + Grob *stem = Grob::unsmob (cols[i]->get_object ("stem")); if (stem && to_boolean (stem->get_property ("cross-staff"))) return SCM_BOOL_T; } @@ -815,11 +822,11 @@ ADD_INTERFACE (Tuplet_bracket, " @code{edge-text} are printed at the edges.", /* properties */ + "avoid-scripts " "bracket-flare " "bracket-visibility " "break-overshoot " "connect-to-neighbor " - "control-points " "direction " "edge-height " "edge-text " @@ -834,4 +841,5 @@ ADD_INTERFACE (Tuplet_bracket, "staff-padding " "thickness " "tuplets " + "X-positions " );