release: 1.3.94

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

diff --git a/lily/extender-engraver.cc b/lily/extender-engraver.cc
index 8dab340163c7bf2dabbf2b617e3033c5c1e7a120..5c893207eedcbd211b994948454bd97d6e63dd04 100644 (file)
--- a/lily/extender-engraver.cc
+++ b/lily/extender-engraver.cc
@@ -6,14 +6,14 @@
   
 */
 
-#include "proto.hh"
+#include "flower-proto.hh"
 #include "musical-request.hh"
-#include "extender-spanner.hh"
+#include "lyric-extender.hh"
 #include "paper-column.hh"
-#include "text-item.hh"
+#include "item.hh"
 #include "engraver.hh"
 #include "drul-array.hh"
-#include "extender-spanner.hh"
+#include "lyric-extender.hh"
 #include "pqueue.hh"
 
 
@@ -22,16 +22,16 @@
   typesets a nice centred extender of varying length depending on the
   gap between syllables.
 
-  We remember the last Text_item that come across. When we get a
+  We remember the last Item that come across. When we get a
   request, we create the spanner, and attach the left point to the
   last lyrics, and the right point to any lyrics we receive by
   then.  */
 class Extender_engraver : public Engraver
 {
-  Text_item *  last_lyric_l_;
-  Text_item * current_lyric_l_;
+  Score_element *last_lyric_l_;
+  Score_element *current_lyric_l_;
   Extender_req* req_l_;
-  Lyric_extender* extender_spanner_p_;
+  Spanner* extender_p_;
 public:
   Extender_engraver ();
   VIRTUAL_COPY_CONS (Translator);
@@ -54,21 +54,23 @@ Extender_engraver::Extender_engraver ()
 {
   current_lyric_l_ = 0;
   last_lyric_l_ = 0;
-  extender_spanner_p_ = 0;
+  extender_p_ = 0;
   req_l_ = 0;
 }
 
 void
 Extender_engraver::acknowledge_element (Score_element_info i)
 {
-  if (Text_item* t = dynamic_cast<Text_item*> (i.elem_l_))
+  // -> text_item
+  if (i.elem_l_->has_interface (ly_symbol2scm("text-item-interface")))
+
     {
-      current_lyric_l_ = t;
-      if (extender_spanner_p_
-         && !extender_spanner_p_->get_bound (RIGHT)
+      current_lyric_l_ = i.elem_l_;
+      if (extender_p_
+         && !extender_p_->get_bound (RIGHT)
            )
          {
-           extender_spanner_p_->set_textitem (RIGHT, t);
+           Lyric_extender(extender_p_).set_textitem (RIGHT, dynamic_cast<Item*> (i.elem_l_));
          }
     }
 }
@@ -91,10 +93,10 @@ Extender_engraver::do_try_music (Music* r)
 void
 Extender_engraver::do_removal_processing ()
 {
-  if (extender_spanner_p_)
+  if (extender_p_)
     {
-      req_l_->warning (_ ("unterminated extender"));
-      extender_spanner_p_->set_bound(RIGHT, get_staff_info ().command_pcol_l ());
+      req_l_->origin ()->warning (_ ("unterminated extender"));
+      extender_p_->set_bound(RIGHT, unsmob_element (get_property ("currentCommandColumn")));
     }
 }
 
@@ -105,13 +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_spanner_p_ = new Lyric_extender (get_property ("basicLyricExtenderProperties"));
-      extender_spanner_p_->set_textitem  (LEFT, last_lyric_l_);
-      announce_element (Score_element_info (extender_spanner_p_, req_l_));
+      extender_p_ = new Spanner (get_property ("LyricExtender"));
+
+
+      Lyric_extender (extender_p_).set_textitem  (LEFT, last_lyric_l_);
+      announce_element (extender_p_, req_l_);
     }
 }
 
@@ -119,10 +123,10 @@ Extender_engraver::do_process_music ()
 void
 Extender_engraver::do_pre_move_processing ()
 {
-  if (extender_spanner_p_)
+  if (extender_p_)
     {
-      typeset_element (extender_spanner_p_);
-      extender_spanner_p_ = 0;
+      typeset_element (extender_p_);
+      extender_p_ = 0;
     }
 
   if (current_lyric_l_)