Run `make grand-replace'.

[lilypond.git] / lily / bezier-bow.cc

diff --git a/lily/bezier-bow.cc b/lily/bezier-bow.cc
index 6ef641134cd9fdad36c62cfae5fa7b952ac2b018..c61d480803a8ac7630a041a697b836d82d7d3ae4 100644 (file)
--- 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 <janneke@gnu.org>
+  (c) 1998--2008 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
-#include <math.h>
-
 #include "misc.hh"
 #include "bezier.hh"
 
@@ -24,11 +22,11 @@ slur_height (Real width, Real h_inf, Real r_0)
 }
 
 /*
-  ^              x                    x
+  ^                x                    x
   |
   height   <indent>
   |
-  v      x                                    x
+  v      x                                       x
 
 
 
@@ -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