X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fspan-bar-engraver.cc;h=7b54329835b87055c29eb8c9a8b6ba1c5b93b26a;hb=076884bc0f9ee5e10fa4e8d29e09aeed85b0c0c6;hp=7674d05dc11cea0df5d39e507d90938cdb309742;hpb=df4a7c4a55148e065d878dcc2f7e09ac27ea9c32;p=lilypond.git

diff --git a/lily/span-bar-engraver.cc b/lily/span-bar-engraver.cc
index 7674d05dc1..7b54329835 100644
--- a/lily/span-bar-engraver.cc
+++ b/lily/span-bar-engraver.cc
@@ -3,92 +3,84 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
-
-#include "lily-guile.hh"
-#include "bar.hh"
+#include "bar-line.hh"
 #include "item.hh"
 #include "span-bar.hh"
 #include "engraver.hh"
 
-
 /** 
 
-  Make bars that span multiple "staffs". Catch bars, and span a
+  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 staffs changes the appearance of spanbars.  It is up to the
+  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:
-  VIRTUAL_COPY_CONS(Translator);
-  Span_bar_engraver();
+  TRANSLATOR_DECLARATIONS (Span_bar_engraver);
 protected:
   virtual void acknowledge_grob (Grob_info);
-  virtual void stop_translation_timestep();
-
+  virtual void stop_translation_timestep ();
 };
 
-
-Span_bar_engraver::Span_bar_engraver()
+Span_bar_engraver::Span_bar_engraver ()
 {
-  spanbar_p_ =0;
+  spanbar_ = 0;
 }
 
-
-
 void
 Span_bar_engraver::acknowledge_grob (Grob_info i)
 {
-  int depth = i.origin_trans_l_arr (this).size();
-  if (depth > 1
-      && Bar::has_interface (i.elem_l_))
+  int depth = i.origin_contexts (this).size ();
+  if (depth && Bar_line::has_interface (i.grob_))
     {
-      Item * it = dynamic_cast<Item*>(i.elem_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"));
-	  Span_bar::set_interface (spanbar_p_);
-		
-	  spanbar_p_->set_parent (bar_l_arr_[0], Y_AXIS);
-	  spanbar_p_->set_parent (bar_l_arr_[0], X_AXIS);
+	  spanbar_ = make_item ("SpanBar", SCM_EOL);
 
-	  announce_grob (spanbar_p_,0);
+	  spanbar_->set_parent (bars_[0], X_AXIS);
+	  
 	}
     }
 }
+
 void
-Span_bar_engraver::stop_translation_timestep()
+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 ("visibility-lambda");
-      SCM vis = bar_l_arr_[0]->get_grob_property (vissym);	  
-      if (scm_equal_p (spanbar_p_->get_grob_property (vissym), vis) != SCM_BOOL_T)
-	spanbar_p_->set_grob_property (vissym, vis);
+      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);
 
-      typeset_grob (spanbar_p_);
-      spanbar_p_ =0;
+      
+      spanbar_ = 0;
     }
-  bar_l_arr_.set_size (0);
+  bars_.set_size (0);
 }
 
 
-
-ADD_THIS_TRANSLATOR(Span_bar_engraver);
-
-
-
+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 */       "");