* Documentation/user/notation.itely: fixed 2 typos

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

diff --git a/lily/fingering-engraver.cc b/lily/fingering-engraver.cc
index c87aab6b31b27689864d53421aa4296e5c2494f1..48776e2f645d10b55b408e3ba05598ea4c02412b 100644 (file)
--- a/lily/fingering-engraver.cc
+++ b/lily/fingering-engraver.cc
@@ -81,7 +81,7 @@ Fingering_engraver::process_music ()
 void
 Fingering_engraver::make_script (Direction d, Music *r, int i)
 {
-  Item *fingering = make_item ("Fingering");
+  Item *fingering = make_item ("Fingering", r->self_scm ());
   Axis a = Y_AXIS;
   Axis other = other_axis (a);
 
@@ -105,27 +105,26 @@ Fingering_engraver::make_script (Direction d, Music *r, int i)
   // Hmm
   int priority = 200;
   SCM s = fingering->get_property ("script-priority");
-  if (gh_number_p (s))
-    priority = gh_scm2int (s);
+  if (scm_is_number (s))
+    priority = scm_to_int (s);
   
   /* See script-engraver.cc */
   priority += i;
 
-  fingering->set_property ("script-priority", gh_int2scm (priority));
+  fingering->set_property ("script-priority", scm_int2num (priority));
 
 
   if (!is_direction (fingering->get_property ("direction")))
     {
       if (d)
-       fingering->set_property ("direction", gh_int2scm (d));
+       fingering->set_property ("direction", scm_int2num (d));
       else
-       fingering->set_property ("direction",  gh_int2scm (RIGHT));
+       fingering->set_property ("direction",  scm_int2num (RIGHT));
     }
 
   SCM dig =  r->get_property ("digit");
-  fingering->set_property ("text", scm_number_to_string (dig, gh_int2scm (10)));
+  fingering->set_property ("text", scm_number_to_string (dig, scm_int2num (10)));
 
-  announce_grob (fingering, r->self_scm ());
   fingerings_.push (fingering);
 }
 
@@ -135,11 +134,6 @@ Fingering_engraver::stop_translation_timestep ()
   if (!fingerings_.size ())
     return;
   
-  for (int i=0; i < fingerings_.size (); i++)
-    {
-      Item *ti = fingerings_[i];
-      typeset_grob (ti);
-    }
   fingerings_.clear ();
 }