Updates. Add targets: tar, dist, release.

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

diff --git a/lily/text-engraver.cc b/lily/text-engraver.cc
index 3d849d36d918cfdd9bd2112c24371f6421422fbe..af6e4c5869aac5d2d54e9a4e9165eb2d3427bbf9 100644 (file)
--- a/lily/text-engraver.cc
+++ b/lily/text-engraver.cc
@@ -3,11 +3,10 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1998--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1998--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
-
-
+#include "directional-element-interface.hh"
 #include "engraver.hh"
 #include "side-position-interface.hh"
 #include "item.hh"
@@ -22,10 +21,10 @@
  */
 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 ();
@@ -38,7 +37,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;
@@ -80,43 +79,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 = new Item (get_property (basic.to_str0 ()));
+      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);
+      SCM s = text->get_property ("script-priority");
+      if (ly_c_number_p (s))
+       priority = ly_scm2int (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);
+       set_grob_direction (text, dir);
 
 
-      SCM mark = r->get_mus_property ("text");
+      SCM mark = r->get_property ("text");
 
-      text->set_grob_property ("text", mark);
-      announce_grob (text, r->self_scm ());
+      text->set_property ("text", mark);
       texts_.push (text);
     }
 }
@@ -124,15 +116,8 @@ 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 ();
-  reqs_.clear ();
+  evs_.clear ();
 }
 
 
@@ -140,10 +125,10 @@ Text_engraver::Text_engraver ()
 {
 }
 
-ENTER_DESCRIPTION(Text_engraver,
+ENTER_DESCRIPTION (Text_engraver,
 /* descr */       "Create text-scripts",
 /* creats*/       "TextScript",
 /* accepts */     "text-script-event",
 /* acks  */      "rhythmic-head-interface stem-interface",
-/* reads */       "scriptHorizontal",
+/* reads */       "",
 /* write */       "");