X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ftext-engraver.cc;h=723e111741e04760f4bac5cde99403b68eb8f5cf;hb=d765f3af45be51f15da55cf570a4b172200e1035;hp=989332320e8184fff491f9548187b0cc0dc95d4d;hpb=f6e3a77381e8eb67aa01195ec3945bd978f86aa8;p=lilypond.git

diff --git a/lily/text-engraver.cc b/lily/text-engraver.cc
index 989332320e..723e111741 100644
--- a/lily/text-engraver.cc
+++ b/lily/text-engraver.cc
@@ -3,18 +3,18 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1998--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1998--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
-#include "dimension-cache.hh"
+
 
 #include "engraver.hh"
 #include "side-position-interface.hh"
-#include "text-item.hh"
+#include "item.hh"
 #include "musical-request.hh"
-#include "note-head.hh"
 #include "stem.hh"
-#include "staff-symbol.hh"
+#include "rhythmic-head.hh"
+
 
 /**
    typeset directions that are  plain text.
@@ -22,111 +22,128 @@
 class Text_engraver : public Engraver
 {
   Link_array<Text_script_req> reqs_;
-  Link_array<Text_item> texts_;
+  Link_array<Item> 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_requests ();
-  virtual void acknowledge_element (Score_element_info);
+  virtual bool try_music (Music* m);
+  virtual void stop_translation_timestep ();
+  virtual void start_translation_timestep ();
+  virtual void process_acknowledged_grobs ();
+  virtual void acknowledge_grob (Grob_info);
 };
 
-
 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 (dynamic_cast<Text_script_req*> (m)
+      && m->get_mus_property ("text-type") != ly_symbol2scm ("finger")
+      && m->get_mus_property ("text-type") != ly_symbol2scm ("dynamic"))
     {
-      reqs_.push (r);
+      reqs_.push (dynamic_cast<Text_script_req*> (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 < texts_.size (); i++)
 	{
-	  Side_position_interface st (texts_[i]);
-	  st.add_support (n);
-	  if (st.get_axis( ) == X_AXIS
-	      && !texts_[i]->parent_l (Y_AXIS))
-	    texts_[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 < texts_.size (); i++)
 	{
-	  Side_position_interface st(texts_[i]);
-	  st.add_support (n);
+	  Side_position_interface::add_support (texts_[i],inf.grob_);
 	}
     }
 }
 
 void
-Text_engraver::do_process_requests ()
+Text_engraver::process_acknowledged_grobs ()
 {
+  if (texts_.size ())
+    return;
   for (int i=0; i < reqs_.size (); i++)
     {
       Text_script_req * r = reqs_[i];
-
-      Text_item *text = new Text_item;
-      Side_position_interface stafy (text);
-
-      SCM axisprop = get_property ("scriptHorizontal",0);
-      if (to_boolean (axisprop))
-	{
-	  stafy.set_axis (X_AXIS);
-	  //	  text->set_parent (ss, Y_AXIS);
-	}
-      else
-	stafy.set_axis (Y_AXIS);
       
-      text->set_elt_property ("script-priority",
-			    gh_int2scm (200));
+      // URG: Text vs TextScript
+      String basic = "TextScript";
 
-      if (r->get_direction ())
-	stafy.set_direction (r->get_direction ());
+      Item *text = new Item (get_property (basic.to_str0 ()));
+
+      /*
+	FIXME -> need to use basic props.
+       */
+      SCM axisprop = get_property ("scriptHorizontal");
       
-      text->text_str_ = r->text_str_;
+      Axis ax = to_boolean (axisprop) ? X_AXIS : Y_AXIS;
+      Side_position_interface::set_axis (text, ax);
+
+      // Hmm
+      int priority = 200;
+      SCM s = text->get_grob_property ("script-priority");
+      if (gh_number_p (s))
+	priority = gh_scm2int (s);
       
-      if (r->style_str_.length_i ())
-	text->set_elt_property ("style", ly_str02scm (r->style_str_.ch_C()));
+      /* see script-engraver.cc */
+      priority += i;
       
-      SCM empty = get_property ("textEmptyDimension", 0);
-      if (to_boolean (empty))
-	{
-	  text->set_empty (X_AXIS);
-	}
+      text->set_grob_property ("script-priority", gh_int2scm (priority));
 
-      announce_element (Score_element_info (text, r));
+      if (r->get_direction ())
+	Side_position_interface::set_direction (text, r->get_direction ());
+      
+      text->set_grob_property ("text", r->get_mus_property ("text"));
+      announce_grob (text, r->self_scm ());
       texts_.push (text);
     }
 }
 
 void
-Text_engraver::do_pre_move_processing ()
+Text_engraver::stop_translation_timestep ()
 {
   for (int i=0; i < texts_.size (); i++)
     {
-      typeset_element (texts_[i]);
+      Item *ti = texts_[i];
+      if (!to_boolean (get_property ("scriptHorizontal")))
+	Side_position_interface::add_staff_support (ti);
+      typeset_grob (ti);
     }
   texts_.clear ();
 }
 
 void
-Text_engraver::do_post_move_processing ()
+Text_engraver::start_translation_timestep ()
 {
   reqs_.clear ();
 }
 
-ADD_THIS_TRANSLATOR(Text_engraver);
 
+Text_engraver::Text_engraver(){}
+
+ENTER_DESCRIPTION(Text_engraver,
+/* descr */       "Create text-scripts",
+/* creats*/       "TextScript",
+/* acks  */       "rhythmic-head-interface stem-interface",
+/* reads */       "scriptHorizontal",
+/* write */       "");