X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fscript-column-engraver.cc;h=cdaf056322106338da839e19a655c3ff56638f96;hb=73b1239c26cd8f25d34ed9595967caa99932d784;hp=d38aed9b0f12f8d32081f5c3bb445f5f6cb03783;hpb=61c4b07cddc6231c3ca4b45a0aa86d27e25110b9;p=lilypond.git

diff --git a/lily/script-column-engraver.cc b/lily/script-column-engraver.cc
index d38aed9b0f..cdaf056322 100644
--- a/lily/script-column-engraver.cc
+++ b/lily/script-column-engraver.cc
@@ -1,94 +1,74 @@
-/*   
-  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 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-  
- */
+
+  (c) 1999--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+*/
 
 #include "engraver.hh"
 #include "script-column.hh"
-#include "staff-side.hh"
-#include "dimension-cache.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.  */
 class Script_column_engraver : public Engraver
 {
-  Script_column *scol_p_;
-  Link_array<Item> script_l_arr_;
-  Link_array<Staff_side_item> staff_side_l_arr_;  
+  Grob *scol_;
+  vector<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 ();
+  DECLARE_ACKNOWLEDGER (side_position);
+  void process_acknowledged ();
+  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_)
+  if (scol_)
     {
-      typeset_element (scol_p_);
-      scol_p_ =0;
+      for (vsize i = 0; i < scripts_.size (); i++)
+	if (Side_position_interface::get_axis (scripts_[i]) == Y_AXIS)
+	  Script_column::add_staff_sided (scol_, scripts_[i]);
     }
-}
 
-void
-Script_column_engraver::do_post_move_processing ()
-{
-  script_l_arr_.clear ();
-  staff_side_l_arr_.clear ();
+  scol_ = 0;
+  scripts_.clear ();
 }
 
 void
-Script_column_engraver::acknowledge_element( Score_element_info inf) 
+Script_column_engraver::acknowledge_side_position (Grob_info inf)
 {
-  Item *thing =  dynamic_cast<Item*>(inf.elem_l_);
-  if (!thing)
-    return;
-  
-  Dimension_cache * parcache = thing->dim_cache_[Y_AXIS]->parent_l_;
-  if (!parcache || !thing)
-    return ;
-  
-  Graphical_element *parent = parcache->element_l ();
-
-  if (Staff_side_item * ss = dynamic_cast<Staff_side_item*>(parent))
+  Item *thing = dynamic_cast<Item *> (inf.grob ());
+  if (thing)
     {
-      if (!ss->breakable_b ())
-	{
-	  script_l_arr_.push (thing);
-	}
+      if (!Item::is_non_musical (thing))
+	scripts_.push_back (thing);
     }
 }
 
 void
 Script_column_engraver::process_acknowledged ()
 {
-  if (!scol_p_ && script_l_arr_.size () > 1)
-    {
-      scol_p_ = new Script_column;
-      announce_element (Score_element_info (scol_p_, 0));
-    }
-
-  if (scol_p_)
-    {
-      for (int i=0; i < script_l_arr_.size (); i++)
-	scol_p_->add_staff_sided (script_l_arr_[i]);
-      script_l_arr_.clear ();
-    }
+  if (!scol_ && scripts_.size () > 1)
+    scol_ = make_item ("ScriptColumn", SCM_EOL);
 }
-ADD_THIS_TRANSLATOR(Script_column_engraver);
+
+ADD_ACKNOWLEDGER (Script_column_engraver, side_position);
+ADD_TRANSLATOR (Script_column_engraver,
+		/* doc */ "",
+		/* create */ "ScriptColumn",
+		/* accept */ "",
+		/* read */ "",
+		/* write */ "");