Merge branch 'jneeman' of git+ssh://jneem@git.sv.gnu.org/srv/git/lilypond into jneeman

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

diff --git a/lily/text-engraver.cc b/lily/text-engraver.cc
index d2eb4055f4115ac668c165f824f8cb898c2f6d34..a3447ccce7175cdceaffd377ac45aa7c4510815e 100644 (file)
--- a/lily/text-engraver.cc
+++ b/lily/text-engraver.cc
@@ -8,39 +8,39 @@
 
 #include "directional-element-interface.hh"
 #include "engraver.hh"
+#include "rhythmic-head.hh"
 #include "side-position-interface.hh"
 #include "stem.hh"
-#include "rhythmic-head.hh"
+#include "stream-event.hh"
 #include "text-interface.hh"
+#include "item.hh"
+
+#include "translator.icc"
 
 /**
    typeset directions that are  plain text.
 */
 class Text_engraver : public Engraver
 {
-  Link_array<Music> evs_;
-  Link_array<Item> texts_;
+  vector<Stream_event *> evs_;
+  vector<Grob*> texts_;
 public:
   TRANSLATOR_DECLARATIONS (Text_engraver);
 protected:
-  virtual bool try_music (Music *m);
   void stop_translation_timestep ();
   void process_acknowledged ();
 
+  DECLARE_TRANSLATOR_LISTENER (text_script);
   DECLARE_ACKNOWLEDGER (stem_tremolo);
   DECLARE_ACKNOWLEDGER (stem);
   DECLARE_ACKNOWLEDGER (rhythmic_head);
 };
 
-bool
-Text_engraver::try_music (Music *m)
+IMPLEMENT_TRANSLATOR_LISTENER (Text_engraver, text_script);
+void
+Text_engraver::listen_text_script (Stream_event *ev)
 {
-  if (m->is_mus_type ("text-script-event"))
-    {
-      evs_.push_back (m);
-      return true;
-    }
-  return false;
+  evs_.push_back (ev);
 }
 
 void
@@ -84,19 +84,13 @@ Text_engraver::process_acknowledged ()
     return;
   for (vsize i = 0; i < evs_.size (); i++)
     {
-      Music *r = evs_[i];
+      Stream_event *r = evs_[i];
 
       // URG: Text vs TextScript
       Item *text = make_item ("TextScript", r->self_scm ());
 
-      Axis ax = Y_AXIS;
-      Side_position_interface::set_axis (text, ax);
-
-      // Hmm
-      int priority = 200;
-      SCM s = text->get_property ("script-priority");
-      if (scm_is_number (s))
-       priority = scm_to_int (s);
+      int priority = robust_scm2int (text->get_property ("script-priority"),
+                                    200);
 
       /* see script-engraver.cc */
       priority += i;
@@ -125,14 +119,11 @@ Text_engraver::Text_engraver ()
 {
 }
 
-#include "translator.icc"
-
 ADD_ACKNOWLEDGER (Text_engraver, stem);
 ADD_ACKNOWLEDGER (Text_engraver, stem_tremolo);
 ADD_ACKNOWLEDGER (Text_engraver, rhythmic_head);
 ADD_TRANSLATOR (Text_engraver,
                /* doc */ "Create text-scripts",
                /* create */ "TextScript",
-               /* accept */ "text-script-event",
                /* read */ "",
                /* write */ "");