patch::: 1.3.32.hwn2

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

diff --git a/lily/extender-engraver.cc b/lily/extender-engraver.cc
index 7b6712be70a9a0546c9847ee7508d45c925bb65b..9cab9a6db5c6c7484ea82b233d28758e1aa8ef06 100644 (file)
--- a/lily/extender-engraver.cc
+++ b/lily/extender-engraver.cc
@@ -1,20 +1,25 @@
 /*
   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 "musical-request.hh"
 #include "extender-engraver.hh"
 #include "extender-spanner.hh"
-#include "score-column.hh"
+#include "paper-column.hh"
 #include "text-item.hh"
+#include "extender-engraver.hh"
 
 ADD_THIS_TRANSLATOR (Extender_engraver);
 
 Extender_engraver::Extender_engraver ()
 {
+  current_lyric_l_ = 0;
+  last_lyric_l_ = 0;
   extender_spanner_p_ = 0;
   req_l_ = 0;
 }
@@ -24,16 +29,9 @@ Extender_engraver::acknowledge_element (Score_element_info i)
 {
   if (Text_item* t = dynamic_cast<Text_item*> (i.elem_l_))
     {
-      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? 
-       */
+      current_lyric_l_ = t;
       if (extender_spanner_p_
-         && !extender_spanner_p_->spanned_drul_[RIGHT]
+         && !extender_spanner_p_->get_bound (RIGHT)
            )
          {
            extender_spanner_p_->set_textitem (RIGHT, t);
@@ -43,9 +41,9 @@ Extender_engraver::acknowledge_element (Score_element_info i)
 
 
 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;
@@ -62,31 +60,23 @@ Extender_engraver::do_removal_processing ()
   if (extender_spanner_p_)
     {
       req_l_->warning (_ ("unterminated extender"));
-      extender_spanner_p_->set_bounds(RIGHT, get_staff_info ().command_pcol_l ());
+      extender_spanner_p_->set_bound(RIGHT, get_staff_info ().command_pcol_l ());
     }
 }
 
 void
 Extender_engraver::do_process_requests ()
 {
-  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_->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_);
+      extender_spanner_p_->set_textitem  (LEFT, last_lyric_l_);
       announce_element (Score_element_info (extender_spanner_p_, req_l_));
     }
 }
@@ -95,47 +85,23 @@ Extender_engraver::do_process_requests ()
 void
 Extender_engraver::do_pre_move_processing ()
 {
-  for (int i=0; i < now_lyrics_.size (); i++)
-    {
-      past_lyrics_pq_.insert (now_lyrics_[i]);
-    }
-  now_lyrics_.clear ();
-
   if (extender_spanner_p_)
     {
       typeset_element (extender_spanner_p_);
       extender_spanner_p_ = 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;
+  if (current_lyric_l_)
+    {
+      last_lyric_l_ = current_lyric_l_;
+      current_lyric_l_ =0;
+    }
 }
 
-Text_lyric_tuple::Text_lyric_tuple (Text_item *h, Rhythmic_req*m, Moment mom)
+void
+Extender_engraver::do_post_move_processing ()
 {
-  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 ();
-}