X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fhairpin.cc;h=afd94f3ee06ada9f66d16a851fed3da119037de5;hb=97a0169312a260933246ab224e4f8b0969871dd5;hp=01d8fd93dea61f696d5af6a189244517f4fca622;hpb=5af7cd44435fd26fade6e700a3912630e1553a87;p=lilypond.git diff --git a/lily/hairpin.cc b/lily/hairpin.cc index 01d8fd93de..afd94f3ee0 100644 --- a/lily/hairpin.cc +++ b/lily/hairpin.cc @@ -157,6 +157,8 @@ Hairpin::print (SCM smob) if (circled_tip) thick = robust_scm2double (me->get_property ("thickness"), 1.0) * Staff_symbol_referencer::line_thickness (me); + Drul_array shorten = robust_scm2interval (me->get_property ("shorten-pair"), + Interval (0, 0)); for (LEFT_and_RIGHT (d)) { @@ -220,7 +222,10 @@ Hairpin::print (SCM smob) Handle back-to-back hairpins with a circle in the middle */ if (circled_tip && (grow_dir != d)) - x_points[d] = e.center () + d * (rad - thick / 2.0); + { + x_points[d] = e.center () + d * (rad - thick / 2.0); + shorten[d] = 0.0; + } /* If we're hung on a paper column, that means we're not adjacent to a text-dynamic, and we may move closer. We @@ -248,6 +253,8 @@ Hairpin::print (SCM smob) } } } + + x_points[d] -= shorten[d] * d; } Real width = x_points[RIGHT] - x_points[LEFT]; @@ -336,4 +343,5 @@ ADD_INTERFACE (Hairpin, "bound-padding " "grow-direction " "height " + "shorten-pair " );