X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ftext-engraver.cc;h=52c6bcace96c06ce7e19a702296262b3873c4cd2;hb=266a1dfe19ef50999bec6543f261ce340f2bc808;hp=4d72b074dbf1273afcdf7039a7827e26e0c40474;hpb=5175fb07679b964a62202f6c900451e88d120f69;p=lilypond.git

diff --git a/lily/text-engraver.cc b/lily/text-engraver.cc
index 4d72b074db..52c6bcace9 100644
--- a/lily/text-engraver.cc
+++ b/lily/text-engraver.cc
@@ -3,136 +3,130 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1998--2000 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 "side-position-interface.hh"
-#include "item.hh"
-#include "musical-request.hh"
 #include "stem.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<Music> evs_;
   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_music ();
-  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);
 };
 
-
 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 inf)
+Text_engraver::acknowledge_grob (Grob_info inf)
 {
-  if (Rhythmic_head::has_interface (inf.elem_l_))
+  if (Rhythmic_head::has_interface (inf.grob_))
     {
-      for (int i=0; i < texts_.size (); i++)
+      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);
+	  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::has_interface (inf.elem_l_))
+  
+  if (Stem::has_interface (inf.grob_))
     {
-      for (int i=0; i < texts_.size (); i++)
+      for (int i = 0; i < texts_.size (); i++)
 	{
-	  Side_position::add_support(texts_[i],inf.elem_l_);
+	  Side_position_interface::add_support (texts_[i], inf.grob_);
 	}
     }
 }
 
 void
-Text_engraver::do_process_music ()
+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];
+      
+      // URG: Text vs TextScript
+      Item *text = make_item ("TextScript", r->self_scm ());
 
-      Item *text = new Item (get_property ("basicTextScriptProperties"));
       
+      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);
+      
+      /* see script-engraver.cc */
+      priority += i;
+      
+      text->set_property ("script-priority", scm_int2num (priority));
 
-      SCM axisprop = get_property ("scriptHorizontal");
+      Direction dir = to_dir (r->get_property ("direction"));
+      if (dir)
+	set_grob_direction (text, dir);
 
-      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));
+      SCM mark = r->get_property ("text");
 
-      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()));
-      
-      /*
-       Text is empty by default, which means that the only condition
-       for not setting 'no-spacing-rods' should be: boolean && true.
-
-       Anyway, non-empty text has been broken for some time now.
-       */
-      SCM nonempty = get_property ("textNonEmpty");
-      if (!to_boolean (nonempty))
-	/*
-	  empty text: signal that no rods should be applied.  
-	 */
-	text->set_elt_property ("no-spacing-rods" , SCM_BOOL_T);
-
-		
-      announce_element (text, r);
+      text->set_property ("text", mark);
       texts_.push (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,
+/* descr */       "Create text-scripts",
+/* creats*/       "TextScript",
+/* accepts */     "text-script-event",
+/* acks  */      "rhythmic-head-interface stem-interface",
+/* reads */       "",
+/* write */       "");