X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ftie-engraver.cc;h=3d30e77738d9a4fe8403cda31830839f5052e866;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=11f534cdec8af2d792dbb205b55127420a979a19;hpb=88414891a8df65b2a251ae01e36fbf9c6e4b855e;p=lilypond.git

diff --git a/lily/tie-engraver.cc b/lily/tie-engraver.cc
index 11f534cdec..3d30e77738 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--2008 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"
@@ -38,7 +37,7 @@ struct Head_event_tuple
   Moment end_moment_;
   SCM tie_definition_;
   Stream_event *tie_stream_event_;
-  Music *tie_event_;
+  Stream_event *tie_event_;
   
   Head_event_tuple ()
   {
@@ -88,19 +87,19 @@ IMPLEMENT_TRANSLATOR_LISTENER (Tie_engraver, tie);
 void
 Tie_engraver::listen_tie (Stream_event *ev)
 {
-  event_ = ev;
+  ASSIGN_EVENT_ONCE (event_, ev);
 }
 
 void
 Tie_engraver::process_music ()
 {
-  for (vsize i = 0; i < heads_to_tie_.size (); i++)
-    if (heads_to_tie_[i].tie_event_
-	|| heads_to_tie_[i].tie_stream_event_)
-      {
-	context ()->set_property ("tieMelismaBusy", SCM_BOOL_T);
-	break;
-      }
+  bool busy = event_;
+  for (vsize i = 0; !busy && i < heads_to_tie_.size (); i++)
+    busy |=  (heads_to_tie_[i].tie_event_
+	      || heads_to_tie_[i].tie_stream_event_);
+
+  if (busy)
+    context ()->set_property ("tieMelismaBusy", SCM_BOOL_T);
 }
 
 void
@@ -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 ()
@@ -135,6 +133,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 +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--; )
@@ -175,14 +180,13 @@ 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;
     }
 
-  if (!wait)
-    heads_to_tie_.clear ();
+  vector<Head_event_tuple> new_heads_to_tie;
   
   for (vsize i = 0; i < now_heads_.size (); i++)
     {
@@ -199,18 +203,18 @@ Tie_engraver::stop_translation_timestep ()
       
       SCM left_articulations = left_ev->get_property ("articulations");
 
-      Music *tie_event = 0;
+      Stream_event *tie_event = 0;
       Stream_event *tie_stream_event = event_;
       for (SCM s = left_articulations;
 	   !tie_event && !tie_stream_event && scm_is_pair (s);
 	   s = scm_cdr (s))
 	{
-	  Music *m = unsmob_music (scm_car (s));
-	  if (!m)
+	  Stream_event *ev = unsmob_stream_event (scm_car (s));
+	  if (!ev)
 	    continue;
 	  
-	  if (m->is_mus_type ("tie-event"))
-	    tie_event = m;
+	  if (ev->in_event_class ("tie-event"))
+	    tie_event = ev;
 	}
 	  
       if (left_ev && (tie_event || tie_stream_event))
@@ -236,10 +240,17 @@ Tie_engraver::stop_translation_timestep ()
 	    }
 	  event_tup.end_moment_ = end;
 	    
-	  heads_to_tie_.push_back (event_tup);
+	  new_heads_to_tie.push_back (event_tup);
 	}
     }
 
+  if (!wait && new_heads_to_tie.size ())
+    heads_to_tie_.clear ();
+
+  // 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]);
+  
   event_ = 0;
   now_heads_.clear ();
 }
@@ -268,11 +279,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 "
+		);