Fix some bugs in the dynamic engraver and PostScript backend

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

diff --git a/lily/fingering-engraver.cc b/lily/fingering-engraver.cc
index f469df8139484e59fa2619ee8ac38bcf5ab8e4f2..a8c4fcf68085bedfe8c5f78bd7e2306cc6345d8b 100644 (file)
--- a/lily/fingering-engraver.cc
+++ b/lily/fingering-engraver.cc
@@ -7,38 +7,39 @@
 */
 
 #include "engraver.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 "translator.icc"
+#include "rhythmic-head.hh"
+#include "self-alignment-interface.hh"
+#include "pitch.hh"
 
 class Fingering_engraver : public Engraver
 {
-  vector<Stream_event*> events_;
+  vector<Music*> 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, Stream_event *, int);
+  void make_script (Direction, Music *, int);
 };
 
-IMPLEMENT_TRANSLATOR_LISTENER (Fingering_engraver, fingering);
-void
-Fingering_engraver::listen_fingering (Stream_event *ev)
+bool
+Fingering_engraver::try_music (Music *m)
 {
-  events_.push_back (ev);
+  if (m->is_mus_type ("fingering-event"))
+    {
+      events_.push_back (m);
+      return true;
+    }
+  return false;
 }
 
 void
@@ -71,7 +72,7 @@ Fingering_engraver::process_music ()
 }
 
 void
-Fingering_engraver::make_script (Direction d, Stream_event *r, int i)
+Fingering_engraver::make_script (Direction d, Music *r, int i)
 {
   Item *fingering = make_item ("Fingering", r->self_scm ());
 
@@ -111,6 +112,9 @@ Fingering_engraver::make_script (Direction d, Stream_event *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_back (fingering);
 }
 
@@ -128,6 +132,8 @@ Fingering_engraver::Fingering_engraver ()
 {
 }
 
+#include "translator.icc"
+
 ADD_ACKNOWLEDGER (Fingering_engraver, rhythmic_head);
 ADD_ACKNOWLEDGER (Fingering_engraver, stem);
 ADD_TRANSLATOR (Fingering_engraver,