X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fnote-performer.cc;h=ddf9fe39213e0d74910ce75a268808ad254d424c;hb=94dc452301cc0d1e9983f5aeb784884f7fe8c964;hp=ff3f5b3f816a2212886c726e6a3a98c0b218e04c;hpb=55ac733b69643a6bc6a83b706c65cb56efd388ef;p=lilypond.git

diff --git a/lily/note-performer.cc b/lily/note-performer.cc
index ff3f5b3f81..ddf9fe3921 100644
--- a/lily/note-performer.cc
+++ b/lily/note-performer.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 1996--2011 Jan Nieuwenhuizen <janneke@gnu.org>
+  Copyright (C) 1996--2012 Jan Nieuwenhuizen <janneke@gnu.org>
 
   LilyPond is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -37,13 +37,12 @@ protected:
 
   DECLARE_TRANSLATOR_LISTENER (note);
 private:
-  vector<Stream_event*> note_evs_;
-  vector<Audio_note*> notes_;
+  vector<Stream_event *> note_evs_;
+  vector<Audio_note *> notes_;
 
-
-  vector<Audio_note*> last_notes_;
+  vector<Audio_note *> last_notes_;
   Moment last_start_;
-  
+
 };
 
 void
@@ -57,48 +56,51 @@ Note_performer::process_music ()
   if (unsmob_pitch (prop))
     transposing = *unsmob_pitch (prop);
 
-  for (vsize i = 0; i < note_evs_.size (); i ++)
+  for (vsize i = 0; i < note_evs_.size (); i++)
     {
       Stream_event *n = note_evs_[i];
       SCM pit = n->get_property ("pitch");
 
       if (Pitch *pitp = unsmob_pitch (pit))
-	{
-	  SCM articulations = n->get_property ("articulations");
-	  Stream_event *tie_event = 0;
-	  for (SCM s = articulations;
-	       !tie_event && scm_is_pair (s);
-	       s = scm_cdr (s))
-	    {
-	      Stream_event *ev = unsmob_stream_event (scm_car (s));
-	      if (!ev)
-		continue;
-	  
-	      if (ev->in_event_class ("tie-event"))
-		tie_event = ev;
-	    }
-
-	  Moment len = get_event_length (n, now_mom ());
-	  
-	  Audio_note *p = new Audio_note (*pitp, len, 
-					  tie_event, transposing.negated ());
-	  Audio_element_info info (p, n);
-	  announce_element (info);
-	  notes_.push_back (p);
-
-	  /*
-	    shorten previous note.
-	   */
-	  if (now_mom ().grace_part_)
-	    {
-	      if (last_start_.grace_part_ == Rational (0))
-		{
-		  for (vsize i = 0; i < last_notes_.size (); i++)
-		    last_notes_[i]->length_mom_ += Moment (0,
-							   now_mom().grace_part_);
-		}
-	    }
-	}
+        {
+          SCM articulations = n->get_property ("articulations");
+          Stream_event *tie_event = 0;
+          for (SCM s = articulations;
+               !tie_event && scm_is_pair (s);
+               s = scm_cdr (s))
+            {
+              Stream_event *ev = unsmob_stream_event (scm_car (s));
+              if (!ev)
+                continue;
+
+              if (ev->in_event_class ("tie-event"))
+                tie_event = ev;
+            }
+
+          Moment len = get_event_length (n, now_mom ());
+
+          Audio_note *p = new Audio_note (*pitp, len,
+                                          tie_event, transposing);
+          Audio_element_info info (p, n);
+          announce_element (info);
+          notes_.push_back (p);
+
+          /*
+            Shorten previous note. If it was part of a tie, shorten
+            the first note in the tie.
+           */
+          if (now_mom ().grace_part_)
+            {
+              if (last_start_.grace_part_ == Rational (0))
+                {
+                  for (vsize i = 0; i < last_notes_.size (); i++)
+                    {
+                      Audio_note *tie_head = last_notes_[i]->tie_head ();
+                      tie_head->length_mom_ += Moment (0, now_mom ().grace_part_);
+                    }
+                }
+            }
+        }
     }
 }
 
@@ -123,18 +125,18 @@ Note_performer::listen_note (Stream_event *ev)
 }
 
 ADD_TRANSLATOR (Note_performer,
-		/* doc */
-		"",
+                /* doc */
+                "",
 
-		/* create */
-		"",
+                /* create */
+                "",
 
-		/* read */
-		"",
+                /* read */
+                "",
 
-		/* write */
-		""
-		);
+                /* write */
+                ""
+               );
 
 Note_performer::Note_performer ()
 {