X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fspan-bar-engraver.cc;h=55ef59e32e40f656388f06b27f7cdf42a6a03b06;hb=77267b700c377fd170abcbf4863728937038eb5e;hp=5e93de630a41e8fd78200902af3e49c9243f9d88;hpb=058370efc7e9710f149d0f444328bb1fcd7bdec1;p=lilypond.git

diff --git a/lily/span-bar-engraver.cc b/lily/span-bar-engraver.cc
index 5e93de630a..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--2014 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
@@ -20,6 +20,9 @@
 #include "item.hh"
 #include "engraver.hh"
 #include "pointer-group-interface.hh"
+#include "lily-imports.hh"
+
+#include "translator.icc"
 
 /**
 
@@ -38,12 +41,13 @@ class Span_bar_engraver : public Engraver
 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;
@@ -82,19 +86,21 @@ 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);
-      scm_call_1 (ly_lily_module_constant ("span-bar::notify-grobs-of-my-existence"), spanbar_->self_scm ());
+      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"