source file of the GNU LilyPond music typesetter
- (c) 1999--2005 Han-Wen Nienhuys <hanwen@xs4all.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"
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);
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 ();
}
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 ()
{
- 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,
/* doc */ "",
/* create */ "ScriptColumn",
- /* accept */ "",
/* read */ "",
/* write */ "");