Run `make grand-replace'.

[lilypond.git] / lily / span-bar-engraver.cc

diff --git a/lily/span-bar-engraver.cc b/lily/span-bar-engraver.cc
index b77fb1bf1e15b66e476ef8496e11ce1af72ac1a4..64f845551334bce03dc71c7745997894abf27d58 100644 (file)
--- a/lily/span-bar-engraver.cc
+++ b/lily/span-bar-engraver.cc
@@ -3,21 +3,89 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
-#include "base-span-bar-engraver.hh"
+#include "bar-line.hh"
+#include "item.hh"
+#include "span-bar.hh"
+#include "engraver.hh"
 
-class Span_bar_engraver : public Base_span_bar_engraver
+/**
+
+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_;
+  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 ();
 };
 
-ADD_THIS_TRANSLATOR (Span_bar_engraver);
-
 Span_bar_engraver::Span_bar_engraver ()
 {
-  use_priority_b_ = false;
+  spanbar_ = 0;
+}
+
+void
+Span_bar_engraver::acknowledge_bar_line (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_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 */
+               ""
+               );