X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fspan-bar-engraver.cc;h=5fbd94f25498da4b713dd5311766099d14527d3a;hb=0e0a18dbaa12275d0a07b76104243a15da821a15;hp=b77fb1bf1e15b66e476ef8496e11ce1af72ac1a4;hpb=2fd5f86de0500ecd9a3f47a2540c3b304f835ef4;p=lilypond.git

diff --git a/lily/span-bar-engraver.cc b/lily/span-bar-engraver.cc
index b77fb1bf1e..5fbd94f254 100644
--- a/lily/span-bar-engraver.cc
+++ b/lily/span-bar-engraver.cc
@@ -1,23 +1,94 @@
 /*
-  span-bar-engraver.cc -- implement Span_bar_engraver
+  span-bar-grav.cc -- implement Span_bar_engraver
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
-#include "base-span-bar-engraver.hh"
 
-class Span_bar_engraver : public Base_span_bar_engraver
+#include "lily-guile.hh"
+#include "bar.hh"
+#include "item.hh"
+#include "span-bar.hh"
+#include "engraver.hh"
+
+
+/** 
+
+  Make bars that span multiple "staffs". 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
+  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_;
+
 public:
-  Span_bar_engraver ();
-  VIRTUAL_COPY_CONS (Translator);
+  VIRTUAL_COPY_CONS(Translator);
+  Span_bar_engraver();
+protected:
+  virtual void acknowledge_element (Score_element_info);
+  virtual void do_pre_move_processing();
+
 };
 
-ADD_THIS_TRANSLATOR (Span_bar_engraver);
 
-Span_bar_engraver::Span_bar_engraver ()
+Span_bar_engraver::Span_bar_engraver()
 {
-  use_priority_b_ = false;
+  spanbar_p_ =0;
 }
+
+
+
+void
+Span_bar_engraver::acknowledge_element (Score_element_info i)
+{
+  int depth = i.origin_trans_l_arr (this).size();
+  if (depth > 1
+      && Bar::has_interface (i.elem_l_))
+    {
+      Item * it = dynamic_cast<Item*>(i.elem_l_);
+      bar_l_arr_.push (it);
+
+      if (bar_l_arr_.size() >= 2 && !spanbar_p_) 
+	{
+	  spanbar_p_ = new Item (get_property ("basicSpanBarProperties"));
+	  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);
+
+	  announce_element (spanbar_p_,0);
+	}
+    }
+}
+void
+Span_bar_engraver::do_pre_move_processing()
+{
+  if (spanbar_p_) 
+    {
+      for (int i=0; i < bar_l_arr_.size() ; i++)
+	Span_bar::add_bar( spanbar_p_,bar_l_arr_[i]);
+
+      SCM vissym =ly_symbol2scm ("visibility-lambda");
+      SCM vis = bar_l_arr_[0]->get_elt_property (vissym);	  
+      if (scm_equal_p (spanbar_p_->get_elt_property (vissym), vis) != SCM_BOOL_T)
+	spanbar_p_->set_elt_property (vissym, vis);
+
+      typeset_element (spanbar_p_);
+      spanbar_p_ =0;
+    }
+  bar_l_arr_.set_size (0);
+}
+
+
+
+ADD_THIS_TRANSLATOR(Span_bar_engraver);
+
+
+