Fix some bugs in the dynamic engraver and PostScript backend

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

diff --git a/lily/text-engraver.cc b/lily/text-engraver.cc
index b9f95093042ee0c1ecbdb89bee66921e63bc9b6f..6a59be86641a1539f1af4b585ea45c9704493f2f 100644 (file)
--- a/lily/text-engraver.cc
+++ b/lily/text-engraver.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1998--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1998--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "directional-element-interface.hh"
@@ -18,15 +18,18 @@
 */
 class Text_engraver : public Engraver
 {
-  Link_array<Music> evs_;
-  Link_array<Item> texts_;
+  vector<Music*> evs_;
+  vector<Item*> texts_;
 public:
   TRANSLATOR_DECLARATIONS (Text_engraver);
 protected:
   virtual bool try_music (Music *m);
-  PRECOMPUTED_VIRTUAL void stop_translation_timestep ();
-  PRECOMPUTED_VIRTUAL void process_acknowledged ();
-  virtual void acknowledge_grob (Grob_info);
+  void stop_translation_timestep ();
+  void process_acknowledged ();
+
+  DECLARE_ACKNOWLEDGER (stem_tremolo);
+  DECLARE_ACKNOWLEDGER (stem);
+  DECLARE_ACKNOWLEDGER (rhythmic_head);
 };
 
 bool
@@ -34,41 +37,44 @@ Text_engraver::try_music (Music *m)
 {
   if (m->is_mus_type ("text-script-event"))
     {
-      evs_.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);
-       }
+      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 ());
-       }
-    }
+void
+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
@@ -76,7 +82,7 @@ Text_engraver::process_acknowledged ()
 {
   if (texts_.size ())
     return;
-  for (int i = 0; i < evs_.size (); i++)
+  for (vsize i = 0; i < evs_.size (); i++)
     {
       Music *r = evs_[i];
 
@@ -95,7 +101,7 @@ Text_engraver::process_acknowledged ()
       /* see script-engraver.cc */
       priority += i;
 
-      text->set_property ("script-priority", scm_int2num (priority));
+      text->set_property ("script-priority", scm_from_int (priority));
 
       Direction dir = to_dir (r->get_property ("direction"));
       if (dir)
@@ -104,7 +110,7 @@ Text_engraver::process_acknowledged ()
       SCM mark = r->get_property ("text");
 
       text->set_property ("text", mark);
-      texts_.push (text);
+      texts_.push_back (text);
     }
 }
 
@@ -121,10 +127,12 @@ Text_engraver::Text_engraver ()
 
 #include "translator.icc"
 
+ADD_ACKNOWLEDGER (Text_engraver, stem);
+ADD_ACKNOWLEDGER (Text_engraver, stem_tremolo);
+ADD_ACKNOWLEDGER (Text_engraver, rhythmic_head);
 ADD_TRANSLATOR (Text_engraver,
-               /* descr */ "Create text-scripts",
-               /* creats*/ "TextScript",
-               /* accepts */ "text-script-event",
-               /* acks  */ "rhythmic-head-interface stem-interface",
-               /* reads */ "",
+               /* doc */ "Create text-scripts",
+               /* create */ "TextScript",
+               /* accept */ "text-script-event",
+               /* read */ "",
                /* write */ "");