release: 1.3.94

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

diff --git a/lily/extender-engraver.cc b/lily/extender-engraver.cc
index 1f616ec7951d674babd835f43069020e40c55085..5c893207eedcbd211b994948454bd97d6e63dd04 100644 (file)
--- a/lily/extender-engraver.cc
+++ b/lily/extender-engraver.cc
@@ -1,51 +1,85 @@
 /*
   extender-engraver.cc -- implement Extender_engraver
 
-  (c) 1998--1999 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1999 Glen Prideaux <glenprideaux@iname.com>,
+  Han-Wen Nienhuys, Jan Nieuwenhuizen.
+  
 */
 
-#include "proto.hh"
+#include "flower-proto.hh"
 #include "musical-request.hh"
-#include "extender-engraver.hh"
-#include "extender-spanner.hh"
-#include "score-column.hh"
-#include "g-text-item.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
+{
+  Score_element *last_lyric_l_;
+  Score_element *current_lyric_l_;
+  Extender_req* req_l_;
+  Spanner* extender_p_;
+public:
+  Extender_engraver ();
+  VIRTUAL_COPY_CONS (Translator);
+
+protected:
+  virtual void acknowledge_element (Score_element_info);
+  virtual void do_removal_processing();
+  virtual void do_process_music();
+  virtual bool do_try_music (Music*);
+  virtual void do_pre_move_processing();
+  virtual void do_post_move_processing ();
+private:
+
+};
+
 
 ADD_THIS_TRANSLATOR (Extender_engraver);
 
 Extender_engraver::Extender_engraver ()
 {
-  extender_spanner_p_ = 0;
+  current_lyric_l_ = 0;
+  last_lyric_l_ = 0;
+  extender_p_ = 0;
   req_l_ = 0;
 }
 
 void
 Extender_engraver::acknowledge_element (Score_element_info i)
 {
-  if (G_text_item* t = dynamic_cast<G_text_item*> (i.elem_l_))
+  // -> text_item
+  if (i.elem_l_->has_interface (ly_symbol2scm("text-item-interface")))
+
     {
-      Rhythmic_req * rh = dynamic_cast<Rhythmic_req*>  (i.req_l_);
-      if (!rh)
-       return;
-
-      now_lyrics_.push (Text_lyric_tuple (t, rh, now_mom () + rh->length_mom ()));
-      /*
-       UGH.  What do we do in case of multiple alternatives? 
-       */
-      if (extender_spanner_p_
-         && !extender_spanner_p_->spanned_drul_[RIGHT]
+      current_lyric_l_ = i.elem_l_;
+      if (extender_p_
+         && !extender_p_->get_bound (RIGHT)
            )
          {
-           extender_spanner_p_->set_textitem (RIGHT, t);
+           Lyric_extender(extender_p_).set_textitem (RIGHT, dynamic_cast<Item*> (i.elem_l_));
          }
     }
 }
 
 
 bool
-Extender_engraver::do_try_music (Music* req_l)
+Extender_engraver::do_try_music (Music* r)
 {
-  if (Extender_req* p = dynamic_cast <Extender_req *> (req_l))
+  if (Extender_req* p = dynamic_cast <Extender_req *> (r))
     {
       if (req_l_)
        return false;
@@ -59,35 +93,29 @@ Extender_engraver::do_try_music (Music* req_l)
 void
 Extender_engraver::do_removal_processing ()
 {
-  if (extender_spanner_p_)
+  if (extender_p_)
     {
-      req_l_->warning (_ ("unterminated extender"));
-      extender_spanner_p_->set_bounds(RIGHT, get_staff_info ().command_pcol_l ());
+      req_l_->origin ()->warning (_ ("unterminated extender"));
+      extender_p_->set_bound(RIGHT, unsmob_element (get_property ("currentCommandColumn")));
     }
 }
 
 void
-Extender_engraver::do_process_requests ()
+Extender_engraver::do_process_music ()
 {
-  Array<Text_lyric_tuple> stopped_texts;
-  Moment now = now_mom ();
-
-  stopped_texts.clear ();
-  while (past_lyrics_pq_.size ()
-        && past_lyrics_pq_.front ().end_ == now)
-    stopped_texts.push (past_lyrics_pq_.get ());
-
   if (req_l_)
     {
-      if (!stopped_texts.size ())
+      if (!last_lyric_l_)
        {
-         req_l_->warning ("Nothing to connect extender to on the left. Ignoring extender request");
+         req_l_->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, stopped_texts[0].text_l_);
-      announce_element (Score_element_info (extender_spanner_p_, req_l_));
+      extender_p_ = new Spanner (get_property ("LyricExtender"));
+
+
+      Lyric_extender (extender_p_).set_textitem  (LEFT, last_lyric_l_);
+      announce_element (extender_p_, req_l_);
     }
 }
 
@@ -95,47 +123,23 @@ Extender_engraver::do_process_requests ()
 void
 Extender_engraver::do_pre_move_processing ()
 {
-  for (int i=0; i < now_lyrics_.size (); i++)
+  if (extender_p_)
     {
-      past_lyrics_pq_.insert (now_lyrics_[i]);
+      typeset_element (extender_p_);
+      extender_p_ = 0;
     }
-  now_lyrics_.clear ();
 
-  if (extender_spanner_p_)
+  if (current_lyric_l_)
     {
-      typeset_element (extender_spanner_p_);
-      extender_spanner_p_ = 0;
+      last_lyric_l_ = current_lyric_l_;
+      current_lyric_l_ =0;
     }
 }
+
 void
 Extender_engraver::do_post_move_processing ()
 {
-  Moment now = now_mom ();
-  while (past_lyrics_pq_.size () && past_lyrics_pq_.front ().end_ < now)
-    past_lyrics_pq_.delmin ();
-
-  req_l_ =0;
-}
-
-/**********************************************************************/
-Text_lyric_tuple::Text_lyric_tuple ()
-{
-  text_l_ =0;
-  req_l_ =0;
-  end_ = 0;
-}
-
-Text_lyric_tuple::Text_lyric_tuple (G_text_item *h, Rhythmic_req*m, Moment mom)
-{
-  text_l_ = h;
-  req_l_ = m;
-  end_ = mom;
+  req_l_ = 0;
 }
 
 
-int
-Text_lyric_tuple::time_compare (Text_lyric_tuple const&h1,
-                            Text_lyric_tuple const &h2)
-{
-  return (h1.end_ - h2.end_ ).sign ();
-}