2003 -> 2004

[lilypond.git] / lily / tie-performer.cc

diff --git a/lily/tie-performer.cc b/lily/tie-performer.cc
index 74dfcb8025ba3348fc8a249691c804ca1967e331..5d16b88b01f070f7c85846b39189bcc139edeba8 100644 (file)
--- a/lily/tie-performer.cc
+++ b/lily/tie-performer.cc
@@ -3,11 +3,11 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1999--2003 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1999--2004 Jan Nieuwenhuizen <janneke@gnu.org>
   
  */
 
-
+#include "translator-group.hh"
 #include "audio-item.hh"
 #include "event.hh"
 #include "pqueue.hh"
@@ -41,8 +41,8 @@ class Tie_performer : public Performer
 public:
   TRANSLATOR_DECLARATIONS(Tie_performer);
 private:
-  bool done_;
-  
+
+  bool ties_created_;
   Array<CNote_melodic_tuple> now_notes_;
   Array<CNote_melodic_tuple> tied_notes_;
 
@@ -52,7 +52,7 @@ private:
   Link_array<Audio_tie> ties_;
   
 protected:
-  virtual void initialize ();
+  virtual void process_music ();
   virtual void start_translation_timestep ();
   virtual void stop_translation_timestep ();
   virtual void acknowledge_audio_element (Audio_element_info);
@@ -60,11 +60,19 @@ protected:
   virtual void create_audio_elements ();
 };
 
+void
+Tie_performer::process_music ()
+{
+  if (event_)
+    daddy_trans_->set_property ("tieMelismaBusy", SCM_BOOL_T);
+}
+
 
 Tie_performer::Tie_performer ()
 {
   event_ = 0;
-  done_ = false;
+  ties_created_ = false;
+  prev_event_ = 0;
 }
 
 ENTER_DESCRIPTION (Tie_performer, "", "",
@@ -72,12 +80,6 @@ ENTER_DESCRIPTION (Tie_performer, "", "",
                   "", "", "");
 
 
-void
-Tie_performer::initialize ()
-{
-  event_ = 0;
-}
-
 
 bool
 Tie_performer::try_music (Music *m)
@@ -129,6 +131,7 @@ Tie_performer::create_audio_elements ()
                  p->set_note (RIGHT, now_notes_[j].note_);
                  ties_.push (p);
                  announce_element (Audio_element_info (p, event_));
+                 ties_created_ = true;
 
                  tied_notes_.del (i);
                  break ; 
@@ -142,22 +145,23 @@ Tie_performer::create_audio_elements ()
 void
 Tie_performer::stop_translation_timestep ()
 {
-  if (prev_event_ && tied_notes_.size () && !ties_.size ())
+  if (prev_event_ && tied_notes_.size () && !ties_.size ()
+      && now_notes_.size ())
     {
       prev_event_->origin ()->warning (_ ("No ties were performed."));
     }
-  else
-    prev_event_ = 0;
+
+  if (ties_created_)
+    {
+      prev_event_ = 0;
+      tied_notes_.clear();
+    }
   
   if (event_)
     {
       tied_notes_ = now_notes_ ;
       prev_event_ = event_;
     }
-  else
-    {
-      tied_notes_.clear (); 
-    }
 
   event_ = 0;
   now_notes_ .clear ();
@@ -174,7 +178,7 @@ void
 Tie_performer::start_translation_timestep ()
 {
   event_ =0;
-  done_ = false;
+  ties_created_ = false;
   Moment now = now_mom ();
   for (int i= tied_notes_.size (); i-- ;)
     {