X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fextender-engraver.cc;h=53938b24f6eee350da9b7995cf14ce3b85f715a5;hb=7821c390d25706041f82371e774e00a6b197e08b;hp=eb2b31f7aa058f23e098b47ab8ca47dfac865d90;hpb=6ecc01fbd54016594f4fcd9891fb3aa75272d0a3;p=lilypond.git

diff --git a/lily/extender-engraver.cc b/lily/extender-engraver.cc
index eb2b31f7aa..53938b24f6 100644
--- a/lily/extender-engraver.cc
+++ b/lily/extender-engraver.cc
@@ -2,133 +2,149 @@
   extender-engraver.cc -- implement Extender_engraver
 
   source file of the GNU LilyPond music typesetter
-  
-  (c)  1999--2003 Glen Prideaux <glenprideaux@iname.com>,
-                  Han-Wen Nienhuys <hanwen@cs.uu.nl>,
-                  Jan Nieuwenhuizen <janneke@gnu.org>
+
+  (c) 1999--2006 Glen Prideaux <glenprideaux@iname.com>,
+  Han-Wen Nienhuys <hanwen@xs4all.nl>,
+  Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
-#include "warn.hh"
-#include "lyric-extender.hh"
-#include "item.hh"
+#include "context.hh"
 #include "engraver.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 "translator.icc"
+
+void completize_extender (Spanner *sp);
 
 class Extender_engraver : public Engraver
 {
-  Music* ev_;
-  Spanner* extender_;
-  Spanner * finished_extender_;  
+  Stream_event *ev_;
+  Spanner *extender_;
+  Spanner *pending_extender_;
+
 public:
-  TRANSLATOR_DECLARATIONS(Extender_engraver);
+  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 start_translation_timestep ();
-  virtual void process_music ();
-private:
-
+  void stop_translation_timestep ();
+  void process_music ();
 };
 
-
-
-
 Extender_engraver::Extender_engraver ()
 {
   extender_ = 0;
-  finished_extender_ = 0;
+  pending_extender_ = 0;
   ev_ = 0;
 }
 
+IMPLEMENT_TRANSLATOR_LISTENER (Extender_engraver, extender);
 void
-Extender_engraver::acknowledge_grob (Grob_info i)
+Extender_engraver::listen_extender (Stream_event *ev)
 {
-  Item * item =  dynamic_cast<Item*> (i.grob_);
-  // -> text_item
-  if (item && item->internal_has_interface (ly_symbol2scm ("lyric-syllable-interface")))
-    {
-      if (extender_)
-	extender_->set_bound (LEFT, item);
-
-      if (finished_extender_)
-	finished_extender_->set_bound (RIGHT, item);
-    }
+  ASSIGN_EVENT_ONCE (ev_, ev);
 }
 
-
-bool
-Extender_engraver::try_music (Music* r)
+void
+Extender_engraver::process_music ()
 {
   if (ev_)
-    return false;
-
-  ev_ = r;
-  return true;
+    extender_ = make_spanner ("LyricExtender", ev_->self_scm ());
 }
 
 void
-Extender_engraver::finalize ()
+Extender_engraver::acknowledge_lyric_syllable (Grob_info i)
 {
+  Item *item = i.item ();
   if (extender_)
+    extender_->set_bound (LEFT, item);
+
+  if (pending_extender_)
     {
-      extender_->warning (_ ("unterminated extender"));
-      typeset_grob (extender_);
-      extender_ = 0;
+      pending_extender_->set_object ("next", item->self_scm ());
+      completize_extender (pending_extender_);
+      pending_extender_ = 0;
     }
+}
 
-  if (finished_extender_)
+void
+Extender_engraver::stop_translation_timestep ()
+{
+  if (extender_ || pending_extender_)
     {
-      finished_extender_->warning (_("unterminated extender"));
-      typeset_grob (finished_extender_);
-      finished_extender_ =0;
+      Context *voice = get_voice_to_lyrics (context ());
+      Grob *h = voice ? get_current_note_head (voice) : 0;
+
+      if (h)
+	{
+	  if (extender_)
+	    {
+	      Pointer_group_interface::add_grob (extender_,
+						 ly_symbol2scm ("heads"), h);
+	    }
+
+	  if (pending_extender_)
+	    {
+	      Pointer_group_interface::add_grob (pending_extender_,
+						 ly_symbol2scm ("heads"), h);
+	    }
+	}
+
+      if (extender_)
+	{
+	  pending_extender_ = extender_;
+	  extender_ = 0;
+	}
     }
+
+  ev_ = 0;
 }
 
 void
-Extender_engraver::process_music ()
+completize_extender (Spanner *sp)
 {
-  if (ev_)
+  if (!sp->get_bound (RIGHT))
     {
-      extender_ = new Spanner (get_property ("LyricExtender"));
-      announce_grob (extender_, ev_->self_scm());
+      extract_item_set (sp, "heads", heads);
+      if (heads.size ())
+	sp->set_bound (RIGHT, heads.back ());
     }
 }
 
-
 void
-Extender_engraver::stop_translation_timestep ()
+Extender_engraver::finalize ()
 {
-  if (finished_extender_ && finished_extender_->get_bound (RIGHT))
+  if (extender_)
     {
-      typeset_grob (finished_extender_);
-      finished_extender_ = 0;
+      completize_extender (extender_);
+
+      if (!extender_->get_bound (RIGHT))
+	extender_->warning (_ ("unterminated extender"));
+      extender_ = 0;
     }
 
-  if (finished_extender_ && extender_)
+  if (pending_extender_)
     {
-      programming_error ("Haven't finished extender yet.");
-      typeset_grob (finished_extender_);
-      finished_extender_ =0;
-    }
-  
-  if (extender_)
-    finished_extender_ = extender_;
-  extender_ = 0;
-}
+      completize_extender (pending_extender_);
 
-void
-Extender_engraver::start_translation_timestep ()
-{
-  ev_ = 0;
+      if (!pending_extender_->get_bound (RIGHT))
+	pending_extender_->warning (_ ("unterminated extender"));
+      pending_extender_ = 0;
+    }
 }
 
-
-ENTER_DESCRIPTION(Extender_engraver,
-/* descr */       "Create lyric extenders",
-/* creats*/       "LyricExtender",
-/* accepts */     "extender-event",
-/* acks  */       "lyric-syllable-interface",
-/* reads */       "",
-/* write */       "");
+ADD_ACKNOWLEDGER (Extender_engraver, lyric_syllable);
+ADD_TRANSLATOR (Extender_engraver,
+		/* doc */ "Create lyric extenders",
+		/* create */ "LyricExtender",
+		/* accept */ "extender-event",
+		/* read */ "",
+		/* write */ "");