X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fspan-bar-engraver.cc;h=7ec59d3895f4d50e4c3d607bf433e8ba8d452b68;hb=75eebcb49e52d296b1da3e1074e0825d2c780db4;hp=3561ce7b6999555ab0fe7294f6c521eb283de04d;hpb=d35271961e34da635524a2246bb1061091242a3b;p=lilypond.git

diff --git a/lily/span-bar-engraver.cc b/lily/span-bar-engraver.cc
index 3561ce7b69..7ec59d3895 100644
--- a/lily/span-bar-engraver.cc
+++ b/lily/span-bar-engraver.cc
@@ -1,98 +1,84 @@
 /*
-  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--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2006 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_p_;
-  Link_array<Item> bar_l_arr_;
+  Item *spanbar_;
+  Link_array<Item> bars_;
 
 public:
-  TRANSLATOR_DECLARATIONS(Span_bar_engraver);
+  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_p_ =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_trans_l_arr (this).size ();
-  if (depth > 1
-      && Bar_line::has_interface (i.grob_l_))
+  int depth = i.origin_contexts (this).size ();
+  if (depth && Bar_line::has_interface (i.grob ()))
     {
-      Item * it = dynamic_cast<Item*> (i.grob_l_);
-      bar_l_arr_.push (it);
+      Item *it = dynamic_cast<Item *> (i.grob ());
+      bars_.push (it);
 
-      if (bar_l_arr_.size () >= 2 && !spanbar_p_) 
+      if (bars_.size () >= 2 && !spanbar_)
 	{
-	  spanbar_p_ = new Item (get_property ("SpanBar"));
+	  spanbar_ = make_item ("SpanBar", SCM_EOL);
 
-	  spanbar_p_->set_parent (bar_l_arr_[0], X_AXIS);
-
-	  announce_grob (spanbar_p_, SCM_EOL);
+	  spanbar_->set_parent (bars_[0], X_AXIS);
 	}
     }
 }
+
 void
 Span_bar_engraver::stop_translation_timestep ()
 {
-  if (spanbar_p_) 
+  if (spanbar_)
     {
-      for (int i=0; i < bar_l_arr_.size () ; i++)
-	Span_bar::add_bar (spanbar_p_,bar_l_arr_[i]);
+      for (int i = 0; i < bars_.size (); i++)
+	Span_bar::add_bar (spanbar_, bars_[i]);
 
-      SCM vissym =ly_symbol2scm ("break-visibility");
-      SCM vis = bar_l_arr_[0]->internal_get_grob_property (vissym);	  
-      if (scm_equal_p (spanbar_p_->internal_get_grob_property (vissym), vis) != SCM_BOOL_T)
-	spanbar_p_->internal_set_grob_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_->internal_set_property (vissym, vis);
 
-      typeset_grob (spanbar_p_);
-      spanbar_p_ =0;
+      spanbar_ = 0;
     }
-  bar_l_arr_.set_size (0);
+  bars_.set_size (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",
-/* 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",
+		/* accept */ "",
+		/* read */ "",
+		/* write */ "");