X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ftext-engraver.cc;h=90376d2a62044a589f2be4ecdecb70faa2341dde;hb=71b9dde55139dbc7eeefb2ebb95105f573cd33a9;hp=c0fb5ab1509756de5e3b2617640a95c580ae65e5;hpb=876ccb4004d92f3b7bd539753f8f9339b7d48490;p=lilypond.git

diff --git a/lily/text-engraver.cc b/lily/text-engraver.cc
index c0fb5ab150..90376d2a62 100644
--- a/lily/text-engraver.cc
+++ b/lily/text-engraver.cc
@@ -1,132 +1,97 @@
-/*   
-  text-engraver.cc --  implement Text_engraver
-  
+/*
+  text-engraver.cc -- implement Text_engraver
+
   source file of the GNU LilyPond music typesetter
-  
-  (c) 1998--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-  
- */
-#include "dimension-cache.hh"
 
+  (c) 1998--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
+*/
+
+#include "directional-element-interface.hh"
 #include "engraver.hh"
-#include "staff-side.hh"
-#include "text-item.hh"
-#include "musical-request.hh"
-#include "note-head.hh"
+#include "rhythmic-head.hh"
+#include "side-position-interface.hh"
 #include "stem.hh"
-#include "staff-symbol.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<Text_script_req> reqs_;
-  Link_array<Text_item> texts_;
+  vector<Stream_event *> evs_;
+  vector<Grob*> texts_;
 public:
-
-  VIRTUAL_COPY_CONS(Translator);
+  TRANSLATOR_DECLARATIONS (Text_engraver);
 protected:
-  virtual bool do_try_music (Music* m);
-  virtual void do_pre_move_processing ();
-  virtual void do_post_move_processing ();
-  virtual void do_process_requests ();
-  virtual void acknowledge_element (Score_element_info);
-};
-
-
-bool
-Text_engraver::do_try_music (Music *m)
-{
-  if (Text_script_req *r = dynamic_cast<Text_script_req*> (m))
-    {
-      reqs_.push (r);
-      return true;
-    }
-  return false;
-}
+  void stop_translation_timestep ();
+  void process_acknowledged ();
 
+  DECLARE_TRANSLATOR_LISTENER (text_script);
+};
 
+IMPLEMENT_TRANSLATOR_LISTENER (Text_engraver, text_script);
 void
-Text_engraver::acknowledge_element (Score_element_info i)
+Text_engraver::listen_text_script (Stream_event *ev)
 {
-  if (Note_head *n = dynamic_cast<Note_head*> (i.elem_l_))
-    {
-      for (int i=0; i < texts_.size (); i++)
-	{
-	  Staff_sidify st (texts_[i]);
-	  st.add_support (n);
-	  if (st.get_axis( ) == X_AXIS
-	      && !texts_[i]->parent_l (Y_AXIS))
-	    texts_[i]->set_parent (n, Y_AXIS);
-	}
-    }
-  if (Stem *n = dynamic_cast<Stem*> (i.elem_l_))
-    {
-      for (int i=0; i < texts_.size (); i++)
-	{
-	  Staff_sidify st(texts_[i]);
-	  st.add_support (n);
-	}
-    }
+  evs_.push_back (ev);
 }
 
 void
-Text_engraver::do_process_requests ()
+Text_engraver::process_acknowledged ()
 {
-  for (int i=0; i < reqs_.size (); i++)
+  if (texts_.size ())
+    return;
+  for (vsize i = 0; i < evs_.size (); i++)
     {
-      Text_script_req * r = reqs_[i];
-
-      Text_item *text = new Text_item;
-      Staff_sidify stafy (text);
-
-      SCM axisprop = get_property ("scriptHorizontal",0);
-      if (gh_boolean_p (axisprop) && gh_scm2bool (axisprop))
-	{
-	  stafy.set_axis (X_AXIS);
-	  //	  text->set_parent (ss, Y_AXIS);
-	}
-      else
-	stafy.set_axis (Y_AXIS);
-      
-      text->set_elt_property ("script-priority",
-			    gh_int2scm (200));
-
-      if (r->get_direction ())
-	stafy.set_direction (r->get_direction ());
-      
-      text->text_str_ = r->text_str_;
-      
-      if (r->style_str_.length_i ())
-	text->set_elt_property ("style", ly_str02scm (r->style_str_.ch_C()));
-      
-      SCM empty = get_property ("textEmptyDimension", 0);
-      if (gh_boolean_p (empty) && gh_scm2bool (empty))
-	{
-	  text->set_empty (true, X_AXIS);
-	}
-
-      announce_element (Score_element_info (text, r));
-      texts_.push (text);
+      Stream_event *r = evs_[i];
+
+      // URG: Text vs TextScript
+      Item *text = make_item ("TextScript", r->self_scm ());
+
+      int priority = robust_scm2int (text->get_property ("script-priority"),
+				     200);
+
+      /* see script-engraver.cc */
+      priority += i;
+
+      text->set_property ("script-priority", scm_from_int (priority));
+
+      Direction dir = to_dir (r->get_property ("direction"));
+      if (dir)
+	set_grob_direction (text, dir);
+
+      SCM mark = r->get_property ("text");
+
+      text->set_property ("text", mark);
+      texts_.push_back (text);
     }
 }
 
 void
-Text_engraver::do_pre_move_processing ()
+Text_engraver::stop_translation_timestep ()
 {
-  for (int i=0; i < texts_.size (); i++)
-    {
-      typeset_element (texts_[i]);
-    }
   texts_.clear ();
+  evs_.clear ();
 }
 
-void
-Text_engraver::do_post_move_processing ()
+Text_engraver::Text_engraver ()
 {
-  reqs_.clear ();
 }
 
-ADD_THIS_TRANSLATOR(Text_engraver);
+ADD_TRANSLATOR (Text_engraver,
+		/* doc */
+		"Create text scripts.",
+
+		/* create */
+		"TextScript ",
+
+		/* read */
+		"",
 
+		/* write */
+		""
+		);