X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ffingering-engraver.cc;h=0c9426f0956b8b36ea4d1f3e1a04f5e329510200;hb=cef13af124f3aa4ced76f71e02e990f94b49a978;hp=117ead2c81e3dca90ccb8d026993af90d4bbe059;hpb=75eebcb49e52d296b1da3e1074e0825d2c780db4;p=lilypond.git

diff --git a/lily/fingering-engraver.cc b/lily/fingering-engraver.cc
index 117ead2c81..0c9426f095 100644
--- a/lily/fingering-engraver.cc
+++ b/lily/fingering-engraver.cc
@@ -3,56 +3,69 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1998--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1998--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "engraver.hh"
-#include "side-position-interface.hh"
-#include "stem.hh"
+#include "pitch.hh"
 #include "rhythmic-head.hh"
 #include "self-alignment-interface.hh"
-#include "pitch.hh"
+#include "side-position-interface.hh"
+#include "stem.hh"
+#include "stream-event.hh"
+#include "item.hh"
+
+#include "translator.icc"
 
 class Fingering_engraver : public Engraver
 {
-  Link_array<Music> events_;
-  Link_array<Item> fingerings_;
+  vector<Stream_event*> events_;
+  vector<Item*> fingerings_;
 
 public:
   TRANSLATOR_DECLARATIONS (Fingering_engraver);
 protected:
-  virtual bool try_music (Music *m);
   void stop_translation_timestep ();
   void process_music ();
+  DECLARE_TRANSLATOR_LISTENER (fingering);
+  DECLARE_TRANSLATOR_LISTENER (stroke_finger);
   DECLARE_ACKNOWLEDGER (rhythmic_head);
   DECLARE_ACKNOWLEDGER (stem);
 
 private:
-  void make_script (Direction, Music *, int);
+  void make_script (Direction, Stream_event *, int);
 };
 
-bool
-Fingering_engraver::try_music (Music *m)
+IMPLEMENT_TRANSLATOR_LISTENER (Fingering_engraver, fingering);
+void
+Fingering_engraver::listen_fingering (Stream_event *ev)
 {
-  if (m->is_mus_type ("fingering-event"))
-    {
-      events_.push (m);
-      return true;
-    }
-  return false;
+  events_.push_back (ev);
+}
+
+IMPLEMENT_TRANSLATOR_LISTENER (Fingering_engraver, stroke_finger);
+void
+Fingering_engraver::listen_stroke_finger (Stream_event *ev)
+{
+  /*
+    FIXME: should do something.
+    
+    This function is mainly here to shut up a warning
+   */
+  (void)ev;
 }
 
 void
 Fingering_engraver::acknowledge_stem (Grob_info inf)
 {
-  for (int i = 0; i < fingerings_.size (); i++)
+  for (vsize i = 0; i < fingerings_.size (); i++)
     Side_position_interface::add_support (fingerings_[i], inf.grob ());
 }
 
 void
 Fingering_engraver::acknowledge_rhythmic_head (Grob_info inf)
 {
-  for (int i = 0; i < fingerings_.size (); i++)
+  for (vsize i = 0; i < fingerings_.size (); i++)
     {
       Grob *t = fingerings_[i];
       Side_position_interface::add_support (t, inf.grob ());
@@ -64,7 +77,7 @@ Fingering_engraver::acknowledge_rhythmic_head (Grob_info inf)
 void
 Fingering_engraver::process_music ()
 {
-  for (int i = events_.size (); i--;)
+  for (vsize i = events_.size (); i--;)
     {
       SCM dir = events_[i]->get_property ("direction");
       make_script (to_dir (dir), events_[i], i);
@@ -72,7 +85,7 @@ Fingering_engraver::process_music ()
 }
 
 void
-Fingering_engraver::make_script (Direction d, Music *r, int i)
+Fingering_engraver::make_script (Direction d, Stream_event *r, int i)
 {
   Item *fingering = make_item ("Fingering", r->self_scm ());
 
@@ -104,7 +117,7 @@ Fingering_engraver::make_script (Direction d, Music *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));
@@ -112,10 +125,7 @@ Fingering_engraver::make_script (Direction d, Music *r, int i)
 	fingering->set_property ("direction", scm_from_int (RIGHT));
     }
 
-  SCM dig = r->get_property ("digit");
-  fingering->set_property ("text", scm_number_to_string (dig, scm_from_int (10)));
-
-  fingerings_.push (fingering);
+  fingerings_.push_back (fingering);
 }
 
 void
@@ -132,13 +142,19 @@ Fingering_engraver::Fingering_engraver ()
 {
 }
 
-#include "translator.icc"
-
 ADD_ACKNOWLEDGER (Fingering_engraver, rhythmic_head);
 ADD_ACKNOWLEDGER (Fingering_engraver, stem);
+
 ADD_TRANSLATOR (Fingering_engraver,
-		/* doc */ "Create fingering-scripts",
-		/* create */ "Fingering",
-		/* accept */ "fingering-event",
-		/* read */ "",
-		/* write */ "");
+		/* doc */
+		"Create fingering scripts.",
+
+		/* create */
+		"Fingering ",
+
+		/* read */
+		"",
+
+		/* write */
+		""
+		);