X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fbezier-bow.cc;h=e3707c13909d7b64a9efbd1a186ce14b92d7ddf5;hb=a8c9e8a7ca320ab0df5fd32e717fd62cd7635ce6;hp=a86a9841071d2f22e91625c8fb11bd6e15579bed;hpb=4f4012093e8da9a9be01221b2acfe656ba3812ad;p=lilypond.git diff --git a/lily/bezier-bow.cc b/lily/bezier-bow.cc index a86a984107..e3707c1390 100644 --- a/lily/bezier-bow.cc +++ b/lily/bezier-bow.cc @@ -3,11 +3,9 @@ source file of the GNU LilyPond music typesetter - (c) 1998--2005 Jan Nieuwenhuizen + (c) 1998--2009 Jan Nieuwenhuizen */ -#include - #include "misc.hh" #include "bezier.hh" @@ -65,27 +63,27 @@ slur_height (Real width, Real h_inf, Real r_0) slurs. For large slurs, this gives a certain hookiness at the end, so we increase the indent. - indent = G(w) + indent = G (w) - w -> 0, G(w) -> .33 w + w -> 0, G (w) -> .33 w (due to derivative constraints, we cannot have indent > len/3) - w -> inf, G(w) -> 2*h_inf + w -> inf, G (w) -> 2*h_inf i.e. - G(0) = 0 , G'(0) 1/3, G(infty) = 2h_inf + G (0) = 0 , G'(0) 1/3, G (infty) = 2h_inf solve from - G(w) = r + p/(w+q) + G (w) = r + p/(w+q) yields - G(w) = 2 h_inf - max_fraction * q^2/ (w + q) + G (w) = 2 h_inf - max_fraction * q^2/ (w + q) with q = 2 h_inf */ @@ -98,8 +96,7 @@ get_slur_indent_height (Real *indent, Real *height, *height = slur_height (width, h_inf, r_0); Real q = 2 * h_inf / max_fraction; - *indent - = 2 * h_inf - sqr (q) * max_fraction / (width + q); + *indent = 2 * h_inf - sqr (q) * max_fraction / (width + q); } Bezier