diff --git a/ChangeLog b/ChangeLog

[lilypond.git] / lily / system-start-delimiter-engraver.cc

diff --git a/lily/system-start-delimiter-engraver.cc b/lily/system-start-delimiter-engraver.cc
index 6bcdea73b04687236e8e3af81c5858d56abf868a..5c28a612311887ea1355022b694f7a77e85eedde 100644 (file)
--- a/lily/system-start-delimiter-engraver.cc
+++ b/lily/system-start-delimiter-engraver.cc
@@ -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,8 +76,7 @@ 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).c_str ());
+  delimiter_ = engraver->make_spanner (ly_symbol2string (type).c_str (), SCM_EOL);
 
   for (vsize i = 0 ; i < children_.size (); i++)
     {
@@ -178,6 +177,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 +189,6 @@ System_start_delimiter_engraver::System_start_delimiter_engraver ()
   nesting_ = 0;
 }
 
-
-
 void
 System_start_delimiter_engraver::process_music ()
 {
@@ -231,6 +229,13 @@ System_start_delimiter_engraver::acknowledge_staff_symbol (Grob_info inf)
 }
 
 
+
+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 +246,17 @@ 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",
+               /* create */ "SystemStartSquare "
+               "SystemStartBrace "
+               "SystemStartBracket "
+               "SystemStartBar",
+               /* read */
+               "systemStartDelimiter "
+               "systemStartDelimiterHierarchy "
+               "currentCommandColumn",
+
                /* write */ "");