* The grand 2005-2006 replace.

[lilypond.git] / lily / fingering-engraver.cc

diff --git a/lily/fingering-engraver.cc b/lily/fingering-engraver.cc
index 83c85691663ee26fec47fd16fb6288ee51ed7c88..117ead2c81e3dca90ccb8d026993af90d4bbe059 100644 (file)
--- a/lily/fingering-engraver.cc
+++ b/lily/fingering-engraver.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1998--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1998--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "engraver.hh"
@@ -46,9 +46,7 @@ void
 Fingering_engraver::acknowledge_stem (Grob_info inf)
 {
   for (int i = 0; i < fingerings_.size (); i++)
-    {
-      Side_position_interface::add_support (fingerings_[i], inf.grob ());
-    }
+    Side_position_interface::add_support (fingerings_[i], inf.grob ());
 }
 
 void
@@ -77,8 +75,6 @@ void
 Fingering_engraver::make_script (Direction d, Music *r, int i)
 {
   Item *fingering = make_item ("Fingering", r->self_scm ());
-  Axis a = Y_AXIS;
-  Axis other = other_axis (a);
 
   /*
     Huh, what's this for? --hwn.
@@ -93,9 +89,9 @@ Fingering_engraver::make_script (Direction d, Music *r, int i)
     We can't fold these definitions into define-grobs since
     fingerings for chords need different settings.
   */
-  Side_position_interface::set_axis (fingering, a);
-  fingering->add_offset_callback (Self_alignment_interface::aligned_on_self_proc, other);
-  fingering->add_offset_callback (Self_alignment_interface::centered_on_parent_proc, other);
+  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);
 
   // Hmm
   int priority = 200;
@@ -108,7 +104,7 @@ Fingering_engraver::make_script (Direction d, Music *r, int i)
 
   fingering->set_property ("script-priority", scm_from_int (priority));
 
-  if (!is_direction (fingering->get_property ("direction")))
+  if (!is_direction (fingering->get_property_data (ly_symbol2scm ("direction"))))
     {
       if (d)
        fingering->set_property ("direction", scm_from_int (d));