X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fscript-column-engraver.cc;h=a7ae23ec4a94042cdbb0c3b91b133cd6c734a12f;hb=459216bffe7aa64cd1e9f31f1fda28f90f6e9c1c;hp=e8bf2c4f60023c2e0a129735746324a5cfdf5e0e;hpb=e540311d3f5799216c91d203080f63b65cccde07;p=lilypond.git

diff --git a/lily/script-column-engraver.cc b/lily/script-column-engraver.cc
index e8bf2c4f60..a7ae23ec4a 100644
--- a/lily/script-column-engraver.cc
+++ b/lily/script-column-engraver.cc
@@ -1,15 +1,13 @@
-/*   
-  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--2004 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"
 
 /**
@@ -28,31 +26,26 @@ protected:
   virtual 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;
-    }
+  scol_ = 0;
   scripts_.clear ();
 }
 
 void
-Script_column_engraver::acknowledge_grob (Grob_info inf) 
+Script_column_engraver::acknowledge_grob (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 && Side_position_interface::has_interface (inf.grob ())) // ugh FIXME
     {
       if (!Item::is_breakable (thing)
-	  && Side_position_interface::get_axis (inf.grob_) == Y_AXIS)
+	  && Side_position_interface::get_axis (inf.grob ()) == Y_AXIS)
 	{
 	  scripts_.push (thing);
 	}
@@ -65,22 +58,20 @@ Script_column_engraver::process_acknowledged_grobs ()
   if (!scol_ && scripts_.size () > 1)
     {
       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_TRANSLATOR (Script_column_engraver,
+		/* descr */ "",
+		/* creats*/ "ScriptColumn",
+		/* accepts */ "",
+		/* acks  */ "side-position-interface",
+		/* reads */ "",
+		/* write */ "");