tie-helpre -> tie-details

[lilypond.git] / lily / script-column-engraver.cc

diff --git a/lily/script-column-engraver.cc b/lily/script-column-engraver.cc
index 4990068ce739c5d59854b5d422167e22469a1b7f..b445c6a6821ddfb4e3f3fd71ff0ee379b0f1eb6f 100644 (file)
--- a/lily/script-column-engraver.cc
+++ b/lily/script-column-engraver.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1999--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1999--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "engraver.hh"
@@ -12,19 +12,18 @@
 
 #include "translator.icc"
 
-
 /**
    Find potentially colliding scripts, and put them in a
    Script_column, that will fix the collisions.  */
 class Script_column_engraver : public Engraver
 {
   Grob *scol_;
-  Link_array<Item> scripts_;
+  vector<Item*> scripts_;
 
 public:
   TRANSLATOR_DECLARATIONS (Script_column_engraver);
 protected:
-  DECLARE_ACKNOWLEDGER(side_position);
+  DECLARE_ACKNOWLEDGER (side_position);
   void process_acknowledged ();
   void stop_translation_timestep ();
 };
@@ -37,6 +36,13 @@ Script_column_engraver::Script_column_engraver ()
 void
 Script_column_engraver::stop_translation_timestep ()
 {
+  if (scol_)
+    {
+      for (vsize i = 0; i < scripts_.size (); i++)
+       if (Side_position_interface::get_axis (scripts_[i]) == Y_AXIS)
+         Script_column::add_staff_sided (scol_, scripts_[i]);
+    }
+
   scol_ = 0;
   scripts_.clear ();
 }
@@ -47,11 +53,8 @@ Script_column_engraver::acknowledge_side_position (Grob_info inf)
   Item *thing = dynamic_cast<Item *> (inf.grob ());
   if (thing)
     {
-      if (!Item::is_breakable (thing)
-         && Side_position_interface::get_axis (inf.grob ()) == Y_AXIS)
-       {
-         scripts_.push (thing);
-       }
+      if (!Item::is_breakable (thing))
+       scripts_.push_back (thing);
     }
 }
 
@@ -59,21 +62,13 @@ void
 Script_column_engraver::process_acknowledged ()
 {
   if (!scol_ && scripts_.size () > 1)
-    {
-      scol_ = make_item ("ScriptColumn", SCM_EOL);
-    }
-
-  if (scol_)
-    {
-      for (int i = 0; i < scripts_.size (); i++)
-       Script_column::add_staff_sided (scol_, scripts_[i]);
-      scripts_.clear ();
-    }
+    scol_ = make_item ("ScriptColumn", SCM_EOL);
 }
-ADD_ACKNOWLEDGER(Script_column_engraver, side_position);
+
+ADD_ACKNOWLEDGER (Script_column_engraver, side_position);
 ADD_TRANSLATOR (Script_column_engraver,
-               /* descr */ "",
-               /* creats*/ "ScriptColumn",
-               /* accepts */ "",
-               /* reads */ "",
+               /* doc */ "",
+               /* create */ "ScriptColumn",
+               /* accept */ "",
+               /* read */ "",
                /* write */ "");