X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fscript-column-engraver.cc;h=9ee7d384ee2235f0077c531fcecd28fc65e54001;hb=7e7a2bf8bde2353decd68a9c4ac7a68d815e8185;hp=58aa49bcce7cf90a91fb65da4b86c672e595579f;hpb=a0b072ed070ca6abb36a11e015073b117103e35d;p=lilypond.git

diff --git a/lily/script-column-engraver.cc b/lily/script-column-engraver.cc
index 58aa49bcce..9ee7d384ee 100644
--- a/lily/script-column-engraver.cc
+++ b/lily/script-column-engraver.cc
@@ -3,13 +3,12 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1999--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1999--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
 #include "engraver.hh"
 #include "script-column.hh"
-#include "item.hh"
 #include "side-position-interface.hh"
 
 /**
@@ -17,51 +16,40 @@
    Script_column, that will fix the collisions.  */
 class Script_column_engraver : public Engraver
 {
-  Grob *scol_p_;
-  Link_array<Item> script_l_arr_;
+  Grob *scol_;
+  Link_array<Item> scripts_;
 
 public:
-  TRANSLATOR_DECLARATIONS(Script_column_engraver);
+  TRANSLATOR_DECLARATIONS (Script_column_engraver);
 protected:
   virtual void acknowledge_grob (Grob_info);
   virtual void process_acknowledged_grobs ();
   virtual void stop_translation_timestep ();
-  virtual void start_translation_timestep ();
 };
 
 
 Script_column_engraver::Script_column_engraver ()
 {
-  scol_p_ =0;
+  scol_ = 0;
 }
 
 void
 Script_column_engraver::stop_translation_timestep ()
 {
-  if (scol_p_)
-    {
-      typeset_grob (scol_p_);
-      scol_p_ =0;
-    }
-}
-
-void
-Script_column_engraver::start_translation_timestep ()
-{
-  script_l_arr_.clear ();
-
+  scol_ = 0;
+  scripts_.clear ();
 }
 
 void
 Script_column_engraver::acknowledge_grob (Grob_info inf) 
 {
-  Item *thing = dynamic_cast<Item*> (inf.grob_l_);
-  if (thing && Side_position_interface::has_interface (inf.grob_l_)) // ugh FIXME
+  Item *thing = dynamic_cast<Item*> (inf.grob_);
+  if (thing && Side_position_interface::has_interface (inf.grob_)) // ugh FIXME
     {
-      if (!Item::breakable_b (thing)
-	  && Side_position_interface::get_axis (inf.grob_l_) == Y_AXIS)
+      if (!Item::is_breakable (thing)
+	  && Side_position_interface::get_axis (inf.grob_) == Y_AXIS)
 	{
-	  script_l_arr_.push (thing);
+	  scripts_.push (thing);
 	}
     }
 }
@@ -69,24 +57,25 @@ Script_column_engraver::acknowledge_grob (Grob_info inf)
 void
 Script_column_engraver::process_acknowledged_grobs ()
 {
-  if (!scol_p_ && script_l_arr_.size () > 1)
+  if (!scol_ && scripts_.size () > 1)
     {
-      scol_p_ = new Item (get_property ("ScriptColumn"));
-      announce_grob(scol_p_, SCM_EOL);
+      scol_ = make_item ("ScriptColumn", SCM_EOL);
+      
     }
 
-  if (scol_p_)
+  if (scol_)
     {
-      for (int i=0; i < script_l_arr_.size (); i++)
-	Script_column::add_staff_sided (scol_p_, script_l_arr_[i]);
-      script_l_arr_.clear ();
+      for (int i = 0; i < scripts_.size (); i++)
+	Script_column::add_staff_sided (scol_, scripts_[i]);
+      scripts_.clear ();
     }
 
 }
 
-ENTER_DESCRIPTION(Script_column_engraver,
+ADD_TRANSLATOR (Script_column_engraver,
 /* descr */       "",
 /* creats*/       "ScriptColumn",
-/* acks  */       "side-position-interface",
+/* accepts */     "",
+/* acks  */      "side-position-interface",
 /* reads */       "",
 /* write */       "");