X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fsystem-start-delimiter-engraver.cc;h=ea4fcf38a859a5930b2a1da7c5172fe8065e062a;hb=0c1bd11621381ae88080162e13a54110f5bc3860;hp=dd2151146d6d7cd724079d0f548126da61036f33;hpb=0326ce088e5d81235df8ff360a7f22f61fa36a09;p=lilypond.git diff --git a/lily/system-start-delimiter-engraver.cc b/lily/system-start-delimiter-engraver.cc index dd2151146d..ea4fcf38a8 100644 --- a/lily/system-start-delimiter-engraver.cc +++ b/lily/system-start-delimiter-engraver.cc @@ -4,7 +4,7 @@ source file of the GNU LilyPond music typesetter - (c) 2005--2006 Han-Wen Nienhuys + (c) 2005--2009 Han-Wen Nienhuys */ @@ -21,7 +21,7 @@ struct Bracket_nesting_node { public: - virtual ~Bracket_nesting_node(){} + virtual ~Bracket_nesting_node (){} virtual bool add_staff (Grob *) { return false; } virtual void add_support (Grob *) { } virtual void set_bound (Direction, Grob *){} @@ -96,8 +96,7 @@ Bracket_nesting_group::add_support (Grob *g) Bracket_nesting_group::~Bracket_nesting_group () { - for (vsize i = 0 ; i < children_.size (); i++) - delete children_[i]; + junk_pointers (children_); } void @@ -212,13 +211,15 @@ System_start_delimiter_engraver::finalize () nesting_->set_bound (RIGHT, unsmob_grob (get_property ("currentCommandColumn"))); nesting_->set_nesting_support (0); + + delete nesting_; } } void System_start_delimiter_engraver::acknowledge_staff_symbol (Grob_info inf) { - Grob *staff = inf.grob(); + Grob *staff = inf.grob (); bool succ = nesting_->add_staff (staff); if (!succ) @@ -249,15 +250,23 @@ ADD_ACKNOWLEDGER (System_start_delimiter_engraver, system_start_delimiter); ADD_ACKNOWLEDGER (System_start_delimiter_engraver, system_start_text); ADD_TRANSLATOR (System_start_delimiter_engraver, - /* doc */ "Creates a system start delimiter (ie. SystemStart@{Bar, Brace, Bracket@} spanner", - /* create */ "SystemStartSquare " + /* doc */ + "Create a system start delimiter (i.e., a" + " @code{SystemStartBar}, @code{SystemStartBrace}," + " @code{SystemStartBracket} or @code{SystemStartSquare}" + " spanner).", + + /* create */ + "SystemStartSquare " "SystemStartBrace " "SystemStartBracket " - "SystemStartBar", - /* accept */ "", + "SystemStartBar ", + /* read */ "systemStartDelimiter " "systemStartDelimiterHierarchy " - "currentCommandColumn", + "currentCommandColumn ", - /* write */ ""); + /* write */ + "" + );