* lily/align-interface.cc (align_elements_to_extents): warn if

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

diff --git a/lily/script-column-engraver.cc b/lily/script-column-engraver.cc
index 7af91365b702659dcaf35c7eba77a9f6b24906b4..a7ae23ec4a94042cdbb0c3b91b133cd6c734a12f 100644 (file)
--- 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--2002 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"
 
 /**
@@ -21,45 +19,33 @@ 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 ();
 };
 
-
 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_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::breakable_b (thing)
-         && Side_position_interface::get_axis (inf.grob_) == Y_AXIS)
+      if (!Item::is_breakable (thing)
+         && Side_position_interface::get_axis (inf.grob ()) == Y_AXIS)
        {
          scripts_.push (thing);
        }
@@ -71,23 +57,21 @@ Script_column_engraver::process_acknowledged_grobs ()
 {
   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 */     "general-music",
-/* acks  */      "side-position-interface",
-/* reads */       "",
-/* write */       "");
+ADD_TRANSLATOR (Script_column_engraver,
+               /* descr */ "",
+               /* creats*/ "ScriptColumn",
+               /* accepts */ "",
+               /* acks  */ "side-position-interface",
+               /* reads */ "",
+               /* write */ "");