X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=lily%2Fscript-column-engraver.cc;h=5e9c668093bc9e6a6331576521480690c684b3a8;hb=bfaf7b9c40948e603388efec369138ce45102db2;hp=9ef23f328a30f949eae80275c1a2c66d312db8cd;hpb=7aabfb20c46e0a1de41698ddc6859ccd3a6dea85;p=lilypond.git

diff --git a/lily/script-column-engraver.cc b/lily/script-column-engraver.cc
index 9ef23f328a..5e9c668093 100644
--- a/lily/script-column-engraver.cc
+++ b/lily/script-column-engraver.cc
@@ -1,17 +1,17 @@
-/*   
-  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--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-  
- */
+
+  (c) 1999--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+*/
 
 #include "engraver.hh"
 #include "script-column.hh"
-#include "item.hh"
 #include "side-position-interface.hh"
 
+#include "translator.icc"
+
 /**
    Find potentially colliding scripts, and put them in a
    Script_column, that will fix the collisions.  */
@@ -21,73 +21,54 @@ class Script_column_engraver : public Engraver
   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 ();
+  DECLARE_ACKNOWLEDGER (side_position);
+  void process_acknowledged ();
+  void stop_translation_timestep ();
 };
 
-
 Script_column_engraver::Script_column_engraver ()
 {
-  scol_ =0;
+  scol_ = 0;
 }
 
 void
 Script_column_engraver::stop_translation_timestep ()
 {
-  if (scol_)
-    {
-      typeset_grob (scol_);
-      scol_ =0;
-    }
-}
-
-void
-Script_column_engraver::start_translation_timestep ()
-{
+  scol_ = 0;
   scripts_.clear ();
-
 }
 
 void
-Script_column_engraver::acknowledge_grob (Grob_info inf) 
+Script_column_engraver::acknowledge_side_position (Grob_info inf)
 {
-  Item *thing = dynamic_cast<Item*> (inf.grob_);
-  if (thing && Side_position_interface::has_interface (inf.grob_)) // ugh FIXME
+  Item *thing = dynamic_cast<Item *> (inf.grob ());
+  if (thing)
     {
-      if (!Item::breakable_b (thing)
-	  && Side_position_interface::get_axis (inf.grob_) == Y_AXIS)
-	{
-	  scripts_.push (thing);
-	}
+      if (!Item::is_breakable (thing)
+	  && Side_position_interface::get_axis (inf.grob ()) == Y_AXIS)
+	scripts_.push (thing);
     }
 }
 
 void
-Script_column_engraver::process_acknowledged_grobs ()
+Script_column_engraver::process_acknowledged ()
 {
   if (!scol_ && scripts_.size () > 1)
-    {
-      scol_ = new Item (get_property ("ScriptColumn"));
-      announce_grob(scol_, SCM_EOL);
-    }
+    scol_ = make_item ("ScriptColumn", SCM_EOL);
 
   if (scol_)
     {
-      for (int i=0; i < scripts_.size (); i++)
+      for (int i = 0; i < scripts_.size (); i++)
 	Script_column::add_staff_sided (scol_, scripts_[i]);
       scripts_.clear ();
     }
-
 }
-
-ENTER_DESCRIPTION(Script_column_engraver,
-/* descr */       "",
-/* creats*/       "ScriptColumn",
-/* accepts */     "",
-/* acks  */      "side-position-interface",
-/* reads */       "",
-/* write */       "");
+ADD_ACKNOWLEDGER (Script_column_engraver, side_position);
+ADD_TRANSLATOR (Script_column_engraver,
+		/* doc */ "",
+		/* create */ "ScriptColumn",
+		/* accept */ "",
+		/* read */ "",
+		/* write */ "");