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 8db63a0318ccc19fcdcbb5bf5caef31d4f1bce25..39be6c057f034d8015cd12e96ea9edc1480a23b4 100644 (file)
--- a/lily/tie-engraver.cc
+++ b/lily/tie-engraver.cc
@@ -3,20 +3,22 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1998--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1998--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
-#include "tie.hh"
+#include "engraver.hh"
+
 #include "context.hh"
+#include "grob-pitch-tuple.hh"
+#include "international.hh"
+#include "item.hh"
+#include "note-head.hh"
 #include "protected-scm.hh"
 #include "spanner.hh"
+#include "staff-symbol-referencer.hh"
 #include "tie-column.hh"
-#include "engraver.hh"
-#include "item.hh"
-#include "grob-pitch-tuple.hh"
+#include "tie.hh"
 #include "warn.hh"
-#include "note-head.hh"
-#include "staff-symbol-referencer.hh"
 
 /**
    Manufacture ties.  Acknowledge noteheads, and put them into a
@@ -46,9 +48,9 @@ struct Head_event_tuple
 class Tie_engraver : public Engraver
 {
   Music *event_;
-  Link_array<Grob> now_heads_;
-  Array<Head_event_tuple> heads_to_tie_;
-  Link_array<Grob> ties_;
+  vector<Grob*> now_heads_;
+  vector<Head_event_tuple> heads_to_tie_;
+  vector<Grob*> ties_;
 
   Spanner *tie_column_;
 
@@ -68,7 +70,7 @@ void
 Tie_engraver::derived_mark () const
 {
   Engraver::derived_mark ();
-  for (int i = 0; i < heads_to_tie_.size (); i++)
+  for (vsize i = 0; i < heads_to_tie_.size (); i++)
     scm_gc_mark (heads_to_tie_[i].tie_definition_);
 }
 
@@ -82,9 +84,7 @@ bool
 Tie_engraver::try_music (Music *mus)
 {
   if (mus->is_mus_type ("tie-event"))
-    {
-      event_ = mus;
-    }
+    event_ = mus;
 
   return true;
 }
@@ -93,17 +93,15 @@ void
 Tie_engraver::process_music ()
 {
   if (event_)
-    {
-      context ()->set_property ("tieMelismaBusy", SCM_BOOL_T);
-    }
+    context ()->set_property ("tieMelismaBusy", SCM_BOOL_T);
 }
 
 void
 Tie_engraver::acknowledge_note_head (Grob_info i)
 {
   Grob *h = i.grob ();
-  now_heads_.push (h);
-  for (int i = heads_to_tie_.size (); i--;)
+  now_heads_.push_back (h);
+  for (vsize i = heads_to_tie_.size (); i--;)
     {
       Grob *th = heads_to_tie_[i].head_;
       Music *right_mus = unsmob_music (h->get_property ("cause"));
@@ -119,23 +117,19 @@ Tie_engraver::acknowledge_note_head (Grob_info i)
          Grob *p = new Spanner (heads_to_tie_[i].tie_definition_,
                                 context ()->get_grob_key ("Tie"));
          announce_grob (p, heads_to_tie_[i].event_->self_scm ());
-         Tie::set_interface (p); // cannot remove yet!
-
          Tie::set_head (p, LEFT, th);
          Tie::set_head (p, RIGHT, h);
 
-         ties_.push (p);
-         heads_to_tie_.del (i);
+         ties_.push_back (p);
+         heads_to_tie_.erase (heads_to_tie_.begin () + i);
        }
     }
 
   if (ties_.size () && ! tie_column_)
-    {
-      tie_column_ = make_spanner ("TieColumn", ties_[0]->self_scm ());
-    }
+    tie_column_ = make_spanner ("TieColumn", ties_[0]->self_scm ());
 
   if (tie_column_)
-    for (int i = ties_.size (); i--;)
+    for (vsize i = ties_.size (); i--;)
       Tie_column::add_tie (tie_column_, ties_[i]);
 }
 
@@ -152,14 +146,10 @@ Tie_engraver::stop_translation_timestep ()
   if (ties_.size ())
     {
       if (!to_boolean (get_property ("tieWaitForNote")))
-       {
-         heads_to_tie_.clear ();
-       }
+       heads_to_tie_.clear ();
 
-      for (int i = 0; i < ties_.size (); i++)
-       {
-         typeset_tie (ties_[i]);
-       }
+      for (vsize i = 0; i < ties_.size (); i++)
+       typeset_tie (ties_[i]);
 
       ties_.clear ();
       tie_column_ = 0;
@@ -173,9 +163,9 @@ Tie_engraver::stop_translation_timestep ()
       if (!to_boolean (get_property ("tieWaitForNote")))
        heads_to_tie_.clear ();
 
-      for (int i = 0; i < now_heads_.size (); i++)
+      for (vsize i = 0; i < now_heads_.size (); i++)
        {
-         heads_to_tie_.push (Head_event_tuple (now_heads_[i], event_,
+         heads_to_tie_.push_back (Head_event_tuple (now_heads_[i], event_,
                                                start_definition));
        }
     }
@@ -201,15 +191,20 @@ Tie_engraver::typeset_tie (Grob *her)
     }
   while (flip (&d) != LEFT);
 
-  index_set_cell (her->get_property ("head-pair"), LEFT, new_head_drul[LEFT]->self_scm ());
-  index_set_cell (her->get_property ("head-pair"), RIGHT, new_head_drul[RIGHT]->self_scm ());
+  Spanner *sp = dynamic_cast<Spanner*> (her);
+  sp->set_bound (LEFT, new_head_drul[LEFT]);
+  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.",
-               /* create */ "Tie TieColumn",
+               /* create */
+               "Tie "
+               "TieColumn",
+
                /* accept */ "tie-event",
-               /* read */ "tieMelismaBusy",
-               /* write */ "");
+               /* read */ "tieWaitForNote",
+               /* write */ "tieMelismaBusy");