X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ffingering-engraver.cc;h=235fdd666dfea51a3bbfd82729d9b2670ec6ccf3;hb=1f8f8075de6d90783386aea28af67755ed57da16;hp=59570ba4a8e3326d68d8b553ceb15b8f41bf76c3;hpb=bdf4ab13203502e7ec7cf9cf5896527643a07c1f;p=lilypond.git

diff --git a/lily/fingering-engraver.cc b/lily/fingering-engraver.cc
index 59570ba4a8..235fdd666d 100644
--- a/lily/fingering-engraver.cc
+++ b/lily/fingering-engraver.cc
@@ -3,82 +3,90 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1998--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1998--2009 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 "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> reqs_;
-  Link_array<Item> fingerings_;
+  vector<Stream_event*> events_;
+  vector<Item*> fingerings_;
 
 public:
   TRANSLATOR_DECLARATIONS (Fingering_engraver);
 protected:
-  virtual bool try_music (Music *m);
-  virtual void stop_translation_timestep ();
-  virtual void start_translation_timestep ();
-  virtual void process_music ();
-  virtual void acknowledge_grob (Grob_info);
+  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"))
-    {
-      reqs_.push (m);
-      return true;
-    }
-  return false;
+  events_.push_back (ev);
 }
 
+IMPLEMENT_TRANSLATOR_LISTENER (Fingering_engraver, stroke_finger);
 void
-Fingering_engraver::acknowledge_grob (Grob_info inf)
+Fingering_engraver::listen_stroke_finger (Stream_event * /* ev */)
 {
-  if (Stem::has_interface (inf.grob_))
-    {
-      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_))
+  /*
+    FIXME: should do something.
+    
+    This function is mainly here to shut up a warning
+   */
+}
+
+void
+Fingering_engraver::acknowledge_stem (Grob_info inf)
+{
+  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 (vsize 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);
-	}
+      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);
     }
 }
 
 void
 Fingering_engraver::process_music ()
 {
-  for (int i = reqs_.size (); i--;)
+  for (vsize i = events_.size (); i--;)
     {
-      SCM dir = reqs_[i]->get_property ("direction");
-      make_script (to_dir (dir), reqs_[i], i);
+      SCM dir = events_[i]->get_property ("direction");
+      make_script (to_dir (dir), events_[i], i);
     }
 }
 
 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 ());
-  Axis a = Y_AXIS;
-  Axis other = other_axis (a);
 
   /*
     Huh, what's this for? --hwn.
@@ -93,9 +101,9 @@ Fingering_engraver::make_script (Direction d, Music *r, int i)
     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);
+  Side_position_interface::set_axis (fingering, Y_AXIS);
+  Self_alignment_interface::set_align_self (fingering, X_AXIS);
+  Self_alignment_interface::set_center_parent (fingering, X_AXIS);
 
   // Hmm
   int priority = 200;
@@ -106,20 +114,17 @@ Fingering_engraver::make_script (Direction d, Music *r, int i)
   /* See script-engraver.cc */
   priority += i;
 
-  fingering->set_property ("script-priority", scm_int2num (priority));
+  fingering->set_property ("script-priority", scm_from_int (priority));
 
-  if (!is_direction (fingering->get_property ("direction")))
+  if (!is_direction (fingering->get_property_data ("direction")))
     {
       if (d)
-	fingering->set_property ("direction", scm_int2num (d));
+	fingering->set_property ("direction", scm_from_int (d));
       else
-	fingering->set_property ("direction", scm_int2num (RIGHT));
+	fingering->set_property ("direction", scm_from_int (RIGHT));
     }
 
-  SCM dig = r->get_property ("digit");
-  fingering->set_property ("text", scm_number_to_string (dig, scm_int2num (10)));
-
-  fingerings_.push (fingering);
+  fingerings_.push_back (fingering);
 }
 
 void
@@ -129,22 +134,26 @@ Fingering_engraver::stop_translation_timestep ()
     return;
 
   fingerings_.clear ();
-}
-
-void
-Fingering_engraver::start_translation_timestep ()
-{
-  reqs_.clear ();
+  events_.clear ();
 }
 
 Fingering_engraver::Fingering_engraver ()
 {
 }
 
+ADD_ACKNOWLEDGER (Fingering_engraver, rhythmic_head);
+ADD_ACKNOWLEDGER (Fingering_engraver, stem);
+
 ADD_TRANSLATOR (Fingering_engraver,
-		/* descr */ "Create fingering-scripts",
-		/* creats*/ "Fingering",
-		/* accepts */ "fingering-event",
-		/* acks  */ "rhythmic-head-interface stem-interface",
-		/* reads */ "",
-		/* write */ "");
+		/* doc */
+		"Create fingering scripts.",
+
+		/* create */
+		"Fingering ",
+
+		/* read */
+		"",
+
+		/* write */
+		""
+		);