X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fspan-bar-engraver.cc;h=55ef59e32e40f656388f06b27f7cdf42a6a03b06;hb=4d405ef96a8a62771d7d9a283ff5369a772e89d8;hp=6d145898f382ee63f21e92bdb81797c1e77d6653;hpb=f93e4199873c91ae32f0e84a610d14853dc379df;p=lilypond.git

diff --git a/lily/span-bar-engraver.cc b/lily/span-bar-engraver.cc
index 6d145898f3..55ef59e32e 100644
--- a/lily/span-bar-engraver.cc
+++ b/lily/span-bar-engraver.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 1997--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 1997--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
   LilyPond is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -17,10 +17,12 @@
   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"
+#include "pointer-group-interface.hh"
+#include "lily-imports.hh"
+
+#include "translator.icc"
 
 /**
 
@@ -33,35 +35,49 @@ dependencies to the spanbars.
 class Span_bar_engraver : public Engraver
 {
   Item *spanbar_;
+  bool make_spanbar_;
   vector<Item *> bars_;
 
 public:
   TRANSLATOR_DECLARATIONS (Span_bar_engraver);
 protected:
-  DECLARE_ACKNOWLEDGER (bar_line);
+  void acknowledge_bar_line (Grob_info);
   void stop_translation_timestep ();
+  void process_acknowledged ();
 };
 
-Span_bar_engraver::Span_bar_engraver ()
+Span_bar_engraver::Span_bar_engraver (Context *c)
+  : Engraver (c)
 {
   spanbar_ = 0;
+  make_spanbar_ = false;
 }
 
 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 ()))
+  if (depth && !i.grob ()->internal_has_interface (ly_symbol2scm ("span-bar-interface")))
     {
       Item *it = dynamic_cast<Item *> (i.grob ());
       bars_.push_back (it);
 
       if (bars_.size () >= 2 && !spanbar_)
-        {
-          spanbar_ = make_item ("SpanBar", SCM_EOL);
+        make_spanbar_ = true;
+    }
+}
+
+void
+Span_bar_engraver::process_acknowledged ()
+{
+  if (make_spanbar_)
+    {
+      spanbar_ = make_item ("SpanBar", SCM_EOL);
 
-          spanbar_->set_parent (bars_[0], X_AXIS);
-        }
+      spanbar_->set_parent (bars_[0], X_AXIS);
+      for (vsize i = 0; i < bars_.size (); i++)
+        Pointer_group_interface::add_grob (spanbar_, ly_symbol2scm ("elements"), bars_[i]);
+      make_spanbar_ = false;
     }
 }
 
@@ -70,22 +86,21 @@ 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);
-
+      SCM vis = bars_[0]->get_property ("break-visibility");
+      if (ly_is_equal (spanbar_->get_property ("break-visibility"), vis))
+        spanbar_->set_property ("break-visibility", vis);
+      Lily::span_bar_notify_grobs_of_my_existence (spanbar_->self_scm ());
       spanbar_ = 0;
     }
   bars_.resize (0);
 }
 
-#include "translator.icc"
+void
+Span_bar_engraver::boot ()
+{
+  ADD_ACKNOWLEDGER (Span_bar_engraver, bar_line);
+}
 
-ADD_ACKNOWLEDGER (Span_bar_engraver, bar_line);
 ADD_TRANSLATOR (Span_bar_engraver,
                 /* doc */
                 "Make cross-staff bar lines: It catches all normal bar lines"