X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fslur-scoring.cc;h=a44f834e1cbc6bd2027560feb74f262f06397753;hb=388121aed1734e9e536ede58bd3de98b68367842;hp=6e9f05dff22ab58ebf3af8f797494e4e96b94bc2;hpb=3b3d3fbc987c37f9f639c1e8720d07653894d318;p=lilypond.git diff --git a/lily/slur-scoring.cc b/lily/slur-scoring.cc index 6e9f05dff2..a44f834e1c 100644 --- a/lily/slur-scoring.cc +++ b/lily/slur-scoring.cc @@ -7,20 +7,19 @@ Jan Nieuwenhuizen */ +#include "slur-scoring.hh" + #include #include "libc-extension.hh" #include "slur-configuration.hh" -#include "slur-scoring.hh" #include "beam.hh" #include "directional-element-interface.hh" #include "group-interface.hh" -#include "lily-guile.hh" #include "slur.hh" #include "note-column.hh" #include "output-def.hh" #include "pitch.hh" -#include "bezier.hh" #include "spanner.hh" #include "staff-symbol-referencer.hh" #include "staff-symbol.hh" @@ -440,12 +439,12 @@ Slur_score_state::get_closest_index (SCM inspect_quants) const Real mindist = 1e6; for (int i = 0; i < configurations_.size (); i ++) { - Real d =fabs (configurations_[i]->attachment_[LEFT][Y_AXIS] - ins[LEFT]) + Real d = fabs (configurations_[i]->attachment_[LEFT][Y_AXIS] - ins[LEFT]) + fabs (configurations_[i]->attachment_[RIGHT][Y_AXIS] - ins[RIGHT]); if (d < mindist) { opt_idx = i; - mindist= d; + mindist = d; } } if (mindist > 1e5)