* buildscripts/guile-gnome.sh: Build without gcc libtool version

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

diff --git a/lily/extender-engraver.cc b/lily/extender-engraver.cc
index 8e60f9f9e3b33118a9776b99283a2e769682716e..f2f9d6761411002a89e47b853e55c9fe9c9b4843 100644 (file)
--- a/lily/extender-engraver.cc
+++ b/lily/extender-engraver.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
   
-  (c)  1999--2003 Glen Prideaux <glenprideaux@iname.com>,
+  (c) 1999--2004 Glen Prideaux <glenprideaux@iname.com>,
                   Han-Wen Nienhuys <hanwen@cs.uu.nl>,
                   Jan Nieuwenhuizen <janneke@gnu.org>
 */
@@ -12,21 +12,22 @@
 #include "lyric-extender.hh"
 #include "item.hh"
 #include "engraver.hh"
+#include "context.hh"
+#include "group-interface.hh"
 
 class Extender_engraver : public Engraver
 {
   Music* ev_;
   Spanner* extender_;
-  Spanner * finished_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 void stop_translation_timestep ();
-  virtual void start_translation_timestep ();
   virtual void process_music ();
 private:
 
@@ -38,26 +39,10 @@ private:
 Extender_engraver::Extender_engraver ()
 {
   extender_ = 0;
-  finished_extender_ = 0;
+  pending_extender_ = 0;
   ev_ = 0;
 }
 
-void
-Extender_engraver::acknowledge_grob (Grob_info i)
-{
-  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_->get_bound (RIGHT))
-       finished_extender_->set_bound (RIGHT, item);
-    }
-}
-
-
 bool
 Extender_engraver::try_music (Music* r)
 {
@@ -68,63 +53,110 @@ Extender_engraver::try_music (Music* r)
   return true;
 }
 
+
 void
-Extender_engraver::finalize ()
+Extender_engraver::process_music ()
 {
-  if (extender_)
-    {
-      extender_->warning (_ ("unterminated extender"));
-      typeset_grob (extender_);
-      extender_ = 0;
-    }
-  if (finished_extender_)
+  if (ev_)
     {
-      finished_extender_->warning (_("unterminated extender"));
-      typeset_grob (finished_extender_);
-      finished_extender_ =0;
+      extender_ = make_spanner ("LyricExtender", ev_->self_scm ());
     }
 }
 
+
 void
-Extender_engraver::process_music ()
+Extender_engraver::acknowledge_grob (Grob_info i)
 {
-  if (ev_)
+  Item * item =  dynamic_cast<Item*> (i.grob_);
+
+  if (item
+      && item->internal_has_interface (ly_symbol2scm ("lyric-syllable-interface")))
     {
-      extender_ = new Spanner (get_property ("LyricExtender"));
-      announce_grob (extender_, ev_->self_scm());
+      if (extender_)
+       extender_->set_bound (LEFT, item);
+
+      if (pending_extender_)
+       pending_extender_->set_bound (RIGHT, item);
     }
 }
 
-
 void
 Extender_engraver::stop_translation_timestep ()
 {
-  if (finished_extender_ && finished_extender_->get_bound (RIGHT))
+  if (pending_extender_ && pending_extender_->get_bound (RIGHT))
     {
-      typeset_grob (finished_extender_);
-      finished_extender_ = 0;
+      pending_extender_ = 0;
     }
 
-  if (finished_extender_ && extender_)
+  if (extender_ || pending_extender_)
     {
-      programming_error ("Haven't finished extender yet.");
-      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;
+       }
     }
-  
-  if (extender_)
-    finished_extender_ = extender_;
-  extender_ = 0;
+
+  ev_ = 0;
 }
 
 void
-Extender_engraver::start_translation_timestep ()
+completize_extender (Spanner* sp)
 {
-  ev_ = 0;
+  if (!sp->get_bound (RIGHT))
+    {
+      SCM heads = sp->get_property ("heads");
+      if (ly_c_pair_p (heads))
+       {
+         Item* it = dynamic_cast<Item*> (unsmob_grob (ly_car (heads)));
+         if (it)
+           sp->set_bound (RIGHT, it);
+       }
+    }
 }
 
+  
+
+void
+Extender_engraver::finalize ()
+{
+  if (extender_)
+    {
+      completize_extender (extender_);
+
+      if (!extender_->get_bound (RIGHT))
+       extender_->warning (_ ("unterminated extender"));
+      extender_ = 0;
+    }
+
+  if (pending_extender_)
+    {
+      completize_extender (pending_extender_);
+
+      if (!pending_extender_->get_bound (RIGHT))
+         pending_extender_->warning (_("unterminated extender"));
+      pending_extender_ =0;
+    }
+}
+
+
+
+
 
-ENTER_DESCRIPTION(Extender_engraver,
+ENTER_DESCRIPTION (Extender_engraver,
 /* descr */       "Create lyric extenders",
 /* creats*/       "LyricExtender",
 /* accepts */     "extender-event",