source file of the GNU LilyPond music typesetter
- (c) 1998--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+ (c) 1998--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
*/
#include "engraver.hh"
#include "note-spacing.hh"
#include "accidental-placement.hh"
#include "context.hh"
+#include "spanner.hh"
#include "grob-array.hh"
#include "pointer-group-interface.hh"
struct Spacings
{
Item *staff_spacing_;
- Link_array<Item> note_spacings_;
+ vector<Item*> note_spacings_;
Spacings ()
{
sep_span_->set_bound (RIGHT, unsmob_grob (ccol));
sep_span_ = 0;
- 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"),
- column);
- }
-
if (last_spacings_.staff_spacing_
&& last_spacings_.staff_spacing_->get_column () == column)
last_spacings_.staff_spacing_->suicide ();
void
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)
- && Axis_group_interface::has_axis (it->get_parent (X_AXIS), 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")))
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 ());
}
Pointer_group_interface::add_grob (it, ly_symbol2scm ("left-items"),
break_item_);
- if (int i = last_spacings_.note_spacings_.size ())
- {
- for (; i--;)
- Pointer_group_interface::add_grob (last_spacings_.note_spacings_[i],
- ly_symbol2scm ("right-items"),
- break_item_);
- }
- else if (last_spacings_.staff_spacing_)
+ if (!last_spacings_.note_spacings_.size ()
+ && last_spacings_.staff_spacing_)
{
SCM ri = last_spacings_.staff_spacing_->get_object ("right-items");
Grob_array *ga = unsmob_grob_array (ri);
"SeparationItem "
"SeparatingGroupSpanner "
"StaffSpacing",
- /* accept */ "",
/* read */ "createSpacing",
/* write */ "breakableSeparationItem");