X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fextender-engraver.cc;h=914eefbe63b857544c750c0f412600fadb30671d;hb=b592e19981c26c381a4347a615f97abbd0838666;hp=604172c29293d564d275ec5f09123ccc89a5f5cf;hpb=fc5394c7751ea902382ecc9022854583aff0d95e;p=lilypond.git

diff --git a/lily/extender-engraver.cc b/lily/extender-engraver.cc
index 604172c292..914eefbe63 100644
--- a/lily/extender-engraver.cc
+++ b/lily/extender-engraver.cc
@@ -6,102 +6,144 @@
   
 */
 
-#include "proto.hh"
+#include "flower-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 "lyric-extender.hh"
+#include "paper-column.hh"
+#include "item.hh"
+#include "engraver.hh"
+#include "drul-array.hh"
+#include "lyric-extender.hh"
+#include "pqueue.hh"
+
+
+/**
+  Generate an centred extender.  Should make a Extender_spanner that
+  typesets a nice centred extender of varying length depending on the
+  gap between syllables.
+
+  We remember the last Item that come across. When we get a
+  request, we create the spanner, and attach the left point to the
+  last lyrics, and the right point to any lyrics we receive by
+  then.  */
+class Extender_engraver : public Engraver
+{
+  Grob *last_lyric_;
+  Grob *current_lyric_;
+  Extender_req* req_;
+  Spanner* extender_;
+public:
+  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:
+
+};
+
+
 
-ADD_THIS_TRANSLATOR (Extender_engraver);
 
 Extender_engraver::Extender_engraver ()
 {
-  current_lyric_l_ = 0;
-  last_lyric_l_ = 0;
-  extender_spanner_p_ = 0;
-  req_l_ = 0;
+  current_lyric_ = 0;
+  last_lyric_ = 0;
+  extender_ = 0;
+  req_ = 0;
 }
 
 void
-Extender_engraver::acknowledge_element (Score_element_info i)
+Extender_engraver::acknowledge_grob (Grob_info i)
 {
-  if (Text_item* t = dynamic_cast<Text_item*> (i.elem_l_))
+  // -> text_item
+  if (i.grob_->internal_has_interface (ly_symbol2scm ("lyric-syllable-interface")))
     {
-      current_lyric_l_ = t;
-      if (extender_spanner_p_
-	  && !extender_spanner_p_->spanned_drul_[RIGHT]
+      current_lyric_ = i.grob_;
+      if (extender_
+	  && !extender_->get_bound (RIGHT)
 	    )
 	  {
-	    extender_spanner_p_->set_textitem (RIGHT, t);
+	    Lyric_extender::set_textitem (extender_, RIGHT, dynamic_cast<Item*> (i.grob_));
 	  }
     }
 }
 
 
 bool
-Extender_engraver::do_try_music (Music* r)
+Extender_engraver::try_music (Music* r)
 {
   if (Extender_req* p = dynamic_cast <Extender_req *> (r))
     {
-      if (req_l_)
+      if (req_)
 	return false;
 
-      req_l_ = p;
+      req_ = p;
       return true;
     }
   return false;
 }
 
 void
-Extender_engraver::do_removal_processing ()
+Extender_engraver::finalize ()
 {
-  if (extender_spanner_p_)
+  if (extender_)
     {
-      req_l_->warning (_ ("unterminated extender"));
-      extender_spanner_p_->set_bounds(RIGHT, get_staff_info ().command_pcol_l ());
+      req_->origin ()->warning (_ ("unterminated extender"));
+      extender_->set_bound (RIGHT, unsmob_grob (get_property ("currentCommandColumn")));
     }
 }
 
 void
-Extender_engraver::do_process_requests ()
+Extender_engraver::process_music ()
 {
-  if (req_l_)
+  if (req_ && ! extender_)
     {
-      if (!last_lyric_l_)
+      if (!last_lyric_)
 	{
-	  req_l_->warning (_ ("Nothing to connect extender to on the left.  Ignoring extender request."));
+	  req_->origin ()->warning (_ ("Nothing to connect extender to on the left.  Ignoring extender request."));
 	  return;
 	}
       
-      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_));
+      extender_ = new Spanner (get_property ("LyricExtender"));
+
+
+      Lyric_extender::set_textitem (extender_, LEFT, last_lyric_);
+      announce_grob(extender_, req_->self_scm());
     }
 }
 
 
 void
-Extender_engraver::do_pre_move_processing ()
+Extender_engraver::stop_translation_timestep ()
 {
-  if (extender_spanner_p_)
+  if (extender_)
     {
-      typeset_element (extender_spanner_p_);
-      extender_spanner_p_ = 0;
+      typeset_grob (extender_);
+      extender_ = 0;
     }
 
-  if (current_lyric_l_)
+  if (current_lyric_)
     {
-      last_lyric_l_ = current_lyric_l_;
-      current_lyric_l_ =0;
+      last_lyric_ = current_lyric_;
+      current_lyric_ =0;
     }
 }
 
 void
-Extender_engraver::do_post_move_processing ()
+Extender_engraver::start_translation_timestep ()
 {
-  req_l_ = 0;
+  req_ = 0;
 }
 
 
+ENTER_DESCRIPTION(Extender_engraver,
+/* descr */       "Create lyric extenders",
+/* creats*/       "LyricExtender",
+/* acks  */       "lyric-syllable-interface",
+/* reads */       "",
+/* write */       "");