X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ftext-engraver.cc;h=6a59be86641a1539f1af4b585ea45c9704493f2f;hb=18c39bfee02951055e27f737a11525062033503d;hp=14a0180feda7f1faf19d139fd41e0bc57ebd2143;hpb=b1323f33e9aa4b9eea05eefb8755c907d4d762d4;p=lilypond.git

diff --git a/lily/text-engraver.cc b/lily/text-engraver.cc
index 14a0180fed..6a59be8664 100644
--- a/lily/text-engraver.cc
+++ b/lily/text-engraver.cc
@@ -1,35 +1,35 @@
-/*   
-  text-engraver.cc --  implement Text_engraver
-  
+/*
+  text-engraver.cc -- implement Text_engraver
+
   source file of the GNU LilyPond music typesetter
-  
-  (c) 1998--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-  
- */
+
+  (c) 1998--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+*/
+
 #include "directional-element-interface.hh"
 #include "engraver.hh"
 #include "side-position-interface.hh"
-#include "item.hh"
-#include "event.hh"
 #include "stem.hh"
 #include "rhythmic-head.hh"
-#include "text-item.hh"
-
+#include "text-interface.hh"
 
 /**
    typeset directions that are  plain text.
- */
+*/
 class Text_engraver : public Engraver
 {
-  Link_array<Music> reqs_;
-  Link_array<Item> texts_;
+  vector<Music*> evs_;
+  vector<Item*> texts_;
 public:
-  TRANSLATOR_DECLARATIONS(Text_engraver);
+  TRANSLATOR_DECLARATIONS (Text_engraver);
 protected:
-  virtual bool try_music (Music* m);
-  virtual void stop_translation_timestep ();
-  virtual void process_acknowledged_grobs ();
-  virtual void acknowledge_grob (Grob_info);
+  virtual bool try_music (Music *m);
+  void stop_translation_timestep ();
+  void process_acknowledged ();
+
+  DECLARE_ACKNOWLEDGER (stem_tremolo);
+  DECLARE_ACKNOWLEDGER (stem);
+  DECLARE_ACKNOWLEDGER (rhythmic_head);
 };
 
 bool
@@ -37,104 +37,102 @@ Text_engraver::try_music (Music *m)
 {
   if (m->is_mus_type ("text-script-event"))
     {
-      reqs_.push (m);
+      evs_.push_back (m);
       return true;
     }
   return false;
 }
 
 void
-Text_engraver::acknowledge_grob (Grob_info inf)
+Text_engraver::acknowledge_rhythmic_head (Grob_info inf)
 {
-  if (Rhythmic_head::has_interface (inf.grob_))
+  for (vsize i = 0; i < texts_.size (); i++)
     {
-      for (int i=0; i < texts_.size (); i++)
-	{
-	  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.grob_))
-    {
-      for (int i=0; i < texts_.size (); i++)
-	{
-	  Side_position_interface::add_support (texts_[i],inf.grob_);
-	}
+      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::process_acknowledged_grobs ()
+Text_engraver::acknowledge_stem (Grob_info inf)
+{
+  for (vsize i = 0; i < texts_.size (); i++)
+    Side_position_interface::add_support (texts_[i], inf.grob ());
+}
+
+void
+Text_engraver::acknowledge_stem_tremolo (Grob_info info)
+{
+  for (vsize i = 0; i < texts_.size (); i++)
+    Side_position_interface::add_support (texts_[i], info.grob ());
+}
+
+void
+Text_engraver::process_acknowledged ()
 {
   if (texts_.size ())
     return;
-  for (int i=0; i < reqs_.size (); i++)
+  for (vsize i = 0; i < evs_.size (); i++)
     {
-      Music * r = reqs_[i];
-      
+      Music *r = evs_[i];
+
       // URG: Text vs TextScript
-      Item *text = make_item ("TextScript");
+      Item *text = make_item ("TextScript", r->self_scm ());
 
-      
       Axis ax = Y_AXIS;
       Side_position_interface::set_axis (text, ax);
 
       // Hmm
       int priority = 200;
       SCM s = text->get_property ("script-priority");
-      if (gh_number_p (s))
-	priority = gh_scm2int (s);
-      
+      if (scm_is_number (s))
+	priority = scm_to_int (s);
+
       /* see script-engraver.cc */
       priority += i;
-      
-      text->set_property ("script-priority", gh_int2scm (priority));
+
+      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);
-      announce_grob (text, r->self_scm ());
-      texts_.push (text);
+      texts_.push_back (text);
     }
 }
 
 void
 Text_engraver::stop_translation_timestep ()
 {
-  for (int i=0; i < texts_.size (); i++)
-    {
-      Item *ti = texts_[i];
-      typeset_grob (ti);
-    }
   texts_.clear ();
-  reqs_.clear ();
+  evs_.clear ();
 }
 
-
 Text_engraver::Text_engraver ()
 {
 }
 
-ENTER_DESCRIPTION(Text_engraver,
-/* descr */       "Create text-scripts",
-/* creats*/       "TextScript",
-/* accepts */     "text-script-event",
-/* acks  */      "rhythmic-head-interface stem-interface",
-/* reads */       "",
-/* write */       "");
+#include "translator.icc"
+
+ADD_ACKNOWLEDGER (Text_engraver, stem);
+ADD_ACKNOWLEDGER (Text_engraver, stem_tremolo);
+ADD_ACKNOWLEDGER (Text_engraver, rhythmic_head);
+ADD_TRANSLATOR (Text_engraver,
+		/* doc */ "Create text-scripts",
+		/* create */ "TextScript",
+		/* accept */ "text-script-event",
+		/* read */ "",
+		/* write */ "");