X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ftext-engraver.cc;h=4787661847d5831eb62fcd24464616521be9a7ab;hb=af978acdd78dce84f3867b80695dc4622fa0cd06;hp=521b7ac1125a95436be8ac3147bae5d9471d61d5;hpb=ce9845392e4e22ae9c5f6ec1da914eb301f1892c;p=lilypond.git

diff --git a/lily/text-engraver.cc b/lily/text-engraver.cc
index 521b7ac112..4787661847 100644
--- a/lily/text-engraver.cc
+++ b/lily/text-engraver.cc
@@ -1,137 +1,129 @@
-/*   
-  text-engraver.cc --  implement Text_engraver
-  
+/*
+  text-engraver.cc -- implement Text_engraver
+
   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-interface.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);
+  void stop_translation_timestep ();
+  void process_acknowledged ();
 
+  DECLARE_ACKNOWLEDGER (stem);
+  DECLARE_ACKNOWLEDGER (rhythmic_head);
+};
 
 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"))
     {
-      if (r->style_str_ == "dynamic")
-	return false;
-      
-      reqs_.push (r);
+      evs_.push (m);
       return true;
     }
   return false;
 }
 
-
 void
-Text_engraver::acknowledge_element (Score_element_info inf)
+Text_engraver::acknowledge_rhythmic_head (Grob_info inf)
 {
-  if (Rhythmic_head::has_interface (inf.elem_l_))
-    {
-      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);
-	}
-    }
-  if (Stem::has_interface (inf.elem_l_))
+  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_);
-	}
+      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);
     }
 }
 
 void
-Text_engraver::do_process_music ()
+Text_engraver::acknowledge_stem (Grob_info inf)
 {
-  for (int i=0; i < reqs_.size (); i++)
+  for (int i = 0; i < texts_.size (); i++)
+    Side_position_interface::add_support (texts_[i], inf.grob ());
+}
+
+void
+Text_engraver::process_acknowledged ()
+{
+  if (texts_.size ())
+    return;
+  for (int i = 0; i < evs_.size (); i++)
     {
-      Text_script_req * r = reqs_[i];
+      Music *r = evs_[i];
 
-      /*
-	Urg:  Text_engraver loads TextScriptProperties
-       */
-      Item *text = new Item (get_property ("basicTextScriptProperties"));
-      
+      // URG: Text vs TextScript
+      Item *text = make_item ("TextScript", r->self_scm ());
 
-      SCM axisprop = get_property ("scriptHorizontal");
+      Axis ax = Y_AXIS;
+      Side_position_interface::set_axis (text, ax);
 
-      Side_position::set_axis (text, to_boolean (axisprop) ? X_AXIS : Y_AXIS);
+      // Hmm
+      int priority = 200;
+      SCM s = text->get_property ("script-priority");
+      if (scm_is_number (s))
+	priority = scm_to_int (s);
 
-      /*
-	make sure they're in order by adding i to the priority field.
-	*/
-      text->set_elt_property ("script-priority",
-			      gh_int2scm (200 + i));
-
-      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()));
-
-      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_F);
-		
-      announce_element (text, r);
+      /* 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 (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);
+#include "translator.icc"
 
+ADD_ACKNOWLEDGER (Text_engraver, stem);
+ADD_ACKNOWLEDGER (Text_engraver, rhythmic_head);
+ADD_TRANSLATOR (Text_engraver,
+		/* doc */ "Create text-scripts",
+		/* create */ "TextScript",
+		/* accept */ "text-script-event",
+		/* read */ "",
+		/* write */ "");