X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fspan-bar-engraver.cc;h=a1618a27567b863b6f65d4bfc73a02bc41ea25f0;hb=62f3c5d4ddb492bc771f2d25b971cd3c9f38676d;hp=0e1e00841faa12bd8b3f890f2e5add9b2b915034;hpb=afa5829cd270e1b0c616b7ba5c5e6cdc0e920e5f;p=lilypond.git

diff --git a/lily/span-bar-engraver.cc b/lily/span-bar-engraver.cc
index 0e1e00841f..a1618a2756 100644
--- a/lily/span-bar-engraver.cc
+++ b/lily/span-bar-engraver.cc
@@ -1,88 +1,83 @@
 /*
-  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--1998 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
+#include "bar-line.hh"
+#include "item.hh"
 #include "span-bar.hh"
-#include "span-bar-engraver.hh"
-#include "vertical-align-spanner.hh"
+#include "engraver.hh"
 
-Span_bar_engraver::Span_bar_engraver()
-{
-  spanbar_p_ =0;
-  valign_l_ =0;
-}
+/**
 
-Span_bar*
-Span_bar_engraver::get_span_bar_p() const
+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
 {
-  return new Span_bar;
-}
+  Item *spanbar_;
+  vector<Item*> bars_;
 
+public:
+  TRANSLATOR_DECLARATIONS (Span_bar_engraver);
+protected:
+  DECLARE_ACKNOWLEDGER (bar_line);
+  void stop_translation_timestep ();
+};
 
-void
-Span_bar_engraver::do_creation_processing ()
+Span_bar_engraver::Span_bar_engraver ()
 {
+  spanbar_ = 0;
 }
 
 void
-Span_bar_engraver::do_removal_processing ()
+Span_bar_engraver::acknowledge_bar_line (Grob_info i)
 {
-}    
-
-void
-Span_bar_engraver::acknowledge_element (Score_element_info i)
-{
-  int depth = i.origin_grav_l_arr_.size();
-  if (depth > 1
-      && dynamic_cast<Bar *> (i.elem_l_)) 
+  int depth = i.origin_contexts (this).size ();
+  if (depth && Bar_line::has_interface (i.grob ()))
     {
-      bar_l_arr_.push (dynamic_cast<Bar *> (i.elem_l_));
-	
-      if (bar_l_arr_.size() >= 2 && !spanbar_p_) 
-	/*
-	  hmm, i do want a bracket with one staff some times, but not always
-	  if (bar_l_arr_.size() >= 1 && !spanbar_p_)
-
-	  --jcn
-	*/
+      Item *it = dynamic_cast<Item *> (i.grob ());
+      bars_.push_back (it);
 
-	/*
-
-	  use a property?  get_property ("singleStaffBracket", 0) ?
-
-	  --hwn
-	 */
+      if (bars_.size () >= 2 && !spanbar_)
 	{
-	  spanbar_p_ = get_span_bar_p();
-	  announce_element (Score_element_info (spanbar_p_,0));
-	  spanbar_p_-> type_str_ = bar_l_arr_[0]->type_str_;
+	  spanbar_ = make_item ("SpanBar", SCM_EOL);
+
+	  spanbar_->set_parent (bars_[0], X_AXIS);
 	}
     }
-  else if  (dynamic_cast<Vertical_align_spanner *> (i.elem_l_) 
-	    && i.origin_grav_l_arr_.size() <= 2) 
-    {
-      valign_l_ = dynamic_cast<Vertical_align_spanner *> (i.elem_l_);
-    }
 }
 
 void
-Span_bar_engraver::do_pre_move_processing()
+Span_bar_engraver::stop_translation_timestep ()
 {
-  if (spanbar_p_) 
+  if (spanbar_)
     {
-      for (int i=0; i < bar_l_arr_.size() ; i++)
-	spanbar_p_->add_bar (bar_l_arr_[i]);
-      spanbar_p_->set_align (valign_l_);
-      typeset_element (spanbar_p_);
-      spanbar_p_ =0;
+      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_is_equal (spanbar_->internal_get_property (vissym), vis))
+	spanbar_->set_property (vissym, vis);
+
+      spanbar_ = 0;
     }
-  bar_l_arr_.set_size (0);
+  bars_.resize (0);
 }
 
+#include "translator.icc"
 
-
-ADD_THIS_TRANSLATOR(Span_bar_engraver);
+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 */ "");