X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ftie-engraver.cc;h=bfae185d3c15fdc0bba345ff9a3c11fa4a047b48;hb=725ff5c600041c5ce8ea41880bc11575b836c5fb;hp=1dfb42fa523236e2bd5266154c34a361d1f8ada7;hpb=abbdb46061be5c0a0682059d1f86bf3e44ca5cf3;p=lilypond.git

diff --git a/lily/tie-engraver.cc b/lily/tie-engraver.cc
index 1dfb42fa52..bfae185d3c 100644
--- a/lily/tie-engraver.cc
+++ b/lily/tie-engraver.cc
@@ -1,15 +1,25 @@
 /*
-  tie-engraver.cc -- implement Tie_engraver
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 1998--2010 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c) 1998--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  LilyPond is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "engraver.hh"
 
 #include "context.hh"
-#include "grob-pitch-tuple.hh"
 #include "international.hh"
 #include "item.hh"
 #include "note-head.hh"
@@ -124,8 +134,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 ()
@@ -135,6 +144,13 @@ Tie_engraver::acknowledge_note_head (Grob_info i)
 	  Tie::set_head (p, LEFT, th);
 	  Tie::set_head (p, RIGHT, h);
 
+
+	  if (is_direction (unsmob_stream_event (cause)->get_property ("direction")))
+	    {
+	      Direction d = to_dir (unsmob_stream_event (cause)->get_property ("direction"));
+	      p->set_property ("direction", scm_from_int (d)); 
+	    }
+	  
 	  ties_.push_back (p);
 	  heads_to_tie_.erase (heads_to_tie_.begin () + i);
 	}
@@ -153,8 +169,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--; )
@@ -175,7 +191,7 @@ Tie_engraver::stop_translation_timestep ()
 	heads_to_tie_.clear ();
 
       for (vsize i = 0; i < ties_.size (); i++)
-	typeset_tie (ties_[i]);
+	  typeset_tie (ties_[i]);
 
       ties_.clear ();
       tie_column_ = 0;
@@ -242,7 +258,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]);
   
@@ -274,11 +290,16 @@ Tie_engraver::typeset_tie (Grob *her)
 
 ADD_ACKNOWLEDGER (Tie_engraver, note_head);
 ADD_TRANSLATOR (Tie_engraver,
-		/* doc */ "Generate ties between noteheads of equal pitch.",
+		/* doc */
+		"Generate ties between note heads of equal pitch.",
+
 		/* create */
 		"Tie "
 		"TieColumn ",
 
-		/* accept */ "tie-event",
-		/* read */ "tieWaitForNote",
-		/* write */ "tieMelismaBusy");
+		/* read */
+		"tieWaitForNote ",
+
+		/* write */
+		"tieMelismaBusy "
+		);