X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fscript-column-engraver.cc;h=6821c51733b7a292c27e0ef833c28982caa06ad5;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=0b6253c4c7d7f8f72fcc3663fab1f2dc17d265c9;hpb=2c22efe5a46a37065b10c3f51c5d7db00d07d318;p=lilypond.git

diff --git a/lily/script-column-engraver.cc b/lily/script-column-engraver.cc
index 0b6253c4c7..6821c51733 100644
--- a/lily/script-column-engraver.cc
+++ b/lily/script-column-engraver.cc
@@ -3,12 +3,13 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1999--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1999--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "engraver.hh"
 #include "script-column.hh"
 #include "side-position-interface.hh"
+#include "item.hh"
 
 #include "translator.icc"
 
@@ -17,8 +18,8 @@
    Script_column, that will fix the collisions.  */
 class Script_column_engraver : public Engraver
 {
-  Grob *scol_;
-  Link_array<Item> scripts_;
+  Grob *script_column_;
+  vector<Grob*> scripts_;
 
 public:
   TRANSLATOR_DECLARATIONS (Script_column_engraver);
@@ -30,13 +31,20 @@ protected:
 
 Script_column_engraver::Script_column_engraver ()
 {
-  scol_ = 0;
+  script_column_ = 0;
 }
 
 void
 Script_column_engraver::stop_translation_timestep ()
 {
-  scol_ = 0;
+  if (script_column_)
+    {
+      for (vsize i = 0; i < scripts_.size (); i++)
+	if (Side_position_interface::get_axis (scripts_[i]) == Y_AXIS)
+	  Script_column::add_side_positioned (script_column_, scripts_[i]);
+    }
+
+  script_column_ = 0;
   scripts_.clear ();
 }
 
@@ -46,31 +54,30 @@ 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_non_musical (thing))
+	scripts_.push_back (thing);
     }
 }
 
 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 ();
-    }
+  if (!script_column_ && scripts_.size () > 1)
+    script_column_ = make_item ("ScriptColumn", SCM_EOL);
 }
+
 ADD_ACKNOWLEDGER (Script_column_engraver, side_position);
 ADD_TRANSLATOR (Script_column_engraver,
-		/* doc */ "",
-		/* create */ "ScriptColumn",
-		/* accept */ "",
-		/* read */ "",
-		/* write */ "");
+		/* doc */
+		"Find potentially colliding scripts and put them into a"
+		" @code{ScriptColumn} object; that will fix the collisions.",
+
+		/* create */
+		"ScriptColumn ",
+
+		/* read */
+		"",
+
+		/* write */
+		""
+		);