X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fextender-engraver.cc;h=c6998c5dde2c2025b677e250f82cd99d08c7a593;hb=3bdd4c5935a952447667c3b7658dfe0871c3e51c;hp=d4b521af9ccf5362b439b812ac6323e0a7714bb8;hpb=75eebcb49e52d296b1da3e1074e0825d2c780db4;p=lilypond.git

diff --git a/lily/extender-engraver.cc b/lily/extender-engraver.cc
index d4b521af9c..c6998c5dde 100644
--- a/lily/extender-engraver.cc
+++ b/lily/extender-engraver.cc
@@ -10,17 +10,22 @@
 
 #include "context.hh"
 #include "engraver.hh"
-#include "pointer-group-interface.hh"
+#include "international.hh"
 #include "item.hh"
 #include "lyric-extender.hh"
 #include "note-head.hh"
+#include "pointer-group-interface.hh"
+#include "stream-event.hh"
 #include "warn.hh"
+#include "spanner.hh"
+
+#include "translator.icc"
 
 void completize_extender (Spanner *sp);
 
 class Extender_engraver : public Engraver
 {
-  Music *ev_;
+  Stream_event *ev_;
   Spanner *extender_;
   Spanner *pending_extender_;
 
@@ -28,9 +33,9 @@ public:
   TRANSLATOR_DECLARATIONS (Extender_engraver);
 
 protected:
+  DECLARE_TRANSLATOR_LISTENER (extender);
   DECLARE_ACKNOWLEDGER (lyric_syllable);
   virtual void finalize ();
-  virtual bool try_music (Music *);
   void stop_translation_timestep ();
   void process_music ();
 };
@@ -42,15 +47,11 @@ Extender_engraver::Extender_engraver ()
   ev_ = 0;
 }
 
-bool
-Extender_engraver::try_music (Music *r)
+IMPLEMENT_TRANSLATOR_LISTENER (Extender_engraver, extender);
+void
+Extender_engraver::listen_extender (Stream_event *ev)
 {
-  if (!ev_)
-    {
-      ev_ = r;
-      return true;
-    }
-  return false;
+  ASSIGN_EVENT_ONCE (ev_, ev);
 }
 
 void
@@ -97,7 +98,15 @@ Extender_engraver::stop_translation_timestep ()
 						 ly_symbol2scm ("heads"), h);
 	    }
 	}
-
+      else
+	{
+	  if (pending_extender_)
+	    {
+	      completize_extender (pending_extender_);
+	      pending_extender_ = 0;
+	    }
+	  
+	}
       if (extender_)
 	{
 	  pending_extender_ = extender_;
@@ -115,7 +124,7 @@ completize_extender (Spanner *sp)
     {
       extract_item_set (sp, "heads", heads);
       if (heads.size ())
-	sp->set_bound (RIGHT, heads.top ());
+	sp->set_bound (RIGHT, heads.back ());
     }
 }
 
@@ -141,12 +150,9 @@ Extender_engraver::finalize ()
     }
 }
 
-#include "translator.icc"
-
 ADD_ACKNOWLEDGER (Extender_engraver, lyric_syllable);
 ADD_TRANSLATOR (Extender_engraver,
 		/* doc */ "Create lyric extenders",
 		/* create */ "LyricExtender",
-		/* accept */ "extender-event",
 		/* read */ "",
 		/* write */ "");