X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Faxis-group-engraver.cc;h=82b5cfe37b2c3aea7378d1834a9b27bab17ecb20;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=87fcd2817d5db6f9a1bb16442f192e09120411d4;hpb=75eebcb49e52d296b1da3e1074e0825d2c780db4;p=lilypond.git diff --git a/lily/axis-group-engraver.cc b/lily/axis-group-engraver.cc index 87fcd2817d..82b5cfe37b 100644 --- a/lily/axis-group-engraver.cc +++ b/lily/axis-group-engraver.cc @@ -3,15 +3,17 @@ source file of the GNU LilyPond music typesetter - (c) 1999--2006 Han-Wen Nienhuys + (c) 1999--2008 Han-Wen Nienhuys */ #include "axis-group-engraver.hh" -#include "spanner.hh" #include "axis-group-interface.hh" -#include "warn.hh" +#include "pointer-group-interface.hh" #include "context.hh" +#include "international.hh" +#include "spanner.hh" +#include "warn.hh" #include "translator.icc" @@ -38,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 () { @@ -49,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 ()); } /* @@ -68,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"))) { @@ -97,8 +97,16 @@ Axis_group_engraver::add_element (Grob *e) 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", - /* write */ ""); + /* doc */ + "Group all objects created in this context in a" + " @code{VerticalAxisGroup} spanner.", + + /* create */ + "VerticalAxisGroup ", + + /* read */ + "currentCommandColumn ", + + /* write */ + "" + );