X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fspan-bar-engraver.cc;h=732c206f3c0dc0a404f34916a68f95c9df6eec52;hb=47db9a3883d726ca53e2133a3b2298f78dd6a32e;hp=bf82ac636fce0e1ff60d54aa7c8e8695cebca00b;hpb=d61cf3bbdb1c6670a127ba3baddf2f04d3e34fd3;p=lilypond.git

diff --git a/lily/span-bar-engraver.cc b/lily/span-bar-engraver.cc
index bf82ac636f..732c206f3c 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--2012 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,9 @@
   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"
 
 /**
 
@@ -54,7 +53,7 @@ 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);
@@ -69,14 +68,11 @@ Span_bar_engraver::process_acknowledged ()
 {
   if (make_spanbar_)
     {
-      Grob *vag = Grob::get_root_vertical_alignment (bars_[0]);
-      if (vag)
-        vector_sort (bars_, Grob::pure_vertical_less);
       spanbar_ = make_item ("SpanBar", SCM_EOL);
 
       spanbar_->set_parent (bars_[0], X_AXIS);
       for (vsize i = 0; i < bars_.size (); i++)
-        Span_bar::add_bar (spanbar_, bars_[i]);
+        Pointer_group_interface::add_grob (spanbar_, ly_symbol2scm ("elements"), bars_[i]);
       make_spanbar_ = false;
     }
 }
@@ -86,11 +82,10 @@ Span_bar_engraver::stop_translation_timestep ()
 {
   if (spanbar_)
     {
-      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);
-      Span_bar::notify_grobs_of_my_existence (spanbar_);
+      SCM vis = bars_[0]->get_property ("break-visibility");
+      if (ly_is_equal (spanbar_->get_property ("break-visibility"), vis))
+        spanbar_->set_property ("break-visibility", vis);
+      scm_call_1 (ly_lily_module_constant ("span-bar::notify-grobs-of-my-existence"), spanbar_->self_scm ());
       spanbar_ = 0;
     }
   bars_.resize (0);