X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fspan-bar-engraver.cc;h=a1618a27567b863b6f65d4bfc73a02bc41ea25f0;hb=78b1072d477435d5f2725b7e3c6c40af8d90f1ab;hp=5842c230b099f08556d846bf656898a01a860991;hpb=e540311d3f5799216c91d203080f63b65cccde07;p=lilypond.git

diff --git a/lily/span-bar-engraver.cc b/lily/span-bar-engraver.cc
index 5842c230b0..a1618a2756 100644
--- a/lily/span-bar-engraver.cc
+++ b/lily/span-bar-engraver.cc
@@ -1,60 +1,55 @@
 /*
-  span-bar-grav.cc -- implement Span_bar_engraver
+  span-bar-engraver.cc -- implement Span_bar_engraver
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
-
-#include "lily-guile.hh"
 #include "bar-line.hh"
 #include "item.hh"
 #include "span-bar.hh"
 #include "engraver.hh"
 
+/**
 
-/** 
-
-  Make bars that span multiple "staves". Catch bars, and span a
-  Span_bar over them if we find more than 2 bars.  Vertical alignment
-  of staves changes the appearance of spanbars.  It is up to the
-  aligner (Vertical_align_engraver, in this case, to add extra
-  dependencies to the spanbars.
-
-  */
+Make bars that span multiple "staves". Catch bars, and span a
+Span_bar over them if we find more than 2 bars.  Vertical alignment
+of staves changes the appearance of spanbars.  It is up to the
+aligner (Vertical_align_engraver, in this case, to add extra
+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 ()
 {
-  spanbar_ =0;
+  spanbar_ = 0;
 }
 
 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_) 
+      if (bars_.size () >= 2 && !spanbar_)
 	{
 	  spanbar_ = make_item ("SpanBar", SCM_EOL);
 
 	  spanbar_->set_parent (bars_[0], X_AXIS);
-	  
 	}
     }
 }
@@ -62,28 +57,27 @@ Span_bar_engraver::acknowledge_grob (Grob_info i)
 void
 Span_bar_engraver::stop_translation_timestep ()
 {
-  if (spanbar_) 
+  if (spanbar_)
     {
-      for (int i=0; i < bars_.size () ; i++)
-	Span_bar::add_bar (spanbar_,bars_[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);
+      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_->set_property (vissym, vis);
 
-      typeset_grob (spanbar_);
-      spanbar_ =0;
+      spanbar_ = 0;
     }
-  bars_.set_size (0);
+  bars_.resize (0);
 }
 
+#include "translator.icc"
 
-ENTER_DESCRIPTION (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 */       "");
+ADD_ACKNOWLEDGER (Span_bar_engraver, bar_line);
+ADD_TRANSLATOR (Span_bar_engraver,
+		/* doc */ "This engraver makes cross-staff barlines: It catches all normal "
+		"bar lines, and draws a single span-bar across them.",
+		/* create */ "SpanBar",
+		/* read */ "",
+		/* write */ "");