X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ftext-engraver.cc;h=f1d83168f1f698d1eff74668dfd2e6253f5ac596;hb=1e63e1c8345be830cf76cda3d0c0d91b65a1f3c6;hp=0f0a5d27d97350b0adb846fff78f729eb9b44738;hpb=42ab6ff971c06253b34f96ed122836ab88d09cc0;p=lilypond.git

diff --git a/lily/text-engraver.cc b/lily/text-engraver.cc
index 0f0a5d27d9..f1d83168f1 100644
--- a/lily/text-engraver.cc
+++ b/lily/text-engraver.cc
@@ -1,135 +1,128 @@
-/*   
-  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--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+*/
+
+#include "directional-element-interface.hh"
 #include "engraver.hh"
-#include "g-staff-side.hh"
-#include "g-text-item.hh"
-#include "musical-request.hh"
-#include "note-head.hh"
+#include "side-position-interface.hh"
 #include "stem.hh"
-#include "staff-symbol.hh"
+#include "rhythmic-head.hh"
+#include "text-item.hh"
 
+/**
+   typeset directions that are  plain text.
+*/
 class Text_engraver : public Engraver
 {
-  Link_array<Text_script_req> reqs_;
-  Link_array<G_staff_side_item> positionings_;
-  Link_array<G_text_item> texts_;
+  Link_array<Music> evs_;
+  Link_array<Item> 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);
+  virtual bool try_music (Music *m);
+  virtual void stop_translation_timestep ();
+  virtual void process_acknowledged_grobs ();
+  virtual void acknowledge_grob (Grob_info);
 };
 
-Text_engraver::Text_engraver ()
-{
-  
-}
-
 bool
-Text_engraver::do_try_music (Music *m)
+Text_engraver::try_music (Music *m)
 {
-  if (Text_script_req *r = dynamic_cast<Text_script_req*> (m))
+  if (m->is_mus_type ("text-script-event"))
     {
-      reqs_.push (r);
+      evs_.push (m);
       return true;
     }
   return false;
 }
 
-
 void
-Text_engraver::acknowledge_element (Score_element_info i)
+Text_engraver::acknowledge_grob (Grob_info inf)
 {
-  if (Note_head *n = dynamic_cast<Note_head*> (i.elem_l_))
+  if (Rhythmic_head::has_interface (inf.grob ()))
     {
-      for (int i=0; i < positionings_.size (); i++)
+      for (int i = 0; i < texts_.size (); i++)
 	{
-	  positionings_[i]->add_support (n);
+	  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);
 	}
     }
-  if (Stem *n = dynamic_cast<Stem*> (i.elem_l_))
+
+  if (Stem::has_interface (inf.grob ()))
     {
-      for (int i=0; i < positionings_.size (); i++)
+      for (int i = 0; i < texts_.size (); i++)
 	{
-	  positionings_[i]->add_support (n);
+	  Side_position_interface::add_support (texts_[i], inf.grob ());
 	}
     }
 }
 
 void
-Text_engraver::do_process_requests ()
+Text_engraver::process_acknowledged_grobs ()
 {
-  for (int i=0; i < reqs_.size (); i++)
+  if (texts_.size ())
+    return;
+  for (int i = 0; i < evs_.size (); i++)
     {
-      Text_script_req * r = reqs_[i];
+      Music *r = evs_[i];
 
-      G_text_item *text = new G_text_item;
-      G_staff_side_item *ss = new G_staff_side_item;
+      // URG: Text vs TextScript
+      Item *text = make_item ("TextScript", r->self_scm ());
 
-      ss->set_victim (text);
-      ss->set_elt_property (script_priority_scm_sym,
-			    gh_int2scm (200));
+      Axis ax = Y_AXIS;
+      Side_position_interface::set_axis (text, ax);
 
-      ss->dir_ = r->dir_;
+      // Hmm
+      int priority = 200;
+      SCM s = text->get_property ("script-priority");
+      if (scm_is_number (s))
+	priority = scm_to_int (s);
 
-      text->text_str_ = r->text_str_;
-      
-      if (r->style_str_.empty_b ())
-	{
-	  Scalar p (get_property ("textStyle", 0));
-	  if (p.length_i ())
-	    text->style_str_ = p;
-	}
-      else
-	text->style_str_ = r->style_str_;
-      
-      Scalar padding = get_property ("textScriptPadding", 0);
-      if (padding.length_i() && padding.isnum_b ())
-	{
-	  ss->set_elt_property (padding_scm_sym, gh_double2scm(Real(padding)));
-	}
+      /* see script-engraver.cc */
+      priority += i;
 
-      Scalar empty = get_property ("textEmptyDimension", 0);
-      if (empty.to_bool ())
-	{
-	  text->dim_cache_[X_AXIS]->set_empty (true);
-	}
-      
-      announce_element (Score_element_info (text, r));
-      announce_element (Score_element_info (ss, r));
+      text->set_property ("script-priority", scm_int2num (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 (text);
-      positionings_.push (ss);
     }
 }
 
 void
-Text_engraver::do_pre_move_processing ()
+Text_engraver::stop_translation_timestep ()
 {
-  for (int i=0; i < texts_.size (); i++)
-    {
-      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,
+		/* descr */ "Create text-scripts",
+		/* creats*/ "TextScript",
+		/* accepts */ "text-script-event",
+		/* acks  */ "rhythmic-head-interface stem-interface",
+		/* reads */ "",
+		/* write */ "");