X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fspan-bar-engraver.cc;h=64f845551334bce03dc71c7745997894abf27d58;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=879477420c9d77b5d18320558cc853bc2da7e02d;hpb=58bcc84c9480dae1b21bc24d8396b91fe19e0131;p=lilypond.git

diff --git a/lily/span-bar-engraver.cc b/lily/span-bar-engraver.cc
index 879477420c..64f8455513 100644
--- 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);
-  virtual void stop_translation_timestep ();
+  DECLARE_ACKNOWLEDGER (bar_line);
+  void stop_translation_timestep ();
 };
 
 Span_bar_engraver::Span_bar_engraver ()
@@ -37,20 +37,19 @@ 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_))
+  if (depth && Bar_line::has_interface (i.grob ()))
     {
-      Item *it = dynamic_cast<Item *> (i.grob_);
-      bars_.push (it);
+      Item *it = dynamic_cast<Item *> (i.grob ());
+      bars_.push_back (it);
 
       if (bars_.size () >= 2 && !spanbar_)
 	{
 	  spanbar_ = make_item ("SpanBar", SCM_EOL);
 
 	  spanbar_->set_parent (bars_[0], X_AXIS);
-
 	}
     }
 }
@@ -60,24 +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_c_equal_p (spanbar_->internal_get_property (vissym), vis))
-	spanbar_->internal_set_property (vissym, vis);
+      if (ly_is_equal (spanbar_->internal_get_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 */
+		""
+		);