virtual Spanner* get_spanner () ;
virtual void add_element (Grob*) ;
public:
- TRANSLATOR_DECLARATIONS(Axis_group_engraver);
+ TRANSLATOR_DECLARATIONS (Axis_group_engraver);
};
Axis_group_engraver::Axis_group_engraver ()
Grob * it = unsmob_grob (get_property ("currentCommandColumn"));
staffline_->set_bound (LEFT,it);
-
- announce_grob(staffline_, SCM_EOL);
}
}
Spanner*
Axis_group_engraver::get_spanner ()
{
- return make_spanner ("VerticalAxisGroup");
+ return make_spanner ("VerticalAxisGroup", SCM_EOL);
}
/*
if (!staffline_)
return ;
- String type = daddy_context_->context_name ();
+ String type = context ()->context_name ();
SCM dims = get_property ("verticalExtent");
if (is_number_pair (dims))
dims = get_property ("minimumVerticalExtent");
if (is_number_pair (dims) )
- staffline_->set_grob_property ("minimum-Y-extent", dims);
+ staffline_->set_property ("minimum-Y-extent", dims);
dims = get_property ("extraVerticalExtent");
if (is_number_pair (dims))
- staffline_->set_grob_property ("extra-Y-extent", dims);
+ staffline_->set_property ("extra-Y-extent", dims);
Grob * it = unsmob_grob (get_property ("currentCommandColumn"));
staffline_->set_bound (RIGHT,it);
- typeset_grob (staffline_);
staffline_ = 0;
}
void
Axis_group_engraver::process_acknowledged_grobs ()
{
- /* UGH UGH UGH */
+ if (!staffline_)
+ return ;
+
for (int i=0; i < elts_.size (); i++)
{
Grob *par = elts_[i]->get_parent (Y_AXIS);
if (!par || !Axis_group_interface::has_interface (par))
- if (elts_[i]->is_empty (Y_AXIS))
- {
- /*
- We have to do _something_, otherwise staff objects will
- end up with System as parent.
+ {
+ if (staffline_->get_parent (Y_AXIS)
+ && staffline_->get_parent (Y_AXIS) == elts_[i])
+ {
+ String msg = _("Axis_group_engraver: vertical group already has a parent.\n"
+ "Do you have two Axis_group_engravers?\n"
+ "Killing this vertical group.");
+ staffline_->warning (msg);
+ staffline_->suicide ();
+ staffline_ = 0;
+ break ;
+ }
+ else if (elts_[i]->is_empty (Y_AXIS))
+ {
+ /*
+ We have to do _something_, otherwise staff objects will
+ end up with System as parent.
- */
- elts_[i]->set_parent (staffline_, Y_AXIS);
- }
- else
- add_element (elts_[i]);
+ */
+ elts_[i]->set_parent (staffline_, Y_AXIS);
+ }
+ else
+ add_element (elts_[i]);
+ }
}
elts_.clear ();
}
virtual void acknowledge_grob (Grob_info);
virtual void add_element (Grob *e);
public:
- TRANSLATOR_DECLARATIONS(Hara_kiri_engraver);
+ TRANSLATOR_DECLARATIONS (Hara_kiri_engraver);
};
void
Spanner*
Hara_kiri_engraver::get_spanner ()
{
- Spanner * sp = make_spanner ("RemoveEmptyVerticalGroup");
+ Spanner * sp = make_spanner ("RemoveEmptyVerticalGroup", SCM_EOL);
return sp;
}
Hara_kiri_engraver::acknowledge_grob (Grob_info i)
{
Axis_group_engraver::acknowledge_grob (i);
- if (i.grob_->internal_has_interface (ly_symbol2scm ("rhythmic-grob-interface"))
- || i.grob_->internal_has_interface (ly_symbol2scm ("lyric-interface"))
+ if (staffline_
+ && (i.grob_->internal_has_interface (ly_symbol2scm ("rhythmic-grob-interface"))
+ || i.grob_->internal_has_interface (ly_symbol2scm ("lyric-interface")))
)
{
Hara_kiri_group_spanner::add_interesting_item (staffline_, i.grob_);
}
-Hara_kiri_engraver::Hara_kiri_engraver()
+Hara_kiri_engraver::Hara_kiri_engraver ()
{
}
-ENTER_DESCRIPTION(Hara_kiri_engraver,
+ENTER_DESCRIPTION (Hara_kiri_engraver,
/* descr */ "Like Axis_group_engraver, but make a hara-kiri spanner, and add "
"interesting items (ie. note heads, lyric syllables and normal rests) ",
/* creats*/ "RemoveEmptyVerticalGroup",
/* reads */ "",
/* write */ "");
-ENTER_DESCRIPTION(Axis_group_engraver,
+ENTER_DESCRIPTION (Axis_group_engraver,
/* descr */ "Group all objects created in this context in a VerticalAxisGroup spanner.",
/* creats*/ "VerticalAxisGroup",
/* accepts */ "",