X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ffootnote-engraver.cc;h=3b04ceae18c098b0a57befe82f8e548ae559a6aa;hb=47db9a3883d726ca53e2133a3b2298f78dd6a32e;hp=efa7900b00d5f570130f0dd279278c435e0b138a;hpb=522f419e3ed3e09ecf834bbb5315ac1777ab13e0;p=lilypond.git

diff --git a/lily/footnote-engraver.cc b/lily/footnote-engraver.cc
index efa7900b00..3b04ceae18 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--2012 Mike Solomon <mike@apollinemike.com>
+  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,45 +33,22 @@ class Footnote_engraver : public Engraver
 {
   TRANSLATOR_DECLARATIONS (Footnote_engraver);
 
-  DECLARE_TRANSLATOR_LISTENER (footnote);
   DECLARE_ACKNOWLEDGER (grob);
   DECLARE_END_ACKNOWLEDGER (grob);
-  vector<Stream_event *> events_;
+
   vector<Drul_array<Spanner *> > annotated_spanners_;
 
-  void stop_translation_timestep ();
   void finalize ();
-  virtual void derived_mark () const;
 
   void footnotify (Grob *, SCM);
 };
 
-IMPLEMENT_TRANSLATOR_LISTENER (Footnote_engraver, footnote);
-void
-Footnote_engraver::listen_footnote (Stream_event *ev)
-{
-  events_.push_back (ev);
-}
-
-void
-Footnote_engraver::stop_translation_timestep ()
-{
-  events_.clear ();
-}
-
 void
 Footnote_engraver::finalize ()
 {
   annotated_spanners_.clear ();
 }
 
-void
-Footnote_engraver::derived_mark () const
-{
-  for (vsize i = 0; i < events_.size (); ++i)
-    scm_gc_mark (events_[i]->self_scm ());
-}
-
 Footnote_engraver::Footnote_engraver ()
 {
 }
@@ -86,7 +63,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 = unsmob_grob (get_property ("currentMusicalColumn"));
+      Grob *bound = Grob::unsmob (get_property ("currentMusicalColumn"));
       b->set_bound (LEFT, bound);
       annotated_spanners_.push_back (Drul_array<Spanner *> (s, b));
     }
@@ -101,7 +78,7 @@ Footnote_engraver::footnotify (Grob *g, SCM cause)
 void
 Footnote_engraver::acknowledge_grob (Grob_info info)
 {
-  Music *mus = unsmob_music (info.grob ()->get_property ("footnote-music"));
+  Music *mus = Music::unsmob (info.grob ()->get_property ("footnote-music"));
 
   if (mus)
     {
@@ -111,28 +88,12 @@ Footnote_engraver::acknowledge_grob (Grob_info info)
           return;
         }
 
-      footnotify (info.grob (), mus->to_event (context ())->unprotect ());
+      footnotify (info.grob (), mus->to_event ()->unprotect ());
 
       // This grob has exhausted its footnote
       info.grob ()->set_property ("footnote-music", SCM_EOL);
-      return;
-    }
 
-  if (!events_.empty ())
-    {
-      string grobname = info.grob ()->name ();
-
-      for (vsize i = 0; i < events_.size (); i++)
-        {
-          SCM name = events_[i]->get_property ("symbol");
-          if (scm_is_symbol (name)
-              && grobname == ly_symbol2string (name))
-            {
-              footnotify (info.grob (), events_[i]->self_scm ());
-              // Event has exhausted its footnote
-              events_[i]->set_property ("symbol", SCM_EOL);
-            }
-        }
+      return;
     }
 }
 
@@ -146,7 +107,7 @@ Footnote_engraver::acknowledge_end_grob (Grob_info info)
       {
         if (annotated_spanners_[i][LEFT] == s)
           {
-            Grob *bound = unsmob_grob (get_property ("currentMusicalColumn"));
+            Grob *bound = Grob::unsmob (get_property ("currentMusicalColumn"));
             annotated_spanners_[i][RIGHT]->set_bound (RIGHT, bound);
             break;
           }