X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ffingering-engraver.cc;h=a364947b08eb363e02718616aab51a359d07136b;hb=623fac8d645e4078af36758af5d437c5eb39e793;hp=e45de84b14fabad1fede39303d67c3a91eee0bac;hpb=64313890b232c731d432e5b096f30bffc3f3756d;p=lilypond.git

diff --git a/lily/fingering-engraver.cc b/lily/fingering-engraver.cc
index e45de84b14..a364947b08 100644
--- a/lily/fingering-engraver.cc
+++ b/lily/fingering-engraver.cc
@@ -1,45 +1,56 @@
 /*
-  fingering-engraver.cc -- implement Fingering_engraver
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 1998--2012 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c) 1998--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  LilyPond is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #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_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_back (m);
-      return true;
-    }
-  return false;
+  events_.push_back (ev);
 }
 
 void
@@ -57,7 +68,7 @@ Fingering_engraver::acknowledge_rhythmic_head (Grob_info inf)
       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);
     }
 }
 
@@ -72,7 +83,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,26 +115,20 @@ 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));
+        fingering->set_property ("direction", scm_from_int (d));
       else
-	fingering->set_property ("direction", scm_from_int (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_from_int (10)));
-
   fingerings_.push_back (fingering);
 }
 
 void
 Fingering_engraver::stop_translation_timestep ()
 {
-  if (!fingerings_.size ())
-    return;
-
   fingerings_.clear ();
   events_.clear ();
 }
@@ -132,13 +137,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 */
+                ""
+               );