* scm/output-ps.scm (new-text): don't access t glyph for getting

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

diff --git a/lily/extender-engraver.cc b/lily/extender-engraver.cc
index 7f7b11b35bafcbd2476228bbb356a28b0d5690bd..d163ac64864bf527350067d0efac182bcb8eea6b 100644 (file)
--- a/lily/extender-engraver.cc
+++ b/lily/extender-engraver.cc
@@ -16,6 +16,8 @@
 #include "note-head.hh"
 #include "warn.hh"
 
+void completize_extender (Spanner *sp);
+
 class Extender_engraver : public Engraver
 {
   Music *ev_;
@@ -71,36 +73,38 @@ Extender_engraver::acknowledge_grob (Grob_info i)
        extender_->set_bound (LEFT, item);
 
       if (pending_extender_)
-       pending_extender_->set_bound (RIGHT, item);
+       {
+         pending_extender_->set_property ("next", item->self_scm ());
+         completize_extender (pending_extender_);
+         pending_extender_ = 0;
+       }
     }
 }
 
 void
 Extender_engraver::stop_translation_timestep ()
 {
-  if (pending_extender_ && pending_extender_->get_bound (RIGHT))
-    pending_extender_ = 0;
-
   if (extender_ || pending_extender_)
     {
       Context *voice = get_voice_to_lyrics (context ());
       Grob *h = voice ? get_current_note_head (voice) : 0;
-      Grob *r = voice ? get_current_rest (voice) : 0;
 
       if (h)
        {
          if (extender_)
-           Pointer_group_interface::add_grob (extender_,
-                                              ly_symbol2scm ("heads"), h);
+           {
+             Pointer_group_interface::add_grob (extender_,
+                                                ly_symbol2scm ("heads"), h);
+           }
+         
          if (pending_extender_)
-           Pointer_group_interface::add_grob (pending_extender_,
-                                              ly_symbol2scm ("heads"), h);
+           {
+             Pointer_group_interface::add_grob (pending_extender_,
+                                                ly_symbol2scm ("heads"), h);
+           }
        }
-      else if (r && pending_extender_)
-       /* Rest: stop right here. */
-       pending_extender_->set_bound (RIGHT, h);
- 
-      if (extender_ && !r)
+      
+      if (extender_)
        {
          pending_extender_ = extender_;
          extender_ = 0;
@@ -116,9 +120,9 @@ completize_extender (Spanner *sp)
   if (!sp->get_bound (RIGHT))
     {
       SCM heads = sp->get_property ("heads");
-      if (ly_c_pair_p (heads))
+      if (scm_is_pair (heads))
        {
-         Item *it = dynamic_cast<Item*> (unsmob_grob (ly_car (heads)));
+         Item *it = dynamic_cast<Item*> (unsmob_grob (scm_car (heads)));
          if (it)
            sp->set_bound (RIGHT, it);
        }
@@ -143,12 +147,12 @@ Extender_engraver::finalize ()
 
       if (!pending_extender_->get_bound (RIGHT))
        pending_extender_->warning (_ ("unterminated extender"));
-      pending_extender_ =0;
+      pending_extender_ = 0;
     }
 }
 
 
-ENTER_DESCRIPTION (Extender_engraver,
+ADD_TRANSLATOR (Extender_engraver,
 /* descr */       "Create lyric extenders",
 /* creats*/       "LyricExtender",
 /* accepts */     "extender-event",