X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ftuplet-bracket.cc;h=8843a0047a0ddf7ec701470006494b67dbf70ffe;hb=540390f466a6e881b5793ac1441e8e7a32ffa579;hp=881bff555093442137b73b1ce669d8b6bef4daa2;hpb=675533acf58b9b863adc830f175696735ca6dc95;p=lilypond.git diff --git a/lily/tuplet-bracket.cc b/lily/tuplet-bracket.cc index 881bff5550..8843a0047a 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--2002 Jan Nieuwenhuizen + (c) 1997--2003 Jan Nieuwenhuizen */ /* @@ -44,10 +44,10 @@ static Grob* get_x_bound_grob (Grob *g, Direction my_dir) { - if (Note_column::stem_l (g) + if (Note_column::get_stem (g) && Note_column::dir (g) == my_dir) { - g = Note_column::stem_l (g); + g = Note_column::get_stem (g); } return g; } @@ -60,16 +60,16 @@ Tuplet_bracket::parallel_beam (Grob *me, Link_array const &cols, bool *equ /* ugh: code dup. */ - Grob *s1 = Note_column::stem_l (cols[0]); - Grob *s2 = Note_column::stem_l (cols.top()); + Grob *s1 = Note_column::get_stem (cols[0]); + Grob *s2 = Note_column::get_stem (cols.top()); - Grob*b1 = s1 ? Stem::beam_l (s1) : 0; - Grob*b2 = s2 ? Stem::beam_l (s2) : 0; + Grob*b1 = s1 ? Stem::get_beam (s1) : 0; + Grob*b2 = s2 ? Stem::get_beam (s2) : 0; Spanner*sp = dynamic_cast (me); *equally_long= false; - if (! ( b1 && (b1 == b2) && !sp->broken_b() )) + if (! (b1 && (b1 == b2) && !sp->broken_b())) return 0; Link_array beam_stems = Pointer_group_interface__extract_grobs @@ -100,14 +100,14 @@ Tuplet_bracket::brew_molecule (SCM smob) { Grob *me= unsmob_grob (smob); Molecule mol; - Link_array column_arr= + Link_array columns= Pointer_group_interface__extract_grobs (me, (Grob*)0, "note-columns"); - if (!column_arr.size ()) + if (!columns.size ()) return mol.smobbed_copy (); bool equally_long = false; - Grob * par_beam = parallel_beam (me, column_arr, &equally_long); + Grob * par_beam = parallel_beam (me, columns, &equally_long); Spanner*sp = dynamic_cast (me); @@ -133,24 +133,34 @@ Tuplet_bracket::brew_molecule (SCM smob) else if (numb == ly_symbol2scm ("if-no-beam")) number_visibility = !par_beam; - Grob * commonx = column_arr[0]->common_refpoint (column_arr.top (),X_AXIS); + Grob * commonx = columns[0]->common_refpoint (columns.top (),X_AXIS); + + /* + Tuplet brackets are normally not broken, but we shouldn't crash if + they are. + */ + commonx = commonx->common_refpoint (sp->get_bound(LEFT), X_AXIS); + commonx = commonx->common_refpoint (sp->get_bound(RIGHT), X_AXIS); + Direction dir = Directional_element_interface::get (me); - Grob * lgr = get_x_bound_grob (column_arr[0], dir); - Grob * rgr = get_x_bound_grob (column_arr.top(), dir); + Grob * lgr = get_x_bound_grob (columns[0], dir); + Grob * rgr = get_x_bound_grob (columns.top(), dir); Real x0 = lgr->extent (commonx,X_AXIS)[LEFT]; Real x1 = rgr->extent (commonx,X_AXIS)[RIGHT]; Real w = x1 -x0; - + Real ly = gh_scm2double (me->get_grob_property ("left-position")); Real ry = gh_scm2double (me->get_grob_property ("right-position")); SCM number = me->get_grob_property ("text"); - + + Paper_def *pap = me->get_paper (); if (gh_string_p (number) && number_visibility) { SCM properties = Font_interface::font_alist_chain (me); - Molecule num = Text_item::text2molecule (me, number, properties); + SCM snum = Text_item::interpret_markup (pap->self_scm (), properties, number); + Molecule num = *unsmob_molecule (snum); num.align_to (X_AXIS, CENTER); num.translate_axis (w/2, X_AXIS); num.align_to (Y_AXIS, CENTER); @@ -159,30 +169,43 @@ Tuplet_bracket::brew_molecule (SCM smob) mol.add_molecule (num); } - - if (bracket_visibility) + + + /* + 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) { - Real lt = me->paper_l ()->get_var ("linethickness"); + bracket_visibility = false; + } + if (bracket_visibility) + { + Real lt = pap->get_realvar (ly_symbol2scm ("linethickness")); + SCM thick = me->get_grob_property ("thickness"); if (gh_number_p (thick)) lt *= gh_scm2double (thick); - + SCM gap = me->get_grob_property ("gap"); - SCM ew = me->get_grob_property ("edge-widen"); + + SCM fl = me->get_grob_property ("bracket-flare"); SCM eh = me->get_grob_property ("edge-height"); SCM sp = me->get_grob_property ("shorten-pair"); Direction d = LEFT; - Drul_array height, width, shorten; + Drul_array height, flare, shorten; do { - width[d] = height[d] = shorten[d] = 0.0; - if ( ly_number_pair_p (ew) ) - width[d] += gh_scm2double (index_cell (ew, d)); - if ( ly_number_pair_p (eh) ) - height[d] += gh_scm2double (index_cell (eh, d)) * - dir; - if ( ly_number_pair_p (sp) ) - shorten[d] += gh_scm2double (index_cell (sp, d)); + flare[d] = height[d] = shorten[d] = 0.0; + if (ly_number_pair_p (fl)) + flare[d] += gh_scm2double (index_get_cell (fl, d)); + if (ly_number_pair_p (eh)) + height[d] += gh_scm2double (index_get_cell (eh, d)) * - dir; + if (ly_number_pair_p (sp)) + shorten[d] += gh_scm2double (index_get_cell (sp, d)); } while (flip (&d) != LEFT); @@ -190,7 +213,7 @@ Tuplet_bracket::brew_molecule (SCM smob) w, ry - ly, lt, height, gh_scm2double (gap), - width, + flare, shorten); mol.add_molecule (brack); } @@ -202,49 +225,50 @@ Tuplet_bracket::brew_molecule (SCM smob) /* should move to lookup? + + TODO: this will fail for very short (shorter than the flare) + brackets. */ Molecule Tuplet_bracket::make_bracket (Axis protusion_axis, Real dx, Real dy, Real thick, Drul_array height, Real gap, - Drul_array widen, + Drul_array flare, Drul_array shorten) { - Real len = Offset (dx,dy).length (); - Real gapx = dx * (gap / len); - Real gapy = dy * (gap / len); - Drul_array shortx, shorty; + Offset dz = Offset (dx,dy); + Drul_array corners (Offset(0,0), dz); + + Real length = dz.length (); + Drul_array gap_corners; + + + Axis bracket_axis = other_axis (protusion_axis); + + Drul_array straight_corners = corners; + Direction d = LEFT; do { - shortx[d] = dx * (shorten[d] / len); - shorty[d] = dy * (shorten[d] / len); - } - while (flip (&d) != LEFT); - Axis other = other_axis (protusion_axis); - - Molecule l1 = Lookup::line (thick, Offset(shortx[LEFT], shorty[LEFT]), - Offset ( (dx - gapx)/2, (dy - gapy)/2 )); - - Molecule l2 = Lookup::line (thick, Offset((dx + gapx) / 2,(dy + gapy) / 2), - Offset (dx - shortx[RIGHT], dy - shorty[RIGHT])); - - Offset protusion; - protusion[other] = -widen[LEFT]; - protusion[protusion_axis] = height[LEFT]; - Molecule p1 = Lookup::line (thick, - Offset(shortx[LEFT], shorty[LEFT]), - Offset(shortx[LEFT], shorty[LEFT]) + protusion); - protusion[other] = widen[RIGHT]; - protusion[protusion_axis] = height[RIGHT]; - Molecule p2 = Lookup::line (thick, - Offset(dx - shortx[RIGHT], dy - shorty[RIGHT]), - Offset(dx - shortx[RIGHT], dy - shorty[RIGHT]) + protusion); + straight_corners[d] += - d * shorten[d] /length * dz; + gap_corners[d] = (dz * 0.5) + d * gap / length * dz; + } while (flip (&d) != LEFT); + + Drul_array flare_corners = straight_corners; + do { + flare_corners[d][bracket_axis] = straight_corners[d][bracket_axis]; + flare_corners[d][protusion_axis] += height[d]; + straight_corners[d][bracket_axis] += - d * flare[d]; + } while (flip (&d) != LEFT); Molecule m; - m.add_molecule (p1); - m.add_molecule (p2); - m.add_molecule (l1); - m.add_molecule (l2); + do { + + m.add_molecule (Lookup::line (thick, straight_corners[d], + gap_corners[d])); + + m.add_molecule (Lookup::line (thick, straight_corners[d], + flare_corners[d])); + } while (flip (&d) != LEFT); return m; } @@ -256,7 +280,7 @@ Tuplet_bracket::make_bracket (Axis protusion_axis, void Tuplet_bracket::calc_position_and_height (Grob*me,Real *offset, Real * dy) { - Link_array column_arr= + Link_array columns= Pointer_group_interface__extract_grobs (me, (Grob*)0, "note-columns"); @@ -270,17 +294,17 @@ Tuplet_bracket::calc_position_and_height (Grob*me,Real *offset, Real * dy) Use outer non-rest columns to determine slope */ int l = 0; - while (l = l && Note_column::rest_b (column_arr[r])) + int r = columns.size ()- 1; + while (r >= l && Note_column::rest_b (columns[r])) r--; if (l < r) { - *dy = column_arr[r]->extent (commony, Y_AXIS) [dir] - - column_arr[l]->extent (commony, Y_AXIS) [dir] ; + *dy = columns[r]->extent (commony, Y_AXIS) [dir] + - columns[l]->extent (commony, Y_AXIS) [dir] ; } else * dy = 0; @@ -288,13 +312,13 @@ Tuplet_bracket::calc_position_and_height (Grob*me,Real *offset, Real * dy) *offset = - dir * infinity_f; - if (!column_arr.size ()) + if (!columns.size ()) return; - Grob * lgr = get_x_bound_grob (column_arr[0], dir); - Grob * rgr = get_x_bound_grob (column_arr.top(), dir); + Grob * lgr = get_x_bound_grob (columns[0], dir); + Grob * rgr = get_x_bound_grob (columns.top(), dir); Real x0 = lgr->extent (commonx,X_AXIS)[LEFT]; Real x1 = rgr->extent (commonx,X_AXIS)[RIGHT]; @@ -302,14 +326,14 @@ Tuplet_bracket::calc_position_and_height (Grob*me,Real *offset, Real * dy) /* Slope. */ - Real factor = column_arr.size () > 1 ? 1/ (x1 - x0) : 1.0; + Real factor = columns.size () > 1 ? 1/ (x1 - x0) : 1.0; - for (int i = 0; i < column_arr.size (); i++) + for (int i = 0; i < columns.size (); i++) { - Real notey = column_arr[i]->extent (commony, Y_AXIS)[dir] + Real notey = columns[i]->extent (commony, Y_AXIS)[dir] - me->relative_coordinate (commony, Y_AXIS); - - Real x = column_arr[i]->relative_coordinate (commonx, X_AXIS) - x0; + + Real x = columns[i]->relative_coordinate (commonx, X_AXIS) - x0; Real tuplety = *dy * x * factor; if (notey * dir > (*offset + tuplety) * dir) @@ -322,11 +346,12 @@ Tuplet_bracket::calc_position_and_height (Grob*me,Real *offset, Real * dy) /* horizontal brackets should not collide with staff lines. + */ - if (*dy == 0) + Real ss= Staff_symbol_referencer::staff_space (me); + if (*dy == 0 && fabs (*offset) < ss * Staff_symbol_referencer::staff_radius (me)) { // quantize, then do collision check. - Real ss= Staff_symbol_referencer::staff_space (me); *offset *= 2 / ss; *offset = rint (*offset); @@ -344,15 +369,15 @@ Tuplet_bracket::calc_position_and_height (Grob*me,Real *offset, Real * dy) void Tuplet_bracket::calc_dy (Grob*me,Real * dy) { - Link_array column_arr= + Link_array columns= Pointer_group_interface__extract_grobs (me, (Grob*)0, "note-columns"); /* ugh. refps. */ Direction d = Directional_element_interface::get (me); - *dy = column_arr.top ()->extent (column_arr.top (), Y_AXIS) [d] - - column_arr[0]->extent (column_arr[0], Y_AXIS) [d]; + *dy = columns.top ()->extent (columns.top (), Y_AXIS) [d] + - columns[0]->extent (columns[0], Y_AXIS) [d]; } @@ -364,14 +389,14 @@ SCM Tuplet_bracket::before_line_breaking (SCM smob) { Grob *me = unsmob_grob (smob); - Link_array column_arr= + Link_array columns= Pointer_group_interface__extract_grobs (me, (Grob*)0, "note-columns"); - for (int i = column_arr.size(); i--;) + for (int i = columns.size(); i--;) { - Grob * s =Note_column::stem_l (column_arr[i]); - Grob * b = s ? Stem::beam_l (s): 0; + Grob * s =Note_column::get_stem (columns[i]); + Grob * b = s ? Stem::get_beam (s): 0; if (b) me->add_dependency (b); } @@ -384,17 +409,17 @@ SCM Tuplet_bracket::after_line_breaking (SCM smob) { Grob * me = unsmob_grob (smob); - Link_array column_arr= + Link_array columns= Pointer_group_interface__extract_grobs (me, (Grob*)0, "note-columns"); - if (!column_arr.size ()) + if (!columns.size ()) { me->suicide (); return SCM_UNSPECIFIED; } if (dynamic_cast (me)->broken_b ()) { - me->warning ( "Tuplet_bracket was across linebreak. Farewell cruel world."); + me->warning ("Tuplet_bracket was across linebreak. Farewell cruel world."); me->suicide(); return SCM_UNSPECIFIED; } @@ -407,7 +432,7 @@ Tuplet_bracket::after_line_breaking (SCM smob) } bool equally_long = false; - Grob * par_beam = parallel_beam (me, column_arr, &equally_long); + Grob * par_beam = parallel_beam (me, columns, &equally_long); /* We follow the beam only if there is one, and we are next to it. @@ -492,5 +517,5 @@ Tuplet_bracket::add_column (Grob*me, Item*n) ADD_INTERFACE (Tuplet_bracket,"tuplet-bracket-interface", "A bracket with a number in the middle, used for tuplets.", - "note-columns edge-widen edge-height shorten-pair padding gap left-position right-position bracket-visibility number-visibility thickness direction"); + "note-columns bracket-flare edge-height shorten-pair padding gap left-position right-position bracket-visibility number-visibility thickness direction");