X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fsystem-start-delimiter-engraver.cc;h=238a3a6d9c99986620d331be967f00f91c76f3ef;hb=8d076ebc46c46e90ef83615275d5777bef5c3698;hp=d5adf8ecb959fb0865a0b2d0c4cb9aa291216cf4;hpb=75eebcb49e52d296b1da3e1074e0825d2c780db4;p=lilypond.git

diff --git a/lily/system-start-delimiter-engraver.cc b/lily/system-start-delimiter-engraver.cc
index d5adf8ecb9..238a3a6d9c 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 <hanwen@xs4all.nl>
+  (c) 2005--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
 */
 
@@ -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 *){}
@@ -32,7 +32,7 @@ public:
 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 ); 
@@ -76,10 +76,9 @@ void
 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);
     }
@@ -89,7 +88,7 @@ void
 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);
     }
@@ -97,15 +96,14 @@ Bracket_nesting_group::add_support (Grob *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);
     }
@@ -117,7 +115,7 @@ Bracket_nesting_group::set_nesting_support (Grob *parent)
   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_);
     }
@@ -134,7 +132,7 @@ Bracket_nesting_group::from_list (SCM x)
 	{
 	  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")
@@ -144,7 +142,7 @@ Bracket_nesting_group::from_list (SCM x)
 	symbol_ = entry;
       else
 	{
-	  children_.push (new Bracket_nesting_staff (0));
+	  children_.push_back (new Bracket_nesting_staff (0));
 	}
     }
 }
@@ -152,7 +150,7 @@ Bracket_nesting_group::from_list (SCM x)
 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))
 	{
@@ -178,6 +176,7 @@ protected:
   Bracket_nesting_group *nesting_;
   
   DECLARE_ACKNOWLEDGER (system_start_delimiter);
+  DECLARE_ACKNOWLEDGER (system_start_text);
   DECLARE_ACKNOWLEDGER (staff_symbol);
 
   void process_music ();
@@ -189,8 +188,6 @@ System_start_delimiter_engraver::System_start_delimiter_engraver ()
   nesting_ = 0;
 }
 
-
-
 void
 System_start_delimiter_engraver::process_music ()
 {
@@ -214,23 +211,32 @@ 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)
     {
-      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)
 {
@@ -241,10 +247,26 @@ System_start_delimiter_engraver::acknowledge_system_start_delimiter (Grob_info i
 
 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 */
+		""
+		);