rewrite Self_alignment_interface

lily/new-fingering-engraver.cc

 /*
   This file is part of LilyPond, the GNU music typesetter.
 
   Copyright (C) 1998--2012 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
   the Free Software Foundation, either version 3 of the License, or
   (at your option) any later version.
 
@@ skipping 270 matching lines @@
       f->set_parent (ft.head_, Y_AXIS);
       f->set_property ("avoid-slur", ly_symbol2scm ("inside"));
       if (hordir == LEFT
           && unsmob_grob (ft.head_->get_object ("accidental-grob")))
         Side_position_interface::add_support (f,
                                               unsmob_grob (ft.head_->get_object ("accidental-grob")));
       else if (unsmob_grob (ft.head_->get_object ("dot")))
         Side_position_interface::add_support (f,
                                               unsmob_grob (ft.head_->get_object ("dot")));
 
-      Self_alignment_interface::set_align_self (f, Y_AXIS);
-      Self_alignment_interface::set_center_parent (f, Y_AXIS);
+      // don't overwrite offset property if it was overridden by the user
+      if (f->get_property (ly_symbol2scm ("Y-offset")) == SCM_EOL)
+        f->set_property (ly_symbol2scm ("Y-offset"),
+                         Self_alignment_interface::y_align_grob (f->self_scm ()));
+
       Side_position_interface::set_axis (f, X_AXIS);
 
       f->set_property ("direction", scm_from_int (hordir));
     }
 
   Drul_array< vector<Finger_tuple> > vertical (down, up);
   for (DOWN_and_UP (d))
     {
       for (vsize i = 0; i < vertical[d].size (); i++)
         {
           Finger_tuple ft = vertical[d][i];
           Grob *f = ft.script_;
           int finger_prio = robust_scm2int (f->get_property ("script-priority"), 200);
           f->set_parent (ft.head_, X_AXIS);
           f->set_property ("script-priority",
                            scm_from_int (finger_prio + d * ft.position_));
 
-          Self_alignment_interface::set_align_self (f, X_AXIS);
-          Self_alignment_interface::set_center_parent (f, X_AXIS);
+          // don't overwrite offset property if it was overridden by the user
+          if (f->get_property (ly_symbol2scm ("X-offset")) == SCM_EOL)
+            f->set_property (ly_symbol2scm ("X-offset"),
+                             Self_alignment_interface::x_align_grob (f->self_scm ()));
+
           Side_position_interface::set_axis (f, Y_AXIS);
 
           f->set_property ("direction", scm_from_int (d));
         }
     }
 }
 
 void
 New_fingering_engraver::stop_translation_timestep ()
 {
@@ skipping 69 matching lines @@
 
                 /* read */
                 "fingeringOrientations "
                 "harmonicDots "
                 "strokeFingerOrientations "
                 "stringNumberOrientations ",
 
                 /* write */
                 ""
                );