Merge branch 'jneeman' of git+ssh://jneem@git.sv.gnu.org/srv/git/lilypond into jneeman

[lilypond.git] / lily / trill-spanner-engraver.cc

diff --git a/lily/trill-spanner-engraver.cc b/lily/trill-spanner-engraver.cc
index 54d3daa96b71eaac338d61630463343dbc515c86..3f07d5b5accd769f76a4b30e58026f7f17a1feb2 100644 (file)
--- a/lily/trill-spanner-engraver.cc
+++ b/lily/trill-spanner-engraver.cc
@@ -19,6 +19,7 @@
 #include "note-column.hh"
 #include "side-position-interface.hh"
 #include "stream-event.hh"
+#include "spanner.hh"
 
 #include "translator.icc"
 
@@ -55,7 +56,7 @@ void
 Trill_spanner_engraver::listen_trill_span (Stream_event *ev)
 {
   Direction d = to_dir (ev->get_property ("span-direction"));
-  event_drul_[d] = ev;
+  ASSIGN_EVENT_ONCE (event_drul_[d], ev);
 }
 
 void
@@ -96,7 +97,7 @@ Trill_spanner_engraver::acknowledge_note_column (Grob_info info)
       if (spans[i])
        {
          Side_position_interface::add_support (spans[i], info.grob ());
-         add_bound_item (spans[i], dynamic_cast<Item *> (info.grob ()));
+         add_bound_item (spans[i], info.grob ());
        }
     }
 }
@@ -142,8 +143,7 @@ Trill_spanner_engraver::finalize ()
 
 ADD_ACKNOWLEDGER (Trill_spanner_engraver, note_column);
 ADD_TRANSLATOR (Trill_spanner_engraver,
-               /* doc */ "Create trill spanner from a Music.",
+               /* doc */ "Create trill spanner from an event.",
                /* create */ "TrillSpanner",
-               /* accept */ "trill-span-event",
                /* read */ "",
                /* write */ "");