(DECLARE_EVENT_SWALLOWER): ENTER_DESCRIPTION -> ADD_TRANSLATOR

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

diff --git a/lily/fingering-engraver.cc b/lily/fingering-engraver.cc
index 867e93d38279ed8816fa38120d36b83510690f8a..2dc0cb9baf6f29a58b6412006f068391f3f94722 100644 (file)
--- a/lily/fingering-engraver.cc
+++ b/lily/fingering-engraver.cc
@@ -7,11 +7,8 @@
   
  */
 
-
 #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"
@@ -22,7 +19,7 @@ class Fingering_engraver : public Engraver
   Link_array<Item> fingerings_;
 
 public:
-  TRANSLATOR_DECLARATIONS(Fingering_engraver);
+  TRANSLATOR_DECLARATIONS (Fingering_engraver);
 protected:
   virtual bool try_music (Music* m);
   virtual void stop_translation_timestep ();
@@ -30,7 +27,8 @@ protected:
   virtual void process_music ();
   virtual void acknowledge_grob (Grob_info);
 
-  void make_script (Direction, Music*,Axis, int);
+private:
+  void make_script (Direction, Music*, int);
 };
 
 bool
@@ -49,19 +47,19 @@ 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_);
+         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_);
          if (!t->get_parent (X_AXIS))
-               t->set_parent (inf.grob_, X_AXIS);
+           t->set_parent (inf.grob_, X_AXIS);
        }
     }
 }
@@ -69,53 +67,61 @@ 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], Y_AXIS, i);
+      make_script (to_dir (dir), reqs_[i], i);
     }
 }
 
+
 void
-Fingering_engraver::make_script (Direction d, Music *r,Axis a,  int i)
+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);
 
+  /*
+    Huh, what's this for? --hwn.
+
+    junkme.
+   */
   SCM pitch = r->get_property ("pitch");
   if (unsmob_pitch (pitch))
     fingering->set_property ("pitch", pitch);
-  
+
+  /*
+    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);
 
   // 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);
 }
 
@@ -125,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 ();
 }
 
@@ -139,12 +140,12 @@ Fingering_engraver::start_translation_timestep ()
   reqs_.clear ();
 }
 
-Fingering_engraver::Fingering_engraver()
+Fingering_engraver::Fingering_engraver ()
 {
 
 }
 
-ENTER_DESCRIPTION(Fingering_engraver,
+ADD_TRANSLATOR (Fingering_engraver,
 /* descr */       "Create fingering-scripts",
 /* creats*/       "Fingering",
 /* accepts */     "fingering-event",