X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ftext-engraver.cc;h=14f519ec85434ad69c8a8234ba7645846ea37cb1;hb=98f5cb86133b03c2c4739cab384d48021e5d11df;hp=72a81264525c74262c686ff8ff2d20a56eb10813;hpb=f2c2c5c43858f323e4708f83fd97e0f38017c275;p=lilypond.git

diff --git a/lily/text-engraver.cc b/lily/text-engraver.cc
index 72a8126452..14f519ec85 100644
--- a/lily/text-engraver.cc
+++ b/lily/text-engraver.cc
@@ -3,72 +3,41 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1998--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1998--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #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);
-  PRECOMPUTED_VIRTUAL void stop_translation_timestep ();
-  PRECOMPUTED_VIRTUAL void process_acknowledged ();
+  void stop_translation_timestep ();
+  void process_acknowledged ();
 
-  DECLARE_ACKNOWLEDGER(stem);
-  DECLARE_ACKNOWLEDGER(rhythmic_head);
+  DECLARE_TRANSLATOR_LISTENER (text_script);
 };
 
-bool
-Text_engraver::try_music (Music *m)
-{
-  if (m->is_mus_type ("text-script-event"))
-    {
-      evs_.push (m);
-      return true;
-    }
-  return false;
-}
-
-void
-Text_engraver::acknowledge_rhythmic_head (Grob_info inf)
-{
-  for (int i = 0; i < texts_.size (); i++)
-    {
-      Grob *t = texts_[i];
-      Side_position_interface::add_support (t, inf.grob ());
-
-      /*
-	ugh.
-      */
-      if (Side_position_interface::get_axis (t) == X_AXIS
-	  && !t->get_parent (Y_AXIS))
-	t->set_parent (inf.grob (), Y_AXIS);
-      else if (Side_position_interface::get_axis (t) == Y_AXIS
-	       && !t->get_parent (X_AXIS))
-	t->set_parent (inf.grob (), X_AXIS);
-    }
-}
-
+IMPLEMENT_TRANSLATOR_LISTENER (Text_engraver, text_script);
 void
-Text_engraver::acknowledge_stem (Grob_info inf)
+Text_engraver::listen_text_script (Stream_event *ev)
 {
-  for (int i = 0; i < texts_.size (); i++)
-    {
-      Side_position_interface::add_support (texts_[i], inf.grob ());
-    }
+  evs_.push_back (ev);
 }
 
 void
@@ -76,26 +45,20 @@ Text_engraver::process_acknowledged ()
 {
   if (texts_.size ())
     return;
-  for (int i = 0; i < evs_.size (); i++)
+  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;
 
-      text->set_property ("script-priority", scm_int2num (priority));
+      text->set_property ("script-priority", scm_from_int (priority));
 
       Direction dir = to_dir (r->get_property ("direction"));
       if (dir)
@@ -104,7 +67,7 @@ Text_engraver::process_acknowledged ()
       SCM mark = r->get_property ("text");
 
       text->set_property ("text", mark);
-      texts_.push (text);
+      texts_.push_back (text);
     }
 }
 
@@ -119,13 +82,8 @@ Text_engraver::Text_engraver ()
 {
 }
 
-#include "translator.icc"
-
-ADD_ACKNOWLEDGER(Text_engraver, stem);
-ADD_ACKNOWLEDGER(Text_engraver, rhythmic_head);
 ADD_TRANSLATOR (Text_engraver,
-		/* descr */ "Create text-scripts",
-		/* creats*/ "TextScript",
-		/* accepts */ "text-script-event",
-		/* reads */ "",
+		/* doc */ "Create text-scripts",
+		/* create */ "TextScript",
+		/* read */ "",
 		/* write */ "");