X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fnew-fingering-engraver.cc;h=1ae7794393cffa9dd7be84a82bad09b4f0d5c4c7;hb=a1741dc78d0f4a71cd6790b4306fdcd618e5c40a;hp=ed69676ec62aba4bc9a5c849518fc2ed587934e2;hpb=5d576b1299d374ae478cb38075cc05d5cb691046;p=lilypond.git

diff --git a/lily/new-fingering-engraver.cc b/lily/new-fingering-engraver.cc
index ed69676ec6..1ae7794393 100644
--- a/lily/new-fingering-engraver.cc
+++ b/lily/new-fingering-engraver.cc
@@ -15,10 +15,13 @@
 #include "side-position-interface.hh"
 #include "stem.hh"
 #include "stream-event.hh"
+#include "item.hh"
 #include "warn.hh"
 
 #include "translator.icc"
 
+
+
 struct Finger_tuple
 {
   Grob *head_;
@@ -46,7 +49,7 @@ operator< (Finger_tuple const &a, Finger_tuple const &b)
 class New_fingering_engraver : public Engraver
 {
   vector<Finger_tuple> fingerings_;
-  vector<Finger_tuple> string_fingerings_;
+  vector<Finger_tuple> stroke_fingerings_;
   vector<Finger_tuple> articulations_;
   vector<Finger_tuple> string_numbers_;
 
@@ -90,16 +93,16 @@ New_fingering_engraver::acknowledge_rhythmic_head (Grob_info inf)
 		       &fingerings_,
 		       ev, note_ev);
       else if (ev->in_event_class ("text-script-event"))
-	ev->origin ()->warning (_ ("can't add text scripts to individual note heads"));
+	ev->origin ()->warning (_ ("cannot add text scripts to individual note heads"));
       else if (ev->in_event_class ("script-event"))
 	add_script (inf.grob (), ev, note_ev);
       else if (ev->in_event_class ("string-number-event"))
 	add_fingering (inf.grob (),
 		       ly_symbol2scm ("StringNumber"), &string_numbers_,
 		       ev, note_ev);
-      else if (ev->in_event_class ("string-finger-event"))
+      else if (ev->in_event_class ("stroke-finger-event"))
 	add_fingering (inf.grob (),
-		       ly_symbol2scm ("StringFinger"), &string_fingerings_,
+		       ly_symbol2scm ("StrokeFinger"), &stroke_fingerings_,
 		       ev, note_ev);
       else if (ev->in_event_class ("harmonic-event"))
 	{
@@ -304,11 +307,11 @@ New_fingering_engraver::position_all ()
       string_numbers_.clear ();
     }
 
-  if (string_fingerings_.size ())
+  if (stroke_fingerings_.size ())
     {
-      position_scripts (get_property ("stringFingerOrientations"),
-			&string_fingerings_);
-      string_fingerings_.clear ();
+      position_scripts (get_property ("strokeFingerOrientations"),
+			&stroke_fingerings_);
+      stroke_fingerings_.clear ();
     }
   
   for (vsize i = articulations_.size (); i--;)
@@ -343,15 +346,13 @@ ADD_TRANSLATOR (New_fingering_engraver,
 		/* create */
 		"Fingering "
 		"StringNumber "
-		"StringFinger "
+		"StrokeFinger "
 		"Script "
 		,
-		
-		/* accept */ "",
 		/* read */
 		
 		"fingeringOrientations "
-		"stringFingerOrientations "
+		"strokeFingerOrientations "
 		"stringNumberOrientations "
 		,