* stepmake/aclocal.m4 (STEPMAKE_KPATHSEA): Do not include

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

diff --git a/lily/fingering-engraver.cc b/lily/fingering-engraver.cc
index a536f77390d7bfd61a1decad32bf2bf00e5a3b06..4fd86d8ab78487cd8e1996cb4685e6afac25c79e 100644 (file)
--- a/lily/fingering-engraver.cc
+++ b/lily/fingering-engraver.cc
@@ -3,15 +3,12 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1998--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1998--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
-
 #include "engraver.hh"
 #include "side-position-interface.hh"
-#include "item.hh"
-#include "event.hh"
 #include "stem.hh"
 #include "rhythmic-head.hh"
 #include "self-alignment-interface.hh"
@@ -50,17 +47,17 @@ Fingering_engraver::acknowledge_grob (Grob_info inf)
 {
   if (Stem::has_interface (inf.grob_))
     {
-      for (int i=0; i < fingerings_.size (); i++)
+      for (int i = 0; i < fingerings_.size (); i++)
        {
          Side_position_interface::add_support (fingerings_[i], inf.grob_);
        }
     }
   else if (Rhythmic_head::has_interface (inf.grob_))
     {
-      for (int i=0; i < fingerings_.size (); i++)
+      for (int i = 0; i < fingerings_.size (); i++)
        {
          Grob*t = fingerings_[i];
-         Side_position_interface::add_support (t,inf.grob_);
+         Side_position_interface::add_support (t, inf.grob_);
          if (!t->get_parent (X_AXIS))
            t->set_parent (inf.grob_, X_AXIS);
        }
@@ -70,7 +67,7 @@ Fingering_engraver::acknowledge_grob (Grob_info inf)
 void
 Fingering_engraver::process_music ()
 {
-  for (int i= reqs_.size (); i--;)
+  for (int i = reqs_.size (); i--;)
     {
       SCM dir = reqs_[i]->get_property ("direction");
       make_script (to_dir (dir), reqs_[i], i);
@@ -81,7 +78,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,8 +102,8 @@ Fingering_engraver::make_script (Direction d, Music *r, int i)
   // Hmm
   int priority = 200;
   SCM s = fingering->get_property ("script-priority");
-  if (ly_number_p (s))
-    priority = ly_scm2int (s);
+  if (scm_is_number (s))
+    priority = scm_to_int (s);
   
   /* See script-engraver.cc */
   priority += i;
@@ -125,7 +122,6 @@ Fingering_engraver::make_script (Direction d, Music *r, int i)
   SCM dig =  r->get_property ("digit");
   fingering->set_property ("text", scm_number_to_string (dig, scm_int2num (10)));
 
-  announce_grob (fingering, r->self_scm ());
   fingerings_.push (fingering);
 }
 
@@ -135,11 +131,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 ();
 }
 
@@ -154,7 +145,7 @@ Fingering_engraver::Fingering_engraver ()
 
 }
 
-ENTER_DESCRIPTION (Fingering_engraver,
+ADD_TRANSLATOR (Fingering_engraver,
 /* descr */       "Create fingering-scripts",
 /* creats*/       "Fingering",
 /* accepts */     "fingering-event",