X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Faxis-group-engraver.cc;h=10ad7f59922796e33043cca02e1d0f31567400e6;hb=4b4331d24c2c39592f2da381156da92d140c9419;hp=82b5cfe37b2c3aea7378d1834a9b27bab17ecb20;hpb=62f221b6b3861ff055dc0384ec3c48cc665688cd;p=lilypond.git diff --git a/lily/axis-group-engraver.cc b/lily/axis-group-engraver.cc index 82b5cfe37b..10ad7f5992 100644 --- a/lily/axis-group-engraver.cc +++ b/lily/axis-group-engraver.cc @@ -1,9 +1,20 @@ /* - axis-group-engraver.cc -- implement Axis_group_engraver + This file is part of LilyPond, the GNU music typesetter. - source file of the GNU LilyPond music typesetter + Copyright (C) 1999--2012 Han-Wen Nienhuys - (c) 1999--2008 Han-Wen Nienhuys + LilyPond is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + LilyPond is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with LilyPond. If not, see . */ #include "axis-group-engraver.hh" @@ -19,10 +30,15 @@ Axis_group_engraver::Axis_group_engraver () { - must_be_last_ = true; staffline_ = 0; } +bool +Axis_group_engraver::must_be_last () const +{ + return true; +} + void Axis_group_engraver::process_music () { @@ -71,19 +87,19 @@ Axis_group_engraver::process_acknowledged () for (vsize i = 0; i < elts_.size (); i++) { if (!unsmob_grob (elts_[i]->get_object ("axis-group-parent-Y"))) - { - if (staffline_->get_parent (Y_AXIS) - && staffline_->get_parent (Y_AXIS) == elts_[i]) - { - staffline_->warning (_ ("Axis_group_engraver: vertical group already has a parent")); - staffline_->warning (_ ("are there two Axis_group_engravers?")); - staffline_->warning (_ ("removing this vertical group")); - staffline_->suicide (); - staffline_ = 0; - break; - } - add_element (elts_[i]); - } + { + if (staffline_->get_parent (Y_AXIS) + && staffline_->get_parent (Y_AXIS) == elts_[i]) + { + staffline_->warning (_ ("Axis_group_engraver: vertical group already has a parent")); + staffline_->warning (_ ("are there two Axis_group_engravers?")); + staffline_->warning (_ ("removing this vertical group")); + staffline_->suicide (); + staffline_ = 0; + break; + } + add_element (elts_[i]); + } } elts_.clear (); } @@ -97,16 +113,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" - " @code{VerticalAxisGroup} spanner.", + /* doc */ + "Group all objects created in this context in a" + " @code{VerticalAxisGroup} spanner.", - /* create */ - "VerticalAxisGroup ", + /* create */ + "VerticalAxisGroup ", - /* read */ - "currentCommandColumn ", + /* read */ + "currentCommandColumn ", - /* write */ - "" - ); + /* write */ + "" + );