X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Faxis-group-engraver.cc;h=e6ad51e6836a53ce9614a675fe6626c04646682e;hb=5cb7876d337b0805f55d98255bb5aced5a2ee456;hp=b20abef88f15c6c513b3f898023330a167346db8;hpb=b37e3f652677ae0298423db9fa0e552e5fce0c92;p=lilypond.git diff --git a/lily/axis-group-engraver.cc b/lily/axis-group-engraver.cc index b20abef88f..e6ad51e683 100644 --- a/lily/axis-group-engraver.cc +++ b/lily/axis-group-engraver.cc @@ -9,6 +9,7 @@ #include "axis-group-engraver.hh" #include "axis-group-interface.hh" +#include "pointer-group-interface.hh" #include "context.hh" #include "international.hh" #include "spanner.hh" @@ -39,10 +40,6 @@ Axis_group_engraver::get_spanner () return make_spanner ("VerticalAxisGroup", SCM_EOL); } -/* - TODO: should we junk minimumVerticalExtent/extraVerticalExtent ? -*/ - void Axis_group_engraver::finalize () { @@ -50,13 +47,15 @@ Axis_group_engraver::finalize () { Grob *it = unsmob_grob (get_property ("currentCommandColumn")); staffline_->set_bound (RIGHT, it); + + Pointer_group_interface::set_ordered (staffline_, ly_symbol2scm ("elements"), false); } } void Axis_group_engraver::acknowledge_grob (Grob_info i) { - elts_.push (i.grob ()); + elts_.push_back (i.grob ()); } /* @@ -69,7 +68,7 @@ Axis_group_engraver::process_acknowledged () if (!staffline_) return; - for (int i = 0; i < elts_.size (); i++) + for (vsize i = 0; i < elts_.size (); i++) { if (!unsmob_grob (elts_[i]->get_object ("axis-group-parent-Y"))) { @@ -100,6 +99,7 @@ ADD_ACKNOWLEDGER (Axis_group_engraver, grob); ADD_TRANSLATOR (Axis_group_engraver, /* doc */ "Group all objects created in this context in a VerticalAxisGroup spanner.", /* create */ "VerticalAxisGroup", - /* accept */ "", - /* read */ "verticalExtent minimumVerticalExtent extraVerticalExtent", + /* read */ + "currentCommandColumn ", + /* write */ "");