X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ftext-engraver.cc;h=ffd669ef80575f192ffc23e5be7ff091bfc401e8;hb=2348fa9c19d9884469911f17dac9ad1f93b13363;hp=4b5904abf208e7567a78c9a4437b28f745ced074;hpb=545092a25d8ca41dc90b87482474b3719f7130a9;p=lilypond.git

diff --git a/lily/text-engraver.cc b/lily/text-engraver.cc
index 4b5904abf2..ffd669ef80 100644
--- a/lily/text-engraver.cc
+++ b/lily/text-engraver.cc
@@ -1,94 +1,65 @@
 /*
-  text-engraver.cc -- implement Text_engraver
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 1998--2014 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c) 1998--2005 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 "directional-element-interface.hh"
 #include "engraver.hh"
+#include "item.hh"
 #include "side-position-interface.hh"
-#include "stem.hh"
-#include "rhythmic-head.hh"
+#include "stream-event.hh"
 #include "text-interface.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_;
 public:
   TRANSLATOR_DECLARATIONS (Text_engraver);
 protected:
-  virtual bool try_music (Music *m);
   void stop_translation_timestep ();
-  void process_acknowledged ();
+  void process_music ();
 
-  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;
-}
-
+IMPLEMENT_TRANSLATOR_LISTENER (Text_engraver, text_script);
 void
-Text_engraver::acknowledge_rhythmic_head (Grob_info inf)
+Text_engraver::listen_text_script (Stream_event *ev)
 {
-  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);
-    }
+  evs_.push_back (ev);
 }
 
 void
-Text_engraver::acknowledge_stem (Grob_info inf)
+Text_engraver::process_music ()
 {
-  for (int i = 0; i < texts_.size (); i++)
-    Side_position_interface::add_support (texts_[i], inf.grob ());
-}
-
-void
-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;
@@ -97,19 +68,17 @@ Text_engraver::process_acknowledged ()
 
       Direction dir = to_dir (r->get_property ("direction"));
       if (dir)
-	set_grob_direction (text, dir);
+        set_grob_direction (text, dir);
 
       SCM mark = r->get_property ("text");
 
       text->set_property ("text", mark);
-      texts_.push (text);
     }
 }
 
 void
 Text_engraver::stop_translation_timestep ()
 {
-  texts_.clear ();
   evs_.clear ();
 }
 
@@ -117,13 +86,16 @@ Text_engraver::Text_engraver ()
 {
 }
 
-#include "translator.icc"
-
-ADD_ACKNOWLEDGER (Text_engraver, stem);
-ADD_ACKNOWLEDGER (Text_engraver, rhythmic_head);
 ADD_TRANSLATOR (Text_engraver,
-		/* doc */ "Create text-scripts",
-		/* create */ "TextScript",
-		/* accept */ "text-script-event",
-		/* read */ "",
-		/* write */ "");
+                /* doc */
+                "Create text scripts.",
+
+                /* create */
+                "TextScript ",
+
+                /* read */
+                "",
+
+                /* write */
+                ""
+               );