Run `make grand-replace'.

[lilypond.git] / lily / span-bar-engraver.cc

diff --git a/lily/span-bar-engraver.cc b/lily/span-bar-engraver.cc
index f98f8d321422665374e0be2353c648c665168ac8..64f845551334bce03dc71c7745997894abf27d58 100644 (file)
--- a/lily/span-bar-engraver.cc
+++ b/lily/span-bar-engraver.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "bar-line.hh"
@@ -22,13 +22,13 @@ dependencies to the spanbars.
 class Span_bar_engraver : public Engraver
 {
   Item *spanbar_;
-  Link_array<Item> bars_;
+  vector<Item*> bars_;
 
 public:
   TRANSLATOR_DECLARATIONS (Span_bar_engraver);
 protected:
-  virtual void acknowledge_grob (Grob_info);
-  PRECOMPUTED_VIRTUAL void stop_translation_timestep ();
+  DECLARE_ACKNOWLEDGER (bar_line);
+  void stop_translation_timestep ();
 };
 
 Span_bar_engraver::Span_bar_engraver ()
@@ -37,13 +37,13 @@ Span_bar_engraver::Span_bar_engraver ()
 }
 
 void
-Span_bar_engraver::acknowledge_grob (Grob_info i)
+Span_bar_engraver::acknowledge_bar_line (Grob_info i)
 {
   int depth = i.origin_contexts (this).size ();
   if (depth && Bar_line::has_interface (i.grob ()))
     {
       Item *it = dynamic_cast<Item *> (i.grob ());
-      bars_.push (it);
+      bars_.push_back (it);
 
       if (bars_.size () >= 2 && !spanbar_)
        {
@@ -59,26 +59,33 @@ Span_bar_engraver::stop_translation_timestep ()
 {
   if (spanbar_)
     {
-      for (int i = 0; i < bars_.size (); i++)
+      for (vsize i = 0; i < bars_.size (); i++)
        Span_bar::add_bar (spanbar_, bars_[i]);
 
       SCM vissym = ly_symbol2scm ("break-visibility");
       SCM vis = bars_[0]->internal_get_property (vissym);
       if (ly_is_equal (spanbar_->internal_get_property (vissym), vis))
-       spanbar_->internal_set_property (vissym, vis);
+       spanbar_->set_property (vissym, vis);
 
       spanbar_ = 0;
     }
-  bars_.set_size (0);
+  bars_.resize (0);
 }
 
 #include "translator.icc"
 
+ADD_ACKNOWLEDGER (Span_bar_engraver, bar_line);
 ADD_TRANSLATOR (Span_bar_engraver,
-               /* descr */ "This engraver makes cross-staff barlines: It catches all normal "
-               "bar lines, and draws a single span-bar across them.",
-               /* creats*/ "SpanBar",
-               /* accepts */ "",
-               /* acks  */ "bar-line-interface",
-               /* reads */ "",
-               /* write */ "");
+               /* doc */
+               "Make cross-staff bar lines: It catches all normal bar lines"
+               " and draws a single span bar across them.",
+
+               /* create */
+               "SpanBar ",
+
+               /* read */
+               "",
+
+               /* write */
+               ""
+               );