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

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

diff --git a/lily/text-spanner-engraver.cc b/lily/text-spanner-engraver.cc
index b7628c325c29fef4d5ec88aab8d164500a85278c..28f88fd76ffee3f2c35d16f640b5c7ff840d78ca 100644 (file)
--- a/lily/text-spanner-engraver.cc
+++ b/lily/text-spanner-engraver.cc
@@ -11,6 +11,7 @@
 #include "international.hh"
 #include "note-column.hh"
 #include "side-position-interface.hh"
+#include "spanner.hh"
 #include "stream-event.hh"
 
 #include "translator.icc"
@@ -48,7 +49,7 @@ void
 Text_spanner_engraver::listen_text_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
@@ -90,7 +91,7 @@ Text_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 ());
        }
     }
 }
@@ -137,8 +138,7 @@ Text_spanner_engraver::finalize ()
 
 ADD_ACKNOWLEDGER (Text_spanner_engraver, note_column);
 ADD_TRANSLATOR (Text_spanner_engraver,
-               /* doc */ "Create text spanner from a Music.",
+               /* doc */ "Create text spanner from an event.",
                /* create */ "TextSpanner",
-               /* accept */ "text-span-event",
                /* read */ "",
                /* write */ "");