X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Flookup.cc;h=62e0d9731786d78c03da4f7bcefe0cc3ae8cf4e7;hb=5fb0c572f7f92aa0c3b7584932433ee84cdce26d;hp=0050002223848461c7adfed53f0f1ac5bf07cc6a;hpb=2b695bcbe3d6a5fddd58eb03189d3272112421d9;p=lilypond.git diff --git a/lily/lookup.cc b/lily/lookup.cc index 0050002223..62e0d97317 100644 --- a/lily/lookup.cc +++ b/lily/lookup.cc @@ -404,6 +404,7 @@ Lookup::slur (Bezier curve, Real curvethick, Real linethick) b[X_AXIS].unite (back.extent (X_AXIS)); b[Y_AXIS].unite (back.extent (Y_AXIS)); + b.widen (0.5 * linethick, 0.5 * linethick); return Stencil (b, at); } @@ -687,7 +688,7 @@ Lookup::repeat_slash (Real w, Real s, Real t) } Stencil -Lookup::bracket (Axis a, Interval iv, Real thick, Real protude, Real blot) +Lookup::bracket (Axis a, Interval iv, Real thick, Real protrude, Real blot) { Box b; Axis other = Axis ((a + 1)%2); @@ -697,8 +698,8 @@ Lookup::bracket (Axis a, Interval iv, Real thick, Real protude, Real blot) Stencil m = round_filled_box (b, blot); b[a] = Interval (iv[UP] - thick, iv[UP]); - Interval oi = Interval (-thick / 2, thick / 2 + fabs (protude)); - oi *= sign (protude); + Interval oi = Interval (-thick / 2, thick / 2 + fabs (protrude)); + oi *= sign (protrude); b[other] = oi; m.add_stencil (round_filled_box (b, blot)); b[a] = Interval (iv[DOWN], iv[DOWN] + thick); @@ -708,16 +709,16 @@ Lookup::bracket (Axis a, Interval iv, Real thick, Real protude, Real blot) } Stencil -Lookup::triangle (Interval iv, Real thick, Real protude) +Lookup::triangle (Interval iv, Real thick, Real protrude) { Box b; b[X_AXIS] = Interval (0, iv.length ()); - b[Y_AXIS] = Interval (min (0., protude), max (0.0, protude)); + b[Y_AXIS] = Interval (min (0., protrude), max (0.0, protrude)); vector points; points.push_back (Offset (iv[LEFT], 0)); points.push_back (Offset (iv[RIGHT], 0)); - points.push_back (Offset (iv.center (), protude)); + points.push_back (Offset (iv.center (), protrude)); return points_to_line_stencil (thick, points);