X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fextender-engraver.cc;h=6058843e875a1f2de716214b78de8af13cc09cbe;hb=38189e6a227753ee6dca31aac448d97071a8551d;hp=64bf8165921616c67c77c93656a5600473befcd0;hpb=2745cbd907f8216a4cc1fc5f488ae19efdfdbd10;p=lilypond.git

diff --git a/lily/extender-engraver.cc b/lily/extender-engraver.cc
index 64bf816592..6058843e87 100644
--- a/lily/extender-engraver.cc
+++ b/lily/extender-engraver.cc
@@ -2,147 +2,158 @@
   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--2005 Glen Prideaux <glenprideaux@iname.com>,
+  Han-Wen Nienhuys <hanwen@cs.uu.nl>,
+  Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
-#include "flower-proto.hh"
-#include "event.hh"
-#include "lyric-extender.hh"
-#include "paper-column.hh"
-#include "item.hh"
+#include "context.hh"
 #include "engraver.hh"
-#include "drul-array.hh"
+#include "group-interface.hh"
+#include "item.hh"
 #include "lyric-extender.hh"
-#include "pqueue.hh"
+#include "note-head.hh"
+#include "warn.hh"
 
+void completize_extender (Spanner *sp);
 
-/**
-  Generate an centred extender.  Should make a Extender_spanner that
-  typesets a nice centred extender of varying length depending on the
-  gap between syllables.
-
-  We remember the last Item that come across. When we get a
-  event, we create the spanner, and attach the left point to the
-  last lyrics, and the right point to any lyrics we receive by
-  then.  */
 class Extender_engraver : public Engraver
 {
-  Grob *last_lyric_;
-  Grob *current_lyric_;
-  Music* req_;
-  Spanner* extender_;
+  Music *ev_;
+  Spanner *extender_;
+  Spanner *pending_extender_;
+
 public:
-  TRANSLATOR_DECLARATIONS(Extender_engraver);
+  TRANSLATOR_DECLARATIONS (Extender_engraver);
 
 protected:
   virtual void acknowledge_grob (Grob_info);
   virtual void finalize ();
-  virtual bool try_music (Music*);
+  virtual bool try_music (Music *);
   virtual void stop_translation_timestep ();
-  virtual void start_translation_timestep ();
   virtual void process_music ();
-private:
-
 };
 
-
-
-
 Extender_engraver::Extender_engraver ()
 {
-  current_lyric_ = 0;
-  last_lyric_ = 0;
   extender_ = 0;
-  req_ = 0;
+  pending_extender_ = 0;
+  ev_ = 0;
 }
 
-void
-Extender_engraver::acknowledge_grob (Grob_info i)
+bool
+Extender_engraver::try_music (Music *r)
 {
-  // -> text_item
-  if (i.grob_->internal_has_interface (ly_symbol2scm ("lyric-syllable-interface")))
+  if (!ev_)
     {
-      current_lyric_ = i.grob_;
-      if (extender_
-	  && !extender_->get_bound (RIGHT)
-	    )
-	  {
-	    Lyric_extender::set_textitem (extender_, RIGHT, dynamic_cast<Item*> (i.grob_));
-	  }
+      ev_ = r;
+      return true;
     }
+  return false;
 }
 
-
-bool
-Extender_engraver::try_music (Music* r)
+void
+Extender_engraver::process_music ()
 {
-  if (req_)
-    return false;
-
-  req_ = r;
-      return true;
+  if (ev_)
+    extender_ = make_spanner ("LyricExtender", ev_->self_scm ());
 }
 
 void
-Extender_engraver::finalize ()
+Extender_engraver::acknowledge_grob (Grob_info i)
 {
-  if (extender_)
+  Item *item = dynamic_cast<Item *> (i.grob_);
+
+  if (item
+      && item->internal_has_interface (ly_symbol2scm ("lyric-syllable-interface")))
     {
-      req_->origin ()->warning (_ ("unterminated extender"));
-      extender_->set_bound (RIGHT, unsmob_grob (get_property ("currentCommandColumn")));
+      if (extender_)
+	extender_->set_bound (LEFT, item);
+
+      if (pending_extender_)
+	{
+	  pending_extender_->set_property ("next", item->self_scm ());
+	  completize_extender (pending_extender_);
+	  pending_extender_ = 0;
+	}
     }
 }
 
 void
-Extender_engraver::process_music ()
+Extender_engraver::stop_translation_timestep ()
 {
-  if (req_ && ! extender_)
+  if (extender_ || pending_extender_)
     {
-      if (!last_lyric_)
+      Context *voice = get_voice_to_lyrics (context ());
+      Grob *h = voice ? get_current_note_head (voice) : 0;
+
+      if (h)
 	{
-	  req_->origin ()->warning (_ ("Nothing to connect extender to on the left.  Ignoring extender event."));
-	  return;
+	  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);
+	    }
 	}
-      
-      extender_ = new Spanner (get_property ("LyricExtender"));
-
 
-      Lyric_extender::set_textitem (extender_, LEFT, last_lyric_);
-      announce_grob(extender_, req_->self_scm());
+      if (extender_)
+	{
+	  pending_extender_ = extender_;
+	  extender_ = 0;
+	}
     }
+
+  ev_ = 0;
 }
 
+void
+completize_extender (Spanner *sp)
+{
+  if (!sp->get_bound (RIGHT))
+    {
+      SCM heads = sp->get_property ("heads");
+      if (scm_is_pair (heads))
+	{
+	  Item *it = dynamic_cast<Item *> (unsmob_grob (scm_car (heads)));
+	  if (it)
+	    sp->set_bound (RIGHT, it);
+	}
+    }
+}
 
 void
-Extender_engraver::stop_translation_timestep ()
+Extender_engraver::finalize ()
 {
   if (extender_)
     {
-      typeset_grob (extender_);
+      completize_extender (extender_);
+
+      if (!extender_->get_bound (RIGHT))
+	extender_->warning (_ ("unterminated extender"));
       extender_ = 0;
     }
 
-  if (current_lyric_)
+  if (pending_extender_)
     {
-      last_lyric_ = current_lyric_;
-      current_lyric_ =0;
-    }
-}
+      completize_extender (pending_extender_);
 
-void
-Extender_engraver::start_translation_timestep ()
-{
-  req_ = 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_TRANSLATOR (Extender_engraver,
+		/* descr */ "Create lyric extenders",
+		/* creats*/ "LyricExtender",
+		/* accepts */ "extender-event",
+		/* acks  */ "lyric-syllable-interface",
+		/* reads */ "",
+		/* write */ "");