X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ftext-engraver.cc;h=6bd2356cab176959cdacb948b425604c0fb2fedd;hb=0f108b36cbf1e3e2168120b3d68997e75158e348;hp=c53cf3e4fd2cc6143bca02b6d9c1f6f4dee2eda4;hpb=a276a19dc6bd57832db3107f2f2cbb04cb4677b6;p=lilypond.git

diff --git a/lily/text-engraver.cc b/lily/text-engraver.cc
index c53cf3e4fd..6bd2356cab 100644
--- a/lily/text-engraver.cc
+++ b/lily/text-engraver.cc
@@ -1,19 +1,28 @@
 /*
-  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--2012 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c) 1998--2007 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 "rhythmic-head.hh"
+#include "item.hh"
 #include "side-position-interface.hh"
-#include "stem.hh"
 #include "stream-event.hh"
 #include "text-interface.hh"
-#include "item.hh"
 
 #include "translator.icc"
 
@@ -23,17 +32,13 @@
 class Text_engraver : public Engraver
 {
   vector<Stream_event *> evs_;
-  vector<Grob*> texts_;
 public:
   TRANSLATOR_DECLARATIONS (Text_engraver);
 protected:
   void stop_translation_timestep ();
-  void process_acknowledged ();
+  void process_music ();
 
   DECLARE_TRANSLATOR_LISTENER (text_script);
-  DECLARE_ACKNOWLEDGER (stem_tremolo);
-  DECLARE_ACKNOWLEDGER (stem);
-  DECLARE_ACKNOWLEDGER (rhythmic_head);
 };
 
 IMPLEMENT_TRANSLATOR_LISTENER (Text_engraver, text_script);
@@ -44,44 +49,8 @@ Text_engraver::listen_text_script (Stream_event *ev)
 }
 
 void
-Text_engraver::acknowledge_rhythmic_head (Grob_info inf)
+Text_engraver::process_music ()
 {
-  for (vsize 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);
-    }
-}
-
-void
-Text_engraver::acknowledge_stem (Grob_info inf)
-{
-  for (vsize i = 0; i < texts_.size (); i++)
-    Side_position_interface::add_support (texts_[i], inf.grob ());
-}
-
-void
-Text_engraver::acknowledge_stem_tremolo (Grob_info info)
-{
-  for (vsize i = 0; i < texts_.size (); i++)
-    Side_position_interface::add_support (texts_[i], info.grob ());
-}
-
-void
-Text_engraver::process_acknowledged ()
-{
-  if (texts_.size ())
-    return;
   for (vsize i = 0; i < evs_.size (); i++)
     {
       Stream_event *r = evs_[i];
@@ -90,7 +59,7 @@ Text_engraver::process_acknowledged ()
       Item *text = make_item ("TextScript", r->self_scm ());
 
       int priority = robust_scm2int (text->get_property ("script-priority"),
-				     200);
+                                     200);
 
       /* see script-engraver.cc */
       priority += i;
@@ -99,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_back (text);
     }
 }
 
 void
 Text_engraver::stop_translation_timestep ()
 {
-  texts_.clear ();
   evs_.clear ();
 }
 
@@ -119,11 +86,16 @@ Text_engraver::Text_engraver ()
 {
 }
 
-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",
-		/* read */ "",
-		/* write */ "");
+                /* doc */
+                "Create text scripts.",
+
+                /* create */
+                "TextScript ",
+
+                /* read */
+                "",
+
+                /* write */
+                ""
+               );