X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ffootnote-engraver.cc;h=ea5c4781b55532da20566082a7e6b2dc5b386349;hb=b872748c6aa8bb721ced458691b38ac2fac5dfc8;hp=4cac19447841dabcd493dfa6c7044982199d299c;hpb=9066eeede909ace56324c905217c5b585ba42f90;p=lilypond.git

diff --git a/lily/footnote-engraver.cc b/lily/footnote-engraver.cc
index 4cac194478..ea5c4781b5 100644
--- a/lily/footnote-engraver.cc
+++ b/lily/footnote-engraver.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 2011--2014 Mike Solomon <mike@mikesolomon.org>
+  Copyright (C) 2011--2015 Mike Solomon <mike@mikesolomon.org>
 
   LilyPond is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -33,8 +33,8 @@ class Footnote_engraver : public Engraver
 {
   TRANSLATOR_DECLARATIONS (Footnote_engraver);
 
-  DECLARE_ACKNOWLEDGER (grob);
-  DECLARE_END_ACKNOWLEDGER (grob);
+  void acknowledge_grob (Grob_info);
+  void acknowledge_end_grob (Grob_info);
 
   vector<Drul_array<Spanner *> > annotated_spanners_;
 
@@ -49,7 +49,8 @@ Footnote_engraver::finalize ()
   annotated_spanners_.clear ();
 }
 
-Footnote_engraver::Footnote_engraver ()
+Footnote_engraver::Footnote_engraver (Context *c)
+  : Engraver (c)
 {
 }
 
@@ -63,7 +64,7 @@ Footnote_engraver::footnotify (Grob *g, SCM cause)
       Spanner *b = make_spanner ("FootnoteSpanner", cause);
       b->set_parent (s, Y_AXIS);
       b->set_parent (s, X_AXIS);
-      Grob *bound = Grob::unsmob (get_property ("currentMusicalColumn"));
+      Grob *bound = unsmob<Grob> (get_property ("currentMusicalColumn"));
       b->set_bound (LEFT, bound);
       annotated_spanners_.push_back (Drul_array<Spanner *> (s, b));
     }
@@ -78,7 +79,7 @@ Footnote_engraver::footnotify (Grob *g, SCM cause)
 void
 Footnote_engraver::acknowledge_grob (Grob_info info)
 {
-  Music *mus = Music::unsmob (info.grob ()->get_property ("footnote-music"));
+  Music *mus = unsmob<Music> (info.grob ()->get_property ("footnote-music"));
 
   if (mus)
     {
@@ -107,15 +108,20 @@ Footnote_engraver::acknowledge_end_grob (Grob_info info)
       {
         if (annotated_spanners_[i][LEFT] == s)
           {
-            Grob *bound = Grob::unsmob (get_property ("currentMusicalColumn"));
+            Grob *bound = unsmob<Grob> (get_property ("currentMusicalColumn"));
             annotated_spanners_[i][RIGHT]->set_bound (RIGHT, bound);
             break;
           }
       }
 }
 
-ADD_ACKNOWLEDGER (Footnote_engraver, grob);
-ADD_END_ACKNOWLEDGER (Footnote_engraver, grob);
+
+void
+Footnote_engraver::boot ()
+{
+  ADD_ACKNOWLEDGER (Footnote_engraver, grob);
+  ADD_END_ACKNOWLEDGER (Footnote_engraver, grob);
+}
 
 ADD_TRANSLATOR (Footnote_engraver,
                 /* doc */