class Axis_group_engraver : public Engraver
{
protected:
- Spanner *staffline_p_;
+ Spanner *staffline_;
Link_array<Grob> elts_;
virtual void initialize ();
virtual void finalize ();
virtual void acknowledge_grob (Grob_info);
virtual void process_acknowledged_grobs ();
- virtual Spanner* get_spanner_p () const;
+ virtual Spanner* get_spanner () const;
virtual void add_element (Grob*) ;
public:
TRANSLATOR_DECLARATIONS(Axis_group_engraver );
Axis_group_engraver::Axis_group_engraver ()
{
- staffline_p_ = 0;
+ staffline_ = 0;
}
void
Axis_group_engraver::initialize ()
{
- staffline_p_ = get_spanner_p ();
+ staffline_ = get_spanner ();
Grob * it = unsmob_grob (get_property ("currentCommandColumn"));
- staffline_p_->set_bound (LEFT,it);
+ staffline_->set_bound (LEFT,it);
- announce_grob(staffline_p_, SCM_EOL);
+ announce_grob(staffline_, SCM_EOL);
}
Spanner*
-Axis_group_engraver::get_spanner_p () const
+Axis_group_engraver::get_spanner () const
{
return new Spanner (get_property ("VerticalAxisGroup"));
}
void
Axis_group_engraver::finalize ()
{
- String type = daddy_grav_l ()->type_str_ ;
+ String type = get_daddy_grav ()->type_string_ ;
SCM dims = get_property ("verticalExtent");
if (gh_pair_p (dims) && gh_number_p (ly_car (dims))
&& gh_number_p (ly_cdr (dims)))
{
- staffline_p_->set_extent (Grob::preset_extent_proc, Y_AXIS);
- staffline_p_->set_grob_property ("extent-Y", dims);
+ staffline_->set_extent (Grob::preset_extent_proc, Y_AXIS);
+ staffline_->set_grob_property ("extent-Y", dims);
}
dims = get_property ("minimumVerticalExtent");
if (gh_pair_p (dims) && gh_number_p (ly_car (dims))
&& gh_number_p (ly_cdr (dims)))
- staffline_p_->set_grob_property ("minimum-extent-Y", dims);
+ staffline_->set_grob_property ("minimum-extent-Y", dims);
dims = get_property ("extraVerticalExtent");
if (gh_pair_p (dims) && gh_number_p (ly_car (dims))
&& gh_number_p (ly_cdr (dims)))
- staffline_p_->set_grob_property ("extra-extent-Y", dims);
+ staffline_->set_grob_property ("extra-extent-Y", dims);
Grob * it = unsmob_grob (get_property ("currentCommandColumn"));
- staffline_p_->set_bound (RIGHT,it);
+ staffline_->set_bound (RIGHT,it);
- typeset_grob (staffline_p_);
- staffline_p_ = 0;
+ typeset_grob (staffline_);
+ staffline_ = 0;
}
void
Axis_group_engraver::acknowledge_grob (Grob_info i)
{
- elts_.push (i.grob_l_);
+ elts_.push (i.grob_);
}
/*
- maybe should check if our parent_l is set, because we now get a
+ maybe should check if our parent is set, because we now get a
cyclic parent relationship if we have two Axis_group_engravers in
the context. */
void
void
Axis_group_engraver::add_element (Grob*e)
{
- Axis_group_interface::add_element (staffline_p_, e);
+ Axis_group_interface::add_element (staffline_, e);
}
////////////////////////////////////////////////////////
class Hara_kiri_engraver : public Axis_group_engraver
{
protected:
- virtual Spanner*get_spanner_p ()const;
+ virtual Spanner*get_spanner ()const;
virtual void acknowledge_grob (Grob_info);
virtual void add_element (Grob *e);
public:
void
Hara_kiri_engraver::add_element (Grob*e)
{
- Hara_kiri_group_spanner::add_element (staffline_p_, e);
+ Hara_kiri_group_spanner::add_element (staffline_, e);
}
Spanner*
-Hara_kiri_engraver::get_spanner_p () const
+Hara_kiri_engraver::get_spanner () const
{
Spanner * sp = new Spanner (get_property ("HaraKiriVerticalGroup"));
Hara_kiri_engraver::acknowledge_grob (Grob_info i)
{
Axis_group_engraver::acknowledge_grob (i);
- if (Rhythmic_head::has_interface (i.grob_l_)
- || i.grob_l_->internal_has_interface (ly_symbol2scm ("lyric-syllable-interface")))
+ if (Rhythmic_head::has_interface (i.grob_)
+ || i.grob_->internal_has_interface (ly_symbol2scm ("lyric-syllable-interface")))
{
- Hara_kiri_group_spanner::add_interesting_item (staffline_p_, i.grob_l_);
+ Hara_kiri_group_spanner::add_interesting_item (staffline_, i.grob_);
}
}