release: 1.5.29

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

diff --git a/lily/script-column-engraver.cc b/lily/script-column-engraver.cc
index 93083a1cb0ab7232add7fcb278db3ad997c34014..df4ca98b880aa4a5f5dfad3d8977f37078094deb 100644 (file)
--- a/lily/script-column-engraver.cc
+++ b/lily/script-column-engraver.cc
@@ -1,9 +1,9 @@
 /*   
-  g-script-column-engraver.cc --  implement Script_column_engraver
+  script-column-engraver.cc --  implement Script_column_engraver
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1999--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1999--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
@@ -21,8 +21,7 @@ class Script_column_engraver : public Engraver
   Link_array<Item> script_l_arr_;
 
 public:
-  Script_column_engraver ();
-  VIRTUAL_COPY_CONS (Translator);
+  TRANSLATOR_DECLARATIONS(Script_column_engraver);
 protected:
   virtual void acknowledge_grob (Grob_info);
   virtual void create_grobs ();
@@ -56,11 +55,11 @@ Script_column_engraver::start_translation_timestep ()
 void
 Script_column_engraver::acknowledge_grob (Grob_info inf) 
 {
-  Item *thing = dynamic_cast<Item*> (inf.elem_l_);
-  if (thing && Side_position_interface::has_interface (inf.elem_l_)) // ugh FIXME
+  Item *thing = dynamic_cast<Item*> (inf.grob_l_);
+  if (thing && Side_position_interface::has_interface (inf.grob_l_)) // ugh FIXME
     {
       if (!Item::breakable_b (thing)
-         && Side_position_interface::get_axis (inf.elem_l_) == Y_AXIS)
+         && Side_position_interface::get_axis (inf.grob_l_) == Y_AXIS)
        {
          script_l_arr_.push (thing);
        }
@@ -73,8 +72,6 @@ Script_column_engraver::create_grobs ()
   if (!scol_p_ && script_l_arr_.size () > 1)
     {
       scol_p_ = new Item (get_property ("ScriptColumn"));
-
-
       announce_grob (scol_p_, 0);
     }
 
@@ -84,5 +81,12 @@ Script_column_engraver::create_grobs ()
        Script_column::add_staff_sided (scol_p_, script_l_arr_[i]);
       script_l_arr_.clear ();
     }
+
 }
-ADD_THIS_TRANSLATOR (Script_column_engraver);
+
+ENTER_DESCRIPTION(Script_column_engraver,
+/* descr */       "",
+/* creats*/       "ScriptColumn",
+/* acks  */       "side-position-interface",
+/* reads */       "",
+/* write */       "");