X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fextender-engraver.cc;h=f3f711de0f84d9efb31664bb04b43f3ce7f8086e;hb=09bf9a18185476020686ff65b5d70b57051be780;hp=c8b4bef0b3546f00f161b94be4fead941362d29b;hpb=c25ee470e74011bda8c19fbc6d52f293cf179355;p=lilypond.git

diff --git a/lily/extender-engraver.cc b/lily/extender-engraver.cc
index c8b4bef0b3..f3f711de0f 100644
--- a/lily/extender-engraver.cc
+++ b/lily/extender-engraver.cc
@@ -2,23 +2,30 @@
   extender-engraver.cc -- implement Extender_engraver
 
   source file of the GNU LilyPond music typesetter
-  
-  (c) 1999--2004 Glen Prideaux <glenprideaux@iname.com>,
-                  Han-Wen Nienhuys <hanwen@cs.uu.nl>,
-                  Jan Nieuwenhuizen <janneke@gnu.org>
+
+  (c) 1999--2009 Glen Prideaux <glenprideaux@iname.com>,
+  Han-Wen Nienhuys <hanwen@xs4all.nl>,
+  Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #include "context.hh"
 #include "engraver.hh"
-#include "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_;
 
@@ -26,13 +33,14 @@ public:
   TRANSLATOR_DECLARATIONS (Extender_engraver);
 
 protected:
-  virtual void acknowledge_grob (Grob_info);
+  DECLARE_TRANSLATOR_LISTENER (extender);
+  DECLARE_ACKNOWLEDGER (lyric_syllable);
+
   virtual void finalize ();
-  virtual bool try_music (Music*);
-  virtual void stop_translation_timestep ();
-  virtual void process_music ();
-};
 
+  void stop_translation_timestep ();
+  void process_music ();
+};
 
 Extender_engraver::Extender_engraver ()
 {
@@ -41,15 +49,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
@@ -60,47 +64,53 @@ Extender_engraver::process_music ()
 }
 
 void
-Extender_engraver::acknowledge_grob (Grob_info i)
+Extender_engraver::acknowledge_lyric_syllable (Grob_info i)
 {
-  Item *item = dynamic_cast<Item*> (i.grob_);
+  Item *item = i.item ();
+  if (extender_)
+    extender_->set_bound (LEFT, item);
 
-  if (item
-      && item->internal_has_interface (ly_symbol2scm ("lyric-syllable-interface")))
+  if (pending_extender_)
     {
-      if (extender_)
-	extender_->set_bound (LEFT, item);
-
-      if (pending_extender_)
-	pending_extender_->set_bound (RIGHT, item);
+      pending_extender_->set_object ("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, r);
- 
-      if (extender_ && !r)
+      else
+	{
+	  if (pending_extender_
+	      && !get_property ("extendersOverRests"))
+	    {
+	      completize_extender (pending_extender_);
+	      pending_extender_ = 0;
+	    }
+	  
+	}
+      if (extender_)
 	{
 	  pending_extender_ = extender_;
 	  extender_ = 0;
@@ -115,13 +125,9 @@ completize_extender (Spanner *sp)
 {
   if (!sp->get_bound (RIGHT))
     {
-      SCM heads = sp->get_property ("heads");
-      if (ly_c_pair_p (heads))
-	{
-	  Item *it = dynamic_cast<Item*> (unsmob_grob (ly_car (heads)));
-	  if (it)
-	    sp->set_bound (RIGHT, it);
-	}
+      extract_item_set (sp, "heads", heads);
+      if (heads.size ())
+	sp->set_bound (RIGHT, heads.back ());
     }
 }
 
@@ -143,15 +149,21 @@ Extender_engraver::finalize ()
 
       if (!pending_extender_->get_bound (RIGHT))
 	pending_extender_->warning (_ ("unterminated extender"));
-      pending_extender_ =0;
+      pending_extender_ = 0;
     }
 }
 
+ADD_ACKNOWLEDGER (Extender_engraver, lyric_syllable);
+ADD_TRANSLATOR (Extender_engraver,
+		/* doc */
+		"Create lyric extenders.",
+
+		/* create */
+		"LyricExtender ",
+
+		/* read */
+		"extendersOverRests ",
 
-ENTER_DESCRIPTION (Extender_engraver,
-/* descr */       "Create lyric extenders",
-/* creats*/       "LyricExtender",
-/* accepts */     "extender-event",
-/* acks  */       "lyric-syllable-interface",
-/* reads */       "",
-/* write */       "");
+		/* write */
+		""
+		);