X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ftext-engraver.cc;h=a7d8dfa875e036fe4d93e6f43a6fe6626c2813ea;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=5db60e1750c93f641f14cc2021ef8475674771ac;hpb=736bfdaea194aade5d20d9f749f009c96d41b953;p=lilypond.git

diff --git a/lily/text-engraver.cc b/lily/text-engraver.cc
index 5db60e1750..a7d8dfa875 100644
--- a/lily/text-engraver.cc
+++ b/lily/text-engraver.cc
@@ -1,169 +1,97 @@
-/*   
-  text-engraver.cc --  implement Text_engraver
-  
+/*
+  text-engraver.cc -- implement Text_engraver
+
   source file of the GNU LilyPond music typesetter
-  
-  (c) 1998--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-  
- */
 
+  (c) 1998--2008 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 "rhythmic-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:
-  TRANSLATOR_DECLARATIONS(Text_engraver);
+  TRANSLATOR_DECLARATIONS (Text_engraver);
 protected:
-  virtual bool try_music (Music* m);
-  virtual void stop_translation_timestep ();
-  virtual void start_translation_timestep ();
-  virtual void create_grobs ();
-  virtual void acknowledge_grob (Grob_info);
-};
+  void stop_translation_timestep ();
+  void process_acknowledged ();
 
-bool
-Text_engraver::try_music (Music *m)
-{
-  if (dynamic_cast<Text_script_req*> (m)
-      && m->get_mus_property ("text-type") != ly_symbol2scm ("dynamic"))
-    {
-      reqs_.push (dynamic_cast<Text_script_req*> (m));
-      return true;
-    }
-  return false;
-}
+  DECLARE_TRANSLATOR_LISTENER (text_script);
+};
 
+IMPLEMENT_TRANSLATOR_LISTENER (Text_engraver, text_script);
 void
-Text_engraver::acknowledge_grob (Grob_info inf)
+Text_engraver::listen_text_script (Stream_event *ev)
 {
-  if (Rhythmic_head::has_interface (inf.grob_l_))
-    {
-      for (int i=0; i < texts_.size (); i++)
-	{
-	  Grob*t = texts_[i];
-	  Side_position_interface::add_support (t,inf.grob_l_);
-
-	  /*
-	    ugh.
-	   */
-	  if (Side_position_interface::get_axis (t) == X_AXIS
-	      && !t->parent_l (Y_AXIS))
-	    t->set_parent (inf.grob_l_, Y_AXIS);
-	  else if (Side_position_interface::get_axis (t) == Y_AXIS
-	      && !t->parent_l (X_AXIS))
-	    t->set_parent (inf.grob_l_, X_AXIS);
-	}
-    }
-  
-  if (Stem::has_interface (inf.grob_l_))
-    {
-      for (int i=0; i < texts_.size (); i++)
-	{
-	  Side_position_interface::add_support (texts_[i],inf.grob_l_);
-	}
-    }
+  evs_.push_back (ev);
 }
 
 void
-Text_engraver::create_grobs ()
+Text_engraver::process_acknowledged ()
 {
   if (texts_.size ())
     return;
-  for (int i=0; i < reqs_.size (); i++)
+  for (vsize i = 0; i < evs_.size (); i++)
     {
-      Text_script_req * r = reqs_[i];
-      
+      Stream_event *r = evs_[i];
+
       // URG: Text vs TextScript
-      String basic = "TextScript";
-
-      if (r->get_mus_property ("text-type") == ly_symbol2scm ("finger"))
-	{
-	  basic = "Fingering";
-	}
-
-      Item *text = new Item (get_property (basic.ch_C ()));
-
-      /*
-	FIXME -> need to use basic props.
-       */
-      SCM axisprop = get_property ("scriptHorizontal");
-      
-      Axis ax = to_boolean (axisprop) ? X_AXIS : Y_AXIS;
-      Side_position_interface::set_axis (text, ax);
-
-#if 0
-      if (r->style_str_ == "finger" && ax == Y_AXIS)
-	{
-	  /*
-	    nicely center the scripts.
-	   */ 
-	  text->add_offset_callback (Side_position_interface::aligned_on_self_proc, X_AXIS);
-	  text->add_offset_callback (Side_position_interface::centered_on_parent_proc, X_AXIS);
-	}
-#endif
-      
-
-      
-      /*
-	make sure they're in order by adding i to the priority field.
-	*/
-      text->set_grob_property ("script-priority",
-			      gh_int2scm (200 + i));
-
-      if (r->get_direction ())
-	Side_position_interface::set_direction (text, r->get_direction ());
-      
-      text->set_grob_property ("text", r->get_mus_property ("text"));
-      
-      SCM nonempty = get_property ("textNonEmpty");
-      if (to_boolean (nonempty))
-	/*
-	  empty text: signal that no rods should be applied.  
-	 */
-	text->set_grob_property ("no-spacing-rods" , SCM_BOOL_F);
-		
-      announce_grob (text, r);
-      texts_.push (text);
+      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::stop_translation_timestep ()
 {
-  for (int i=0; i < texts_.size (); i++)
-    {
-      Item *ti = texts_[i];
-      if (!to_boolean (get_property ("scriptHorizontal")))
-	Side_position_interface::add_staff_support (ti);
-      typeset_grob (ti);
-    }
   texts_.clear ();
+  evs_.clear ();
 }
 
-void
-Text_engraver::start_translation_timestep ()
+Text_engraver::Text_engraver ()
 {
-  reqs_.clear ();
 }
 
+ADD_TRANSLATOR (Text_engraver,
+		/* doc */
+		"Create text scripts.",
+
+		/* create */
+		"TextScript ",
 
-Text_engraver::Text_engraver(){}
+		/* read */
+		"",
 
-ENTER_DESCRIPTION(Text_engraver,
-/* descr */       "Create text-scripts",
-/* creats*/       "TextScript",
-/* acks  */       "rhythmic-head-interface stem-interface",
-/* reads */       "scriptHorizontal textNonEmpty",
-/* write */       "");
+		/* write */
+		""
+		);