source file of the GNU LilyPond music typesetter
- (c) 2005 Han-Wen Nienhuys <hanwen@xs4all.nl>
+ (c) 2005--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
*/
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 *){}
struct Bracket_nesting_group : public Bracket_nesting_node
{
Spanner *delimiter_;
- Link_array<Bracket_nesting_node> children_;
+ vector<Bracket_nesting_node*> children_;
SCM symbol_;
void from_list (SCM );
Bracket_nesting_group::create_grobs (Engraver *engraver, SCM default_type)
{
SCM type = scm_is_symbol (symbol_) ? symbol_ : default_type;
- delimiter_ = make_spanner_from_properties (engraver, type,
- SCM_EOL, ly_symbol2string (type).to_str0 ());
+ delimiter_ = engraver->make_spanner (ly_symbol2string (type).c_str (), SCM_EOL);
- for (int i = 0 ; i < children_.size (); i++)
+ for (vsize i = 0 ; i < children_.size (); i++)
{
children_[i]->create_grobs (engraver, default_type);
}
Bracket_nesting_group::add_support (Grob *g)
{
Side_position_interface::add_support (g, delimiter_);
- for (int i = 0 ; i < children_.size (); i++)
+ for (vsize i = 0 ; i < children_.size (); i++)
{
children_[i]->add_support (g);
}
Bracket_nesting_group::~Bracket_nesting_group ()
{
- for (int i = 0 ; i < children_.size (); i++)
- delete children_[i];
+ junk_pointers (children_);
}
void
Bracket_nesting_group::set_bound (Direction d, Grob *g)
{
delimiter_->set_bound (d, g);
- for (int i = 0 ; i < children_.size (); i++)
+ for (vsize i = 0 ; i < children_.size (); i++)
{
children_[i]->set_bound (d, g);
}
if (parent)
Side_position_interface::add_support (delimiter_, parent);
- for (int i = 0 ; i < children_.size (); i++)
+ for (vsize i = 0 ; i < children_.size (); i++)
{
children_[i]->set_nesting_support (delimiter_);
}
{
Bracket_nesting_group *node = new Bracket_nesting_group;
node->from_list (entry);
- children_.push (node);
+ children_.push_back (node);
}
else if (entry == ly_symbol2scm ("SystemStartBrace")
|| entry == ly_symbol2scm ("SystemStartBracket")
symbol_ = entry;
else
{
- children_.push (new Bracket_nesting_staff (0));
+ children_.push_back (new Bracket_nesting_staff (0));
}
}
}
bool
Bracket_nesting_group::add_staff (Grob *grob)
{
- for (int i = 0; i < children_.size (); i++)
+ for (vsize i = 0; i < children_.size (); i++)
{
if (children_[i]->add_staff (grob))
{
Bracket_nesting_group *nesting_;
DECLARE_ACKNOWLEDGER (system_start_delimiter);
+ DECLARE_ACKNOWLEDGER (system_start_text);
DECLARE_ACKNOWLEDGER (staff_symbol);
void process_music ();
nesting_ = 0;
}
-
-
void
System_start_delimiter_engraver::process_music ()
{
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)
{
- nesting_->children_.push (new Bracket_nesting_staff (0));
+ nesting_->children_.push_back (new Bracket_nesting_staff (0));
nesting_->add_staff (staff);
}
}
+
+void
+System_start_delimiter_engraver::acknowledge_system_start_text (Grob_info inf)
+{
+ nesting_->add_support (inf.grob ());
+}
+
void
System_start_delimiter_engraver::acknowledge_system_start_delimiter (Grob_info inf)
{
ADD_ACKNOWLEDGER (System_start_delimiter_engraver, staff_symbol);
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 SystemStartBrace SystemStartBracket SystemStartBar",
- /* accept */ "",
- /* read */ "systemStartDelimiter systemStartDelimiterHierarchy currentCommandColumn",
- /* write */ "");
+ /* doc */
+ "Create a system start delimiter (i.e., a"
+ " @code{SystemStartBar}, @code{SystemStartBrace},"
+ " @code{SystemStartBracket} or @code{SystemStartSquare}"
+ " spanner).",
+
+ /* create */
+ "SystemStartSquare "
+ "SystemStartBrace "
+ "SystemStartBracket "
+ "SystemStartBar ",
+
+ /* read */
+ "systemStartDelimiter "
+ "systemStartDelimiterHierarchy "
+ "currentCommandColumn ",
+
+ /* write */
+ ""
+ );