X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fspan-bar-engraver.cc;h=15e7234259b7794f07d347cf29c847042faefd5e;hb=829caefcc215ddffe25806d0ff87bcc577c3286e;hp=135d978c15864841a09858bdaa4441a38485d1fa;hpb=bb36bac02a64770871780231ecc709cb18b20932;p=lilypond.git

diff --git a/lily/span-bar-engraver.cc b/lily/span-bar-engraver.cc
index 135d978c15..15e7234259 100644
--- a/lily/span-bar-engraver.cc
+++ b/lily/span-bar-engraver.cc
@@ -1,17 +1,89 @@
-#include "base-span-bar-engraver.hh"
+/*
+  span-bar-grav.cc -- implement Span_bar_engraver
 
+  source file of the GNU LilyPond music typesetter
 
-class Span_bar_engraver : public Base_span_bar_engraver
+  (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.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.
+
+  */
+class Span_bar_engraver : public Engraver
 {
+  Item *spanbar_;
+  Link_array<Item> bars_;
+
 public:
-  Span_bar_engraver ();
-  VIRTUAL_COPY_CONS (Translator);
+  TRANSLATOR_DECLARATIONS (Span_bar_engraver);
+protected:
+  virtual void acknowledge_grob (Grob_info);
+  virtual void stop_translation_timestep ();
 };
 
-
 Span_bar_engraver::Span_bar_engraver ()
 {
-  use_priority_b_ = false;
+  spanbar_ =0;
 }
 
-ADD_THIS_TRANSLATOR(Span_bar_engraver);
+void
+Span_bar_engraver::acknowledge_grob (Grob_info i)
+{
+  int depth = i.origin_contexts (this).size ();
+  if (depth && Bar_line::has_interface (i.grob_))
+    {
+      Item * it = dynamic_cast<Item*> (i.grob_);
+      bars_.push (it);
+
+      if (bars_.size () >= 2 && !spanbar_) 
+	{
+	  spanbar_ = make_item ("SpanBar");
+
+	  spanbar_->set_parent (bars_[0], X_AXIS);
+	  announce_grob (spanbar_, SCM_EOL);
+	}
+    }
+}
+
+void
+Span_bar_engraver::stop_translation_timestep ()
+{
+  if (spanbar_) 
+    {
+      for (int 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 (gh_equal_p (spanbar_->internal_get_property (vissym), vis))
+	spanbar_->internal_set_property (vissym, vis);
+
+      typeset_grob (spanbar_);
+      spanbar_ =0;
+    }
+  bars_.set_size (0);
+}
+
+
+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",
+/* accepts */     "",
+/* acks  */      "bar-line-interface",
+/* reads */       "",
+/* write */       "");