(try_music): add moments for

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

diff --git a/lily/tie-engraver.cc b/lily/tie-engraver.cc
index 181ede0912fd3c3fe921f5babc1a30e3d5e9d2b6..8c418564753480dbbd6ed64c5e7ed9c08ebce8e9 100644 (file)
--- a/lily/tie-engraver.cc
+++ b/lily/tie-engraver.cc
@@ -74,7 +74,7 @@ void
 Tie_engraver::process_music ()
 {
   if (event_)
-    get_parent_context ()->set_property ("tieMelismaBusy", SCM_BOOL_T);
+    context ()->set_property ("tieMelismaBusy", SCM_BOOL_T);
 }
 
 void
@@ -94,24 +94,23 @@ Tie_engraver::acknowledge_grob (Grob_info i)
            maybe should check positions too.
           */
          if (right_mus && left_mus
-             && is_equal (right_mus->get_property ("pitch"),
+             && ly_c_equal_p (right_mus->get_property ("pitch"),
                             left_mus->get_property ("pitch")))
            {
-             Grob * p = make_spanner ("Tie");
+             Grob * p = make_spanner ("Tie", last_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);
-             announce_grob (p, last_event_->self_scm ());
            }
        }
 
       if (ties_.size () && ! tie_column_)
        {
-         tie_column_ = make_spanner ("TieColumn");
-         announce_grob (tie_column_, SCM_EOL);
+         tie_column_ = make_spanner ("TieColumn", SCM_EOL);
+         
        }
 
       if (tie_column_)
@@ -123,7 +122,7 @@ Tie_engraver::acknowledge_grob (Grob_info i)
 void
 Tie_engraver::start_translation_timestep ()
 {
-  get_parent_context ()->set_property ("tieMelismaBusy",
+  context ()->set_property ("tieMelismaBusy",
                              ly_bool2scm (heads_to_tie_.size ()));
       
 }
@@ -141,11 +140,7 @@ Tie_engraver::stop_translation_timestep ()
 
       ties_.clear ();
       last_event_ = 0;
-      if (tie_column_)
-       {
-         typeset_grob (tie_column_);
-         tie_column_ =0;
-       }
+      tie_column_ =0;
     }
   
   if (event_)
@@ -175,7 +170,6 @@ Tie_engraver::typeset_tie (Grob *her)
   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 ());
 
-  typeset_grob (her);
 }