X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fcompletion-note-heads-engraver.cc;h=1522dad8b3d4ada7bdb589003b6ae95dddd74ab4;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=a83c961727578ab5951a96d73e997ac83a369170;hpb=19bb2e8bc9c42b2ffe8dc680bab084597ce6bf64;p=lilypond.git

diff --git a/lily/completion-note-heads-engraver.cc b/lily/completion-note-heads-engraver.cc
index a83c961727..1522dad8b3 100644
--- a/lily/completion-note-heads-engraver.cc
+++ b/lily/completion-note-heads-engraver.cc
@@ -1,7 +1,7 @@
 /*
   completion-note-heads-engraver.cc -- Completion_heads_engraver
 
-  (c) 1997--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1997--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include <cctype>
@@ -14,6 +14,7 @@ using namespace std;
 #include "item.hh"
 #include "output-def.hh"
 #include "pitch.hh"
+#include "pqueue.hh"
 #include "rhythmic-head.hh"
 #include "score-engraver.hh"
 #include "spanner.hh"
@@ -27,6 +28,18 @@ using namespace std;
 /*
   TODO: make matching rest engraver.
 */
+struct Pending_tie
+{
+  Moment when_;
+  Stream_event* tie_event_;
+  Pending_tie() { tie_event_ = 0; }
+};
+
+int compare(Pending_tie const &a, Pending_tie const &b)
+{
+  return compare(a.when_, b.when_);
+}
+
 
 /*
   How does this work?
@@ -47,10 +60,15 @@ class Completion_heads_engraver : public Engraver
 {
   vector<Item*> notes_;
   vector<Item*> prev_notes_;
-  vector<Grob*> ties_;
 
+  // Must remember notes for explicit ties.
+  vector<Item*> tie_note_candidates_;
+  vector<Stream_event*> tie_note_candidate_events_;
+  vector<Grob*> ties_;
+  PQueue<Pending_tie> pending_ties_;
   vector<Stream_event*> note_events_;
 
+  Stream_event *current_tie_event_;
   Moment note_end_mom_;
   bool is_first_;
   Rational left_to_do_;
@@ -64,16 +82,19 @@ public:
 
 protected:
   virtual void initialize ();
+  void make_tie (Grob *, Grob *);
   void start_translation_timestep ();
   void process_music ();
   void stop_translation_timestep ();
   DECLARE_TRANSLATOR_LISTENER (note);
+  DECLARE_TRANSLATOR_LISTENER (tie);
 };
 
 void
 Completion_heads_engraver::initialize ()
 {
   is_first_ = false;
+  current_tie_event_ = 0;
 }
 
 IMPLEMENT_TRANSLATOR_LISTENER (Completion_heads_engraver, note);
@@ -90,6 +111,14 @@ Completion_heads_engraver::listen_note (Stream_event *ev)
   do_nothing_until_ = Rational (0, 0);
 }
 
+IMPLEMENT_TRANSLATOR_LISTENER (Completion_heads_engraver, tie);
+void
+Completion_heads_engraver::listen_tie (Stream_event *ev)
+{
+  is_first_ = true;
+  current_tie_event_ = ev;
+}
+
 /*
   The duration _until_ the next barline.
 */
@@ -128,6 +157,14 @@ Completion_heads_engraver::process_music ()
   if (!is_first_ && !left_to_do_)
     return;
 
+  if (current_tie_event_)
+    {
+      Pending_tie pending;
+      pending.when_ = note_end_mom_;
+      pending.tie_event_ = current_tie_event_;
+      pending_ties_.insert (pending);
+    }
+  
   is_first_ = false;
 
   Moment now = now_mom ();
@@ -166,6 +203,7 @@ Completion_heads_engraver::process_music ()
 
       event->set_property ("pitch", pits);
       event->set_property ("duration", note_dur.smobbed_copy ());
+      event->set_property ("length", Moment (note_dur.get_length ()).smobbed_copy ());
       event->set_property ("duration-log", scm_from_int (note_dur.duration_log ()));
 
       Item *note = make_note_head (event);
@@ -173,31 +211,46 @@ Completion_heads_engraver::process_music ()
 	event->unprotect ();
       notes_.push_back (note);
     }
-
+  
+  if (pending_ties_.size ()
+      && pending_ties_.front().when_ == now_mom())
+    {
+      for (vsize i = 0; i < tie_note_candidate_events_.size(); i++)
+	for (vsize j = 0; j < note_events_.size(); j++)
+	  {
+	    Pitch *p =  unsmob_pitch (note_events_[j]->get_property ("pitch"));
+	    Pitch *p_last
+	      = unsmob_pitch (tie_note_candidate_events_[j]->get_property ("pitch"));
+	    if (p && p_last && *p == *p_last)
+	      make_tie (tie_note_candidates_[i], notes_[j]);
+	  }
+    }
+      
   if (prev_notes_.size () == notes_.size ())
     {
       for (vsize i = 0; i < notes_.size (); i++)
-	{
-	  Grob *p = make_spanner ("Tie", SCM_EOL);
-	  Tie::set_head (p, LEFT, prev_notes_[i]);
-	  Tie::set_head (p, RIGHT, notes_[i]);
-
-	  ties_.push_back (p);
-	}
+	make_tie (prev_notes_[i], notes_[i]);
     }
 
   left_to_do_ -= note_dur.get_length ();
-
   if (left_to_do_)
-    get_global_context ()->add_moment_to_process (now.main_part_ + left_to_do_);
+    get_global_context ()->add_moment_to_process (now.main_part_ + note_dur.get_length());
   /*
     don't do complicated arithmetic with grace notes.
   */
-  if (orig
-      && now_mom ().grace_part_)
+  if (orig && now_mom ().grace_part_)
     left_to_do_ = Rational (0, 0);
 }
 
+void
+Completion_heads_engraver::make_tie (Grob *left, Grob *right)
+{
+  Grob *p = make_spanner ("Tie", SCM_EOL);
+  Tie::set_head (p, LEFT, left);
+  Tie::set_head (p, RIGHT, right);
+  ties_.push_back (p);
+}
+				     
 void
 Completion_heads_engraver::stop_translation_timestep ()
 {
@@ -212,11 +265,21 @@ void
 Completion_heads_engraver::start_translation_timestep ()
 {
   Moment now = now_mom ();
+  while (pending_ties_.size() && pending_ties_.front().when_ < now)
+    {
+      pending_ties_.delmin();
+    }
+  current_tie_event_ = 0;
   if (note_end_mom_.main_part_ <= now.main_part_)
     {
+      tie_note_candidate_events_ = note_events_;
+      tie_note_candidates_ = prev_notes_;
+
       note_events_.clear ();
       prev_notes_.clear ();
     }
+  context ()->set_property ("completionBusy",
+			    ly_bool2scm (note_events_.size ()));
 }
 
 Completion_heads_engraver::Completion_heads_engraver ()
@@ -240,5 +303,5 @@ ADD_TRANSLATOR (Completion_heads_engraver,
 		"measureLength ",
 
 		/* write */
-		""
+		"completionBusy "
 		);