From: Benkő Pál <benko.pal@gmail.com>
Date: Thu, 19 Jul 2012 21:10:48 +0000 (+0200)
Subject: make slur behaviour symmetrical for above/below staff
X-Git-Tag: release/2.15.95-1~9
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=dd3d77f226d5304e2359cf332b7553cb773eecc5;p=lilypond.git

make slur behaviour symmetrical for above/below staff

the original code probably missed an fabs and
certainly didn't work for non-standard staves
---

diff --git a/lily/slur-scoring.cc b/lily/slur-scoring.cc
index d8b713265c..e1025fa545 100644
--- a/lily/slur-scoring.cc
+++ b/lily/slur-scoring.cc
@@ -595,8 +595,7 @@ Slur_score_state::move_away_from_staffline (Real y,
       * 2.0 / staff_space_;
 
   if (fabs (pos - my_round (pos)) < 0.2
-      && Staff_symbol_referencer::on_line (on_staff, (int) rint (pos))
-      && Staff_symbol_referencer::line_count (on_staff) - 1 >= rint (pos))
+      && Staff_symbol_referencer::on_staff_line (on_staff, (int) rint (pos)))
     y += 1.5 * staff_space_ * dir_ / 10;
 
   return y;