Fix some bugs in the dynamic engraver and PostScript backend

[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 a8414f932b5232603d3b225c943024c86c8e944e..b03c1d20a4017f0adf8fb2eed1425c2645fe1dad 100644 (file)
--- 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 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2005--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
 */
 
@@ -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 ); 
@@ -77,9 +77,9 @@ 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 ());
+                                            SCM_EOL, ly_symbol2string (type).c_str ());
 
-  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 +89,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,7 +97,7 @@ Bracket_nesting_group::add_support (Grob *g)
 
 Bracket_nesting_group::~Bracket_nesting_group ()
 {
-  for (int i = 0 ; i < children_.size (); i++)
+  for (vsize i = 0 ; i < children_.size (); i++)
     delete children_[i];
 }
 
@@ -105,7 +105,7 @@ 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 +117,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 +134,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 +144,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 +152,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 +178,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 +190,6 @@ System_start_delimiter_engraver::System_start_delimiter_engraver ()
   nesting_ = 0;
 }
 
-
-
 void
 System_start_delimiter_engraver::process_music ()
 {
@@ -225,12 +224,19 @@ System_start_delimiter_engraver::acknowledge_staff_symbol (Grob_info inf)
 
   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,18 @@ 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",
+               /* create */ "SystemStartSquare "
+               "SystemStartBrace "
+               "SystemStartBracket "
+               "SystemStartBar",
                /* accept */ "",
-               /* read */ "systemStartDelimiter systemStartDelimiterHierarchy currentCommandColumn",
+               /* read */
+               "systemStartDelimiter "
+               "systemStartDelimiterHierarchy "
+               "currentCommandColumn",
+
                /* write */ "");