X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ftext-engraver.cc;h=52c6bcace96c06ce7e19a702296262b3873c4cd2;hb=c93997ee6226dae036e411b39e5af873b8726293;hp=cf8c0ea0f635ad013504ce8c6a0bd1b33bc5d833;hpb=43c708d5857fd1a15f0ebcf41d04f5a24441dc9a;p=lilypond.git

diff --git a/lily/text-engraver.cc b/lily/text-engraver.cc
index cf8c0ea0f6..52c6bcace9 100644
--- a/lily/text-engraver.cc
+++ b/lily/text-engraver.cc
@@ -3,135 +3,130 @@
   
   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 "dimension-cache.hh"
 
+#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 "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<Staff_side_item> positionings_;
-  Link_array<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);
-	  if (positionings_[i]->axis_ == X_AXIS
-	      && !positionings_[i]->parent_l (Y_AXIS))
-	    positionings_[i]->set_parent (n, Y_AXIS);
+	  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];
-
-      Text_item *text = new Text_item;
-      Staff_side_item *ss = new Staff_side_item;
-
-
-
-      SCM axisprop = get_property ("scriptHorizontal",0);
-      if (gh_boolean_p (axisprop) && gh_scm2bool (axisprop))
-	{
-	  ss->axis_ = X_AXIS;
-	  text->set_parent (ss, Y_AXIS);
-			       
-	}
-      ss->set_victim (text);
-      ss->set_elt_property ("script-priority",
-			    gh_int2scm (200));
-
-      ss->dir_ = r->dir_;
+      Music * r = evs_[i];
+      
+      // URG: Text vs TextScript
+      Item *text = make_item ("TextScript", r->self_scm ());
 
-      text->text_str_ = r->text_str_;
       
-      if (r->style_str_.length_i ())
-	text->set_elt_property ("style", ly_str02scm (r->style_str_.ch_C()));
+      Axis ax = Y_AXIS;
+      Side_position_interface::set_axis (text, ax);
+
+      // Hmm
+      int priority = 200;
+      SCM s = text->get_property ("script-priority");
+      if (scm_is_number (s))
+	priority = scm_to_int (s);
       
-      SCM empty = get_property ("textEmptyDimension", 0);
-      if (gh_boolean_p (empty) && gh_scm2bool (empty))
-	{
-	  text->set_empty (true, X_AXIS);
-	}
+      /* see script-engraver.cc */
+      priority += i;
+      
+      text->set_property ("script-priority", scm_int2num (priority));
+
+      Direction dir = to_dir (r->get_property ("direction"));
+      if (dir)
+	set_grob_direction (text, dir);
 
-      announce_element (Score_element_info (text, r));
-      announce_element (Score_element_info (ss, r));
 
+      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 */       "");