X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fspan-bar-engraver.cc;h=64f845551334bce03dc71c7745997894abf27d58;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=10d2c345a853de9d7f374b92fc8883ca15c117d8;hpb=28d97df78de5e56962730b42119c2d9b73401fa7;p=lilypond.git

diff --git a/lily/span-bar-engraver.cc b/lily/span-bar-engraver.cc
index 10d2c345a8..64f8455513 100644
--- a/lily/span-bar-engraver.cc
+++ b/lily/span-bar-engraver.cc
@@ -1,100 +1,91 @@
 /*
-  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--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
-#include "dimension-cache.hh"
-#include "lily-guile.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
-  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.
-
-  */
+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
 {
-  Span_bar * spanbar_p_;
-  Link_array<Bar> bar_l_arr_;
+  Item *spanbar_;
+  vector<Item*> bars_;
 
 public:
-  VIRTUAL_COPY_CONS(Translator);
-  Span_bar_engraver();
+  TRANSLATOR_DECLARATIONS (Span_bar_engraver);
 protected:
-  virtual void acknowledge_element (Score_element_info);
-  virtual void do_pre_move_processing();
-  virtual Span_bar* get_span_bar_p() const;
+  DECLARE_ACKNOWLEDGER (bar_line);
+  void stop_translation_timestep ();
 };
 
-
-Span_bar_engraver::Span_bar_engraver()
-{
-  spanbar_p_ =0;
-}
-
-Span_bar*
-Span_bar_engraver::get_span_bar_p() const
+Span_bar_engraver::Span_bar_engraver ()
 {
-  return new Span_bar;
+  spanbar_ = 0;
 }
 
-
 void
-Span_bar_engraver::acknowledge_element (Score_element_info i)
+Span_bar_engraver::acknowledge_bar_line (Grob_info i)
 {
-  int depth = i.origin_trans_l_arr (this).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_));
+      Item *it = dynamic_cast<Item *> (i.grob ());
+      bars_.push_back (it);
 
-      if (bar_l_arr_.size() >= 2 && !spanbar_p_) 
+      if (bars_.size () >= 2 && !spanbar_)
 	{
-	  spanbar_p_ = get_span_bar_p();
-	  spanbar_p_->set_parent (bar_l_arr_[0], Y_AXIS);
-	  spanbar_p_->set_parent (bar_l_arr_[0], X_AXIS);
-
-	  /*
-	    UGH. UGH UUHGK GUHG G
-	   */
-	  String visnam =  String(name()) + "-visibility";
-
-	  spanbar_p_->set_elt_property ("visibility-lambda",
-					scm_eval (ly_symbol2scm (visnam.ch_C())));
-
-	  spanbar_p_->set_parent (bar_l_arr_[0], X_AXIS);
-	  announce_element (Score_element_info (spanbar_p_,0));
-	  if (!gh_string_p (spanbar_p_->get_elt_property ("glyph")))
-	    spanbar_p_-> set_elt_property ("glyph",
-					   bar_l_arr_[0]->get_elt_property ("glyph"));
+	  spanbar_ = make_item ("SpanBar", SCM_EOL);
+
+	  spanbar_->set_parent (bars_[0], X_AXIS);
 	}
     }
 }
 
 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]);
-      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_ACKNOWLEDGER (Span_bar_engraver, bar_line);
+ADD_TRANSLATOR (Span_bar_engraver,
+		/* doc */
+		"Make cross-staff bar lines: It catches all normal bar lines"
+		" and draws a single span bar across them.",
 
-ADD_THIS_TRANSLATOR(Span_bar_engraver);
-
+		/* create */
+		"SpanBar ",
 
+		/* read */
+		"",
 
+		/* write */
+		""
+		);