X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ftext-engraver.cc;h=14f519ec85434ad69c8a8234ba7645846ea37cb1;hb=2276edf762c253ae190d481a63262574fdb46f9e;hp=f6661e2359ff73f20f8f06fbb9cf78b74c22a684;hpb=9661ba1fb275f3e14f8a69f2cee2f02a2f893e48;p=lilypond.git

diff --git a/lily/text-engraver.cc b/lily/text-engraver.cc
index f6661e2359..14f519ec85 100644
--- a/lily/text-engraver.cc
+++ b/lily/text-engraver.cc
@@ -1,130 +1,89 @@
-/*   
-  text-engraver.cc --  implement Text_engraver
-  
+/*
+  text-engraver.cc -- implement Text_engraver
+
   source file of the GNU LilyPond music typesetter
-  
-  (c) 1998--2000 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 "item.hh"
-#include "musical-request.hh"
 #include "stem.hh"
-#include "note-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<Text_script_req> reqs_;
-  Link_array<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_music ();
-  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 inf)
+Text_engraver::listen_text_script (Stream_event *ev)
 {
-  if (Note_head::has_interface (inf.elem_l_))
-    {
-      for (int i=0; i < texts_.size (); i++)
-	{
-	  Score_element*t = texts_[i];
-	  Side_position::add_support (t,inf.elem_l_);
-	  if (Side_position::get_axis( t) == X_AXIS
-	      && !t->parent_l (Y_AXIS))
-	    t->set_parent (inf.elem_l_, Y_AXIS);
-	}
-    }
-  if (Stem::has_interface (inf.elem_l_))
-    {
-      for (int i=0; i < texts_.size (); i++)
-	{
-	  Side_position::add_support(texts_[i],inf.elem_l_);
-	}
-    }
+  evs_.push_back (ev);
 }
 
 void
-Text_engraver::do_process_music ()
+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];
-
-      Item *text = new Item (get_property ("basicTextScriptProperties"));
-      
-
-      SCM axisprop = get_property ("scriptHorizontal");
-
-      Side_position::set_axis (text, to_boolean (axisprop) ? X_AXIS : Y_AXIS);
-
-      /*
-	make sure they're in order by adding i to the priority field.
-	*/
-      text->set_elt_property ("script-priority",
-			    gh_int2scm (200 + i));
-
-      if (r->get_direction ())
-	Side_position::set_direction (text, r->get_direction ());
-      
-      text->set_elt_property ("text",
-			      ly_str02scm ( r->text_str_.ch_C ()));
-      
-      if (r->style_str_.length_i ())
-	text->set_elt_property ("style", ly_str02scm (r->style_str_.ch_C()));
-      
-      SCM empty = get_property ("textNonEmpty");
-      if (to_boolean (empty))
-	{
-	  text->set_elt_property ("no-spacing-rods" , SCM_BOOL_F);
-	  text->set_extent_callback (0, X_AXIS);
-	}
-      announce_element (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++)
-    {
-      Item *ti = texts_[i];
-      Side_position::add_staff_support (ti);
-      typeset_element (ti);
-    }
   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 */ "");