source file of the GNU LilyPond music typesetter
- (c) 1999--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1999--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
#include "spanner.hh"
virtual void finalize ();
virtual void acknowledge_grob (Grob_info);
virtual void process_acknowledged_grobs ();
- virtual Spanner* get_spanner () const;
+ 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 ()
{
staffline_ = 0;
}
Spanner*
-Axis_group_engraver::get_spanner () const
+Axis_group_engraver::get_spanner ()
{
- return new Spanner (get_property ("VerticalAxisGroup"));
+ return make_spanner ("VerticalAxisGroup");
}
/*
Axis_group_engraver::finalize ()
{
if (!staffline_)
- {
- programming_error ("Huh? This context never lived?");
- return ;
- }
+ return ;
String type = get_daddy_grav ()->context_name ();
SCM dims = get_property ("verticalExtent");
Grob *par = elts_[i]->get_parent (Y_AXIS);
if (!par || !Axis_group_interface::has_interface (par))
- if (elts_[i]->empty_b (Y_AXIS))
+ if (elts_[i]->is_empty (Y_AXIS))
{
/*
We have to do _something_, otherwise staff objects will
class Hara_kiri_engraver : public Axis_group_engraver
{
protected:
- virtual Spanner*get_spanner ()const;
+ virtual Spanner*get_spanner ();
virtual void acknowledge_grob (Grob_info);
virtual void add_element (Grob *e);
public:
Spanner*
-Hara_kiri_engraver::get_spanner () const
+Hara_kiri_engraver::get_spanner ()
{
- Spanner * sp = new Spanner (get_property ("RemoveEmptyVerticalGroup"));
+ Spanner * sp = make_spanner ("RemoveEmptyVerticalGroup");
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")))
+ if (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_);
}