From: David Kastrup <dak@gnu.org>
Date: Sun, 10 Feb 2013 10:21:24 +0000 (+0100)
Subject: Issue 1863: Explicit fingering direction (^3) has no effect if Fingering.direction... 
X-Git-Tag: release/2.17.13-1~10^2~15
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=dc8ee46c4c688714be8eda73c741818283320192;p=lilypond.git

Issue 1863: Explicit fingering direction (^3) has no effect if Fingering.direction is set
---

diff --git a/lily/fingering-engraver.cc b/lily/fingering-engraver.cc
index 2571ac1d70..56d7b3257e 100644
--- a/lily/fingering-engraver.cc
+++ b/lily/fingering-engraver.cc
@@ -123,13 +123,10 @@ Fingering_engraver::make_script (Direction d, Stream_event *r, int i)
 
   fingering->set_property ("script-priority", scm_from_int (priority));
 
-  if (!is_direction (fingering->get_property_data ("direction")))
-    {
-      if (d)
-        fingering->set_property ("direction", scm_from_int (d));
-      else
-        fingering->set_property ("direction", scm_from_int (RIGHT));
-    }
+  if (d)
+    fingering->set_property ("direction", scm_from_int (d));
+  else if (!is_direction (fingering->get_property_data ("direction")))
+    fingering->set_property ("direction", scm_from_int (UP));
 
   fingerings_.push_back (fingering);
 }