X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fextender-engraver.cc;h=f3f711de0f84d9efb31664bb04b43f3ce7f8086e;hb=d3edd18b19979ac9947486af04a002a6118072ff;hp=407442c96822a1f4cd96482177de36db6886e86d;hpb=1c73ec3c7960794484e1c6c335a2421ded1db87a;p=lilypond.git

diff --git a/lily/extender-engraver.cc b/lily/extender-engraver.cc
index 407442c968..f3f711de0f 100644
--- a/lily/extender-engraver.cc
+++ b/lily/extender-engraver.cc
@@ -2,152 +2,168 @@
   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--2009 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 "spanner.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 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
-completize_extender (Spanner* sp)
+Extender_engraver::acknowledge_lyric_syllable (Grob_info i)
 {
-  if (!sp->get_bound (RIGHT))
+  Item *item = i.item ();
+  if (extender_)
+    extender_->set_bound (LEFT, item);
+
+  if (pending_extender_)
     {
-      SCM heads = sp->get_grob_property ("heads");
-      if (gh_pair_p (heads))
-	{
-	  Item* it = dynamic_cast<Item*> (unsmob_grob (gh_car (heads)));
-	  if (it)
-	    sp->set_bound (RIGHT, it);
-	}
+      pending_extender_->set_object ("next", item->self_scm ());
+      completize_extender (pending_extender_);
+      pending_extender_ = 0;
     }
 }
 
-  
-
 void
-Extender_engraver::finalize ()
+Extender_engraver::stop_translation_timestep ()
 {
-  if (extender_)
+  if (extender_ || pending_extender_)
     {
-      completize_extender (extender_);
+      Context *voice = get_voice_to_lyrics (context ());
+      Grob *h = voice ? get_current_note_head (voice) : 0;
 
-      if (!extender_->get_bound (RIGHT))
-	extender_->warning (_ ("unterminated extender"));
-      typeset_grob (extender_);
-      extender_ = 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);
+	    }
+	}
+      else
+	{
+	  if (pending_extender_
+	      && !get_property ("extendersOverRests"))
+	    {
+	      completize_extender (pending_extender_);
+	      pending_extender_ = 0;
+	    }
+	  
+	}
+      if (extender_)
+	{
+	  pending_extender_ = extender_;
+	  extender_ = 0;
+	}
     }
 
-  if (finished_extender_)
-    {
-      completize_extender (finished_extender_);
-
-      if (!finished_extender_->get_bound (RIGHT))
-	  finished_extender_->warning (_("unterminated extender"));
-      typeset_grob (finished_extender_);
-      finished_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_);
 
-  ev_ = 0;
+      if (!pending_extender_->get_bound (RIGHT))
+	pending_extender_->warning (_ ("unterminated extender"));
+      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 */
+		""
+		);