Editing.

[lilypond.git] / lily / extender-engraver.cc

diff --git a/lily/extender-engraver.cc b/lily/extender-engraver.cc
index 7f7b11b35bafcbd2476228bbb356a28b0d5690bd..ac03f5c67f6a26d52149f7d13880b5b368103e30 100644 (file)
--- a/lily/extender-engraver.cc
+++ b/lily/extender-engraver.cc
@@ -2,10 +2,10 @@
   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 "context.hh"
@@ -16,6 +16,8 @@
 #include "note-head.hh"
 #include "warn.hh"
 
+void completize_extender (Spanner *sp);
+
 class Extender_engraver : public Engraver
 {
   Music *ev_;
@@ -28,12 +30,11 @@ public:
 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 ();
 };
 
-
 Extender_engraver::Extender_engraver ()
 {
   extender_ = 0;
@@ -62,7 +63,7 @@ Extender_engraver::process_music ()
 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")))
@@ -71,36 +72,38 @@ 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))
-    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, h);
- 
-      if (extender_ && !r)
+
+      if (extender_)
        {
          pending_extender_ = extender_;
          extender_ = 0;
@@ -116,9 +119,9 @@ 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);
        }
@@ -143,15 +146,14 @@ Extender_engraver::finalize ()
 
       if (!pending_extender_->get_bound (RIGHT))
        pending_extender_->warning (_ ("unterminated extender"));
-      pending_extender_ =0;
+      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 */ "");