X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ffingering-engraver.cc;h=58dfa4106a6b6c9081951fe67d36ff7fda320476;hb=1f44d06d0f111217fbbc9b39140a918f982dcfd6;hp=2571ac1d709c10bec1e00df16e873877aefdbd58;hpb=2f7fe0c6bc80ad57ae73e213f9b20bc9719ba2ce;p=lilypond.git

diff --git a/lily/fingering-engraver.cc b/lily/fingering-engraver.cc
index 2571ac1d70..58dfa4106a 100644
--- a/lily/fingering-engraver.cc
+++ b/lily/fingering-engraver.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 1998--2012 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 1998--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
   LilyPond is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -101,7 +101,7 @@ Fingering_engraver::make_script (Direction d, Stream_event *r, int i)
     junkme.
   */
   SCM pitch = r->get_property ("pitch");
-  if (unsmob_pitch (pitch))
+  if (Pitch::is_smob (pitch))
     fingering->set_property ("pitch", pitch);
 
   /*
@@ -109,8 +109,7 @@ Fingering_engraver::make_script (Direction d, Stream_event *r, int i)
     fingerings for chords need different settings.
   */
   Side_position_interface::set_axis (fingering, Y_AXIS);
-  Self_alignment_interface::set_align_self (fingering, X_AXIS);
-  Self_alignment_interface::set_center_parent (fingering, X_AXIS);
+  Self_alignment_interface::set_aligned_on_parent (fingering, X_AXIS);
 
   // Hmm
   int priority = 200;
@@ -123,13 +122,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);
 }