X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fextender-engraver.cc;h=77a9f7c9520f50f1c2f46c80586d03a866fde169;hb=dd995017b7f85676fabd12cbb340d09e56554cd5;hp=3cf5b3455c9c487e484a3c40e90b0332a2a14ac0;hpb=bb446de35e2d24c7f6f15425a76b433cb71a4a1d;p=lilypond.git

diff --git a/lily/extender-engraver.cc b/lily/extender-engraver.cc
index 3cf5b3455c..77a9f7c952 100644
--- a/lily/extender-engraver.cc
+++ b/lily/extender-engraver.cc
@@ -1,92 +1,169 @@
 /*
   extender-engraver.cc -- implement Extender_engraver
 
-  (c) 1998--1999 Jan Nieuwenhuizen <janneke@gnu.org>
+  source file of the GNU LilyPond music typesetter
+
+  (c) 1999--2007 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 "text-def.hh"
-#include "score-column.hh"
-#include "g-text-item.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_;
+
+public:
+  TRANSLATOR_DECLARATIONS (Extender_engraver);
+
+protected:
+  DECLARE_TRANSLATOR_LISTENER (extender);
+  DECLARE_ACKNOWLEDGER (lyric_syllable);
 
-ADD_THIS_TRANSLATOR (Extender_engraver);
+  virtual void finalize ();
+
+  void stop_translation_timestep ();
+  void process_music ();
+};
 
 Extender_engraver::Extender_engraver ()
 {
-  extender_spanner_p_ = 0;
-  span_reqs_drul_[RIGHT] = span_reqs_drul_[LEFT] = 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)
 {
-  G_text_item* t = dynamic_cast<G_text_item*> (i.elem_l_);
-  if (!t)
-    return;
-  if (!extender_spanner_p_)
-    return;
-  if (!span_reqs_drul_[LEFT])
-    return;
-
-  if (!extender_spanner_p_->item_l_drul_[LEFT])
-    extender_spanner_p_->set_textitem (LEFT, t);
-  else
-    if (span_reqs_drul_[RIGHT] && !extender_spanner_p_->item_l_drul_[RIGHT]) 
-      extender_spanner_p_->set_textitem (RIGHT, t);
+  ASSIGN_EVENT_ONCE (ev_, ev);
 }
 
-bool
-Extender_engraver::do_try_music (Music* req_l)
+void
+Extender_engraver::process_music ()
 {
-  if (Extender_req* p = dynamic_cast <Extender_req *> (req_l))
-    {
-      if (bool (extender_spanner_p_) == bool (p->spantype_ == START))
-	return false;
+  if (ev_)
+    extender_ = make_spanner ("LyricExtender", ev_->self_scm ());
+}
 
-      Direction d = (!extender_spanner_p_) ? LEFT : RIGHT;
-      if (span_reqs_drul_[d] && !span_reqs_drul_[d]->equal_b (p))
-	return false;
+void
+Extender_engraver::acknowledge_lyric_syllable (Grob_info i)
+{
+  Item *item = i.item ();
+  if (extender_)
+    extender_->set_bound (LEFT, item);
 
-      span_reqs_drul_[d] = p;
-      span_mom_drul_[d] = get_staff_info ().musical_l ()->when ();
-      return true;
+  if (pending_extender_)
+    {
+      pending_extender_->set_object ("next", item->self_scm ());
+      completize_extender (pending_extender_);
+      pending_extender_ = 0;
     }
-  return false;
 }
 
 void
-Extender_engraver::do_removal_processing ()
+Extender_engraver::stop_translation_timestep ()
 {
-  if (extender_spanner_p_)
+  if (extender_ || pending_extender_)
     {
-      span_reqs_drul_[LEFT]->warning (_ ("unterminated extender"));
-      extender_spanner_p_->set_bounds(RIGHT, get_staff_info ().command_l ());
+      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);
+	    }
+	}
+      else
+	{
+	  if (pending_extender_
+	      && !get_property ("extendersOverRests"))
+	    {
+	      completize_extender (pending_extender_);
+	      pending_extender_ = 0;
+	    }
+	  
+	}
+      if (extender_)
+	{
+	  pending_extender_ = extender_;
+	  extender_ = 0;
+	}
     }
+
+  ev_ = 0;
 }
 
 void
-Extender_engraver::do_process_requests ()
+completize_extender (Spanner *sp)
 {
-  if (extender_spanner_p_ || !span_reqs_drul_[LEFT])
-    return;
-
-  extender_spanner_p_ = new Extender_spanner;
-
-  announce_element (Score_element_info (extender_spanner_p_, span_reqs_drul_[LEFT]));
+  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_ || !span_reqs_drul_[RIGHT]) 
-    return;
+  if (extender_)
+    {
+      completize_extender (extender_);
+
+      if (!extender_->get_bound (RIGHT))
+	extender_->warning (_ ("unterminated extender"));
+      extender_ = 0;
+    }
+
+  if (pending_extender_)
+    {
+      completize_extender (pending_extender_);
 
-  typeset_element (extender_spanner_p_);
-  
-  extender_spanner_p_ = 0;
-  span_reqs_drul_[RIGHT] = span_reqs_drul_[LEFT] = 0;
+      if (!pending_extender_->get_bound (RIGHT))
+	pending_extender_->warning (_ ("unterminated extender"));
+      pending_extender_ = 0;
+    }
 }
 
+ADD_ACKNOWLEDGER (Extender_engraver, lyric_syllable);
+ADD_TRANSLATOR (Extender_engraver,
+		/* doc */
+		"Create lyric extenders.",
+
+		/* create */
+		"LyricExtender ",
+
+		/* read */
+		"extendersOverRests ",
+
+		/* write */
+		""
+		);