X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ftie-engraver.cc;h=cf525dc7b967c57d50c562b94b19c87c677e4c4b;hb=e81c133991d5a43a8177b8fe391fa328dca2e6b4;hp=243b14b43f86dad60776736f2006d89fb308e69e;hpb=61c60c408b78992e56b906b9d1f01c0f15cefce5;p=lilypond.git

diff --git a/lily/tie-engraver.cc b/lily/tie-engraver.cc
index 243b14b43f..cf525dc7b9 100644
--- a/lily/tie-engraver.cc
+++ b/lily/tie-engraver.cc
@@ -3,13 +3,12 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1998--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1998--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "engraver.hh"
 
 #include "context.hh"
-#include "grob-pitch-tuple.hh"
 #include "international.hh"
 #include "item.hh"
 #include "note-head.hh"
@@ -124,8 +123,7 @@ Tie_engraver::acknowledge_note_head (Grob_info i)
       if (ly_is_equal (right_ev->get_property ("pitch"),
 		       left_ev->get_property ("pitch")))
 	{
-	  Grob *p = new Spanner (heads_to_tie_[i].tie_definition_,
-				 context ()->get_grob_key ("Tie"));
+	  Grob *p = new Spanner (heads_to_tie_[i].tie_definition_);
 
 	  SCM cause = heads_to_tie_[i].tie_event_
 	    ? heads_to_tie_[i].tie_event_->self_scm ()
@@ -160,8 +158,8 @@ Tie_engraver::start_translation_timestep ()
 {
   context ()->set_property ("tieMelismaBusy",
 			    ly_bool2scm (heads_to_tie_.size ()));
-  
-  if (!to_boolean (get_property ("tieWaitForNote")))
+
+  if (heads_to_tie_.size () && !to_boolean (get_property ("tieWaitForNote")))
     {
       Moment now = now_mom ();
       for (vsize i = heads_to_tie_.size ();  i--; )
@@ -181,14 +179,9 @@ Tie_engraver::stop_translation_timestep ()
       if (!wait)
 	heads_to_tie_.clear ();
 
-      Grob *sep = unsmob_grob (get_property ("breakableSeparationItem"));
       for (vsize i = 0; i < ties_.size (); i++)
-	{
-	  if (sep)
-	    ties_[i]->set_object  ("separation-item", sep->self_scm ());
-	  
 	  typeset_tie (ties_[i]);
-	}
+
       ties_.clear ();
       tie_column_ = 0;
     }
@@ -254,7 +247,7 @@ Tie_engraver::stop_translation_timestep ()
   if (!wait && new_heads_to_tie.size ())
     heads_to_tie_.clear ();
 
-  // hmmm, how to do with copy() ?
+  // hmmm, how to do with copy () ?
   for (vsize i = 0; i < new_heads_to_tie.size (); i++)
     heads_to_tie_.push_back (new_heads_to_tie[i]);