release: 1.5.19

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

diff --git a/lily/script-column-engraver.cc b/lily/script-column-engraver.cc
index 93e25140b8797d27fefcf8606594cd2ce4fcf3d0..b6b53162cf242aa5f50e18695aee92eb022af6cb 100644 (file)
--- a/lily/script-column-engraver.cc
+++ b/lily/script-column-engraver.cc
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1999--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1999--2001 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 ();
@@ -31,7 +30,7 @@ protected:
 };
 
 
-Script_column_engraver::Script_column_engraver()
+Script_column_engraver::Script_column_engraver ()
 {
   scol_p_ =0;
 }
@@ -54,13 +53,13 @@ Script_column_engraver::start_translation_timestep ()
 }
 
 void
-Script_column_engraver::acknowledge_grob(Grob_info inf) 
+Script_column_engraver::acknowledge_grob (Grob_info inf) 
 {
-  Item *thing = dynamic_cast<Item*> (inf.elem_l_);
-  if (thing && Side_position::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::get_axis (inf.elem_l_) == Y_AXIS)
+         && Side_position_interface::get_axis (inf.grob_l_) == Y_AXIS)
        {
          script_l_arr_.push (thing);
        }
@@ -85,4 +84,10 @@ Script_column_engraver::create_grobs ()
       script_l_arr_.clear ();
     }
 }
-ADD_THIS_TRANSLATOR(Script_column_engraver);
+
+ENTER_DESCRIPTION(Script_column_engraver,
+/* descr */       "",
+/* creats*/       "ScriptColumn",
+/* acks  */       "side-position-interface",
+/* reads */       "",
+/* write */       "");