X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fscript-column-engraver.cc;h=6a0211530de10dacd425f2776c61fb82f02bb69f;hb=2a07e2ea1924abec1b70e2150e698e5792ae1687;hp=7e027aacfc11e6f2894b2bb36cc562466f99b014;hpb=bdf4ab13203502e7ec7cf9cf5896527643a07c1f;p=lilypond.git

diff --git a/lily/script-column-engraver.cc b/lily/script-column-engraver.cc
index 7e027aacfc..6a0211530d 100644
--- a/lily/script-column-engraver.cc
+++ b/lily/script-column-engraver.cc
@@ -3,75 +3,72 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1999--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1999--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "engraver.hh"
 #include "script-column.hh"
 #include "side-position-interface.hh"
+#include "item.hh"
+
+#include "translator.icc"
 
 /**
    Find potentially colliding scripts, and put them in a
    Script_column, that will fix the collisions.  */
 class Script_column_engraver : public Engraver
 {
-  Grob *scol_;
-  Link_array<Item> scripts_;
+  Grob *script_column_;
+  vector<Grob*> scripts_;
 
 public:
   TRANSLATOR_DECLARATIONS (Script_column_engraver);
 protected:
-  virtual void acknowledge_grob (Grob_info);
-  virtual void process_acknowledged_grobs ();
-  virtual void stop_translation_timestep ();
+  DECLARE_ACKNOWLEDGER (side_position);
+  void process_acknowledged ();
+  void stop_translation_timestep ();
 };
 
 Script_column_engraver::Script_column_engraver ()
 {
-  scol_ = 0;
+  script_column_ = 0;
 }
 
 void
 Script_column_engraver::stop_translation_timestep ()
 {
-  scol_ = 0;
+  if (script_column_)
+    {
+      for (vsize i = 0; i < scripts_.size (); i++)
+	if (Side_position_interface::get_axis (scripts_[i]) == Y_AXIS)
+	  Script_column::add_side_positioned (script_column_, scripts_[i]);
+    }
+
+  script_column_ = 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::is_breakable (thing)
-	  && Side_position_interface::get_axis (inf.grob_) == Y_AXIS)
-	{
-	  scripts_.push (thing);
-	}
+      if (!Item::is_non_musical (thing))
+	scripts_.push_back (thing);
     }
 }
 
 void
-Script_column_engraver::process_acknowledged_grobs ()
+Script_column_engraver::process_acknowledged ()
 {
-  if (!scol_ && scripts_.size () > 1)
-    {
-      scol_ = make_item ("ScriptColumn", SCM_EOL);
-    }
-
-  if (scol_)
-    {
-      for (int i = 0; i < scripts_.size (); i++)
-	Script_column::add_staff_sided (scol_, scripts_[i]);
-      scripts_.clear ();
-    }
+  if (!script_column_ && scripts_.size () > 1)
+    script_column_ = make_item ("ScriptColumn", SCM_EOL);
 }
 
+ADD_ACKNOWLEDGER (Script_column_engraver, side_position);
 ADD_TRANSLATOR (Script_column_engraver,
-		/* descr */ "",
-		/* creats*/ "ScriptColumn",
-		/* accepts */ "",
-		/* acks  */ "side-position-interface",
-		/* reads */ "",
+		/* doc */ "",
+		/* create */ "ScriptColumn",
+		/* read */ "",
 		/* write */ "");