release: 1.3.94

[lilypond.git] / lily / extender-engraver.cc

diff --git a/lily/extender-engraver.cc b/lily/extender-engraver.cc
index 6e9f20a8727bbe8f62c6460ea76cb3b8a4e20701..5c893207eedcbd211b994948454bd97d6e63dd04 100644 (file)
--- a/lily/extender-engraver.cc
+++ b/lily/extender-engraver.cc
@@ -6,7 +6,7 @@
   
 */
 
-#include "proto.hh"
+#include "flower-proto.hh"
 #include "musical-request.hh"
 #include "lyric-extender.hh"
 #include "paper-column.hh"
@@ -62,8 +62,8 @@ void
 Extender_engraver::acknowledge_element (Score_element_info i)
 {
   // -> text_item
-  if (dynamic_cast<Item*> (i.elem_l_)
-      && to_boolean (i.elem_l_->get_elt_property ("text-item-interface")))
+  if (i.elem_l_->has_interface (ly_symbol2scm("text-item-interface")))
+
     {
       current_lyric_l_ = i.elem_l_;
       if (extender_p_
@@ -95,7 +95,7 @@ Extender_engraver::do_removal_processing ()
 {
   if (extender_p_)
     {
-      req_l_->warning (_ ("unterminated extender"));
+      req_l_->origin ()->warning (_ ("unterminated extender"));
       extender_p_->set_bound(RIGHT, unsmob_element (get_property ("currentCommandColumn")));
     }
 }
@@ -107,15 +107,15 @@ Extender_engraver::do_process_music ()
     {
       if (!last_lyric_l_)
        {
-         req_l_->warning (_ ("Nothing to connect extender to on the left.  Ignoring extender request."));
+         req_l_->origin ()->warning (_ ("Nothing to connect extender to on the left.  Ignoring extender request."));
          return;
        }
       
-      extender_p_ = new Spanner (get_property ("basicLyricExtenderProperties"));
-      extender_p_->set_extent_callback (Score_element::point_dimension_callback, Y_AXIS);
+      extender_p_ = new Spanner (get_property ("LyricExtender"));
+
 
       Lyric_extender (extender_p_).set_textitem  (LEFT, last_lyric_l_);
-      announce_element (Score_element_info (extender_p_, req_l_));
+      announce_element (extender_p_, req_l_);
     }
 }