(calc_position_and_height): robustness:

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

diff --git a/lily/script-column-engraver.cc b/lily/script-column-engraver.cc
index ccbe0f6112b682bd71aafeb29578d1ac04e641f1..ce69a3929c8b61022fd20c067cb422bdc01f6da6 100644 (file)
--- a/lily/script-column-engraver.cc
+++ b/lily/script-column-engraver.cc
@@ -17,8 +17,8 @@
    Script_column, that will fix the collisions.  */
 class Script_column_engraver : public Engraver
 {
-  Grob *scol_;
-  Link_array__Item_ scripts_;
+  Grob *script_column_;
+  vector<Item*> scripts_;
 
 public:
   TRANSLATOR_DECLARATIONS (Script_column_engraver);
@@ -30,20 +30,20 @@ protected:
 
 Script_column_engraver::Script_column_engraver ()
 {
-  scol_ = 0;
+  script_column_ = 0;
 }
 
 void
 Script_column_engraver::stop_translation_timestep ()
 {
-  if (scol_)
+  if (script_column_)
     {
       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]);
+         Script_column::add_side_positioned (script_column_, scripts_[i]);
     }
 
-  scol_ = 0;
+  script_column_ = 0;
   scripts_.clear ();
 }
 
@@ -53,7 +53,7 @@ Script_column_engraver::acknowledge_side_position (Grob_info inf)
   Item *thing = dynamic_cast<Item *> (inf.grob ());
   if (thing)
     {
-      if (!Item::is_breakable (thing))
+      if (!Item::is_non_musical (thing))
        scripts_.push_back (thing);
     }
 }
@@ -61,14 +61,13 @@ Script_column_engraver::acknowledge_side_position (Grob_info inf)
 void
 Script_column_engraver::process_acknowledged ()
 {
-  if (!scol_ && scripts_.size () > 1)
-    scol_ = make_item ("ScriptColumn", SCM_EOL);
+  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 */ "");