Merge with git+ssh://jneem@git.sv.gnu.org/srv/git/lilypond.git

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

diff --git a/lily/fingering-engraver.cc b/lily/fingering-engraver.cc
index c6a6a9b0fb9318da6279a871ba498ad30a1214a7..896913bbc2796fbcb9e8eae06f648964f2c34398 100644 (file)
--- a/lily/fingering-engraver.cc
+++ b/lily/fingering-engraver.cc
@@ -27,7 +27,7 @@ protected:
   void stop_translation_timestep ();
   void process_music ();
   DECLARE_TRANSLATOR_LISTENER (fingering);
-  DECLARE_TRANSLATOR_LISTENER (string_finger);
+  DECLARE_TRANSLATOR_LISTENER (stroke_finger);
   DECLARE_ACKNOWLEDGER (rhythmic_head);
   DECLARE_ACKNOWLEDGER (stem);
 
@@ -42,9 +42,9 @@ Fingering_engraver::listen_fingering (Stream_event *ev)
   events_.push_back (ev);
 }
 
-IMPLEMENT_TRANSLATOR_LISTENER (Fingering_engraver, string_finger);
+IMPLEMENT_TRANSLATOR_LISTENER (Fingering_engraver, stroke_finger);
 void
-Fingering_engraver::listen_string_finger (Stream_event *ev)
+Fingering_engraver::listen_stroke_finger (Stream_event *ev)
 {
   /*
     FIXME: should do something.
@@ -116,7 +116,7 @@ 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 (ly_symbol2scm ("direction"))))
+  if (!is_direction (fingering->get_property_data ("direction")))
     {
       if (d)
        fingering->set_property ("direction", scm_from_int (d));
@@ -149,7 +149,5 @@ ADD_TRANSLATOR (Fingering_engraver,
                "Create fingering-scripts",
                /* create */
                "Fingering",
-               /* accept */
-               "fingering-event",
                /* read */ "",
                /* write */ "");