* lily/tie-column.cc (set_manual_tie_configuration): new function.

[lilypond.git] / lily / beam-quanting.cc

diff --git a/lily/beam-quanting.cc b/lily/beam-quanting.cc
index 0ee1a01b4145d5b3371635e1a718a590fe7d9da9..d8544b9b18de2c402e0a875874b73104ffe8d28c 100644 (file)
--- a/lily/beam-quanting.cc
+++ b/lily/beam-quanting.cc
@@ -10,7 +10,8 @@
 #include "beam.hh"
 
 #include <algorithm>
-#include <math.h>
+#include <cmath>
+using namespace std;
 
 #include "warn.hh"
 #include "staff-symbol-referencer.hh"
@@ -401,7 +402,8 @@ Beam::score_slopes_dy (Real yl, Real yr,
       && sign (dy_damp) != sign (dy))
     dem += parameters->DAMPING_DIRECTION_PENALTY;
 
-  dem += parameters->MUSICAL_DIRECTION_FACTOR *max (0.0, (fabs (dy) - fabs (dy_mus)));
+  dem += parameters->MUSICAL_DIRECTION_FACTOR
+    * max (0.0, (fabs (dy) - fabs (dy_mus)));
 
   Real slope_penalty = parameters->IDEAL_SLOPE_FACTOR;