Rearranging, editing, clean-up.

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

diff --git a/lily/text-engraver.cc b/lily/text-engraver.cc
index 09e1ab073c7102335cae5eee224d388799891fe2..f1d83168f1f698d1eff74668dfd2e6253f5ac596 100644 (file)
--- a/lily/text-engraver.cc
+++ b/lily/text-engraver.cc
@@ -1,24 +1,21 @@
-/*   
-  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--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 "event.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> evs_;
@@ -26,7 +23,7 @@ class Text_engraver : public Engraver
 public:
   TRANSLATOR_DECLARATIONS (Text_engraver);
 protected:
-  virtual bool try_music (Music* m);
+  virtual bool try_music (Music *m);
   virtual void stop_translation_timestep ();
   virtual void process_acknowledged_grobs ();
   virtual void acknowledge_grob (Grob_info);
@@ -46,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 ());
        }
     }
 }
@@ -79,37 +76,34 @@ Text_engraver::process_acknowledged_grobs ()
 {
   if (texts_.size ())
     return;
-  for (int i=0; i < evs_.size (); i++)
+  for (int i = 0; i < evs_.size (); i++)
     {
-      Music * r = evs_[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_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);
-      announce_grob (text, r->self_scm ());
       texts_.push (text);
     }
 }
@@ -117,24 +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];
-      typeset_grob (ti);
-    }
   texts_.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 */       "");
+ADD_TRANSLATOR (Text_engraver,
+               /* descr */ "Create text-scripts",
+               /* creats*/ "TextScript",
+               /* accepts */ "text-script-event",
+               /* acks  */ "rhythmic-head-interface stem-interface",
+               /* reads */ "",
+               /* write */ "");