X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fscript-column-engraver.cc;h=9ee7d384ee2235f0077c531fcecd28fc65e54001;hb=f817c9010f8016d5e9c19ec3b167e7d485538eb3;hp=572fd3f807b9698c24cac35f0be832c15979f00f;hpb=ad7defd5f5a3d0151a711555c2d680c56ef559c7;p=lilypond.git

diff --git a/lily/script-column-engraver.cc b/lily/script-column-engraver.cc
index 572fd3f807..9ee7d384ee 100644
--- a/lily/script-column-engraver.cc
+++ b/lily/script-column-engraver.cc
@@ -1,87 +1,81 @@
 /*   
-  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--2000 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 "side-position-interface.hh"
-#include "dimension-cache.hh"
 
 /**
    Find potentially colliding scripts, and put them in a
    Script_column, that will fix the collisions.  */
 class Script_column_engraver : public Engraver
 {
-  Script_column *scol_p_;
-  Link_array<Item> script_l_arr_;
+  Grob *scol_;
+  Link_array<Item> scripts_;
 
 public:
-  Script_column_engraver ();
-  VIRTUAL_COPY_CONS(Translator);
+  TRANSLATOR_DECLARATIONS (Script_column_engraver);
 protected:
-  virtual void acknowledge_element (Score_element_info);
-  virtual void process_acknowledged ();
-  virtual void  do_pre_move_processing ();
-  virtual void  do_post_move_processing ();
+  virtual void acknowledge_grob (Grob_info);
+  virtual void process_acknowledged_grobs ();
+  virtual void stop_translation_timestep ();
 };
 
 
-Script_column_engraver::Script_column_engraver()
+Script_column_engraver::Script_column_engraver ()
 {
-  scol_p_ =0;
+  scol_ = 0;
 }
 
 void
-Script_column_engraver::do_pre_move_processing ()
+Script_column_engraver::stop_translation_timestep ()
 {
-  if (scol_p_)
-    {
-      typeset_element (scol_p_);
-      scol_p_ =0;
-    }
+  scol_ = 0;
+  scripts_.clear ();
 }
 
 void
-Script_column_engraver::do_post_move_processing ()
+Script_column_engraver::acknowledge_grob (Grob_info inf) 
 {
-  script_l_arr_.clear ();
-
-}
-
-void
-Script_column_engraver::acknowledge_element( Score_element_info inf) 
-{
-  if (side_position (inf.elem_l_).has_interface_b ())
+  Item *thing = dynamic_cast<Item*> (inf.grob_);
+  if (thing && Side_position_interface::has_interface (inf.grob_)) // ugh FIXME
     {
-      Item *thing = dynamic_cast<Item*> (inf.elem_l_);
-      if (thing
-	  && !thing->breakable_b ()
-	  && side_position (inf.elem_l_).get_axis () == Y_AXIS)
+      if (!Item::is_breakable (thing)
+	  && Side_position_interface::get_axis (inf.grob_) == Y_AXIS)
 	{
-	  script_l_arr_.push (thing);
+	  scripts_.push (thing);
 	}
     }
 }
 
 void
-Script_column_engraver::process_acknowledged ()
+Script_column_engraver::process_acknowledged_grobs ()
 {
-  if (!scol_p_ && script_l_arr_.size () > 1)
+  if (!scol_ && scripts_.size () > 1)
     {
-      scol_p_ = new Script_column;
-      announce_element (Score_element_info (scol_p_, 0));
+      scol_ = make_item ("ScriptColumn", SCM_EOL);
+      
     }
 
-  if (scol_p_)
+  if (scol_)
     {
-      for (int i=0; i < script_l_arr_.size (); i++)
-	scol_p_->add_staff_sided (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 ();
     }
+
 }
-ADD_THIS_TRANSLATOR(Script_column_engraver);
+
+ADD_TRANSLATOR (Script_column_engraver,
+/* descr */       "",
+/* creats*/       "ScriptColumn",
+/* accepts */     "",
+/* acks  */      "side-position-interface",
+/* reads */       "",
+/* write */       "");