X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fscript-column-engraver.cc;h=ada6f0aac4d1c67933013af6338c89924f556ed9;hb=9ac6b17dfcca6826c8ab3ea5d65b789086ae15e0;hp=df81722ee68a66bf5a2233e347fcef786b8017a3;hpb=2fd5f86de0500ecd9a3f47a2540c3b304f835ef4;p=lilypond.git

diff --git a/lily/script-column-engraver.cc b/lily/script-column-engraver.cc
index df81722ee6..ada6f0aac4 100644
--- a/lily/script-column-engraver.cc
+++ b/lily/script-column-engraver.cc
@@ -1,89 +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 "side-position-interface.hh"
-#include "dimension-cache.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
 {
-  Script_column *scol_p_;
-  Link_array<Item> script_l_arr_;
+  Grob *script_column_;
+  vector<Grob*> 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 ();
 };
 
-
-ADD_THIS_TRANSLATOR (Script_column_engraver);
-
-Script_column_engraver::Script_column_engraver()
+Script_column_engraver::Script_column_engraver ()
 {
-  scol_p_ =0;
+  script_column_ = 0;
 }
 
 void
-Script_column_engraver::do_pre_move_processing ()
+Script_column_engraver::stop_translation_timestep ()
 {
-  if (scol_p_)
+  if (script_column_)
     {
-      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_side_positioned (script_column_, scripts_[i]);
     }
-}
-
-void
-Script_column_engraver::do_post_move_processing ()
-{
-  script_l_arr_.clear ();
 
+  script_column_ = 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;
-  
-  if (Side_position_interface (thing).has_interface_b ())
+  Item *thing = dynamic_cast<Item *> (inf.grob ());
+  if (thing)
     {
-      if (!thing->breakable_b () && Side_position_interface (thing).get_axis () == Y_AXIS)
-	{
-	  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 (!script_column_ && scripts_.size () > 1)
+    script_column_ = make_item ("ScriptColumn", SCM_EOL);
 }
+
+ADD_ACKNOWLEDGER (Script_column_engraver, side_position);
+ADD_TRANSLATOR (Script_column_engraver,
+		/* doc */ "",
+		/* create */ "ScriptColumn",
+		/* read */ "",
+		/* write */ "");