X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fscript-column-engraver.cc;h=e94e233882ab45d4b87aeb20575604db8755611b;hb=90e4d7057f3857da049dfda3d130017d4719bd6b;hp=50cbee9c91e91033cd93c34bf73d8fd381e6ad64;hpb=2804f8f79e01dc606ce067bffda2d966524e6e36;p=lilypond.git

diff --git a/lily/script-column-engraver.cc b/lily/script-column-engraver.cc
index 50cbee9c91..e94e233882 100644
--- a/lily/script-column-engraver.cc
+++ b/lily/script-column-engraver.cc
@@ -1,92 +1,100 @@
-/*   
-  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>
-  
- */
+/*
+  This file is part of LilyPond, the GNU music typesetter.
+
+  Copyright (C) 1999--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
+
+  LilyPond is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
+*/
 
 #include "engraver.hh"
 #include "script-column.hh"
-#include "item.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_p_;
-  Link_array<Item> script_l_arr_;
+  Grob *script_column_;
+  vector<Grob *> scripts_;
 
 public:
-  TRANSLATOR_DECLARATIONS(Script_column_engraver);
+  TRANSLATOR_DECLARATIONS (Script_column_engraver);
 protected:
-  virtual void acknowledge_grob (Grob_info);
-  virtual void create_grobs ();
-  virtual void stop_translation_timestep ();
-  virtual void start_translation_timestep ();
+  void acknowledge_side_position (Grob_info);
+  void process_acknowledged ();
+  void stop_translation_timestep ();
 };
 
-
-Script_column_engraver::Script_column_engraver ()
+Script_column_engraver::Script_column_engraver (Context *c)
+  : Engraver (c)
 {
-  scol_p_ =0;
+  script_column_ = 0;
 }
 
 void
 Script_column_engraver::stop_translation_timestep ()
 {
-  if (scol_p_)
+  if (script_column_)
     {
-      typeset_grob (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]);
     }
+
+  script_column_ = 0;
+  scripts_.clear ();
 }
 
 void
-Script_column_engraver::start_translation_timestep ()
+Script_column_engraver::acknowledge_side_position (Grob_info inf)
 {
-  script_l_arr_.clear ();
-
+  Item *thing = dynamic_cast<Item *> (inf.grob ());
+  if (thing)
+    {
+      if (!Item::is_non_musical (thing))
+        scripts_.push_back (thing);
+    }
 }
 
 void
-Script_column_engraver::acknowledge_grob (Grob_info inf) 
+Script_column_engraver::process_acknowledged ()
 {
-  Item *thing = dynamic_cast<Item*> (inf.grob_l_);
-  if (thing && Side_position_interface::has_interface (inf.grob_l_)) // ugh FIXME
-    {
-      if (!Item::breakable_b (thing)
-	  && Side_position_interface::get_axis (inf.grob_l_) == Y_AXIS)
-	{
-	  script_l_arr_.push (thing);
-	}
-    }
+  if (!script_column_ && scripts_.size () > 1)
+    script_column_ = make_item ("ScriptColumn", SCM_EOL);
 }
 
 void
-Script_column_engraver::create_grobs ()
+Script_column_engraver::boot ()
 {
-  if (!scol_p_ && script_l_arr_.size () > 1)
-    {
-      scol_p_ = new Item (get_property ("ScriptColumn"));
-      announce_grob(scol_p_, SCM_EOL);
-    }
+  ADD_ACKNOWLEDGER (Script_column_engraver, side_position);
+}
 
-  if (scol_p_)
-    {
-      for (int i=0; i < script_l_arr_.size (); i++)
-	Script_column::add_staff_sided (scol_p_, script_l_arr_[i]);
-      script_l_arr_.clear ();
-    }
+ADD_TRANSLATOR (Script_column_engraver,
+                /* doc */
+                "Find potentially colliding scripts and put them into a"
+                " @code{ScriptColumn} object; that will fix the collisions.",
 
-}
+                /* create */
+                "ScriptColumn ",
+
+                /* read */
+                "",
 
-ENTER_DESCRIPTION(Script_column_engraver,
-/* descr */       "",
-/* creats*/       "ScriptColumn",
-/* acks  */       "side-position-interface",
-/* reads */       "",
-/* write */       "");
+                /* write */
+                ""
+               );