X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fspan-bar-engraver.cc;h=6b6813868b735e3fb1142997583b307fdfe5b952;hb=e62c1e205cd619afcc43fd8c8a9a2c5a093b508e;hp=3848b84164daa58e39762735a6b7dfe312d3128e;hpb=622b379cd71af8dde94f68135a489b2536309e6f;p=lilypond.git

diff --git a/lily/span-bar-engraver.cc b/lily/span-bar-engraver.cc
index 3848b84164..6b6813868b 100644
--- a/lily/span-bar-engraver.cc
+++ b/lily/span-bar-engraver.cc
@@ -1,19 +1,102 @@
-#include "base-span-bar-engraver.hh"
+/*
+  This file is part of LilyPond, the GNU music typesetter.
 
+  Copyright (C) 1997--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-class Span_bar_engraver : public Base_span_bar_engraver
+  LilyPond is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#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
 {
-protected:
-  Span_bar *get_span_bar_p ();
+  Item *spanbar_;
+  vector<Item*> bars_;
+
 public:
-  Span_bar_engraver ();
-  VIRTUAL_COPY_CONS (Translator);
+  TRANSLATOR_DECLARATIONS (Span_bar_engraver);
+protected:
+  DECLARE_ACKNOWLEDGER (bar_line);
+  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_bar_line (Grob_info i)
+{
+  int depth = i.origin_contexts (this).size ();
+  if (depth && !Span_bar::has_interface (i.grob ()))
+    {
+      Item *it = dynamic_cast<Item *> (i.grob ());
+      bars_.push_back (it);
+
+      if (bars_.size () >= 2 && !spanbar_)
+	{
+	  spanbar_ = make_item ("SpanBar", SCM_EOL);
+
+	  spanbar_->set_parent (bars_[0], X_AXIS);
+	}
+    }
+}
+
+void
+Span_bar_engraver::stop_translation_timestep ()
+{
+  if (spanbar_)
+    {
+      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;
+    }
+  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.",
+
+		/* create */
+		"SpanBar ",
+
+		/* read */
+		"",
+
+		/* write */
+		""
+		);