X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fextender-engraver.cc;h=ac03f5c67f6a26d52149f7d13880b5b368103e30;hb=0fcd8c283c45644a92d2308f1cd0d82a1e63380b;hp=35f4db921848d5da8fa0dda91fdc3268cd281a7b;hpb=e540311d3f5799216c91d203080f63b65cccde07;p=lilypond.git

diff --git a/lily/extender-engraver.cc b/lily/extender-engraver.cc
index 35f4db9218..ac03f5c67f 100644
--- a/lily/extender-engraver.cc
+++ b/lily/extender-engraver.cc
@@ -2,40 +2,39 @@
   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--2005 Glen Prideaux <glenprideaux@iname.com>,
+  Han-Wen Nienhuys <hanwen@cs.uu.nl>,
+  Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
-#include "warn.hh"
-#include "lyric-extender.hh"
-#include "item.hh"
-#include "engraver.hh"
 #include "context.hh"
+#include "engraver.hh"
 #include "group-interface.hh"
+#include "item.hh"
+#include "lyric-extender.hh"
+#include "note-head.hh"
+#include "warn.hh"
+
+void completize_extender (Spanner *sp);
 
 class Extender_engraver : public Engraver
 {
-  Music* ev_;
-  Spanner* extender_;
-  Spanner * pending_extender_;  
+  Music *ev_;
+  Spanner *extender_;
+  Spanner *pending_extender_;
+
 public:
   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 process_music ();
-private:
-
 };
 
-
-
-
 Extender_engraver::Extender_engraver ()
 {
   extender_ = 0;
@@ -44,30 +43,27 @@ Extender_engraver::Extender_engraver ()
 }
 
 bool
-Extender_engraver::try_music (Music* r)
+Extender_engraver::try_music (Music *r)
 {
-  if (ev_)
-    return false;
-
-  ev_ = r;
-  return true;
+  if (!ev_)
+    {
+      ev_ = r;
+      return true;
+    }
+  return false;
 }
 
-
 void
 Extender_engraver::process_music ()
 {
   if (ev_)
-    {
-      extender_ = make_spanner ("LyricExtender", ev_->self_scm ());
-    }
+    extender_ = make_spanner ("LyricExtender", ev_->self_scm ());
 }
 
-
 void
 Extender_engraver::acknowledge_grob (Grob_info i)
 {
-  Item * item =  dynamic_cast<Item*> (i.grob_);
+  Item *item = dynamic_cast<Item *> (i.grob ());
 
   if (item
       && item->internal_has_interface (ly_symbol2scm ("lyric-syllable-interface")))
@@ -76,33 +72,36 @@ Extender_engraver::acknowledge_grob (Grob_info i)
 	extender_->set_bound (LEFT, item);
 
       if (pending_extender_)
-	pending_extender_->set_bound (RIGHT, item);
+	{
+	  pending_extender_->set_property ("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))
-    {
-      typeset_grob (pending_extender_);
-      pending_extender_ = 0;
-    }
-
   if (extender_ || pending_extender_)
     {
       Context *voice = get_voice_to_lyrics (context ());
-      Grob* h =  (voice) ? get_current_note_head (voice) : 0;
+      Grob *h = voice ? get_current_note_head (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);
+	    }
+	}
 
       if (extender_)
 	{
@@ -115,22 +114,20 @@ Extender_engraver::stop_translation_timestep ()
 }
 
 void
-completize_extender (Spanner* sp)
+completize_extender (Spanner *sp)
 {
   if (!sp->get_bound (RIGHT))
     {
       SCM heads = sp->get_property ("heads");
-      if (ly_c_pair_p (heads))
+      if (scm_is_pair (heads))
 	{
-	  Item* it = dynamic_cast<Item*> (unsmob_grob (ly_car (heads)));
+	  Item *it = dynamic_cast<Item *> (unsmob_grob (scm_car (heads)));
 	  if (it)
 	    sp->set_bound (RIGHT, it);
 	}
     }
 }
 
-  
-
 void
 Extender_engraver::finalize ()
 {
@@ -140,7 +137,6 @@ Extender_engraver::finalize ()
 
       if (!extender_->get_bound (RIGHT))
 	extender_->warning (_ ("unterminated extender"));
-      typeset_grob (extender_);
       extender_ = 0;
     }
 
@@ -149,20 +145,15 @@ Extender_engraver::finalize ()
       completize_extender (pending_extender_);
 
       if (!pending_extender_->get_bound (RIGHT))
-	  pending_extender_->warning (_("unterminated extender"));
-      typeset_grob (pending_extender_);
-      pending_extender_ =0;
+	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 */ "");