X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ffigured-bass-position-engraver.cc;h=b35d037a35fb0ca8442a3fc3ad90db2b264e4e53;hb=97a0169312a260933246ab224e4f8b0969871dd5;hp=a9d0a89dc04a932d672f8ba02742db860447640d;hpb=89b7e75f6888d2020f7fe8b258e818c0c5e7a223;p=lilypond.git

diff --git a/lily/figured-bass-position-engraver.cc b/lily/figured-bass-position-engraver.cc
index a9d0a89dc0..b35d037a35 100644
--- a/lily/figured-bass-position-engraver.cc
+++ b/lily/figured-bass-position-engraver.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 2005--2012 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 2005--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
 
   LilyPond is free software: you can redistribute it and/or modify
@@ -36,12 +36,12 @@ class Figured_bass_position_engraver : public Engraver
   vector<Grob *> support_;
   vector<Grob *> span_support_;
 protected:
-  DECLARE_ACKNOWLEDGER (note_column);
-  DECLARE_ACKNOWLEDGER (slur);
-  DECLARE_END_ACKNOWLEDGER (slur);
-  DECLARE_END_ACKNOWLEDGER (tie);
-  DECLARE_ACKNOWLEDGER (bass_figure_alignment);
-  DECLARE_END_ACKNOWLEDGER (bass_figure_alignment);
+  void acknowledge_note_column (Grob_info);
+  void acknowledge_slur (Grob_info);
+  void acknowledge_end_slur (Grob_info);
+  void acknowledge_end_tie (Grob_info);
+  void acknowledge_bass_figure_alignment (Grob_info);
+  void acknowledge_end_bass_figure_alignment (Grob_info);
 
   virtual void finalize ();
   void start_spanner ();
@@ -49,7 +49,8 @@ protected:
   void stop_translation_timestep ();
 };
 
-Figured_bass_position_engraver::Figured_bass_position_engraver ()
+Figured_bass_position_engraver::Figured_bass_position_engraver (Context *c)
+  : Engraver (c)
 {
   positioner_ = 0;
   bass_figure_alignment_ = 0;
@@ -102,8 +103,7 @@ Figured_bass_position_engraver::acknowledge_end_slur (Grob_info info)
 void
 Figured_bass_position_engraver::acknowledge_slur (Grob_info info)
 {
-  if (!info.grob ()->internal_has_interface (ly_symbol2scm ("cross-staff-stub-interface")))
-    span_support_.push_back (info.grob ());
+  span_support_.push_back (info.grob ());
 }
 
 void
@@ -139,13 +139,18 @@ Figured_bass_position_engraver::acknowledge_bass_figure_alignment (Grob_info inf
   start_spanner ();
 }
 
-ADD_ACKNOWLEDGER (Figured_bass_position_engraver, note_column);
-ADD_ACKNOWLEDGER (Figured_bass_position_engraver, slur);
-ADD_END_ACKNOWLEDGER (Figured_bass_position_engraver, slur);
 
-ADD_END_ACKNOWLEDGER (Figured_bass_position_engraver, tie);
-ADD_ACKNOWLEDGER (Figured_bass_position_engraver, bass_figure_alignment);
-ADD_END_ACKNOWLEDGER (Figured_bass_position_engraver, bass_figure_alignment);
+
+void
+Figured_bass_position_engraver::boot ()
+{
+  ADD_ACKNOWLEDGER (Figured_bass_position_engraver, note_column);
+  ADD_ACKNOWLEDGER (Figured_bass_position_engraver, slur);
+  ADD_END_ACKNOWLEDGER (Figured_bass_position_engraver, slur);
+  ADD_END_ACKNOWLEDGER (Figured_bass_position_engraver, tie);
+  ADD_ACKNOWLEDGER (Figured_bass_position_engraver, bass_figure_alignment);
+  ADD_END_ACKNOWLEDGER (Figured_bass_position_engraver, bass_figure_alignment);
+}
 
 ADD_TRANSLATOR (Figured_bass_position_engraver,
                 /* doc */