Fix some bugs in the dynamic engraver and PostScript backend

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

diff --git a/lily/tie-engraver.cc b/lily/tie-engraver.cc
index 17a6f3fc3ae6343bb0577ac69a99ac3586275a05..39be6c057f034d8015cd12e96ea9edc1480a23b4 100644 (file)
--- a/lily/tie-engraver.cc
+++ b/lily/tie-engraver.cc
@@ -16,13 +16,10 @@
 #include "protected-scm.hh"
 #include "spanner.hh"
 #include "staff-symbol-referencer.hh"
-#include "stream-event.hh"
 #include "tie-column.hh"
 #include "tie.hh"
 #include "warn.hh"
 
-#include "translator.icc"
-
 /**
    Manufacture ties.  Acknowledge noteheads, and put them into a
    priority queue. If we have a TieEvent, connect the notes that finish
@@ -35,21 +32,22 @@
 struct Head_event_tuple
 {
   Grob *head_;
-  Moment end_moment_;
   SCM tie_definition_;
-  Stream_event *event_;
-  
+  Music *event_;
   Head_event_tuple ()
   {
-    event_ = 0;
-    head_ = 0;
-    tie_definition_ = SCM_EOL;
+  }
+  Head_event_tuple (Grob *h, Music *m, SCM def)
+  {
+    head_ = h;
+    event_ = m;
+    tie_definition_ = def;
   }
 };
 
 class Tie_engraver : public Engraver
 {
-  Stream_event *event_;
+  Music *event_;
   vector<Grob*> now_heads_;
   vector<Head_event_tuple> heads_to_tie_;
   vector<Grob*> ties_;
@@ -61,7 +59,7 @@ protected:
   virtual void derived_mark () const;
   void start_translation_timestep ();
   DECLARE_ACKNOWLEDGER (note_head);
-  DECLARE_TRANSLATOR_LISTENER (tie);
+  virtual bool try_music (Music *);
   void process_music ();
   void typeset_tie (Grob *);
 public:
@@ -82,11 +80,13 @@ Tie_engraver::Tie_engraver ()
   tie_column_ = 0;
 }
 
-IMPLEMENT_TRANSLATOR_LISTENER (Tie_engraver, tie);
-void
-Tie_engraver::listen_tie (Stream_event *ev)
+bool
+Tie_engraver::try_music (Music *mus)
 {
-  event_ = ev;
+  if (mus->is_mus_type ("tie-event"))
+    event_ = mus;
+
+  return true;
 }
 
 void
@@ -104,16 +104,15 @@ Tie_engraver::acknowledge_note_head (Grob_info i)
   for (vsize i = heads_to_tie_.size (); i--;)
     {
       Grob *th = heads_to_tie_[i].head_;
-      Stream_event *right_ev = unsmob_stream_event (h->get_property ("cause"));
-      Stream_event *left_ev = unsmob_stream_event (th->get_property ("cause"));
+      Music *right_mus = unsmob_music (h->get_property ("cause"));
+      Music *left_mus = unsmob_music (th->get_property ("cause"));
 
       /*
        maybe should check positions too.
       */
-      if (right_ev && left_ev
-         && !to_boolean (left_ev->get_property ("untied"))
-         && ly_is_equal (right_ev->get_property ("pitch"),
-                         left_ev->get_property ("pitch")))
+      if (right_mus && left_mus
+         && ly_is_equal (right_mus->get_property ("pitch"),
+                         left_mus->get_property ("pitch")))
        {
          Grob *p = new Spanner (heads_to_tie_[i].tie_definition_,
                                 context ()->get_grob_key ("Tie"));
@@ -139,17 +138,6 @@ Tie_engraver::start_translation_timestep ()
 {
   context ()->set_property ("tieMelismaBusy",
                            ly_bool2scm (heads_to_tie_.size ()));
-  
-  
-  if (!to_boolean (get_property ("tieWaitForNote")))
-    {
-      Moment now = now_mom ();
-      for (vsize i = heads_to_tie_.size ();  i--; )
-       {
-         if (now > heads_to_tie_[i].end_moment_)
-           heads_to_tie_.erase (heads_to_tie_.begin () + i);
-       }
-    }
 }
 
 void
@@ -177,29 +165,8 @@ Tie_engraver::stop_translation_timestep ()
 
       for (vsize i = 0; i < now_heads_.size (); i++)
        {
-         Grob *head = now_heads_[i];
-         Stream_event *left_ev = unsmob_stream_event (head->get_property ("cause"));
-         if (left_ev)
-           {
-             Head_event_tuple event_tup;
-
-             event_tup.head_ = head;
-             event_tup.tie_definition_ = start_definition;
-             event_tup.event_ = event_;
-
-             Moment end = now_mom ();
-             if (end.grace_part_)
-               {
-                 end.grace_part_ += get_event_length (left_ev).main_part_;
-               }
-             else
-               {
-                 end += get_event_length (left_ev);
-               }
-             event_tup.end_moment_ = end;
-
-             heads_to_tie_.push_back (event_tup);
-           }
+         heads_to_tie_.push_back (Head_event_tuple (now_heads_[i], event_,
+                                               start_definition));
        }
     }
 
@@ -229,6 +196,8 @@ Tie_engraver::typeset_tie (Grob *her)
   sp->set_bound (RIGHT, new_head_drul[RIGHT]);
 }
 
+#include "translator.icc"
+
 ADD_ACKNOWLEDGER (Tie_engraver, note_head);
 ADD_TRANSLATOR (Tie_engraver,
                /* doc */ "Generate ties between noteheads of equal pitch.",