X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fextender-engraver.cc;h=f3f711de0f84d9efb31664bb04b43f3ce7f8086e;hb=5affcbfc2285da731e317dbe32fac312c67b662b;hp=dd0b405bb1a6298dead9a5f6493430d7dd8fc776;hpb=339ea28cd7e4f8a1c1ca7c1d4dfe803a3f4c03e6;p=lilypond.git

diff --git a/lily/extender-engraver.cc b/lily/extender-engraver.cc
index dd0b405bb1..f3f711de0f 100644
--- a/lily/extender-engraver.cc
+++ b/lily/extender-engraver.cc
@@ -1,107 +1,169 @@
 /*
   extender-engraver.cc -- implement Extender_engraver
 
-  (c) 1999 Glen Prideaux <glenprideaux@iname.com>,
-  Han-Wen Nienhuys, Jan Nieuwenhuizen.
-  
+  source file of the GNU LilyPond music typesetter
+
+  (c) 1999--2009 Glen Prideaux <glenprideaux@iname.com>,
+  Han-Wen Nienhuys <hanwen@xs4all.nl>,
+  Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
-#include "proto.hh"
-#include "musical-request.hh"
-#include "extender-engraver.hh"
-#include "extender-spanner.hh"
-#include "score-column.hh"
-#include "text-item.hh"
-#include "extender-engraver.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
+{
+  Stream_event *ev_;
+  Spanner *extender_;
+  Spanner *pending_extender_;
 
-ADD_THIS_TRANSLATOR (Extender_engraver);
+public:
+  TRANSLATOR_DECLARATIONS (Extender_engraver);
+
+protected:
+  DECLARE_TRANSLATOR_LISTENER (extender);
+  DECLARE_ACKNOWLEDGER (lyric_syllable);
+
+  virtual void finalize ();
+
+  void stop_translation_timestep ();
+  void process_music ();
+};
 
 Extender_engraver::Extender_engraver ()
 {
-  current_lyric_l_ = 0;
-  last_lyric_l_ = 0;
-  extender_spanner_p_ = 0;
-  req_l_ = 0;
+  extender_ = 0;
+  pending_extender_ = 0;
+  ev_ = 0;
 }
 
+IMPLEMENT_TRANSLATOR_LISTENER (Extender_engraver, extender);
 void
-Extender_engraver::acknowledge_element (Score_element_info i)
+Extender_engraver::listen_extender (Stream_event *ev)
 {
-  if (Text_item* t = dynamic_cast<Text_item*> (i.elem_l_))
-    {
-      current_lyric_l_ = t;
-      if (extender_spanner_p_
-	  && !extender_spanner_p_->spanned_drul_[RIGHT]
-	    )
-	  {
-	    extender_spanner_p_->set_textitem (RIGHT, t);
-	  }
-    }
+  ASSIGN_EVENT_ONCE (ev_, ev);
 }
 
-
-bool
-Extender_engraver::do_try_music (Music* r)
+void
+Extender_engraver::process_music ()
 {
-  if (Extender_req* p = dynamic_cast <Extender_req *> (r))
-    {
-      if (req_l_)
-	return false;
-
-      req_l_ = p;
-      return true;
-    }
-  return false;
+  if (ev_)
+    extender_ = make_spanner ("LyricExtender", ev_->self_scm ());
 }
 
 void
-Extender_engraver::do_removal_processing ()
+Extender_engraver::acknowledge_lyric_syllable (Grob_info i)
 {
-  if (extender_spanner_p_)
+  Item *item = i.item ();
+  if (extender_)
+    extender_->set_bound (LEFT, item);
+
+  if (pending_extender_)
     {
-      req_l_->warning (_ ("unterminated extender"));
-      extender_spanner_p_->set_bounds(RIGHT, get_staff_info ().command_pcol_l ());
+      pending_extender_->set_object ("next", item->self_scm ());
+      completize_extender (pending_extender_);
+      pending_extender_ = 0;
     }
 }
 
 void
-Extender_engraver::do_process_requests ()
+Extender_engraver::stop_translation_timestep ()
 {
-  if (req_l_)
+  if (extender_ || pending_extender_)
     {
-      if (!last_lyric_l_)
+      Context *voice = get_voice_to_lyrics (context ());
+      Grob *h = voice ? get_current_note_head (voice) : 0;
+
+      if (h)
 	{
-	  req_l_->warning ("Nothing to connect extender to on the left. Ignoring extender request");
-	  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);
+	    }
+	}
+      else
+	{
+	  if (pending_extender_
+	      && !get_property ("extendersOverRests"))
+	    {
+	      completize_extender (pending_extender_);
+	      pending_extender_ = 0;
+	    }
+	  
+	}
+      if (extender_)
+	{
+	  pending_extender_ = extender_;
+	  extender_ = 0;
 	}
-      
-      extender_spanner_p_ = new Extender_spanner;
-      extender_spanner_p_->set_textitem  (LEFT, last_lyric_l_);
-      announce_element (Score_element_info (extender_spanner_p_, req_l_));
     }
+
+  ev_ = 0;
 }
 
+void
+completize_extender (Spanner *sp)
+{
+  if (!sp->get_bound (RIGHT))
+    {
+      extract_item_set (sp, "heads", heads);
+      if (heads.size ())
+	sp->set_bound (RIGHT, heads.back ());
+    }
+}
 
 void
-Extender_engraver::do_pre_move_processing ()
+Extender_engraver::finalize ()
 {
-  if (extender_spanner_p_)
+  if (extender_)
     {
-      typeset_element (extender_spanner_p_);
-      extender_spanner_p_ = 0;
+      completize_extender (extender_);
+
+      if (!extender_->get_bound (RIGHT))
+	extender_->warning (_ ("unterminated extender"));
+      extender_ = 0;
     }
 
-  if (current_lyric_l_)
+  if (pending_extender_)
     {
-      last_lyric_l_ = current_lyric_l_;
-      current_lyric_l_ =0;
+      completize_extender (pending_extender_);
+
+      if (!pending_extender_->get_bound (RIGHT))
+	pending_extender_->warning (_ ("unterminated extender"));
+      pending_extender_ = 0;
     }
 }
 
-void
-Extender_engraver::do_post_move_processing ()
-{
-  req_l_ = 0;
-}
+ADD_ACKNOWLEDGER (Extender_engraver, lyric_syllable);
+ADD_TRANSLATOR (Extender_engraver,
+		/* doc */
+		"Create lyric extenders.",
+
+		/* create */
+		"LyricExtender ",
 
+		/* read */
+		"extendersOverRests ",
 
+		/* write */
+		""
+		);