X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ftext-engraver.cc;h=14f519ec85434ad69c8a8234ba7645846ea37cb1;hb=2a00c69a012d4ccaf24a036bdb5ac9ea43fb9604;hp=088ca5577c62f8b0da4992340d68064ae4427073;hpb=8aad615ea7bb31f49a0c2afc21eea5ff5de20437;p=lilypond.git

diff --git a/lily/text-engraver.cc b/lily/text-engraver.cc
index 088ca5577c..14f519ec85 100644
--- a/lily/text-engraver.cc
+++ b/lily/text-engraver.cc
@@ -1,122 +1,89 @@
-/*   
-  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>
-  
- */
 
+  (c) 1998--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
+*/
+
+#include "directional-element-interface.hh"
 #include "engraver.hh"
-#include "g-staff-side.hh"
-#include "g-text-item.hh"
-#include "text-def.hh"
-#include "note-head.hh"
+#include "rhythmic-head.hh"
+#include "side-position-interface.hh"
 #include "stem.hh"
-#include "staff-sym.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<Script_req> reqs_;
-  Link_array<G_staff_side_item> positionings_;
-  Link_array<G_text_item> texts_;
+  vector<Stream_event *> evs_;
+  vector<Grob*> texts_;
 public:
-  Text_engraver();
-  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);
+  void stop_translation_timestep ();
+  void process_acknowledged ();
+
+  DECLARE_TRANSLATOR_LISTENER (text_script);
 };
 
-Text_engraver::Text_engraver ()
+IMPLEMENT_TRANSLATOR_LISTENER (Text_engraver, text_script);
+void
+Text_engraver::listen_text_script (Stream_event *ev)
 {
-  
+  evs_.push_back (ev);
 }
 
-bool
-Text_engraver::do_try_music (Music *m)
+void
+Text_engraver::process_acknowledged ()
 {
-  if (Script_req *r = dynamic_cast<Script_req*> (m))
+  if (texts_.size ())
+    return;
+  for (vsize i = 0; i < evs_.size (); i++)
     {
-      Text_def * t = dynamic_cast<Text_def*> (r->scriptdef_p_);
-      if (!t)
-	return false;
-      reqs_.push (r);
-      return true;
-    }
-  return false;
-}
+      Stream_event *r = evs_[i];
 
+      // URG: Text vs TextScript
+      Item *text = make_item ("TextScript", r->self_scm ());
 
-void
-Text_engraver::acknowledge_element (Score_element_info i)
-{
-  if (Note_head *n = dynamic_cast<Note_head*> (i.elem_l_))
-    {
-      for (int i=0; i < positionings_.size (); i++)
-	{
-	  positionings_[i]->add_support (n);
-	}
-    }
-  if (Stem *n = dynamic_cast<Stem*> (i.elem_l_))
-    {
-      for (int i=0; i < positionings_.size (); i++)
-	{
-	  positionings_[i]->add_support (n);
-	}
-    }
-}
+      int priority = robust_scm2int (text->get_property ("script-priority"),
+				     200);
 
-void
-Text_engraver::do_process_requests ()
-{
-  for (int i=0; i < reqs_.size (); i++)
-    {
-      Script_req * r = reqs_[i];
-      Text_def * t= dynamic_cast<Text_def*> (r->scriptdef_p_);
-
-      G_text_item *text = new G_text_item;
-      G_staff_side_item *ss = new G_staff_side_item;
-      ss->set_victim (text);
-      ss->dir_ = r->dir_;
-      Scalar p (get_property ("textstyle", 0)); // textStyle?
-      if (p.length_i ())
-	text->style_str_ = p;
-      text->text_str_ = t->text_str_;
-
-      announce_element (Score_element_info (text, r));
-      announce_element (Score_element_info (ss, r));
-
-      texts_.push (text);
-      positionings_.push (ss);
+      /* 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 ()
 {
-  Staff_symbol* s_l = get_staff_info().staff_sym_l_;
-  for (int i=0; i < texts_.size (); i++)
-    {
-      if (s_l != 0)
-	{
-	  positionings_[i]->add_support (s_l);
-	}
-
-      typeset_element (texts_[i]);
-      typeset_element (positionings_[i]);
-    }
   texts_.clear ();
-  positionings_.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 */ "");