X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ftext-engraver.cc;h=1766ac64b710a3a5c937af577d776033ac360876;hb=f07f18bef861d6afa48b941b7579079d5d40df80;hp=a448d15ef820b7972cd97a1efae7e250183746fd;hpb=a6ee9dcd388111e842064a8d46ab06c4897a00d2;p=lilypond.git

diff --git a/lily/text-engraver.cc b/lily/text-engraver.cc
index a448d15ef8..1766ac64b7 100644
--- a/lily/text-engraver.cc
+++ b/lily/text-engraver.cc
@@ -1,34 +1,30 @@
-/*   
-  text-engraver.cc --  implement Text_engraver
-  
+/*
+  text-engraver.cc -- implement Text_engraver
+
   source file of the GNU LilyPond music typesetter
-  
-  (c) 1998--2002 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:
-  TRANSLATOR_DECLARATIONS(Text_engraver);
+  TRANSLATOR_DECLARATIONS (Text_engraver);
 protected:
-  virtual bool try_music (Music* m);
+  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);
 };
@@ -36,11 +32,9 @@ protected:
 bool
 Text_engraver::try_music (Music *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"))
+  if (m->is_mus_type ("text-script-event"))
     {
-      reqs_.push (dynamic_cast<Text_script_req*> (m));
+      evs_.push (m);
       return true;
     }
   return false;
@@ -49,30 +43,30 @@ Text_engraver::try_music (Music *m)
 void
 Text_engraver::acknowledge_grob (Grob_info inf)
 {
-  if (Rhythmic_head::has_interface (inf.grob_))
+  if (Rhythmic_head::has_interface (inf.grob ()))
     {
-      for (int 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_);
+	  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);
+	    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);
+		   && !t->get_parent (X_AXIS))
+	    t->set_parent (inf.grob (), X_AXIS);
 	}
     }
-  
-  if (Stem::has_interface (inf.grob_))
+
+  if (Stem::has_interface (inf.grob ()))
     {
-      for (int i=0; i < texts_.size (); i++)
+      for (int i = 0; i < texts_.size (); i++)
 	{
-	  Side_position_interface::add_support (texts_[i],inf.grob_);
+	  Side_position_interface::add_support (texts_[i], inf.grob ());
 	}
     }
 }
@@ -82,39 +76,34 @@ Text_engraver::process_acknowledged_grobs ()
 {
   if (texts_.size ())
     return;
-  for (int i=0; i < reqs_.size (); i++)
+  for (int i = 0; i < evs_.size (); i++)
     {
-      Text_script_req * r = reqs_[i];
-      
-      // URG: Text vs TextScript
-      String basic = "TextScript";
+      Music *r = evs_[i];
 
-      Item *text = new Item (get_property (basic.to_str0 ()));
+      // URG: Text vs TextScript
+      Item *text = make_item ("TextScript", r->self_scm ());
 
-      /*
-	FIXME -> need to use basic props.
-       */
-      SCM axisprop = get_property ("scriptHorizontal");
-      
-      Axis ax = to_boolean (axisprop) ? X_AXIS : Y_AXIS;
+      Axis ax = 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);
-      
-      /* Make sure they're in order of user input by adding index i. */
-      priority += i * (r->get_direction () ? r->get_direction () : 1);
-      
-      text->set_grob_property ("script-priority", gh_int2scm (priority));
-
-      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 ());
+      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));
+
+      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);
     }
 }
@@ -122,28 +111,18 @@ Text_engraver::process_acknowledged_grobs ()
 void
 Text_engraver::stop_translation_timestep ()
 {
-  for (int i=0; i < texts_.size (); i++)
-    {
-      Item *ti = texts_[i];
-      if (!to_boolean (get_property ("scriptHorizontal")))
-	Side_position_interface::add_staff_support (ti);
-      typeset_grob (ti);
-    }
   texts_.clear ();
+  evs_.clear ();
 }
 
-void
-Text_engraver::start_translation_timestep ()
+Text_engraver::Text_engraver ()
 {
-  reqs_.clear ();
 }
 
-
-Text_engraver::Text_engraver(){}
-
-ENTER_DESCRIPTION(Text_engraver,
-/* descr */       "Create text-scripts",
-/* creats*/       "TextScript",
-/* acks  */       "rhythmic-head-interface stem-interface",
-/* reads */       "scriptHorizontal",
-/* write */       "");
+ADD_TRANSLATOR (Text_engraver,
+		/* descr */ "Create text-scripts",
+		/* creats*/ "TextScript",
+		/* accepts */ "text-script-event",
+		/* acks  */ "rhythmic-head-interface stem-interface",
+		/* reads */ "",
+		/* write */ "");