* lily/output-def-scheme.cc: new file.

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

diff --git a/lily/text-spanner-engraver.cc b/lily/text-spanner-engraver.cc
index c5fb70991a30a64da1117ef375c7b7e2992fe841..8bd59c74b292e428ba6d92129834f5022e5a3a6e 100644 (file)
--- a/lily/text-spanner-engraver.cc
+++ b/lily/text-spanner-engraver.cc
@@ -7,7 +7,6 @@
 */
 
 #include "note-column.hh"
-#include "item.hh"
 #include "side-position-interface.hh"
 #include "engraver.hh"
 
@@ -35,7 +34,7 @@ Text_spanner_engraver::Text_spanner_engraver ()
 {
   finished_ = 0;
   current_req_ = 0;
-  span_ =0;
+  span_ = 0;
   req_drul_[START] = 0;
   req_drul_[STOP] = 0;
 }
@@ -45,7 +44,6 @@ Text_spanner_engraver::try_music (Music *m)
 {
   if (m->is_mus_type ("text-span-event"))
     {
-
       Direction d = to_dir (m->get_property ("span-direction"));
       req_drul_[d] = m;
       return true;
@@ -61,8 +59,7 @@ Text_spanner_engraver::process_music ()
     {
       if (!span_)
        {
-         req_drul_[STOP]->origin ()->warning
- (_ ("can't find start of text spanner"));
+         req_drul_[STOP]->origin ()->warning (_ ("can't find start of text spanner"));
        }
       else
        {
@@ -81,11 +78,10 @@ Text_spanner_engraver::process_music ()
       else
        {
          current_req_ = req_drul_[START];
-         span_  = make_spanner ("TextSpanner");
+         span_  = make_spanner ("TextSpanner", req_drul_[START]->self_scm ());
 
          
          Side_position_interface::set_axis (span_, Y_AXIS);
-         announce_grob (span_, req_drul_[START]->self_scm ());
          req_drul_[START] = 0;
        }
     }
@@ -115,7 +111,6 @@ Text_spanner_engraver::typeset_all ()
          Grob* e = unsmob_grob (get_property ("currentMusicalColumn"));
          finished_->set_bound (RIGHT, e);
        }
-      typeset_grob (finished_);
       finished_ = 0;
     }
 }
@@ -146,7 +141,7 @@ Text_spanner_engraver::finalize ()
     }
 }
 
-ENTER_DESCRIPTION (Text_spanner_engraver,
+ADD_TRANSLATOR (Text_spanner_engraver,
 /* descr */       "Create text spanner from a Music.",
 /* creats*/       "TextSpanner",
 /* accepts */     "text-span-event",