/*
- ' separating-line-group-engraver.cc -- implement Separating_line_group_engraver
+ separating-line-group-engraver.cc -- implement Separating_line_group_engraver
source file of the GNU LilyPond music typesetter
- (c) 1998--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1998--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
*/
+#include "engraver.hh"
+
#include "separating-group-spanner.hh"
#include "separation-item.hh"
#include "paper-column.hh"
#include "output-def.hh"
-#include "engraver.hh"
#include "axis-group-interface.hh"
#include "note-spacing.hh"
#include "accidental-placement.hh"
#include "context.hh"
+#include "spanner.hh"
#include "grob-array.hh"
+#include "pointer-group-interface.hh"
+
+#include "translator.icc"
struct Spacings
{
Item *staff_spacing_;
- Link_array<Item> note_spacings_;
+ vector<Item*> note_spacings_;
Spacings ()
{
Spanner *sep_span_;
- virtual void acknowledge_grob (Grob_info);
- virtual void process_music ();
+ DECLARE_ACKNOWLEDGER (item);
+ void process_music ();
virtual void finalize ();
- virtual void stop_translation_timestep ();
- virtual void start_translation_timestep ();
+ void stop_translation_timestep ();
+ void start_translation_timestep ();
public:
TRANSLATOR_DECLARATIONS (Separating_line_group_engraver);
};
void
Separating_line_group_engraver::process_music ()
{
-
if (!sep_span_)
{
sep_span_ = make_spanner ("SeparatingGroupSpanner", SCM_EOL);
sep_span_->set_bound (RIGHT, unsmob_grob (ccol));
sep_span_ = 0;
- for (int i = 0; i < last_spacings_.note_spacings_.size (); i++)
+ for (vsize i = 0; i < last_spacings_.note_spacings_.size (); i++)
{
Pointer_group_interface::add_grob (last_spacings_.note_spacings_[i],
ly_symbol2scm ("right-items"),
if (last_spacings_.staff_spacing_
&& last_spacings_.staff_spacing_->get_column () == column)
- {
- last_spacings_.staff_spacing_->suicide ();
- }
+ last_spacings_.staff_spacing_->suicide ();
}
void
-Separating_line_group_engraver::acknowledge_grob (Grob_info i)
+Separating_line_group_engraver::acknowledge_item (Grob_info i)
{
- Item *it = dynamic_cast<Item *> (i.grob ());
- if (!it)
- return;
+ Item *it = i.item ();
if (it->get_parent (X_AXIS)
- && it->get_parent (X_AXIS)
- ->has_extent_callback (Axis_group_interface::group_extent_callback_proc, X_AXIS))
+ && it->get_parent (X_AXIS) == it->get_parent (Y_AXIS)
+ && Axis_group_interface::has_axis (it->get_parent (X_AXIS), X_AXIS)
+ && Axis_group_interface::has_axis (it->get_parent (Y_AXIS), Y_AXIS))
return;
if (to_boolean (it->get_property ("no-spacing-rods")))
if (Note_spacing::has_interface (it))
{
- current_spacings_.note_spacings_.push (it);
+ current_spacings_.note_spacings_.push_back (it);
return;
}
- bool ib = Item::is_breakable (it);
+ bool ib = Item::is_non_musical (it);
Item *&p_ref_ (ib ? break_item_
: musical_item_);
if (ib)
{
- p_ref_->set_property ("breakable", SCM_BOOL_T);
+ p_ref_->set_property ("non-musical", SCM_BOOL_T);
context ()->set_property ("breakableSeparationItem", p_ref_->self_scm ());
}
{
Item *it = make_item ("StaffSpacing", SCM_EOL);
current_spacings_.staff_spacing_ = it;
- Pointer_group_interface::add_grob (it, ly_symbol2scm ("left-items"),
+ Pointer_group_interface::add_grob (it, ly_symbol2scm ("left-items"),
break_item_);
if (int i = last_spacings_.note_spacings_.size ())
else if (last_spacings_.staff_spacing_)
{
SCM ri = last_spacings_.staff_spacing_->get_object ("right-items");
- Grob_array *ga = unsmob_grob_array (ri);
+ Grob_array *ga = unsmob_grob_array (ri);
if (!ga)
{
SCM ga_scm = Grob_array::make_array ();
Separating_line_group_engraver::start_translation_timestep ()
{
if (break_item_)
- context ()->unset_property (ly_symbol2scm ("breakableSeparationItem"));
- break_item_ = 0;
+ {
+ context ()->unset_property (ly_symbol2scm ("breakableSeparationItem"));
+ break_item_ = 0;
+ }
}
void
Separating_line_group_engraver::stop_translation_timestep ()
{
if (break_item_)
- {
- Separating_group_spanner::add_spacing_unit (sep_span_, break_item_);
- }
+ Separating_group_spanner::add_spacing_unit (sep_span_, break_item_);
if (Item *sp = current_spacings_.staff_spacing_)
{
}
if (!current_spacings_.is_empty ())
- {
- last_spacings_ = current_spacings_;
- }
+ last_spacings_ = current_spacings_;
current_spacings_.clear ();
if (musical_item_)
- {
- Separating_group_spanner::add_spacing_unit (sep_span_, musical_item_);
- }
+ Separating_group_spanner::add_spacing_unit (sep_span_, musical_item_);
musical_item_ = 0;
}
+ADD_ACKNOWLEDGER (Separating_line_group_engraver, item);
ADD_TRANSLATOR (Separating_line_group_engraver,
- /* descr */ "Generates objects for computing spacing parameters.",
- /* creats*/ "SeparationItem SeparatingGroupSpanner StaffSpacing",
- /* accepts */ "",
- /* acks */ "item-interface",
- /* reads */ "createSpacing",
+ /* doc */ "Generates objects for computing spacing parameters.",
+
+ /* create */
+ "SeparationItem "
+ "SeparatingGroupSpanner "
+ "StaffSpacing",
+ /* read */ "createSpacing",
/* write */ "breakableSeparationItem");