X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ffootnote-engraver.cc;h=efa7900b00d5f570130f0dd279278c435e0b138a;hb=66f9cbcfe348419cf09597f0f00c748e8849a6b9;hp=89cecc3a0080b2fc48b1fa8f1b7dacafe6f88c32;hpb=66336e13517363e4603368d42fae23227a760ab4;p=lilypond.git

diff --git a/lily/footnote-engraver.cc b/lily/footnote-engraver.cc
index 89cecc3a00..efa7900b00 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 Mike Solomon <mike@apollinemike.com>
+  Copyright (C) 2011--2012 Mike Solomon <mike@apollinemike.com>
 
   LilyPond is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -19,7 +19,9 @@
 
 #include "engraver.hh"
 
+#include "music.hh"
 #include "stream-event.hh"
+#include "international.hh"
 #include "item.hh"
 #include "pointer-group-interface.hh"
 #include "spanner.hh"
@@ -39,8 +41,9 @@ class Footnote_engraver : public Engraver
 
   void stop_translation_timestep ();
   void finalize ();
+  virtual void derived_mark () const;
 
-  void footnotify (Grob *, Stream_event *);
+  void footnotify (Grob *, SCM);
 };
 
 IMPLEMENT_TRANSLATOR_LISTENER (Footnote_engraver, footnote);
@@ -59,7 +62,14 @@ Footnote_engraver::stop_translation_timestep ()
 void
 Footnote_engraver::finalize ()
 {
-  annotated_spanners_.resize (0);
+  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 ()
@@ -67,13 +77,13 @@ Footnote_engraver::Footnote_engraver ()
 }
 
 void
-Footnote_engraver::footnotify (Grob *g, Stream_event *event)
+Footnote_engraver::footnotify (Grob *g, SCM cause)
 {
   Spanner *s = dynamic_cast<Spanner *>(g);
 
   if (s)
     {
-      Spanner *b = make_spanner ("FootnoteSpanner", event->self_scm ());
+      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"));
@@ -82,7 +92,7 @@ Footnote_engraver::footnotify (Grob *g, Stream_event *event)
     }
   else
     {
-      Grob *b = make_item ("FootnoteItem", event->self_scm ());
+      Grob *b = make_item ("FootnoteItem", cause);
       b->set_parent (g, Y_AXIS);
       b->set_parent (g, X_AXIS);
     }
@@ -91,20 +101,38 @@ Footnote_engraver::footnotify (Grob *g, Stream_event *event)
 void
 Footnote_engraver::acknowledge_grob (Grob_info info)
 {
-  Stream_event *cause = info.event_cause ();
+  Music *mus = unsmob_music (info.grob ()->get_property ("footnote-music"));
 
-  SCM arts = cause ? cause->get_property ("articulations") : SCM_EOL;
-  for (SCM s = arts; scm_is_pair (s); s = scm_cdr (s))
+  if (mus)
     {
-      Stream_event *e = unsmob_stream_event (scm_car (s));
-      if (e->in_event_class ("footnote-event"))
-        footnotify (info.grob (), e);
+      if (!mus->is_mus_type ("footnote-event"))
+        {
+          mus->origin ()->programming_error (_ ("Must be footnote-event."));
+          return;
+        }
+
+      footnotify (info.grob (), mus->to_event (context ())->unprotect ());
+
+      // This grob has exhausted its footnote
+      info.grob ()->set_property ("footnote-music", SCM_EOL);
+      return;
     }
 
-  for (vsize i = 0; i < events_.size (); i++)
+  if (!events_.empty ())
     {
-      if (info.grob ()->name () == ly_symbol2string (events_[i]->get_property ("symbol")))
-        footnotify (info.grob (), events_[i]);
+      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);
+            }
+        }
     }
 }