Basic-notation reorg and misc small fixes.

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

diff --git a/lily/script-column-engraver.cc b/lily/script-column-engraver.cc
index 53b50336a5d6316f994702454e7eb18f84c1e240..cdaf056322106338da839e19a655c3ff56638f96 100644 (file)
--- a/lily/script-column-engraver.cc
+++ b/lily/script-column-engraver.cc
@@ -18,7 +18,7 @@
 class Script_column_engraver : public Engraver
 {
   Grob *scol_;
-  Link_array<Item> scripts_;
+  vector<Item*> scripts_;
 
 public:
   TRANSLATOR_DECLARATIONS (Script_column_engraver);
@@ -38,7 +38,7 @@ Script_column_engraver::stop_translation_timestep ()
 {
   if (scol_)
     {
-      for (int i = 0; i < scripts_.size (); i++)
+      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]);
     }
@@ -53,8 +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))
-       scripts_.push (thing);
+      if (!Item::is_non_musical (thing))
+       scripts_.push_back (thing);
     }
 }