*** empty log message ***

[lilypond.git] / lily / text-engraver.cc

diff --git a/lily/text-engraver.cc b/lily/text-engraver.cc
index 57acc8c4c792a5c6b61e26b010faa00300a2fac6..52c6bcace96c06ce7e19a702296262b3873c4cd2 100644 (file)
--- a/lily/text-engraver.cc
+++ b/lily/text-engraver.cc
@@ -3,32 +3,29 @@
   
   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 "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<Music> 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 void stop_translation_timestep ();
-  virtual void start_translation_timestep ();
   virtual void process_acknowledged_grobs ();
   virtual void acknowledge_grob (Grob_info);
 };
@@ -38,7 +35,7 @@ Text_engraver::try_music (Music *m)
 {
   if (m->is_mus_type ("text-script-event"))
     {
-      reqs_.push (m);
+      evs_.push (m);
       return true;
     }
   return false;
@@ -49,10 +46,10 @@ Text_engraver::acknowledge_grob (Grob_info inf)
 {
   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_);
+         Side_position_interface::add_support (t, inf.grob_);
 
          /*
            ugh.
@@ -68,9 +65,9 @@ Text_engraver::acknowledge_grob (Grob_info inf)
   
   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_);
        }
     }
 }
@@ -80,40 +77,36 @@ 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++)
     {
-      Music * r = reqs_[i];
+      Music * r = evs_[i];
       
       // URG: Text vs TextScript
-      String basic = "TextScript";
+      Item *text = make_item ("TextScript", r->self_scm ());
 
-      Item *text = new Item (get_property (basic.to_str0 ()));
-
-      /*
-       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);
+      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_grob_property ("script-priority", gh_int2scm (priority));
+      text->set_property ("script-priority", scm_int2num (priority));
 
-      Direction dir = to_dir (r->get_mus_property ("direction"));
+      Direction dir = to_dir (r->get_property ("direction"));
       if (dir)
-       Side_position_interface::set_direction (text, dir);
-      
-      text->set_grob_property ("text", r->get_mus_property ("text"));
-      announce_grob (text, r->self_scm ());
+       set_grob_direction (text, dir);
+
+
+      SCM mark = r->get_property ("text");
+
+      text->set_property ("text", mark);
       texts_.push (text);
     }
 }
@@ -121,29 +114,19 @@ 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,
+ADD_TRANSLATOR (Text_engraver,
 /* descr */       "Create text-scripts",
 /* creats*/       "TextScript",
 /* accepts */     "text-script-event",
 /* acks  */      "rhythmic-head-interface stem-interface",
-/* reads */       "scriptHorizontal",
+/* reads */       "",
 /* write */       "");