Merge branch 'master' of ssh+git://hanwen@git.sv.gnu.org/srv/git/lilypond

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

diff --git a/lily/script-column-engraver.cc b/lily/script-column-engraver.cc
index cdaf056322106338da839e19a655c3ff56638f96..ada6f0aac4d1c67933013af6338c89924f556ed9 100644 (file)
--- a/lily/script-column-engraver.cc
+++ b/lily/script-column-engraver.cc
@@ -9,6 +9,7 @@
 #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_;
-  vector<Item*> scripts_;
+  Grob *script_column_;
+  vector<Grob*> scripts_;
 
 public:
   TRANSLATOR_DECLARATIONS (Script_column_engraver);
@@ -30,20 +31,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 ();
 }
 
@@ -61,14 +62,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 */ "");